Applied GCC 4.2 patch from PLD for bug #186637. (gcc-porting) Fix quoting.

Package-Manager: portage-2.1.3.16

4 files changed, 70 insertions, 15 deletions

diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog
index 32967eefe926..ef24572f080e 100644
--- a/media-video/mpeg4ip/ChangeLog
+++ b/media-video/mpeg4ip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mpeg4ip
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.51 2007/07/22 08:45:39 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.52 2007/10/28 19:20:53 dirtyepic Exp $
+
+  28 Oct 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/mpeg4ip-1.5.0.1-gcc42.patch, mpeg4ip-1.5.0.1-r2.ebuild:
+  Applied GCC 4.2 patch from PLD for bug #186637.  (gcc-porting)  Fix quoting.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; mpeg4ip-1.4.1.ebuild,
   mpeg4ip-1.4.1-r1.ebuild, mpeg4ip-1.5.0.1-r1.ebuild,
diff --git a/media-video/mpeg4ip/Manifest b/media-video/mpeg4ip/Manifest
index 1ab809c06b87..2843ff0dfb86 100644
--- a/media-video/mpeg4ip/Manifest
+++ b/media-video/mpeg4ip/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mpeg4ip-1.4.1-disable-faac-test.patch 1149 RMD160 fabfac7262e34ad8ba0aea08938fa61ca9f2c389 SHA1 a84ae2a263374edbe104c682fd2db385ff1145ca SHA256 cbe9093e82530731e4dc53973c62e3879b7297199f52f25b7d0317cfe4c0d2ba
 MD5 22a76c68f55b131dfc602a61ededb699 files/mpeg4ip-1.4.1-disable-faac-test.patch 1149
 RMD160 fabfac7262e34ad8ba0aea08938fa61ca9f2c389 files/mpeg4ip-1.4.1-disable-faac-test.patch 1149
@@ -10,6 +13,10 @@ AUX mpeg4ip-1.5.0.1-as-needed.patch 4197 RMD160 3a55f0ce40c5e771df88307cf08b8f91
 MD5 1377c5577684c189977dd42bcb8734c2 files/mpeg4ip-1.5.0.1-as-needed.patch 4197
 RMD160 3a55f0ce40c5e771df88307cf08b8f912cfb06e1 files/mpeg4ip-1.5.0.1-as-needed.patch 4197
 SHA256 b95921dbae1c4b0964b90698605a7dff1886f792e347c3ad0518b705fcf25aa9 files/mpeg4ip-1.5.0.1-as-needed.patch 4197
+AUX mpeg4ip-1.5.0.1-gcc42.patch 1282 RMD160 250ae882c6737a02f0d5eac18359f030faed5168 SHA1 9a5e1334476dca239c9a9290bcb9767cfcaa0f25 SHA256 a1a03d56865fd0d2989db980e546b445e740e5d5a3241ef2639e5def125c0ff7
+MD5 76e3304aa89c02c59f44639354f14c67 files/mpeg4ip-1.5.0.1-gcc42.patch 1282
+RMD160 250ae882c6737a02f0d5eac18359f030faed5168 files/mpeg4ip-1.5.0.1-gcc42.patch 1282
+SHA256 a1a03d56865fd0d2989db980e546b445e740e5d5a3241ef2639e5def125c0ff7 files/mpeg4ip-1.5.0.1-gcc42.patch 1282
 AUX mpeg4ip-1.5.0.1-lX11.patch 418 RMD160 931eac8523d5a5b594571887ab4792e9dbe544f3 SHA1 dc73ae37cb4569a7476c2cd25ba11cf96a6c0919 SHA256 c34ab2bf8304fa223a20c2baacb83cc5a2ec7ef427cba8db7318f21b0f280f5a
 MD5 199ffbaa7e96920c6cce6672f4102bb9 files/mpeg4ip-1.5.0.1-lX11.patch 418
 RMD160 931eac8523d5a5b594571887ab4792e9dbe544f3 files/mpeg4ip-1.5.0.1-lX11.patch 418
@@ -36,14 +43,14 @@ EBUILD mpeg4ip-1.5.0.1-r1.ebuild 3671 RMD160 40134d3f6e779a3e0200e2b8e78280a46f0
 MD5 7f9aeaa62a27b5b5321c8d3856d77a30 mpeg4ip-1.5.0.1-r1.ebuild 3671
 RMD160 40134d3f6e779a3e0200e2b8e78280a46f04737f mpeg4ip-1.5.0.1-r1.ebuild 3671
 SHA256 f0ab97763c9b6aa65173fd512e80583a0afc53cd290518c164f2710deb1a9a39 mpeg4ip-1.5.0.1-r1.ebuild 3671
