Fix by Ryan Hill for building with gcc-4.3 #200767.

Package-Manager: portage-2.2_pre5

4 files changed, 170 insertions, 6 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index b30165de454b..4a9ca4ceef6a 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mjpegtools
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.130 2007/12/04 21:18:16 zzam Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.131 2008/04/20 08:02:34 vapier Exp $
+
+  20 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/mjpegtools-1.9.0_rc3-gcc43.patch, mjpegtools-1.9.0_rc3.ebuild:
+  Fix by Ryan Hill for building with gcc-4.3 #200767.
 
 *mjpegtools-1.9.0_rc3 (04 Dec 2007)
 
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 2707d5351673..be7a101a82c5 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
@@ -9,6 +12,7 @@ AUX mjpegtools-1.8.0-pkg-config.patch 423 RMD160 2d3d55fb7561a9c0ceeb7ce880953cb
 AUX mjpegtools-1.9.0_rc1-as-needed.patch 1015 RMD160 10c6f59d6a30c33d9ce18eab603b7faca5f238f6 SHA1 82c76d7caae15360ab11835b6667f63cfa8f2c89 SHA256 ee21d2d19e3eaa446d0c6708f496ea9b485da51d487863ea198c04d991e2a2b6
 AUX mjpegtools-1.9.0_rc1-lavrec-memleak.patch 2473 RMD160 fd6a6627659ab50f48d9f5c3d41c5239ed750820 SHA1 b9ced8e381bb6f8a2b407368e779640b278d226d SHA256 2256ebdbf69429d038908aef1d1e538c68f3d78318783ef57fb27845abf9875f
 AUX mjpegtools-1.9.0_rc1-pkg-config.patch 436 RMD160 f81c036f402b6e409919a2c85c77ff22173cc35b SHA1 1f8e2ebc29872de35c0b82034f44313ea2ab9bf6 SHA256 2db469cf2d43961fef06db27cb3d4e0abf970008895471f82fc1eff09a619c1a
+AUX mjpegtools-1.9.0_rc3-gcc43.patch 4198 RMD160 8c9d465a76a0adb1a195ca34b7d2b77e26dfdbf8 SHA1 847b3da0a00b60cde6c4b598628c823a47d91f83 SHA256 9d851bea269c4ec57e051cbd1e4e73b445fe5819d52fc3d93f04677885bc5195
 DIST mjpegtools-1.8.0.tar.gz 1475998 RMD160 4d97a6a721f29223975605e2a5e645b4d7d129b5 SHA1 e11d68298a64b52f98724dbf3fd14f168e140290 SHA256 d841575c72cd0e587c1bab703d0906e3d23bf428424000557739cf5d6097209a
 DIST mjpegtools-1.9.0rc1.tar.gz 2339752 RMD160 403e5504f5de42ab043fe6a8dcb938a25eebefd4 SHA1 b6f4d4bb7669212b56faae9e4826856dfbe41e16 SHA256 50439edf61e58da8ef7143529bce86ed1f5a4711497bd5ea0f026ec9ec77ee81
 DIST mjpegtools-1.9.0rc2.tar.gz 2591542 RMD160 2ea62d8f0fac9441a8c1164697a674d9febb55ee SHA1 717ca43bf8b9f423a2837391be30058a319d86db SHA256 fbf99164da88921d8c97aafcb98b595a66fcdd00897ca387ff6198d23fb237bf
@@ -18,6 +22,13 @@ EBUILD mjpegtools-1.8.0-r1.ebuild 3190 RMD160 f40f7db8e8862667c8d1d2960bcad8597a
 EBUILD mjpegtools-1.8.0-r2.ebuild 2846 RMD160 c908f2dfe02d4d7edd4703e752674b1f795e1175 SHA1 c787d180b922a442953bca0b7d09f376d55104ee SHA256 072d80a4e1b441158c1236f320742e4656f0982f5ffb7a6f183df729339d8814
 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 2335 RMD160 a99e634734f169415e65553dc2095a807b7baeb4 SHA1 465110db395b14a3296a09b2dd9fb54e4143e23a SHA256 a77d04447703b5473ee30f5247dc2b82a02f186828389ea356bbe83aa1c514cd
-MISC ChangeLog 23461 RMD160 084288f542e5b7040dac4fde79f7c6b74cc2594c SHA1 0b33888431544427dd83f00e7705ffaff2f7fe21 SHA256 22ae0f20238bfef3112a79b94451bd3c469bc6b31b4696dd1829a5eeedf52009
+EBUILD mjpegtools-1.9.0_rc3.ebuild 2385 RMD160 e0eef9cbfd7cdcfff8775269f4b3a7dfbc69bb88 SHA1 22e62791fb8960b3952765f1a3e83c3180d49b02 SHA256 7c8ad923b139e1bf540ecb17e5b071120e6f9fa909c0ceb35fd8a12322e95c64
+MISC ChangeLog 23640 RMD160 8d41079a793cc70f596ff83e3e9ca896c62e538f SHA1 2f1e03a90fd3c243ece331dfefd3e1343131101b SHA256 3516b07b263553467d0776952ed9686607570a181a671755116f08016c437bb5
 MISC metadata.xml 311 RMD160 5d2d2fac1a97018f75e5ff1e8e7c90fb02511cb9 SHA1 228093feb5989936d0480ac2bc543df959b06dfa SHA256 74869f2267904c0a7409e16cc0d2e54f41b186683c4f5bb6e0127b275e66b4b0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFICvihj9hvisErhMIRAh/bAKCpApAucy0hBecSx7L1Zhl6hZYA3ACfWpIS
