Fix mpa codec error, thanks to Harry in bug #318525. See http://www.mail-archive...

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index 4a09c411d6039d9f862541382c046d0786b73791..3b327651d65e9de23349ae3b49889eec35b3d311 100644 (file)
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/transcode
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.276 2010/02/15 20:51:35 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.277 2010/07/04 19:00:51 je_fro Exp $
+
+*transcode-1.1.5-r2 (04 Jul 2010)
+
+  04 Jul 2010; Jeff Gardner <je_fro@gentoo.org> +transcode-1.1.5-r2.ebuild,
+  +files/transcode-1.1.5-mpa.patch:
+  Fix mpa codec error. See
+  http://www.mail-archive.com/transcode-users@exit1.org/msg02236.html Thanks
+  to Harry in bug #318525.
 
   15 Feb 2010; Joseph Jezak <josejx@gentoo.org> transcode-1.1.5-r1.ebuild:
   Marked ppc stable for bug #297851.

diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index d3c54a2289d03506852c09cb4b253c303610f7e1..ab1da5b4d14cf3f2a329a7d67b661884921de1e8 100644 (file)
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX transcode-1.0.6-imagemagick.patch 672 RMD160 2d1ab8cf8ca9846c8ca5de24033b358985050f85 SHA1 e2e2890f9217c068755d094fd1f656d8c344a69c SHA256 bd4d8aa5577fabac5becb03539db1e547e72cd2e4748cd53c62e8032acaf41ac
 AUX transcode-1.1.4-x264.patch 1837 RMD160 6ec8925ca714f688df06f5df229c741ca2076708 SHA1 6f54bbebc996e4576e31f16d22863f23de2ce2d9 SHA256 f1746212a2b2f2bfc01cce0e26c83c2392dbd776878a76e627f7ec809f5da0a9
 AUX transcode-1.1.5-jpeg-7.patch 460 RMD160 2e5f96ff0700890814e1af2338fe0d7dde147f04 SHA1 9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977 SHA256 f4807d5f598e387a7056c41bc0fefd29f61b75dcf946e2894c783481f6a627bd
+AUX transcode-1.1.5-mpa.patch 583 RMD160 6500b698ff0f46e2eeae47acd1d4e4c4c2f1cd4d SHA1 6f45d9167c3aa15a83cb29545749f55eb1f1e5a2 SHA256 9b31976d3104e024c3fd339d501575c48d3cbadc99bb3121e5934d48bc6fc193
 DIST transcode-1.0.7.tar.bz2 1942127 RMD160 f302972d8cf784e356753f7c21a012a73246ae71 SHA1 480f1997ae391f29f6493993ec7b1cdbcf8afbc6 SHA256 8015efe2a62edf4280ad156995c540285e9dbc92b540c66f81cc180eb3d2481e
 DIST transcode-1.1.4.tar.bz2 2116804 RMD160 6afd10e67503a6a70ee9826a7e1c49a31c4a4e7e SHA1 3d08f67c047b1b498a4a5183ad164c0641fcbc00 SHA256 7f61fec49ccbf6c5ebe86505c779a659711352733252b241287ce7bf15710e3e
 DIST transcode-1.1.5.tar.bz2 2123207 RMD160 fdc441190110a4ae4a54a4e2abd307db7f0111aa SHA1 48c36e06ca0cd1cdc1a9c6a241e231f896eefd26 SHA256 7e01665079eef81625c4761cc5c08a3b53b97de90fb0728d64f5a86a3bc59009
 EBUILD transcode-1.0.7.ebuild 3914 RMD160 bf65e7cad4492278ce334099699bbb3c2785a210 SHA1 4a0f9477f1bdf833956c5085400ac80c9991c9fe SHA256 d16c8f315fe7dd1b9cf073e7b6e1a2d6cbddc3741b67618c6d0e77cd8c9f14c1
 EBUILD transcode-1.1.4.ebuild 3292 RMD160 ed832c523168698d843a9c05073ce38072f10a11 SHA1 81f0d8d1d6c958b40621aab35cb9d4e3b7e8d7f1 SHA256 69619cdc9cda4cd124d4601f3e8fb874786adfcd43b1006245e3aec91465fcb0
 EBUILD transcode-1.1.5-r1.ebuild 4013 RMD160 86cb2db70e24d6c77a735b3c6f6c730eb473d2fd SHA1 e574bcc98b4755c862bac699b772e63ab7c2f2b3 SHA256 ed9af5b39d68514f34642ad7b6ebbf9aca613bf81829afdc929f216bab1b3bf4