-EBUILD mpeg4ip-1.5.0.1-r2.ebuild 3730 RMD160 de4489e0ba026559f26c4961d6bab96a7d3811c8 SHA1 b0ac6299f464cd431ce683565cbd8a1e2cc20dec SHA256 bdc14a4cd471cadd676e029010360960f148311f597f20d2b70ed71c5e1c7a25
-MD5 b4a1ad2770fe634611c691fae3c6c3d7 mpeg4ip-1.5.0.1-r2.ebuild 3730
-RMD160 de4489e0ba026559f26c4961d6bab96a7d3811c8 mpeg4ip-1.5.0.1-r2.ebuild 3730
-SHA256 bdc14a4cd471cadd676e029010360960f148311f597f20d2b70ed71c5e1c7a25 mpeg4ip-1.5.0.1-r2.ebuild 3730
-MISC ChangeLog 8570 RMD160 a8c8f1007e11f8f74bf97be2a439bb5d3273aa1d SHA1 7953ccd20db0fd14780a65448f27bbaae1de6990 SHA256 c3e35b4130f7a323859635c08688233e6d7efdd41b553f153aa63c0ae3f0f8d2
-MD5 ec301cdd6eef5a4c693df6e789d4c88a ChangeLog 8570
-RMD160 a8c8f1007e11f8f74bf97be2a439bb5d3273aa1d ChangeLog 8570
-SHA256 c3e35b4130f7a323859635c08688233e6d7efdd41b553f153aa63c0ae3f0f8d2 ChangeLog 8570
+EBUILD mpeg4ip-1.5.0.1-r2.ebuild 3779 RMD160 ab4600bfeeb97242a0432d340a903380ef4a32e1 SHA1 e22d930cfce4a99b6da24570f7a192cbc59e5ab4 SHA256 cf68a854e5ada26cec3ed385362c0cc00067fcf1289f5afa87230117254edd81
+MD5 148a9cfa35161fa01ec46355ff161c5c mpeg4ip-1.5.0.1-r2.ebuild 3779
+RMD160 ab4600bfeeb97242a0432d340a903380ef4a32e1 mpeg4ip-1.5.0.1-r2.ebuild 3779
+SHA256 cf68a854e5ada26cec3ed385362c0cc00067fcf1289f5afa87230117254edd81 mpeg4ip-1.5.0.1-r2.ebuild 3779
+MISC ChangeLog 8763 RMD160 8fddd0d7143ab0e8204f605ccb2432a399b1914c SHA1 ac2d5f36406eefd576b6b2789879bcec2b5cba82 SHA256 1aaa49bf12b38490fd103a9299a300ac54af049874c0e03d6cfa526f21b9e4c3
+MD5 ba6a0b66ab081a557f2c836bd0bac426 ChangeLog 8763
+RMD160 8fddd0d7143ab0e8204f605ccb2432a399b1914c ChangeLog 8763
+SHA256 1aaa49bf12b38490fd103a9299a300ac54af049874c0e03d6cfa526f21b9e4c3 ChangeLog 8763
 MISC metadata.xml 255 RMD160 5270d78482f975182f91bf12c1c35f02f1724b80 SHA1 ab610963bd3bcba3a951090a167f9fd5755b6cde SHA256 1711781f9f166223d7d8e3bda1083ed9e144627c3ccc3bbdbafbb59db0bfce1f
 MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255
 RMD160 5270d78482f975182f91bf12c1c35f02f1724b80 metadata.xml 255
@@ -60,3 +67,10 @@ SHA256 0f7df09398e7002cb89b9685203d3148c6c6c878c748380a78735aaaa7ba1bbc files/di
 MD5 e2f664c0648cfd656f71ec99f49c8a32 files/digest-mpeg4ip-1.5.0.1-r2 250
 RMD160 92cd3b3759cc48d6714f344756350b6d045478db files/digest-mpeg4ip-1.5.0.1-r2 250
 SHA256 0f7df09398e7002cb89b9685203d3148c6c6c878c748380a78735aaaa7ba1bbc files/digest-mpeg4ip-1.5.0.1-r2 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHJOEgiqiDRvmkBmIRAuUkAKC8g43KWJl2RSO1fFYHOLm+AC7LZwCeKwEJ
