Fix building with GCC 4.3+ and glibc-2.8+ wrt #240379, thanks to Chris Slycord.

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

4 files changed, 165 insertions, 5 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index d142713b21c0..e884ed72eb5e 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,11 @@
 # 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.139 2009/06/04 21:40:51 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.140 2009/07/22 21:23:20 ssuominen Exp $
+
+  22 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  mjpegtools-1.8.0-r2.ebuild, +files/mjpegtools-1.8.0-libc.patch:
+  Fix building with GCC 4.3+ and glibc-2.8+ wrt #240379, thanks to Chris
+  Slycord.
 
   04 Jun 2009; Peter Alfredsen <loki_val@gentoo.org>
   mjpegtools-1.9.0.ebuild, +files/mjpegtools-1.9.0-glibc-2.10.patch:
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index b023ccaf1e2d..5bb40cd9f64d 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -2,6 +2,7 @@ AUX mjpegtools-1.8.0-as-needed.patch 1015 RMD160 10c6f59d6a30c33d9ce18eab603b7fa
 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-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
 AUX mjpegtools-1.8.0-no-jpeg-mmx.patch 1539 RMD160 eb2b1756e65ce56b128e0c6763a27253d5cd9d4c SHA1 09e6c05a4c277498c277b9480d4f51c29e707b0c SHA256 f748ee564a03473ea027ab69d08fe1e25ab6ff05cbf4f223fefa657f1cd3e3aa
 AUX mjpegtools-1.8.0-parallelmake.patch 2163 RMD160 1bf0d3c30601b2b6d421c8dad3167a42304cce39 SHA1 72c4caeb7d18f9bb82176bad8e10347da6ea3f1e SHA256 d2456d4a75c7c2b205fc9c71431aaae427dd5667c71dd3bee2fa4869cb438b03
@@ -19,11 +20,11 @@ DIST mjpegtools-1.9.0rc3.tar.gz 2537088 RMD160 f47c71cd76281fb6e02fda3d08b0a142e
 DIST mjpegtools-1.9.0rc4.tar.gz 3169290 RMD160 3adc1d06b0e977416711c294566477d925339c1a SHA1 b3b7ad281d2aff04e82e7bdf973620d552fb4c9c SHA256 81108ecfb599d5973b02697dbd4dedbe73160fc28ebb98219aaea1c7507649e0
 DIST mjpegtools-m4-1.tar.bz2 4547 RMD160 b81b89bb6364023606a1d3ca9519e143fe053ab4 SHA1 4c69f9918dcc56fc544fef9af9aaed968da1ae67 SHA256 10de1e206ee9c84aae111e95f655ad9394be749bfed01d337f7ff9a983aab522
 EBUILD mjpegtools-1.8.0-r1.ebuild 3190 RMD160 f40f7db8e8862667c8d1d2960bcad8597ae9b747 SHA1 21d995731d1fe495b7716b339c0d6327120f90fa SHA256 901923bd53b5a0bda9b72171aa155e7278f9d6483f07d355a5ff01002bba8157
