diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-08-05 19:06:47 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-05 19:06:47 +0000 |
| commit | 86b42761bc7d74bb33f38f5eb7d48607c4c5fc03 (patch) | |
| tree | 564abc5d312ea67be04de188eaea970ff9c1ad2e /media-video | |
| parent | Use PYTHON() instead of get_python(). (diff) | |
| download | gentoo-2-86b42761bc7d74bb33f38f5eb7d48607c4c5fc03.tar.gz gentoo-2-86b42761bc7d74bb33f38f5eb7d48607c4c5fc03.tar.bz2 gentoo-2-86b42761bc7d74bb33f38f5eb7d48607c4c5fc03.zip | |
Fix building with GCC 4.4+ and GLIBC 2.10+ wrt #278421.
(Portage version: 2.2_rc36/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/streamdvd/ChangeLog | 8 | ||||
| -rw-r--r-- | media-video/streamdvd/files/streamdvd-0.4-gcc44.patch | 24 | ||||
| -rw-r--r-- | media-video/streamdvd/streamdvd-0.4-r1.ebuild | 21 |
3 files changed, 41 insertions, 12 deletions
diff --git a/media-video/streamdvd/ChangeLog b/media-video/streamdvd/ChangeLog index 7b4f0fd735e4..8b90d7fe3fcf 100644 --- a/media-video/streamdvd/ChangeLog +++ b/media-video/streamdvd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/streamdvd -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/streamdvd/ChangeLog,v 1.20 2008/07/09 09:24:15 loki_val Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/streamdvd/ChangeLog,v 1.21 2009/08/05 19:06:47 ssuominen Exp $ + + 05 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> + streamdvd-0.4-r1.ebuild, +files/streamdvd-0.4-gcc44.patch: + Fix building with GCC 4.4+ and GLIBC 2.10+ wrt #278421. 09 Jul 2008; Peter Alfredsen <loki_val@gentoo.org> +files/streamdvd-0.4-gcc43.patch, streamdvd-0.4-r1.ebuild: diff --git a/media-video/streamdvd/files/streamdvd-0.4-gcc44.patch b/media-video/streamdvd/files/streamdvd-0.4-gcc44.patch new file mode 100644 index 000000000000..2ca12ff29f69 --- /dev/null +++ b/media-video/streamdvd/files/streamdvd-0.4-gcc44.patch @@ -0,0 +1,24 @@ +diff -ur StreamDVD-0.4.orig/mplex/lpcmstrm_in.cpp StreamDVD-0.4/mplex/lpcmstrm_in.cpp +--- StreamDVD-0.4.orig/mplex/lpcmstrm_in.cpp 2004-03-09 00:10:53.000000000 +0200 ++++ StreamDVD-0.4/mplex/lpcmstrm_in.cpp 2009-08-05 22:05:48.000000000 +0300 +@@ -52,7 +52,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 -ur StreamDVD-0.4.orig/mplex/yuv4mpeg_ratio.c StreamDVD-0.4/mplex/yuv4mpeg_ratio.c +--- StreamDVD-0.4.orig/mplex/yuv4mpeg_ratio.c 2004-03-09 00:10:53.000000000 +0200 ++++ StreamDVD-0.4/mplex/yuv4mpeg_ratio.c 2009-08-05 22:07:49.000000000 +0300 +@@ -104,7 +104,7 @@ + + int y4m_parse_ratio(y4m_ratio_t *r, const char *s) + { +- char *t = strchr(s, ':'); ++ const char *t = strchr(s, ':'); + if (t == NULL) return Y4M_ERR_RANGE; + r->n = atoi(s); + r->d = atoi(t+1); diff --git a/media-video/streamdvd/streamdvd-0.4-r1.ebuild b/media-video/streamdvd/streamdvd-0.4-r1.ebuild index ea98a2436378..4b45568deb8d 100644 --- a/media-video/streamdvd/streamdvd-0.4-r1.ebuild +++ b/media-video/streamdvd/streamdvd-0.4-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 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/streamdvd/streamdvd-0.4-r1.ebuild,v 1.15 2008/07/09 09:24:15 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/streamdvd/streamdvd-0.4-r1.ebuild,v 1.16 2009/08/05 19:06:47 ssuominen Exp $ inherit eutils toolchain-funcs @@ -22,17 +22,18 @@ DEPEND="media-libs/libdvdread >=media-video/dvdauthor-0.6.5 >=app-cdr/dvd+rw-tools-5.13.4.7.4 )" -S="${WORKDIR}/StreamDVD-${PV}" +S=${WORKDIR}/StreamDVD-${PV} src_unpack() { unpack ${A} - cd "${S}" || die - use X && epatch "${FILESDIR}/${P}.patch" - - epatch "${FILESDIR}/${P}-makefile.patch" - epatch "${FILESDIR}/${P}-gcc41.patch" - epatch "${FILESDIR}/${P}-libdvdread.patch" - epatch "${FILESDIR}/${P}-gcc43.patch" + cd "${S}" + use X && epatch "${FILESDIR}"/${P}.patch + + epatch "${FILESDIR}"/${P}-makefile.patch + epatch "${FILESDIR}"/${P}-gcc41.patch + epatch "${FILESDIR}"/${P}-libdvdread.patch + epatch "${FILESDIR}"/${P}-gcc43.patch + epatch "${FILESDIR}"/${P}-gcc44.patch } src_compile() { |