diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-08-27 20:19:56 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-27 20:19:56 +0000 |
| commit | 094bef10875eb7b0db057b4f8f405c80ead5b24c (patch) | |
| tree | b7e50daa2736fa1776716f7b7f171c415f86b748 /media-video | |
| parent | Fixed typo: app-text/libwpdlibwpd -> app-text/libwpd. (diff) | |
| download | gentoo-2-094bef10875eb7b0db057b4f8f405c80ead5b24c.tar.gz gentoo-2-094bef10875eb7b0db057b4f8f405c80ead5b24c.tar.bz2 gentoo-2-094bef10875eb7b0db057b4f8f405c80ead5b24c.zip | |
Fix building with GCC 4.4+ and GLIBC 2.10+ wrt #282960 by Chris Slycord.
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mjpegtools/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mjpegtools/files/mjpegtools-1.8.0-glibc-2.10.patch | 11 | ||||
| -rw-r--r-- | media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild | 3 |
3 files changed, 18 insertions, 2 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/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 |