+EBUILD transcode-1.1.5-r2.ebuild 4056 RMD160 4b580ac62702ed27259f402e4010fa9b2700d7fc SHA1 206c11574628a7e3797b4094880d7b9d0b0c8c95 SHA256 2ccb187d42028af2cb5d69356903caf902c1adccf743a5d2d197496b463f8586
 EBUILD transcode-1.1.5.ebuild 3971 RMD160 c78040e28f12d5d0eed273677fe3ac0bbef17aaa SHA1 2aa3e66ac2a0841b9718ece716a8188713ce9599 SHA256 1621c71ec98ba0412170b120ed0dd71c761a9ad0ede1358909e78976ed7fd806
-MISC ChangeLog 46302 RMD160 4168a5eaee493826ffa5d2b9bcf9779bd2734cfe SHA1 9be62c02795e9023e4111038035f8228d336fbe0 SHA256 fb52c5ad2ab50dc6ae973e8043845b9d062650dbf95b07d53e2e034597c422af
+MISC ChangeLog 46581 RMD160 42e8048d25d710cb2aea4abf43844f1b64b60dfe SHA1 8274885badc93a667190527b3e6a00c978af12fc SHA256 8eea8b97615c2dc65bfa8aba1500d3c09104ca09fb42284e872bd04589ea7c49
 MISC metadata.xml 645 RMD160 73b9c254a56c875542316ae2e672cd822e796083 SHA1 ae717e64c138b5c9692760911e8325fdeb3f7584 SHA256 31d2bc07b4751ed99dd1378a429d7d2cadac64ba89be6c1eda268e2e874dc41c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkt5s6AACgkQcsIHjyDViGT+XgCcCJ8YH0sO3uQ2fs8oJRsgxNYf
-dFwAn0Rz7eFGVJnhhxIgi8z0yhh1Re43
-=mtMf
------END PGP SIGNATURE-----

diff --git a/media-video/transcode/files/transcode-1.1.5-mpa.patch b/media-video/transcode/files/transcode-1.1.5-mpa.patch
new file mode 100644 (file)
index 0000000..e7fb0fc
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.5-mpa.patch
@@ -0,0 +1,10 @@
+--- transcode-1.1.5-old/export/aud_aux.c       2010-07-04 12:44:31.867550180 -0500
++++ transcode-1.1.5/export/aud_aux.c   2010-07-04 13:41:01.253292529 -0500
+@@ -347,6 +347,7 @@
+     //-- set parameters (bitrate, channels and sample-rate) --
+     //--------------------------------------------------------
+     memset(&mpa_ctx, 0, sizeof(mpa_ctx));          // default all
++    mpa_ctx.codec_type  = CODEC_TYPE_AUDIO;
+     mpa_ctx.bit_rate    = vob->mp3bitrate * 1000;  // bitrate dest.
+     mpa_ctx.channels    = vob->dm_chan;            // channels
+     mpa_ctx.sample_rate = vob->a_rate;