++Bi7H/Dz9G71s43KIc5fDXk=
+=oFLk
+-----END PGP SIGNATURE-----
diff --git a/media-video/mjpegtools/files/mjpegtools-1.9.0_rc3-gcc43.patch b/media-video/mjpegtools/files/mjpegtools-1.9.0_rc3-gcc43.patch
new file mode 100644
index 000000000000..ae3fc901d880
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-1.9.0_rc3-gcc43.patch
@@ -0,0 +1,147 @@
+http://bugs.gentoo.org/200767
+http://sourceforge.net/tracker/index.php?func=detail&aid=1947059&group_id=5776&atid=305776
+
+--- mjpegtools-1.9.0rc3/mpeg2enc/encodertypes.h
++++ mjpegtools-1.9.0rc3/mpeg2enc/encodertypes.h
+@@ -25,6 +25,8 @@
+  */
+ 
+ 
++#include <stdlib.h>
++
+ class Parity
+ {
+ public:
+--- mjpegtools-1.9.0rc3/mpeg2enc/macroblock.cc
++++ mjpegtools-1.9.0rc3/mpeg2enc/macroblock.cc
+@@ -21,6 +21,7 @@
+ 
+ #include <stdio.h>
+ #include <cassert>
++#include <limits.h>
+ 
+ #include "macroblock.hh"
+ #include "mpeg2syntaxcodes.h"
+--- mjpegtools-1.9.0rc3/mpeg2enc/picturereader.cc
++++ mjpegtools-1.9.0rc3/mpeg2enc/picturereader.cc
+@@ -23,6 +23,7 @@
+ #include "picturereader.hh"
+ #include "mpeg2encoder.hh"
+ #include "imageplanes.hh"
++#include <limits.h>
+ //#include <stdio.h>
+ //#include <stdlib.h>
+ //#include <unistd.h>
+--- mjpegtools-1.9.0rc3/mplex/inputstrm.cpp
++++ mjpegtools-1.9.0rc3/mplex/inputstrm.cpp
+@@ -23,6 +23,7 @@
+ 
+ #include <config.h>
+ #include <assert.h>
++#include <limits.h>
+ 
+ #include "mjpeg_types.h"
+ #include "inputstrm.hpp"
+--- mjpegtools-1.9.0rc3/mplex/padstrm.cpp
++++ mjpegtools-1.9.0rc3/mplex/padstrm.cpp
+@@ -24,6 +24,7 @@
+ #include "config.h"
+ #endif
+ 
++#include <string.h>
+ #include "padstrm.hpp"
+ 
+ 
+--- mjpegtools-1.9.0rc3/mplex/multiplexor.cpp
++++ mjpegtools-1.9.0rc3/mplex/multiplexor.cpp
+@@ -22,6 +22,7 @@
+ #include <config.h>
+ #include <math.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include <mjpeg_types.h>
+ #include <mjpeg_logging.h>
+--- mjpegtools-1.9.0rc3/mplex/main.cpp
++++ mjpegtools-1.9.0rc3/mplex/main.cpp
+@@ -31,6 +31,7 @@
+ #include <getopt.h>
+ #endif
+ #include <string>
++#include <string.h>
+ #include <memory>
+ #include <sys/stat.h>
+ #ifndef _WIN32
+--- mjpegtools-1.9.0rc3/y4mdenoise/Set.hh
++++ mjpegtools-1.9.0rc3/y4mdenoise/Set.hh
+@@ -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(),
+--- mjpegtools-1.9.0rc3/y4mdenoise/SkipList.hh
++++ mjpegtools-1.9.0rc3/y4mdenoise/SkipList.hh
+@@ -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.9.0_rc3.ebuild b/media-video/mjpegtools/mjpegtools-1.9.0_rc3.ebuild
index edbce75da9f7..b727ca5bc3b8 100644
--- a/media-video/mjpegtools/mjpegtools-1.9.0_rc3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.9.0_rc3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.9.0_rc3.ebuild,v 1.1 2007/12/04 21:18:16 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.9.0_rc3.ebuild,v 1.2 2008/04/20 08:02:35 vapier Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -39,6 +39,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${P}-gcc43.patch #200767
+
 	# eautoreconf instead of elibtoolize
 	# as pkg-config-patch changes configure.in
 	#