diff options
author | Peter Alfredsen <loki_val@gentoo.org> | 2009-06-04 21:40:51 +0000 |
---|---|---|
committer | Peter Alfredsen <loki_val@gentoo.org> | 2009-06-04 21:40:51 +0000 |
commit | 1a9d70eac023a3f23c81ca8b77b1bb76c7a513ee (patch) | |
tree | 21f767eb8acfbc0e6d1ce56ae7d78d97eda135f7 /media-video/mjpegtools | |
parent | Stable on alpha, bug #271463 (diff) | |
download | gentoo-2-1a9d70eac023a3f23c81ca8b77b1bb76c7a513ee.tar.gz gentoo-2-1a9d70eac023a3f23c81ca8b77b1bb76c7a513ee.tar.bz2 gentoo-2-1a9d70eac023a3f23c81ca8b77b1bb76c7a513ee.zip |
Fix the constness of a char w.r.t. bug 270778. Thanks to hirakendu <hirakendu@gmail.com> for providing the patch.
(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.9.0-glibc-2.10.patch | 11 | ||||
-rw-r--r-- | media-video/mjpegtools/mjpegtools-1.9.0.ebuild | 3 |
3 files changed, 19 insertions, 2 deletions
diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog index 59ce8eab2ca3..d142713b21c0 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.138 2009/03/03 15:55:39 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.139 2009/06/04 21:40:51 loki_val Exp $ + + 04 Jun 2009; Peter Alfredsen <loki_val@gentoo.org> + mjpegtools-1.9.0.ebuild, +files/mjpegtools-1.9.0-glibc-2.10.patch: + Fix the constness of a char w.r.t. bug 270778. Thanks to hirakendu + <hirakendu@gmail.com> for providing the patch. 03 Mar 2009; Raúl Porcel <armin76@gentoo.org> mjpegtools-1.9.0.ebuild: sparc stable wrt #217427 diff --git a/media-video/mjpegtools/files/mjpegtools-1.9.0-glibc-2.10.patch b/media-video/mjpegtools/files/mjpegtools-1.9.0-glibc-2.10.patch new file mode 100644 index 000000000000..e16156046821 --- /dev/null +++ b/media-video/mjpegtools/files/mjpegtools-1.9.0-glibc-2.10.patch @@ -0,0 +1,11 @@ +--- mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp.orig 2009-05-27 01:31:46.000000000 -0700 ++++ mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp 2009-05-27 01:33:09.000000000 -0700 +@@ -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.9.0.ebuild b/media-video/mjpegtools/mjpegtools-1.9.0.ebuild index a9aca91245bd..9597fc9a0d99 100644 --- a/media-video/mjpegtools/mjpegtools-1.9.0.ebuild +++ b/media-video/mjpegtools/mjpegtools-1.9.0.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.9.0.ebuild,v 1.6 2009/03/03 15:55:39 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.9.0.ebuild,v 1.7 2009/06/04 21:40:51 loki_val Exp $ EAPI="1" @@ -40,6 +40,7 @@ src_unpack() { unpack ${A} cd "${S}" sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure + epatch "${FILESDIR}/${P}-glibc-2.10.patch" } src_compile() { |