From: Alexis Ballier Date: Tue, 10 Oct 2006 20:51:44 +0000 (+0000) Subject: media-video/transcode-1.0.2-r3 : Adding a fix to compile against media-libs/libmpeg3-1.7 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c468547df2648ca148fd66c38314357ebe9a2598;p=gentoo.git media-video/transcode-1.0.2-r3 : Adding a fix to compile against media-libs/libmpeg3-1.7 Package-Manager: portage-2.1.2_pre2-r7 --- 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 + +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 transcode-1.0.2-r3.ebuild: filter -fweb on amd64 for bug 145849 diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest index b563312dba14..339eb1cd059a 100644 --- a/media-video/transcode/Manifest +++ b/media-video/transcode/Manifest @@ -6,6 +6,10 @@ AUX transcode-1.0.2-bigdir.patch 10634 RMD160 dca043f16a24d58802ead53b41e26adf93 MD5 09d908064da685a17f52adb57e0c8075 files/transcode-1.0.2-bigdir.patch 10634 RMD160 dca043f16a24d58802ead53b41e26adf9336c7b9 files/transcode-1.0.2-bigdir.patch 10634 SHA256 306f238ceb11bf81a01f27b684b0ec014aa576fb48c4072e1e67324a86c99bab files/transcode-1.0.2-bigdir.patch 10634 +AUX transcode-1.0.2-libmpeg3-1.7.patch 1635 RMD160 2eef06ea202e792964a5b0d1c723a036dd9d02cd SHA1 34ca8904a2ade759af598393a3f0ff364eb4ffcd SHA256 fd0979eff9350001d63af7fa910a30224538f15602c863aa62537bc80974635c +MD5 4800ad904d7fb6e3bebb1c675f143ca2 files/transcode-1.0.2-libmpeg3-1.7.patch 1635 +RMD160 2eef06ea202e792964a5b0d1c723a036dd9d02cd files/transcode-1.0.2-libmpeg3-1.7.patch 1635 +SHA256 fd0979eff9350001d63af7fa910a30224538f15602c863aa62537bc80974635c files/transcode-1.0.2-libmpeg3-1.7.patch 1635 AUX transcode-1.0.2-lzo2.patch 2922 RMD160 669ee845670e4cd007d613be9ab10d84a56d73da SHA1 15b9b9d6a3847a28f1e5a28d2a12160edcd01d8f SHA256 e1b0631a4e790821160fa5cef7ffc14d80556ff51daf01a5df250d331e0b4b7b MD5 07f7315638c5e4058ed39d914aed0d0f files/transcode-1.0.2-lzo2.patch 2922 RMD160 669ee845670e4cd007d613be9ab10d84a56d73da files/transcode-1.0.2-lzo2.patch 2922 @@ -20,14 +24,14 @@ EBUILD transcode-1.0.2-r2.ebuild 4027 RMD160 9e907a330ccaaae8f8239e8cebcc614ddde MD5 5f575e026e83f59f965f5c741383e082 transcode-1.0.2-r2.ebuild 4027 RMD160 9e907a330ccaaae8f8239e8cebcc614dddea1560 transcode-1.0.2-r2.ebuild 4027 SHA256 6f7d72e8db3c2eb5d3cb6cab84556733c31a605c37241a3361340936b8413146 transcode-1.0.2-r2.ebuild 4027 -EBUILD transcode-1.0.2-r3.ebuild 4090 RMD160 2164ef96a5149ed1760184df10ab85b15c1b4dc6 SHA1 6bed904032dbeb15d0cbb3b644dd0f6d5ec37445 SHA256 1eaf507495fb685d549188e3510a081fbd77278db97d2679e4a61a2a80656940 -MD5 1c5cde15bd54ebde94b39ca9efb9eb2d transcode-1.0.2-r3.ebuild 4090 -RMD160 2164ef96a5149ed1760184df10ab85b15c1b4dc6 transcode-1.0.2-r3.ebuild 4090 -SHA256 1eaf507495fb685d549188e3510a081fbd77278db97d2679e4a61a2a80656940 transcode-1.0.2-r3.ebuild 4090 -MISC ChangeLog 28056 RMD160 6b4b5441bf9a332cec441f94227d49fb6d6e8462 SHA1 cc0b0b13cdc63714a5f99d0544054d7165b5c1a6 SHA256 7d121993b92b983ef2698ec16d22a5066106e1d4f7bada2b9e530a4451aa6d7f -MD5 e3d81398f5cd502c60b43f7cf9f502a8 ChangeLog 28056 -RMD160 6b4b5441bf9a332cec441f94227d49fb6d6e8462 ChangeLog 28056 -SHA256 7d121993b92b983ef2698ec16d22a5066106e1d4f7bada2b9e530a4451aa6d7f ChangeLog 28056 +EBUILD transcode-1.0.2-r3.ebuild 4246 RMD160 ec4dd5b77345228b8c6e3b1ae57c276de990c735 SHA1 ac4783c46c91557942d63e724ba55681a78da6c0 SHA256 40aea876b1eb34461d997b10a6932016942034c1084fddbc05c680f3e0c9d383 +MD5 8cad0b79c3e4081520a9d6b215b6cfe7 transcode-1.0.2-r3.ebuild 4246 +RMD160 ec4dd5b77345228b8c6e3b1ae57c276de990c735 transcode-1.0.2-r3.ebuild 4246 +SHA256 40aea876b1eb34461d997b10a6932016942034c1084fddbc05c680f3e0c9d383 transcode-1.0.2-r3.ebuild 4246 +MISC ChangeLog 28242 RMD160 7cebd292baea423d37807c304f753c45751a373d SHA1 533531734e099cae0a317a50fdde2a502431d38d SHA256 21e9a8facaec1aee80413c34f74202451565c3f2fda30845bdcb0af5f0d99278 +MD5 834a8d206e1d1c273891abb4f5aebed5 ChangeLog 28242 +RMD160 7cebd292baea423d37807c304f753c45751a373d ChangeLog 28242 +SHA256 21e9a8facaec1aee80413c34f74202451565c3f2fda30845bdcb0af5f0d99278 ChangeLog 28242 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223 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