+TwWA06bnpK4zPcd2I4sgi/o=
+=kdzZ
+-----END PGP SIGNATURE-----
diff --git a/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-gcc42.patch b/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-gcc42.patch
new file mode 100644
index 000000000000..8907c3a07ca0
--- /dev/null
+++ b/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-gcc42.patch
@@ -0,0 +1,36 @@
+--- mpeg4ip-1.5.0.1/common/video/iso-mpeg4/include/basic.hpp.orig	2005-05-04 19:55:58.000000000 +0000
++++ mpeg4ip-1.5.0.1/common/video/iso-mpeg4/include/basic.hpp	2006-12-13 10:15:12.283713250 +0000
+@@ -89,12 +89,9 @@
+ #define transpPixel CPixel(0,0,0,0)
+ #define opaquePixel CPixel(255,255,255,255)
+ 
+-#ifndef max
+-#define max(a,b) (((a) > (b)) ? (a) : (b))
+-#endif
+-#ifndef min
+-#define min(a, b)  (((a) < (b)) ? (a) : (b))
+-#endif
++static inline long min( long x, long y ) { return ( ( x < y ) ? x : y ); }
++static inline long max( long x, long y ) { return ( ( x > y ) ? x : y ); }
++
+ #define signOf(x) (((x) > 0) ? 1 : 0)
+ #define invSignOf(x) ((x) > 0 ? 0 : 1)					// see p.22/H.263
+ #define sign(x) ((x) > 0 ? 1 : -1)					// see p.22/H.263
+--- mpeg4ip-1.5.0.1/common/video/iso-mpeg4/src/type_basic.cpp.orig	2005-05-04 19:56:00.000000000 +0000
++++ mpeg4ip-1.5.0.1/common/video/iso-mpeg4/src/type_basic.cpp	2006-12-13 10:41:07.856930500 +0000
+@@ -317,13 +317,13 @@
+ 	iHalfY = m_vctTrueHalfPel.y - iMVY * 2;
+ }
+ 
+-Void CMotionVector::setToZero (Void)
++Void CMotionVector::setToZero ()
+ {
+ 	memset (this, 0, sizeof (*this));
+ }
+ 
+ // RRV insertion
+-Void CMotionVector::scaleup (Void)
++Void CMotionVector::scaleup ()
+ {
+ 	if(m_vctTrueHalfPel.x == 0){
+ 		m_vctTrueHalfPel_x2.x = 0;
\ No newline at end of file
diff --git a/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r2.ebuild b/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r2.ebuild
index 77dbe9cc2040..fbf1564e8c44 100644
--- a/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r2.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r2.ebuild,v 1.3 2007/07/22 08:45:39 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r2.ebuild,v 1.4 2007/10/28 19:20:53 dirtyepic Exp $
 
 WANT_AUTOMAKE="1.9"
 
@@ -58,18 +58,19 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 	epatch "${FILESDIR}/mpeg4ip-1.4.1-disable-faac-test.patch"
 	epatch "${FILESDIR}/${P}-x264.patch"
 	epatch "${FILESDIR}/mpeg4ip-1.5.0.1-newffmpeg.patch"
 	epatch "${FILESDIR}/mpeg4ip-1.5.0.1-lX11.patch"
 	epatch "${FILESDIR}/mpeg4ip-1.5.0.1-as-needed.patch"
+	epatch "${FILESDIR}/${P}-gcc42.patch"
 
 	eautoreconf
 }
 
 src_compile() {
-	cd ${S}
+	cd "${S}"
 
 	local myconf
 	myconf=" --datadir=/usr/share/mpeg4ip
@@ -135,11 +136,11 @@ src_compile() {
 }
 
 src_install () {
-	cd ${S}
+	cd "${S}"
 	make install DESTDIR="${D}" || die "make install failed"
 
-	rm -f ${D}/usr/include/mp4.h
-	rm -f ${D}/usr/$(get_libdir)/libmp4v2*
+	rm -f "${D}"/usr/include/mp4.h
+	rm -f "${D}"/usr/$(get_libdir)/libmp4v2*
 
 	dodoc doc/MPEG4IP_Guide.pdf doc/*txt AUTHORS TODO