Add a patch to built with glibc 2.10, closes bug #270510.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 141 insertions, 3 deletions

diff --git a/media-libs/libmp4v2/ChangeLog b/media-libs/libmp4v2/ChangeLog
index b2e9fc193a85..807d41f2e95d 100644
--- a/media-libs/libmp4v2/ChangeLog
+++ b/media-libs/libmp4v2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libmp4v2
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmp4v2/ChangeLog,v 1.41 2008/12/02 23:13:32 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmp4v2/ChangeLog,v 1.42 2009/05/22 15:10:42 flameeyes Exp $
+
+*libmp4v2-1.5.0.1-r2 (22 May 2009)
+
+  22 May 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +libmp4v2-1.5.0.1-r2.ebuild, +files/libmp4v2-1.5.0.1+glibc-2.10.patch:
+  Add a patch to built with glibc 2.10, closes bug #270510.
 
   02 Dec 2008; Brent Baude <ranger@gentoo.org> libmp4v2-1.5.0.1-r1.ebuild:
   stable ppc64, bug 224217
diff --git a/media-libs/libmp4v2/Manifest b/media-libs/libmp4v2/Manifest
index 6b8ecfdbdbfb..8e78dceaa7fb 100644
--- a/media-libs/libmp4v2/Manifest
+++ b/media-libs/libmp4v2/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX libmp4v2-1.5.0.1+glibc-2.10.patch 1103 RMD160 68e639aefdb2bbcaf5dd9599423809ad5db846f4 SHA1 a1d6c4771b2f74506866b0738a66a7e9ce43153f SHA256 04899e5d8b4ab1ce1628c00a3e7c998e00c5eee4704a7d911e7bddf9cca9e9eb
 DIST mpeg4ip-1.5.0.1.tar.gz 4826180 RMD160 fee5c21c17a470e6de349e07d233a1eb46b2064a SHA1 1271de695ed65284d9c39aa91bf26c5494603fd3 SHA256 23535dd818898ec75ffa0df22d9f27189e77361ce8a500d58328073ee247bcb6
 EBUILD libmp4v2-1.5.0.1-r1.ebuild 1859 RMD160 2a5c4dc5cefc790b331ed6bd7657742fff237dc9 SHA1 4af09617babc8616320b1bad3d07002463b925ea SHA256 63817e0618f005b7d477d2763cd3b4f5ebddf88eac2579585bb0c828916c3b9d
+EBUILD libmp4v2-1.5.0.1-r2.ebuild 1945 RMD160 01071bdd01659c69af4a664df84977c9dbd39695 SHA1 d987557a478a3c63f8bcb0e4ef3ad26d49d6b9d9 SHA256 b067824335a4ae97d97c16776e64ec1651856cc52d636aa481974ee3cb5023d6
 EBUILD libmp4v2-1.5.0.1.ebuild 1772 RMD160 42f3e06a455d450ba81c4b84e1a1aa002dee79c3 SHA1 268f43056d887b51183ae0da77417f6e8327e963 SHA256 11db8990666a8a0b9747cfb907fe10f22f7e5900ee033d1a34d0a2319d1dc4d8
