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

(Portage version: 2.1.3.16)

3 files changed, 48 insertions, 7 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/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