-EBUILD mjpegtools-1.8.0-r2.ebuild 2846 RMD160 c908f2dfe02d4d7edd4703e752674b1f795e1175 SHA1 c787d180b922a442953bca0b7d09f376d55104ee SHA256 072d80a4e1b441158c1236f320742e4656f0982f5ffb7a6f183df729339d8814
+EBUILD mjpegtools-1.8.0-r2.ebuild 2889 RMD160 9e57d0076a7468b7c0940b2708b80b5e676387d8 SHA1 d82e17ee44673025edf4ab47bb210de7e1d9bc5e SHA256 afc3cb1e690a412b992e4298b4217edbc43dbe129ec653f80c5b5fd5271a98c3
 EBUILD mjpegtools-1.9.0.ebuild 2157 RMD160 698a7e63f3a5cb241355e88d087a7f7394b1141b SHA1 3e0fdbcca944619b4941084450d20695c42fc8ba SHA256 74677184f0d49d09b00cf52e738f0a189539c93f409ad0b0050e50ab3d8f7e91
 EBUILD mjpegtools-1.9.0_rc1.ebuild 2617 RMD160 f776c9f89d583fe7b9eb2c36c2d6d5c0893b1648 SHA1 78d507e635f2e00a1ac77cf1516f93c76a4a1697 SHA256 6ae31f42d4414749a0231cbafc3591595b6bf656070151baec998b87ec432f5a
 EBUILD mjpegtools-1.9.0_rc2.ebuild 2335 RMD160 a3ce4d769b2cc2924bdb6b2d68ea8c7adb505da7 SHA1 28c8cd90017cfc4599c9d213cf0693dc051590d3 SHA256 666a58d3d8df6092e8901f43aa8a28a08f39c886bd2eaf448b127275187c69b6
 EBUILD mjpegtools-1.9.0_rc3.ebuild 2385 RMD160 e0eef9cbfd7cdcfff8775269f4b3a7dfbc69bb88 SHA1 22e62791fb8960b3952765f1a3e83c3180d49b02 SHA256 7c8ad923b139e1bf540ecb17e5b071120e6f9fa909c0ceb35fd8a12322e95c64
 EBUILD mjpegtools-1.9.0_rc4.ebuild 2204 RMD160 7bef29cd514b8c3e155d7621de070ff78258bebe SHA1 fb97277c79b28120e953cae544efa30a4a5a4a03 SHA256 4ff521217fa2d2499b31a23b781770bacf654596620ab9cf3c0afe5bebb1e9fe
-MISC ChangeLog 24675 RMD160 f3b0a75a2faf47e8e5719e3b630ad7acbfb9a60d SHA1 2d41b5d4624159bb496069fd900a6fb091cd8efd SHA256 72ee6f8e41b42d8111350ef42568ade6eb0aab0360200892ccd487632b07aaba
+MISC ChangeLog 24881 RMD160 4bf4a7a016e1162394ad2194948fbfc21c9effe2 SHA1 56c204888fc76b35a313fde350bc5e03a0c14e67 SHA256 3bce2340c6d631cba8758c352fe70f564bdb92cb7ff6b79eb3b2cfc1b37bea60
 MISC metadata.xml 415 RMD160 cdbf5de3ece63e3df10d1a4e69ed5e471abb84fa SHA1 5ae767eb57a50fff79f938a01332e67f88306aff SHA256 75cf2c90452ef1a74f46812e6ffee8c2f25a979f3a0b8e366032ee60bdb8663b
diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-libc.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-libc.patch
new file mode 100644
index 000000000000..0a9567b7a21d
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-1.8.0-libc.patch
@@ -0,0 +1,153 @@
+diff -Naur mjpegtools-1.8.0.orig/mpeg2enc/encodertypes.h mjpegtools-1.8.0/mpeg2enc/encodertypes.h
+--- mjpegtools-1.8.0.orig/mpeg2enc/encodertypes.h	2008-12-10 10:57:56.000000000 -0600
++++ mjpegtools-1.8.0/mpeg2enc/encodertypes.h	2008-12-10 11:02:08.000000000 -0600
+@@ -26,7 +26,7 @@
+ 
+ #include "config.h"
+ 
+-
++#include <stdlib.h>
+ 
+ class Parity
+ {
+diff -Naur mjpegtools-1.8.0.orig/mpeg2enc/macroblock.cc mjpegtools-1.8.0/mpeg2enc/macroblock.cc
+--- mjpegtools-1.8.0.orig/mpeg2enc/macroblock.cc	2008-12-10 10:57:56.000000000 -0600
++++ mjpegtools-1.8.0/mpeg2enc/macroblock.cc	2008-12-10 11:02:41.000000000 -0600
+@@ -20,6 +20,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <limits.h>
+ 
+ #include "macroblock.hh"
+ #include "mpeg2syntaxcodes.h"
+diff -Naur mjpegtools-1.8.0.orig/mpeg2enc/picturereader.cc mjpegtools-1.8.0/mpeg2enc/picturereader.cc
+--- mjpegtools-1.8.0.orig/mpeg2enc/picturereader.cc	2008-12-10 10:57:56.000000000 -0600
++++ mjpegtools-1.8.0/mpeg2enc/picturereader.cc	2008-12-10 11:03:04.000000000 -0600
+@@ -25,6 +25,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
++#include <limits.h>
+ #include <errno.h>
+ #include "simd.h"
+ #include "mpeg2encoder.hh"
+diff -Naur mjpegtools-1.8.0.orig/mplex/inputstrm.cpp mjpegtools-1.8.0/mplex/inputstrm.cpp
+--- mjpegtools-1.8.0.orig/mplex/inputstrm.cpp	2008-12-10 10:58:55.000000000 -0600
++++ mjpegtools-1.8.0/mplex/inputstrm.cpp	2008-12-10 11:03:36.000000000 -0600
+@@ -23,6 +23,7 @@
+ 
+ #include <config.h>
+ #include <assert.h>
++#include <limits.h>
+ 
+ #include "mjpeg_types.h"
+ #include "inputstrm.hpp"
+diff -Naur mjpegtools-1.8.0.orig/mplex/padstrm.cpp mjpegtools-1.8.0/mplex/padstrm.cpp
+--- mjpegtools-1.8.0.orig/mplex/padstrm.cpp	2008-12-10 10:58:55.000000000 -0600
++++ mjpegtools-1.8.0/mplex/padstrm.cpp	2008-12-10 11:04:06.000000000 -0600
+@@ -24,6 +24,7 @@
+ #include "config.h"
+ #endif
+ 
++#include <string.h>
+ #include "padstrm.hpp"
+ 
+ 
+diff -Naur mjpegtools-1.8.0.orig/mplex/multiplexor.cpp mjpegtools-1.8.0/mplex/multiplexor.cpp
+--- mjpegtools-1.8.0.orig/mplex/multiplexor.cpp	2008-12-10 10:58:55.000000000 -0600
++++ mjpegtools-1.8.0/mplex/multiplexor.cpp	2008-12-10 11:04:53.000000000 -0600
+@@ -22,6 +22,7 @@
+ #include <config.h>
+ #include <math.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include <mjpeg_types.h>
+ #include <mjpeg_logging.h>
+diff -Naur mjpegtools-1.8.0.orig/mplex/main.cpp mjpegtools-1.8.0/mplex/main.cpp
+--- mjpegtools-1.8.0.orig/mplex/main.cpp	2008-12-10 10:58:55.000000000 -0600
++++ mjpegtools-1.8.0/mplex/main.cpp	2008-12-10 11:05:20.000000000 -0600
+@@ -31,6 +31,7 @@
+ #include <getopt.h>
+ #endif
+ #include <string>
++#include <string.h>
+ #include <memory>
+ #include <sys/stat.h>
+ #ifndef _WIN32
+diff -Naur mjpegtools-1.8.0.orig/y4mdenoise/Set.hh mjpegtools-1.8.0/y4mdenoise/Set.hh
+--- mjpegtools-1.8.0.orig/y4mdenoise/Set.hh	2008-12-10 11:00:49.000000000 -0600
++++ mjpegtools-1.8.0/y4mdenoise/Set.hh	2008-12-10 11:06:30.000000000 -0600
+@@ -23,7 +23,7 @@
+ 		// How we implement ourselves.
+ 	
+ public:
+-	typedef typename Imp::Allocator Allocator;
++	typedef typename Imp::Allocator_t Allocator;
+ 		// The type of allocator to use to allocate items in the set.
+ 
+ 	Set (const PRED &a_rPred = PRED(),
+diff -Naur mjpegtools-1.8.0.orig/y4mdenoise/SkipList.hh mjpegtools-1.8.0/y4mdenoise/SkipList.hh
+--- mjpegtools-1.8.0.orig/y4mdenoise/SkipList.hh	2008-12-10 11:00:49.000000000 -0600
++++ mjpegtools-1.8.0/y4mdenoise/SkipList.hh	2008-12-10 11:09:34.000000000 -0600
+@@ -57,19 +57,19 @@
+ 		// Will give good sorting for up to e^10 items.
+ 	
+ public:
+-	typedef Allocator<Node,HEADERCHUNK> Allocator;
++	typedef Allocator<Node,HEADERCHUNK> Allocator_t;
+ 		// The type of node allocator to use.
+ 
+-	static Allocator sm_oNodeAllocator;
++	static Allocator_t sm_oNodeAllocator;
+ 		// The default node allocator.
+ 
+ 	SkipList (const PRED &a_rPred = PRED(),
+-			Allocator &a_rAlloc = sm_oNodeAllocator);
++			Allocator_t &a_rAlloc = sm_oNodeAllocator);
+ 		// Default constructor.  Must be followed by Init().
+ 
+ 	SkipList (Status_t &a_reStatus, bool a_bAllowDuplicates,
+ 			uint32_t a_nRandSeed, const PRED &a_rPred = PRED(),
+-			Allocator &a_rAlloc = sm_oNodeAllocator);
++			Allocator_t &a_rAlloc = sm_oNodeAllocator);
+ 		// Constructor.  Specify whether or not duplicates are allowed,
+ 		// and provide a random number seed.
+ 
+@@ -255,7 +255,7 @@
+ 
+ private:
+ 	
+-	Allocator &m_rNodeAllocator;
++	Allocator_t &m_rNodeAllocator;
+ 		// Where we get memory to allocate nodes.
+ 
+ 	bool m_bAllowDuplicates;
+@@ -337,7 +337,7 @@
+ 
+ // The default node allocator.  Allocates 64K at a time.
+ template <class KEY, class VALUE, class KEYFN, class PRED>
+-typename SkipList<KEY,VALUE,KEYFN,PRED>::Allocator
++typename SkipList<KEY,VALUE,KEYFN,PRED>::Allocator_t
+ 	SkipList<KEY,VALUE,KEYFN,PRED>::sm_oNodeAllocator (65536);
+ 
+ 
+@@ -345,7 +345,7 @@
+ // Default constructor.  Must be followed by Init().
+ template <class KEY, class VALUE, class KEYFN, class PRED>
+ SkipList<KEY,VALUE,KEYFN,PRED>::SkipList (const PRED &a_rPred,
+-		Allocator &a_rAlloc)
++		Allocator_t &a_rAlloc)
+ 	: m_rNodeAllocator (a_rAlloc), m_oPred (a_rPred)
+ {
+ 	// Set up some defaults.
+@@ -371,7 +371,7 @@
+ template <class KEY, class VALUE, class KEYFN, class PRED>
+ SkipList<KEY,VALUE,KEYFN,PRED>::SkipList (Status_t &a_reStatus,
+ 		bool a_bAllowDuplicates, uint32_t a_nRandSeed,
+-		const PRED &a_rPred, Allocator &a_rAlloc)
++		const PRED &a_rPred, Allocator_t &a_rAlloc)
+ 	: m_rNodeAllocator (a_rAlloc), m_oPred (a_rPred)
+ {
+ 	// Make sure they didn't start us off with an error.
diff --git a/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild b/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild
index 0b841ca7c702..5fce294d6270 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-2007 Gentoo Foundation
+# 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.4 2007/11/27 11:55:08 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild,v 1.5 2009/07/22 21:23:20 ssuominen Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -44,6 +44,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-fix-lav2mpeg.patch"
 	epatch "${FILESDIR}/${P}-lavrec-memleak.patch"
 	epatch "${FILESDIR}/${P}-no-jpeg-mmx.patch"
+	epatch "${FILESDIR}/${P}-libc.patch"
 
 	# eautoreconf instead of elibtoolize
 	# as pkg-config-patch changes configure.in