-MISC ChangeLog 4770 RMD160 1bbba151a210ab80a003c86361c626ab30c6eb4c SHA1 c357e87579cc6eac29fa8133557e01af202e6789 SHA256 30bcb2bc66af8f8f7cea1db27e31b3dc2dca5a32850b0c8160f977097ddaf580
+MISC ChangeLog 4999 RMD160 75f4199aa82508f4900bcd4697cb07455a9a2076 SHA1 610b0063de5da09a2112cfb587e6906fbeff8a2f SHA256 ee568b93934c1fa3926a7434682af3095f0273cbc5e728dfb4292105176256cd
 MISC metadata.xml 222 RMD160 d342873a7670ee948b23c02e32d664c61890147b SHA1 4293498c5319dff0845d6c5668f7329cd83c17c5 SHA256 84d779e4bddf172bed193cce4cafad208ba62317ae9bfc7b26b64e02451496ee
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoWwH0ACgkQAiZjviIA2Xj6mwCgvOYeRHCHMueRxEd88Om+XBc6
+D14An3p8axLJw/TU3Zk17XS4RNa0azEy
+=3tBc
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libmp4v2/files/libmp4v2-1.5.0.1+glibc-2.10.patch b/media-libs/libmp4v2/files/libmp4v2-1.5.0.1+glibc-2.10.patch
new file mode 100644
index 000000000000..763366e69e0b
--- /dev/null
+++ b/media-libs/libmp4v2/files/libmp4v2-1.5.0.1+glibc-2.10.patch
@@ -0,0 +1,41 @@
+--- mpeg4ip-1.5.0.1.orig/configure.in
++++ mpeg4ip-1.5.0.1/configure.in
+@@ -266,7 +266,8 @@ dnl Checks for typedefs, structures, and
+ 
+ dnl Checks for library functions.
+ AC_CHECK_FUNCS(strerror strcasestr poll getopt getopt_long getopt_long_only getrusage socketpair strsep inet_ntoa)
+-
++AC_GNU_SOURCE
++AC_CHECK_DECLS([strcasestr], , ,[#include <string.h>])
+ 
+ AC_CHECK_TYPES([in_port_t, socklen_t], , , 
+ 	[#include <sys/types.h>
+--- mpeg4ip-1.5.0.1.orig/include/mpeg4ip.h
++++ mpeg4ip-1.5.0.1/include/mpeg4ip.h
+@@ -120,6 +120,7 @@
+ #endif
+ #include <sys/param.h>
+ 
++#if !defined(HAVE_DECL_STRCASESTR) || !HAVE_DECL_STRCASESTR
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -127,6 +128,7 @@ char *strcasestr(const char *haystack, c
+ #ifdef __cplusplus
+ }
+ #endif
++#endif
+ 
+ #define OPEN_RDWR O_RDWR
+ #define OPEN_CREAT O_CREAT 
+--- mpeg4ip-1.5.0.1.orig/lib/mp4v2/rtphint.cpp
++++ mpeg4ip-1.5.0.1/lib/mp4v2/rtphint.cpp
+@@ -314,7 +314,7 @@ void MP4RtpHintTrack::GetPayload(
+ 	char **ppEncodingParams)
+ {
+   const char* pRtpMap;
+-  char* pSlash;
++  const char* pSlash;
+   u_int32_t length;
+ 	InitPayload();
+ 
diff --git a/media-libs/libmp4v2/libmp4v2-1.5.0.1-r2.ebuild b/media-libs/libmp4v2/libmp4v2-1.5.0.1-r2.ebuild
new file mode 100644
index 000000000000..8146dddcedaa
--- /dev/null
+++ b/media-libs/libmp4v2/libmp4v2-1.5.0.1-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmp4v2/libmp4v2-1.5.0.1-r2.ebuild,v 1.1 2009/05/22 15:10:42 flameeyes Exp $
+
+inherit libtool autotools
+
+DESCRIPTION="libmp4v2 extracted from mpeg4ip"
+HOMEPAGE="http://www.mpeg4ip.net/"
+SRC_URI="mirror://sourceforge/mpeg4ip/mpeg4ip-${PV}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!<media-video/mpeg4ip-1.4.1
+	!<media-libs/faad2-2.0-r9"
+
+S=${WORKDIR}/mpeg4ip-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e 's:nasm -r:nasm -v:g' configure.in || die "sed nasm"
+
+	epatch "${FILESDIR}"/${P}+glibc-2.10.patch
+
+	AT_NO_RECURSIVE="yes" eautoreconf
+	elibtoolize
+}
+
+src_compile() {
+	touch bootstrapped
+	econf \
+		--disable-warns-as-err \
+		--disable-server \
+		--disable-player \
+		--disable-mp4live \
+		--disable-id3tags \
+		--disable-xvid \
+		--disable-a52dec \
+		--disable-mad \
+		--disable-mpeg2dec \
+		--disable-srtp \
+		--disable-mp3lame \
+		--disable-faac \
+		--disable-ffmpeg \
+		--disable-x264 \
+		|| die "econf failed"
+
+	cd "${S}/lib/mp4v2"
+
+	sed -i -e 's:SUBDIRS = . test util:SUBDIRS = .:' Makefile \
+		 || die "sed failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	cd "${S}/lib/mp4v2"
+
+	make DESTDIR="${D}" install || die
+
+	dodoc README INTERNALS API_CHANGES TODO
+
+	sed -i -e 's:"mpeg4ip.h":<libmp4v2/mpeg4ip.h>:' \
+		"${D}/usr/include/mp4.h" || die "sed failed"
+
+	dodir /usr/include/libmp4v2
+
+	cp "${S}/include/mpeg4ip.h"  "${D}/usr/include/libmp4v2/"
+	sed -i -e 's:mpeg4ip_config.h:libmp4v2/mpeg4ip_config.h:' \
+		-e 's:"mpeg4ip_version.h":<libmp4v2/mpeg4ip_version.h>:' \
+		 "${D}/usr/include/libmp4v2/mpeg4ip.h"  || die "sed failed"
+
+	cp "${S}/include/mpeg4ip_version.h" "${D}/usr/include/libmp4v2/"
+	cp "${S}/mpeg4ip_config.h" "${D}/usr/include/libmp4v2/"
+}