diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2006-10-10 20:51:44 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2006-10-10 20:51:44 +0000 |
| commit | 75fc5a7675add1b879b6957ca3fb77ff11b01892 (patch) | |
| tree | 44966e8b0bafa0a2e7ff5fe5da8297384f44686e /media-video | |
| parent | Stable on ia64. (diff) | |
| download | gentoo-2-75fc5a7675add1b879b6957ca3fb77ff11b01892.tar.gz gentoo-2-75fc5a7675add1b879b6957ca3fb77ff11b01892.tar.bz2 gentoo-2-75fc5a7675add1b879b6957ca3fb77ff11b01892.zip | |
media-video/transcode-1.0.2-r3 : Adding a fix to compile against media-libs/libmpeg3-1.7
(Portage version: 2.1.2_pre2-r7)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/transcode/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/transcode/files/transcode-1.0.2-libmpeg3-1.7.patch | 45 | ||||
| -rw-r--r-- | media-video/transcode/transcode-1.0.2-r3.ebuild | 6 |
3 files changed, 54 insertions, 3 deletions
diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog index ffd15d311dd8..082ae0bfb5c4 100644 --- a/media-video/transcode/ChangeLog +++ b/media-video/transcode/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/transcode # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.154 2006/10/04 12:14:47 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.155 2006/10/10 20:51:44 aballier Exp $ + + 10 Oct 2006; Alexis Ballier <aballier@gentoo.org> + +files/transcode-1.0.2-libmpeg3-1.7.patch, transcode-1.0.2-r3.ebuild: + Adding a fix to compile against media-libs/libmpeg3-1.7 04 Oct 2006; Simon Stelling <blubb@gentoo.org> transcode-1.0.2-r3.ebuild: filter -fweb on amd64 for bug 145849 diff --git a/media-video/transcode/files/transcode-1.0.2-libmpeg3-1.7.patch b/media-video/transcode/files/transcode-1.0.2-libmpeg3-1.7.patch new file mode 100644 index 000000000000..8a058af8c8ae --- /dev/null +++ b/media-video/transcode/files/transcode-1.0.2-libmpeg3-1.7.patch @@ -0,0 +1,45 @@ +--- transcode-1.0.2/import/import_mpeg3.c.orig 2006-09-09 23:39:08.598897708 +0200 ++++ transcode-1.0.2/import/import_mpeg3.c 2006-09-09 23:40:36.455540042 +0200 +@@ -68,7 +68,7 @@ + MOD_open + { + +- int i; ++ int i,return_value; + + param->fd = NULL; + +@@ -79,14 +79,14 @@ + if (param->flag == TC_VIDEO) { + if (!file) { + if (!file_a) { +- if((file = mpeg3_open(vob->video_in_file))==NULL) { ++ if((file = mpeg3_open(vob->video_in_file, &return_value))==NULL) { + fprintf(stderr, "open file failed\n"); + return(TC_IMPORT_ERROR); + } + if (verbose & TC_DEBUG) + printf("[%s] Opened video NO copy\n", MOD_NAME); + } else if (file_a) { +- if((file = mpeg3_open_copy(vob->video_in_file, file_a))==NULL) { ++ if((file = mpeg3_open_copy(vob->video_in_file, file_a, &return_value))==NULL) { + fprintf(stderr, "open file failed\n"); + return(TC_IMPORT_ERROR); + } +@@ -98,14 +98,14 @@ + if (param->flag == TC_AUDIO) { + if (!file_a) { + if (!file) { +- if((file_a = mpeg3_open(vob->audio_in_file))==NULL) { ++ if((file_a = mpeg3_open(vob->audio_in_file, &return_value))==NULL) { + fprintf(stderr, "open audio file failed\n"); + return(TC_IMPORT_ERROR); + } + if (verbose & TC_DEBUG) + printf("[%s] Opened audio NO copy\n", MOD_NAME); + } else if (file) { +- if((file_a = mpeg3_open_copy(vob->audio_in_file, file))==NULL) { ++ if((file_a = mpeg3_open_copy(vob->audio_in_file, file, &return_value))==NULL) { + fprintf(stderr, "open_copy audio file failed\n"); + return(TC_IMPORT_ERROR); + } diff --git a/media-video/transcode/transcode-1.0.2-r3.ebuild b/media-video/transcode/transcode-1.0.2-r3.ebuild index ddfce73290d9..c748520fed7f 100644 --- a/media-video/transcode/transcode-1.0.2-r3.ebuild +++ b/media-video/transcode/transcode-1.0.2-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.2-r3.ebuild,v 1.5 2006/10/04 12:14:47 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.2-r3.ebuild,v 1.6 2006/10/10 20:51:44 aballier Exp $ WANT_AUTOMAKE=latest WANT_AUTOCONF=latest @@ -70,13 +70,15 @@ src_unpack() { epatch "${DISTDIR}/${PN}-types.patch.bz2" epatch "${FILESDIR}/${P}-autoconf259d.patch" epatch "${FILESDIR}/${P}-new-ffmpeg" + # Fix to compile against media-libs/libmpeg3-1.7 + use mpeg && has_version '>=media-libs/libmpeg3-1.7' \ + && epatch "${FILESDIR}/${P}-libmpeg3-1.7.patch" eautoreconf } src_compile() { filter-flags -maltivec -mabi=altivec -momit-leaf-frame-pointer - #145849 use amd64 && filter-flags -fweb |