Author: alexlan Update of /cvs/free/rpms/xbmc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv26562 Modified Files: xbmc.spec Added Files: xbmc-Dharma-10.1-gcc-4.6-fixes-0.1.patch Log Message: Patch from upstream to fix builds for GCC 4.6.x, slightly modified to handle previous patches for Makefile.in http://trac.xbmc.org/ticket/11383 xbmc-Dharma-10.1-gcc-4.6-fixes-0.1.patch: b/xbmc/cores/dvdplayer/Codecs/Makefile.in | 18 +++++++-------- xbmc-10.1/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in | 4 +-- 2 files changed, 11 insertions(+), 11 deletions(-) --- NEW FILE xbmc-Dharma-10.1-gcc-4.6-fixes-0.1.patch --- From: Stephan Raue <stephan(a)openelec.tv&gt; Date: Wed, 30 Mar 2011 14:57:28 +0200 Subject: [PATCH] dvdplayer: fix build with gcc-4.6. Flags to the Linker must be passed via -Wl,. This fixes ticket #11383 Signed-off-by: Stephan Raue <stephan(a)openelec.tv&gt; --- xbmc/cores/dvdplayer/Codecs/Makefile.in | 18 +++++++++--------- xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/xbmc/cores/dvdplayer/Codecs/Makefile.in b/xbmc/cores/dvdplayer/Codecs/Makefile.in index a7ef1a0..308664a 100644 --- a/xbmc/cores/dvdplayer/Codecs/Makefile.in +++ b/xbmc/cores/dvdplayer/Codecs/Makefile.in @@ -148,32 +148,32 @@ liba52: else $(SYSDIR)/avutil-50-$(ARCH).so: ffmpeg/libavutil/libavutil.so - $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \ + $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \ ffmpeg/libavutil/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER) $(SYSDIR)/avcodec-52-$(ARCH).so: $(WRAPPER) ffmpeg/libavcodec/libavcodec.so - $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \ + $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \ ffmpeg/libavcodec/*.o ffmpeg/libavcodec/$(ARCH_DIR)/*.o \ `cat $(WRAPPER:.o=.def)` $(WRAPPER) $(SYSDIR)/avformat-52-$(ARCH).so: $(WRAPPER) ffmpeg/libavformat/libavformat.so - $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \ + $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \ ffmpeg/libavformat/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER) ifneq ($(ARCH), arm) $(SYSDIR)/swscale-0.6.1-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.so - $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \ + $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \ ffmpeg/libswscale/*.o ffmpeg/libswscale/$(ARCH_DIR)/*.o \ `cat $(WRAPPER:.o=.def)` $(WRAPPER) else # No ARM version of swscale available yet. $(SYSDIR)/swscale-0.6.1-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.so - $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \ + $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \ ffmpeg/libswscale/*.o \ `cat $(WRAPPER:.o=.def)` $(WRAPPER) endif $(SYSDIR)/postproc-51-$(ARCH).so: $(WRAPPER) ffmpeg/libpostproc/libpostproc.so - $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \ + $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \ ffmpeg/libpostproc/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER) ffmpeg/libavutil/libavutil.so : ffmpeg; @@ -185,17 +185,17 @@ ffmpeg: $(MAKE) -C $@ $(SYSDIR)/libdts-$(ARCH).so: $(WRAPPER) libdts/libdts/libdts.a - $(CC) -o $@ $(LDFLAGS) --soname,$@ \ + $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \ libdts/libdts/bitstream.o \ libdts/libdts/downmix.o libdts/libdts/parse.o \ `cat $(WRAPPER:.o=.def)` $(WRAPPER) $(SYSDIR)/liba52-$(ARCH).so: $(WRAPPER) liba52/liba52/liba52.la - $(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/liba52/.libs/*.o \ + $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ liba52/liba52/.libs/*.o \ -Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER) $(SYSDIR)/libao-$(ARCH).so: $(WRAPPER) liba52/libao/libao.a - $(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/libao/libao.a \ + $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ liba52/libao/libao.a \ -Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER) libdts/libdts/libdts.a : libdts; --- xbmc-10.1/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in.orig 2011-03-30 23:13:00.901672912 -0400 +++ xbmc-10.1/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in 2011-03-30 23:13:23.837829699 -0400 @@ -48,12 +48,12 @@ else $(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a - $(CC) -o $@ $(LDFLAGS) --soname,$@ \ + $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \ libdvdcss/src/*.o \ `cat $(WRAPPER:.o=.def)` $(WRAPPER) $(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a - $(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o \ + $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o \ `cat $(WRAPPER:.o=.def)` $(WRAPPER) endif Index: xbmc.spec =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- xbmc.spec 30 Mar 2011 05:31:36 -0000 1.25 +++ xbmc.spec 31 Mar 2011 03:22:04 -0000 1.26 @@ -5,7 +5,7 @@ Name: xbmc Version: 10.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.xbmc.org/ Source0: %{name}-%{DIRVERSION}-patched.tar.xz @@ -44,6 +44,10 @@ # to find Python 2.7 (needed for F-14+) Patch6: xbmc-10-python2.7.patch +# patch from upstream to fix builds for GCC 4.6.x +# (committed to git upstream: http://trac.xbmc.org/ticket/11383) +Patch7: xbmc-Dharma-10.1-gcc-4.6-fixes-0.1.patch + ExcludeArch: ppc64 Buildroot: %{_tmppath}/%{name}-%{version} Summary: Media center @@ -158,6 +162,7 @@ %patch4 -p1 %patch5 -p0 %patch6 -p0 +%patch7 -p1 # Prevent rerunning the autotools. touch -r xbmc/screensavers/rsxs-0.9/aclocal.m4 \ @@ -225,6 +230,11 @@ %{_datadir}/icons/hicolor/*/*/*.png %changelog +* Wed Mar 30 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.1-2 +- Patch from upstream to fix builds for GCC 4.6.x, slightly modified + to handle previous patches for Makefile.in + http://trac.xbmc.org/ticket/11383 + * Tue Mar 29 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.1-1 - Update to 10.1 - Add support for using system python-imaging and pysqlite modules, thanks to Pierre