Fix building with GCC 4.4+ and GLIBC 2.10+ wrt #282960 by Chris Slycord.

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

4 files changed, 21 insertions, 4 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index e884ed72eb5e..56a050db2904 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.140 2009/07/22 21:23:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.141 2009/08/27 20:19:56 ssuominen Exp $
+
+  27 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  mjpegtools-1.8.0-r2.ebuild, +files/mjpegtools-1.8.0-glibc-2.10.patch:
+  Fix building with GCC 4.4+ and GLIBC 2.10+ wrt #282960 by Chris Slycord.
 
   22 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
   mjpegtools-1.8.0-r2.ebuild, +files/mjpegtools-1.8.0-libc.patch:
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 765391f7e4a6..02e78e195932 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,6 +1,7 @@
 AUX mjpegtools-1.8.0-as-needed.patch 1015 RMD160 10c6f59d6a30c33d9ce18eab603b7faca5f238f6 SHA1 82c76d7caae15360ab11835b6667f63cfa8f2c89 SHA256 ee21d2d19e3eaa446d0c6708f496ea9b485da51d487863ea198c04d991e2a2b6
 AUX mjpegtools-1.8.0-fix-lav2mpeg.patch 1092 RMD160 50b58be0662d7a004f712f942cae94a0c2caaa3f SHA1 49ba0dc9483e750edabb355042b89124bab95101 SHA256 8d9a19106b3fe3e64f238c1aa0008a584cb792c9f783995eea18bbd4ffa605b6
 AUX mjpegtools-1.8.0-gcc41.patch 420 RMD160 e48e6d716f21e450cc26e7039c703005ed9a0bd9 SHA1 b1bd9604fa0eb6c8b54ee9d0836b0c61b233ffff SHA256 5e748deceb1af3179025ab42d274cc2941fe85bb0b7b512b49263a9ff6754446
+AUX mjpegtools-1.8.0-glibc-2.10.patch 429 RMD160 477cefb02eae1d6b2a1e6f5a75977d49d482035e SHA1 2f9a7a6bb1712de60fc8750ee436de775b4fb820 SHA256 a5966e12b5da5c9beae0878642b30a2b58b74e713bac621ca767ec3ea63e7fff
 AUX mjpegtools-1.8.0-lavrec-memleak.patch 2473 RMD160 fd6a6627659ab50f48d9f5c3d41c5239ed750820 SHA1 b9ced8e381bb6f8a2b407368e779640b278d226d SHA256 2256ebdbf69429d038908aef1d1e538c68f3d78318783ef57fb27845abf9875f
 AUX mjpegtools-1.8.0-libc.patch 5515 RMD160 03ab695826ac6676c6e6f5bb1f5c2784eaff43d5 SHA1 cf03a43c25e7d4788a6dbff78fc8e89adf8560ed SHA256 02c7aef7d237d1af5bb86a4cca3194b71698e99d1250e44052d2fd9cb0560e06
 AUX mjpegtools-1.8.0-libquicktime.patch 1186 RMD160 125fe4cfdecb5b98480d45670e3cb6d84f894c4f SHA1 205138f34d665174cb8f323669b8aa0ee4eb7785 SHA256 abf3043efbcdb29af2ee1b2a2e0b92b948a740d377d8e534635eb8599e6fb386
@@ -11,7 +12,7 @@ AUX mjpegtools-1.9.0-glibc-2.10.patch 429 RMD160 ef7f706aeda7ebfa04dbd43b70a5e3e
 DIST mjpegtools-1.8.0.tar.gz 1475998 RMD160 4d97a6a721f29223975605e2a5e645b4d7d129b5 SHA1 e11d68298a64b52f98724dbf3fd14f168e140290 SHA256 d841575c72cd0e587c1bab703d0906e3d23bf428424000557739cf5d6097209a
 DIST mjpegtools-1.9.0.tar.gz 1718063 RMD160 79e0eb4bce468bb8f12da336e29abe8fab390a5f SHA1 1701233354c7ea86b5b7808c4dd5d03a71118e48 SHA256 a9322aaab1e0835fbaa00fc10e58e885833454fa0ad6f57c60c89a78f7ed1711
 DIST mjpegtools-m4-1.tar.bz2 4547 RMD160 b81b89bb6364023606a1d3ca9519e143fe053ab4 SHA1 4c69f9918dcc56fc544fef9af9aaed968da1ae67 SHA256 10de1e206ee9c84aae111e95f655ad9394be749bfed01d337f7ff9a983aab522
