diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-07-22 21:23:20 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-07-22 21:23:20 +0000 |
commit | 115b42fc5dfe6875e43c3a5ea53630fad580789d (patch) | |
tree | c3c05ae119e3fb1a2bab8b60f4aeaa1750ee5658 /media-video/mjpegtools | |
parent | Fix (diff) | |
download | gentoo-2-115b42fc5dfe6875e43c3a5ea53630fad580789d.tar.gz gentoo-2-115b42fc5dfe6875e43c3a5ea53630fad580789d.tar.bz2 gentoo-2-115b42fc5dfe6875e43c3a5ea53630fad580789d.zip |
Fix building with GCC 4.3+ and glibc-2.8+ wrt #240379, thanks to Chris Slycord.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-video/mjpegtools')
-rw-r--r-- | media-video/mjpegtools/ChangeLog | 7 | ||||
-rw-r--r-- | media-video/mjpegtools/files/mjpegtools-1.8.0-libc.patch | 153 | ||||
-rw-r--r-- | media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild | 5 |
3 files changed, 162 insertions, 3 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/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 |