Add fix from upstream for building with gcc-4.6 #367261 by Nils Larsson.

Package-Manager: portage-2.2.0_alpha33/cvs/Linux x86_64

4 files changed, 113 insertions, 7 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index da8023c89889..86a3883c2d18 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.92 2011/05/18 18:45:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.93 2011/05/18 18:56:18 vapier Exp $
+
+  18 May 2011; Mike Frysinger <vapier@gentoo.org> xbmc-10.1.ebuild,
+  +files/xbmc-10.1-gcc-4.6.patch:
+  Add fix from upstream for building with gcc-4.6 #367261 by Nils Larsson.
 
   18 May 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
   Update autoconf list #367835 by Alexandre B.
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index a79b043be831..2b63cd0ef16d 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -2,15 +2,16 @@
 Hash: SHA256
 
 AUX xbmc-10.0-python-2.7.patch 30308 RMD160 15f01d93b0db903eadb5deb94d5092b0a4b68de4 SHA1 4f6da8045b575a80fd7d556c5b1f2fbbe2bc2da4 SHA256 8f6b2a0a962ad250fc317542d0fa180585d3c9e630ca98f99299b6f750555085
+AUX xbmc-10.1-gcc-4.6.patch 4295 RMD160 4aee4c91f9d2f9e947d37cd39f2700fc0eaec353 SHA1 5ae755b20e06560aaf1508b80c1f7661ef36802f SHA256 cef1154bc3352b215bfece1a749d901d43ec7aa0c6d050921ae8745c553e84c9
 DIST xbmc-10.1.tar.gz 130187822 RMD160 a4ddb06b396b8ae437bf30bea5b44396b54ebc5b SHA1 7a9f4e2c18a23d687ecfc744f2e051e4f88ef01a SHA256 3403195b7eb1d076523f2394793b7f050df00743892b031f6fea86b998559d8a
-EBUILD xbmc-10.1.ebuild 5282 RMD160 aa557bc5cf3d4d50e0a3b103242917c246d55b6e SHA1 e5786180d9d1df4f54e90ce5a4b5e6bd8bddad14 SHA256 2072c70c187689ef8d0a49adb24deeaa6a384a0d92a94f5dada2fb23100bf72f
+EBUILD xbmc-10.1.ebuild 5337 RMD160 b23f20967a3fd40c89455ba2963f5eda982f0318 SHA1 a4db333db347341e3958b5b8a619233c7140ac22 SHA256 f0af2fd26c0462b79a9763b38f5834b8ca63cf7e33ab3d743f3df8c2854705dc
 EBUILD xbmc-9999.ebuild 4896 RMD160 2fde25e4b535a5352b10c33cb09575a7ef2da116 SHA1 aa602fbe01da2be25c42278e95e9dd25f9f66799 SHA256 db04c821ba35498eb8955011b8d93e6a5671c23d7f058594514f817bd2305d02
-MISC ChangeLog 14684 RMD160 40355e96b391676cb77b5bfb315728204ebb13e5 SHA1 47fe36d32a88ad40395e48dc768f4d35987a42d0 SHA256 db1a6a9a7295590c9896d803d2acc1b7936b1d49465f5107f6875c71a0a00686
+MISC ChangeLog 14862 RMD160 bd470fea4d9344fb0155889ea4965d3e187f014b SHA1 fa697d6c8716e13955ea9599816aaef45c621d65 SHA256 66a0c9e0062457e387916f09667c4fa48b8df3931eca38097c533f64ddf742df
 MISC metadata.xml 646 RMD160 e94131de5980a6f435c16f40ae772938d0844db1 SHA1 b1ef02535947638e70e01bb6fa91915f28e2795b SHA256 9bbbd6928abe328028892131aeb27b4ad3db7822236209e0110aa31dca7554b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3UE9gACgkQaC/OocHi7JZslgD+NYCIvmUUyfBVNUBUN44HQYz3
-l7FulpwH6PtG8d8trdABAJNmiII/dDxaNkz6j8CLMverIMcsH7Rt4hycRuEWmqq+
-=75Fs
+iF4EAREIAAYFAk3UFlgACgkQaC/OocHi7JaTMgD/VzV5l5PfKq92ca3vLmq4Ax2t
+i34egrtOns9XQzwZ0IMA/0SqcYX2kTZlt77u7G0BgWXj1av0iNQz0q3aetP7zGDk
+=8s2V
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/files/xbmc-10.1-gcc-4.6.patch b/media-tv/xbmc/files/xbmc-10.1-gcc-4.6.patch
new file mode 100644
index 000000000000..b3e8c7c242fa
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-10.1-gcc-4.6.patch
@@ -0,0 +1,100 @@
+http://trac.xbmc.org/ticket/11383
+http://bugs.gentoo.org/367261
+
+From c66099c4d8e6b2d748ca3ddc31ee90b731d0f620 Mon Sep 17 00:00:00 2001
+From: Stephan Raue <stephan@openelec.tv>
+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@openelec.tv>
+---
+ 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;
+diff --git a/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in b/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
+index 3c487e9..6d4abd4 100644
+--- a/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
++++ b/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
+@@ -49,12 +49,12 @@ $(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER_OSX) $(DVDCSS_A) libdvdread/obj/libdvd
+ 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) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
+-	$(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
++	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
+ 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
+ 
+ endif
+-- 
+1.7.0.2
+
diff --git a/media-tv/xbmc/xbmc-10.1.ebuild b/media-tv/xbmc/xbmc-10.1.ebuild
index c17c21dfd54e..98b118e1a4bf 100644
--- a/media-tv/xbmc/xbmc-10.1.ebuild
+++ b/media-tv/xbmc/xbmc-10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-10.1.ebuild,v 1.4 2011/04/06 22:30:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-10.1.ebuild,v 1.5 2011/05/18 18:56:18 vapier Exp $
 
 EAPI="2"
 
@@ -110,6 +110,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-10.0-python-2.7.patch #350098
+	epatch "${FILESDIR}"/${PN}-10.1-gcc-4.6.patch #367261
 
 	# some dirs ship generated autotools, some dont
 	local d