Fix building for gcc4.

Package-Manager: portage-2.0.51.20-r4

4 files changed, 40 insertions, 21 deletions

diff --git a/media-libs/libmpeg3/ChangeLog b/media-libs/libmpeg3/ChangeLog
index d75293d9d3b1..b04cfd3254b1 100644
--- a/media-libs/libmpeg3/ChangeLog
+++ b/media-libs/libmpeg3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libmpeg3
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.34 2005/04/08 02:32:22 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.35 2005/04/25 19:32:50 azarah Exp $
+
+  25 Apr 2005; Martin Schlemmer <azarah@gentoo.org> +files/1.5.2-gcc4.patch,
+  libmpeg3-1.5.2-r1.ebuild:
+  Fix building for gcc4.
 
   08 Apr 2005; Danny van Dyk <kugelfang@gentoo.org>
   libmpeg3-1.5.2-r1.ebuild:
diff --git a/media-libs/libmpeg3/Manifest b/media-libs/libmpeg3/Manifest
index 00f40331c052..8252ddbe6e30 100644
--- a/media-libs/libmpeg3/Manifest
+++ b/media-libs/libmpeg3/Manifest
@@ -1,33 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a8eb12e5b0444cdfe1ecd042f3d0f5b2 libmpeg3-1.5.2-r1.ebuild 2695
+MD5 55451121e8a2d7edb247a6ab91966f08 libmpeg3-1.5.2-r1.ebuild 2803
 MD5 4811169eda355182993beccc5a95f440 libmpeg3-1.5.2.ebuild 2136
-MD5 55c6b2b7e4518f497089a4b6f5edc566 ChangeLog 5228
+MD5 a84a7be3a23b2545dc1b4be0c9bc711a ChangeLog 5356
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 d3a05866020d3e1f064974f5363c6c53 files/1.5.1-gentoo-mpeg3split.patch 2315
-MD5 8c1c4667609bae1089a66ea6c8ee1f28 files/1.5.1-gentoo-p1.patch 1376
-MD5 4e83631ff34cc2e5505210c328e55a88 files/1.5.1-gentoo-p2.patch 3461
+MD5 d350249b0ff07ff5969ce4368d5ebbe5 files/libmpeg3-gentoo-patch-part2 4180
+MD5 8d7c2891c2e4e8bcb6f8003718d5e74c files/1.5.2-gcc4.patch 355
 MD5 0335a104cfdf11350198751a1f3aff8c files/1.5.1-largefile.patch 291
-MD5 07e228685340f8108b870543728f43cf files/1.5.1-proper-c.patch 601
-MD5 c945b2843e8b1d32fc4af70cf5026912 files/1.5.1-pthread.patch 204
-MD5 9b759ebc2fff68e033053285e5a450c8 files/1.5.2-gentoo-mpeg3split.patch 2083
-MD5 8c1c4667609bae1089a66ea6c8ee1f28 files/1.5.2-gentoo-p1.patch 1376
-MD5 4e83631ff34cc2e5505210c328e55a88 files/1.5.2-gentoo-p2.patch 3461
-MD5 0335a104cfdf11350198751a1f3aff8c files/1.5.2-largefile.patch 291
 MD5 4434d248764e42d26e3ad3a08cfbc4ae files/1.5.2-no-nasm.patch 553
+MD5 793abbb0f0a5b2d5593ffc4be358bd80 files/libmpeg3-gentoo-patch-part1 1358
+MD5 4c1de213cd8a773b0742da874a882100 files/1.5.2-gcc3.4.patch 5963
+MD5 0335a104cfdf11350198751a1f3aff8c files/1.5.2-largefile.patch 291
+MD5 4e83631ff34cc2e5505210c328e55a88 files/1.5.2-gentoo-p2.patch 3461
 MD5 07e228685340f8108b870543728f43cf files/1.5.2-proper-c.patch 601
 MD5 c945b2843e8b1d32fc4af70cf5026912 files/1.5.2-pthread.patch 204
