Marking mpeg4ip-1.0rc1 stable on x86, added patch for m4a file handling

5 files changed, 42 insertions, 8 deletions

diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog
index 7cb0cc06c5fb..63f50b1637df 100644
--- a/media-video/mpeg4ip/ChangeLog
+++ b/media-video/mpeg4ip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mpeg4ip
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.2 2003/12/03 19:14:30 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.3 2003/12/08 23:32:20 tester Exp $
+
+  09 Dec 2003; Olivier Crete <tester@gentoo.org> mpeg4ip-1.0_rc1.ebuild,
+  mpeg4ip-1.0_rc3.ebuild, files/sliver.patch:
+  Marking rc1 stable on x86, added patch for m4a file handling
 
 *mpeg4ip-1.0_rc3 (03 Dec 2003)
 
diff --git a/media-video/mpeg4ip/Manifest b/media-video/mpeg4ip/Manifest
index a8cc3187fa87..46b5e0529a48 100644
--- a/media-video/mpeg4ip/Manifest
+++ b/media-video/mpeg4ip/Manifest
@@ -1,6 +1,7 @@
-MD5 41cd21c57c4a681917a656238a22c7d5 mpeg4ip-1.0_rc1.ebuild 2061
-MD5 3bdb53247abc6254ba752cbe1a7343f0 ChangeLog 673
-MD5 bc789294c8d36a755cc5da5b3d217f84 mpeg4ip-1.0_rc3.ebuild 2061
+MD5 93c2a04ea0a7b4f491f0a0cc74c3f1da mpeg4ip-1.0_rc1.ebuild 2088
+MD5 63acddead8378c85a8f540054fd8d38e ChangeLog 856
+MD5 ec0dbd86ff96a4a47dfc1e599362eb83 mpeg4ip-1.0_rc3.ebuild 2148
 MD5 a090b9d809b76b0d8b075efe6868595a metadata.xml 254
 MD5 9fd30cb88ca225eed3247808dcbea404 files/digest-mpeg4ip-1.0_rc3 67
+MD5 6264dccf9a4c49712b65b406825c5113 files/sliver.patch 659
 MD5 e4f8176e7bdb754b483129ba0cc83b7f files/digest-mpeg4ip-1.0_rc1 67
diff --git a/media-video/mpeg4ip/files/sliver.patch b/media-video/mpeg4ip/files/sliver.patch
new file mode 100644
index 000000000000..50b6d0e57bd2
--- /dev/null
+++ b/media-video/mpeg4ip/files/sliver.patch
@@ -0,0 +1,24 @@
+Index: mp4atom.h
+===================================================================
+RCS file: /vws/pan/mpeg4ip/lib/mp4v2/mp4atom.h,v
+retrieving revision 1.30
+diff -c -w -r1.30 mp4atom.h
+*** mp4atom.h	5 Dec 2001 21:11:20 -0000	1.30
+--- mp4atom.h	3 Dec 2003 21:56:26 -0000
+***************
+*** 88,94 ****
+  		return m_type;
+  	};
+  	void SetType(const char* type) {
+! 		if (type) {
+  			ASSERT(strlen(type) == 4);
+  			memcpy(m_type, type, 4);
+  			m_type[4] = '\0';
+--- 88,94 ----
+  		return m_type;
+  	};
+  	void SetType(const char* type) {
+! 		if (type && *type != '\0') {
+  			ASSERT(strlen(type) == 4);
+  			memcpy(m_type, type, 4);
+  			m_type[4] = '\0';
diff --git a/media-video/mpeg4ip/mpeg4ip-1.0_rc1.ebuild b/media-video/mpeg4ip/mpeg4ip-1.0_rc1.ebuild
index dbc34a8b1a69..ed67115c1e51 100644
--- a/media-video/mpeg4ip/mpeg4ip-1.0_rc1.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.0_rc1.ebuild,v 1.1 2003/11/24 17:10:57 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.0_rc1.ebuild,v 1.2 2003/12/08 23:32:20 tester Exp $
 
 DESCRIPTION="MPEG 4 implementation library"
 
@@ -14,7 +14,8 @@ LICENSE="MPL-1.1 LGPL-2 GPL-2 LGPL-2.1 BSD UCL MPEG4"
 
 SLOT="0"
 
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc -amd64"
+# Not 64bit safe yet
 
 IUSE="ipv6 mmx gtk"
 
diff --git a/media-video/mpeg4ip/mpeg4ip-1.0_rc3.ebuild b/media-video/mpeg4ip/mpeg4ip-1.0_rc3.ebuild
index 223e4c9f5946..770c89badfe8 100644
--- a/media-video/mpeg4ip/mpeg4ip-1.0_rc3.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.0_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.0_rc3.ebuild,v 1.1 2003/12/03 19:14:30 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.0_rc3.ebuild,v 1.2 2003/12/08 23:32:20 tester Exp $
 
 DESCRIPTION="MPEG 4 implementation library"
 
@@ -14,7 +14,8 @@ LICENSE="MPL-1.1 LGPL-2 GPL-2 LGPL-2.1 BSD UCL MPEG4"
 
 SLOT="0"
 
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc -amd64"
+# not 64 bit safe yet
 
 IUSE="ipv6 mmx gtk"
 
@@ -52,6 +53,9 @@ src_unpack() {
 		cp ${file} ${file}.orig || die
 		sed -e 's:libSDL:libSDLmpeg4ip:g' ${file}.orig > ${file} || die
 	done
+
+	cd ${S}/lib/mp4v2
+	patch -p0 < ${FILESDIR}/sliver.patch
 }
 
 src_compile() {