-EBUILD mjpegtools-1.8.0-r2.ebuild 2836 RMD160 2980867a979d2498f7fbc43e442f1970b9de307e SHA1 4c7d0034d7f3353b9414215324aae109e81ad6fc SHA256 24c6e5a479262f1a6ca410fa824e48174daf1bb838f6a7ffe1fd4988182f1a71
+EBUILD mjpegtools-1.8.0-r2.ebuild 2880 RMD160 299aa207ae34c594a5bc8406dc557d86cede7194 SHA1 0e1b6da3472e448007d739f7f6bee140c4c837e0 SHA256 c0a57f6d2c725be7bcdd14b2f64fb7d742bd38a705a7206051d5a027221ac6c6
 EBUILD mjpegtools-1.9.0.ebuild 2111 RMD160 0a2482acf481c28b7b5eda8ea1068e8584944896 SHA1 20403a26b59220150ff60418e7ebdf966898ce4d SHA256 438fb811c05eab1e1db4d6a9d348cfd8b848363156abec835e1b60451b857165
-MISC ChangeLog 24881 RMD160 4bf4a7a016e1162394ad2194948fbfc21c9effe2 SHA1 56c204888fc76b35a313fde350bc5e03a0c14e67 SHA256 3bce2340c6d631cba8758c352fe70f564bdb92cb7ff6b79eb3b2cfc1b37bea60
+MISC ChangeLog 25083 RMD160 60ac82359cba3a7738ef4f1e4cbc1d277edb7cad SHA1 30e579577ef7f12db150d0d91ef422aa850f7caa SHA256 c4614fc42db935e168042cb27dae4c3c980648e40c032e4b78d1a923f2fd210c
 MISC metadata.xml 415 RMD160 cdbf5de3ece63e3df10d1a4e69ed5e471abb84fa SHA1 5ae767eb57a50fff79f938a01332e67f88306aff SHA256 75cf2c90452ef1a74f46812e6ffee8c2f25a979f3a0b8e366032ee60bdb8663b
diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-glibc-2.10.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-glibc-2.10.patch
new file mode 100644
index 000000000000..0e4388dc3376
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-1.8.0-glibc-2.10.patch
@@ -0,0 +1,11 @@
+--- mjpegtools-1.8.0/mplex/lpcmstrm_in.cpp.orig	2009-08-27 14:27:01.000000000 -0500
++++ mjpegtools-1.8.0/mplex/lpcmstrm_in.cpp	2009-08-27 14:28:04.000000000 -0500
+@@ -53,7 +53,7 @@
+ 
+ bool LPCMStream::Probe(IBitStream &bs )
+ {
+-    char *last_dot = strrchr( bs.StreamName(), '.' );
++    const char *last_dot = strrchr( bs.StreamName(), '.' );
+     return 
+         last_dot != NULL 
+         && strcmp( last_dot+1, "lpcm") == 0;
diff --git a/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild b/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild
index c9c29bc98ccf..ce69ef2b5b78 100644
--- a/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild,v 1.6 2009/07/22 23:30:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild,v 1.7 2009/08/27 20:19:56 ssuominen Exp $
 
 inherit flag-o-matic toolchain-funcs eutils libtool autotools
 
@@ -42,6 +42,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-lavrec-memleak.patch"
 	epatch "${FILESDIR}/${P}-no-jpeg-mmx.patch"
 	epatch "${FILESDIR}/${P}-libc.patch"
+	epatch "${FILESDIR}/${P}-glibc-2.10.patch"
 
 	# eautoreconf instead of elibtoolize
 	# as pkg-config-patch changes configure.in