-MD5 81b6cc87dac447d9be64d2327bd6193c files/digest-libmpeg3-1.5.2-r1 71
+MD5 8c1c4667609bae1089a66ea6c8ee1f28 files/1.5.1-gentoo-p1.patch 1376
+MD5 d3a05866020d3e1f064974f5363c6c53 files/1.5.1-gentoo-mpeg3split.patch 2315
+MD5 8c1c4667609bae1089a66ea6c8ee1f28 files/1.5.2-gentoo-p1.patch 1376
+MD5 c945b2843e8b1d32fc4af70cf5026912 files/1.5.1-pthread.patch 204
 MD5 81b6cc87dac447d9be64d2327bd6193c files/digest-libmpeg3-1.5.2 71
-MD5 793abbb0f0a5b2d5593ffc4be358bd80 files/libmpeg3-gentoo-patch-part1 1358
-MD5 d350249b0ff07ff5969ce4368d5ebbe5 files/libmpeg3-gentoo-patch-part2 4180
-MD5 4c1de213cd8a773b0742da874a882100 files/1.5.2-gcc3.4.patch 5963
+MD5 81b6cc87dac447d9be64d2327bd6193c files/digest-libmpeg3-1.5.2-r1 71
+MD5 4e83631ff34cc2e5505210c328e55a88 files/1.5.1-gentoo-p2.patch 3461
+MD5 07e228685340f8108b870543728f43cf files/1.5.1-proper-c.patch 601
+MD5 9b759ebc2fff68e033053285e5a450c8 files/1.5.2-gentoo-mpeg3split.patch 2083
 MD5 c132ad46a3ae646bb3cb0f2f283db3ca files/1.5.2-gentoo-multilib.patch 877
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCVe2j5mJXAu5GbtIRAj4bAJ45b0vPfAPHqT7PipBAPYjR/E4i5ACfV/v2
-iYDDIw0RS43/vd/hkXkM6P0=
-=bOY4
+iD8DBQFCbUbz1ZcsMnZjRyIRAmgQAJ0QvSk1cPnBE/C5kUgcs+h7vbe+ogCfQEYY
+RcAyiH1DaFPiSdkH5UxlsPQ=
+=oguw
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmpeg3/files/1.5.2-gcc4.patch b/media-libs/libmpeg3/files/1.5.2-gcc4.patch
new file mode 100644
index 000000000000..11dee13b3593
--- /dev/null
+++ b/media-libs/libmpeg3/files/1.5.2-gcc4.patch
@@ -0,0 +1,11 @@
+--- libmpeg3-1.5.2/video/output.c.orig	2005-04-25 19:14:02.000000000 +0000
++++ libmpeg3-1.5.2/video/output.c	2005-04-25 19:14:15.000000000 +0000
+@@ -497,7 +497,7 @@
+ 	*data++ = 0;
+ 
+ #define STORE_PIXEL_RGB565 \
+-	*((unsigned short*)data)++ = \
++	*data++ = \
+ 		((CLIP(r_l) & 0xf8) << 8) | \
+ 		((CLIP(g_l) & 0xfc) << 3) | \
+ 		((CLIP(b_l) & 0xf8) >> 3);
diff --git a/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild b/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild
index 7a258bfdb176..d7c4d05f3717 100644
--- a/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild
+++ b/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild,v 1.5 2005/04/08 02:32:22 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild,v 1.6 2005/04/25 19:32:50 azarah Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -33,7 +33,10 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}-proper-c.patch
 	epatch ${FILESDIR}/${PV}-no-nasm.patch
 	epatch ${FILESDIR}/${PV}-gentoo-multilib.patch
-	[ "`gcc-version`" == "3.4" ] && epatch ${FILESDIR}/${PV}-gcc3.4.patch #49452
+	[ "`gcc-version`" == "3.4" -o "`gcc-major-version`" -ge 4 ] && \
+		epatch ${FILESDIR}/${PV}-gcc3.4.patch #49452
+	[ "`gcc-major-version`" -ge 4 ] && \
+		epatch ${FILESDIR}/${PV}-gcc4.patch
 	# remove a52 crap
 	echo > Makefile.a52
 	rm -rf a52dec-0.7.3/*