diff --git a/media-video/transcode/transcode-1.1.5-r2.ebuild b/media-video/transcode/transcode-1.1.5-r2.ebuild
new file mode 100644 (file)
index 0000000..d325dc9
--- /dev/null
+++ b/media-video/transcode/transcode-1.1.5-r2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.5-r2.ebuild,v 1.1 2010/07/04 19:00:51 je_fro Exp $
+
+EAPI="2"
+
+WANT_AUTOCONF="2.5"
+WANT_AUTOMAKE="1.10"
+
+inherit libtool flag-o-matic eutils multilib autotools
+
+MY_P=${P/_}
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="video stream processing tool"
+HOMEPAGE="http://tcforge.berlios.de/"
+SRC_URI="mirror://berlios/tcforge/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X 3dnow a52 aac alsa altivec dv dvd iconv imagemagick jpeg lzo mjpeg mp3 mpeg mmx nuv ogg oss postproc quicktime sdl sse sse2 theora truetype v4l2 vorbis x264 xml xvid"
+
+RDEPEND="aac? ( media-libs/faac )
+       a52? ( media-libs/a52dec )
+       alsa? ( media-libs/alsa-lib )
+       dv? ( media-libs/libdv )
+       dvd? ( media-libs/libdvdread )
+       mjpeg? ( media-video/mjpegtools )
+       lzo? ( >=dev-libs/lzo-2 )
+       imagemagick? ( media-gfx/imagemagick )
+       mp3? ( media-sound/lame )
+       sdl? ( >=media-libs/libsdl-1.2.5[X] )
+       quicktime? ( >=media-libs/libquicktime-1.0.0 )
+       vorbis? ( media-libs/libvorbis )
+       ogg? ( media-libs/libogg )
+       theora? ( media-libs/libtheora )
+       jpeg? ( media-libs/jpeg:0 )
+       truetype? ( >=media-libs/freetype-2 )
+       >=media-video/ffmpeg-0.4.9_p20081014
+       || ( sys-libs/glibc dev-libs/libiconv )
+       mpeg? ( media-libs/libmpeg2 )
+       x264? ( media-libs/x264 )
+       xml? ( dev-libs/libxml2 )
+       xvid? ( media-libs/xvid )
+       X? ( x11-libs/libXpm
+               x11-libs/libXaw
+               x11-libs/libXv )"
+
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig
+       v4l2? ( >=sys-kernel/linux-headers-2.6.11 )"
+
+# Notify the user that some useflag have been forced on
+tc_use_force() {
+       use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled."
+}
+
+# Use when $2 depends strictly on $3
+# if use $1 then enable $2 and $3, otherwise disable $2
+tc_use_enable_force() {
+       if use $1 ; then
+               echo "--enable-$2 --enable-$3"
+       else
+               echo "--disable-$2"
+       fi
+}
+
+pkg_setup() {
+       tc_use_force sse mmx
+       tc_use_force 3dnow mmx
+       tc_use_force sse2 mmx
+       tc_use_force sse2 sse
+}
+
+src_prepare() {
+       sed -i -e "s:\$(datadir)/doc/transcode:\$(datadir)/doc/${PF}:" \
+               "${S}"/Makefile.am "${S}"/docs/Makefile.am "${S}"/docs/html/Makefile.am \
+               "${S}"/docs/pvm3/Makefile.am "${S}"/docs/tech/html/Makefile.am \
+               "${S}"/docs/tech/Makefile.am
+
+       epatch "${FILESDIR}"/${P}-jpeg-7.patch
+       epatch "${FILESDIR}"/${P}-mpa.patch
+
+       eautoreconf
+}
+
+src_configure() {
+       # NuppelVideo is supported only on x86 platform yet
+       # TODO: mask nuv useflag for all other arches
+       # TODO: watch tcrequant for change. It's currently enabled with --enable-deprecated.
+       use x86 && myconf="${myconf} $(use_enable nuv)"
+       myconf="${myconf} \
+               $(use_enable mmx) \
+               $(use_enable 3dnow) \
+               $(use_enable sse) \
+               $(use_enable sse2) \
+               $(use_enable altivec) \
+               $(use_enable v4l2 v4l) \
+               $(use_enable alsa) \
+               $(use_enable oss) \
+               $(use_enable truetype freetype2) \
+               $(use_enable mp3 lame) \
+               $(use_enable x264) \
+               $(use_enable xvid) \
+               $(use_enable ogg) \
+               $(use_enable vorbis) \
+               $(use_enable theora) \
+               $(use_enable dvd libdvdread) \
+               $(use_enable dv libdv) \
+               $(use_enable quicktime libquicktime) \
+               $(use_enable imagemagick) \
+               $(use_enable postproc libpostproc) \
+               $(use_enable lzo) \
+               $(use_enable a52) \
+               $(use_enable aac faac) \
+               $(use_enable xml libxml2) \
+               $(use_enable mpeg libmpeg2) \
+               $(use_enable mpeg libmpeg2convert) \
+               $(use_enable mjpeg mjpegtools) \
+               $(use_enable sdl) \
+               $(use_enable jpeg libjpeg) \
+               $(use_enable iconv) \
+               $(use_with X x) \
+               --enable-deprecated \
+               --enable-experimental \
+               --with-mod-path=/usr/$(get_libdir)/transcode \
+               $(tc_use_enable_force sse sse mmx) \
+               $(tc_use_enable_force 3dnow 3dnow mmx) \
+               $(tc_use_enable_force sse2 sse2 mmx) \
+               $(tc_use_enable_force sse2 sse2 sse) \
+               "
+
+       econf ${myconf} || die "econf failed"
+}
+
+src_install () {
+       make DESTDIR="${D}" install || die "make install failed"
+       rm -fr "${D}/usr/share/doc/transcode"
+
+       dodoc AUTHORS ChangeLog README TODO STYLE
+       dodoc docs/*
+       dohtml docs/html/*
+}