Version bump.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

4 files changed, 178 insertions, 5 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index 9226e021253b..acb2f25d076e 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/transcode
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.289 2011/12/03 18:19:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.290 2011/12/06 07:39:11 ssuominen Exp $
+
+*transcode-1.1.7 (06 Dec 2011)
+
+  06 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> +transcode-1.1.7.ebuild,
+  +files/transcode-1.1.7-ffmpeg.patch:
+  Version bump.
 
   03 Dec 2011; Alexis Ballier <aballier@gentoo.org> transcode-1.1.5-r2.ebuild:
   depend on ffmpeg for postproc, it doesnt build with libav, bug #369513
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index 8a90a4696948..b8b56439f3dd 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -6,14 +6,21 @@ AUX transcode-1.1.4-x264.patch 1837 RMD160 6ec8925ca714f688df06f5df229c741ca2076
 AUX transcode-1.1.5-ffmpeg.patch 6128 RMD160 7c21b8daf99b599f0b3005cd2b08ae5c894c4552 SHA1 2d3bb4486394ee55540e772f134e193874e5c2b4 SHA256 a0246b84d12d289a940468a289ad5471c29d7a35c8317293a0dc0c7428445487
 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
+AUX transcode-1.1.7-ffmpeg.patch 2274 RMD160 9873bd9a8ba3336948336a508551ca3dd0ceaabd SHA1 cc81c190db51d8a64623e2eea3b327ec7eb7ec57 SHA256 443776bbc3497e1f256eb74c19bcda293cfd751776817bafc1ca89ff510e3b61
 DIST transcode-1.1.5.tar.bz2 2123207 RMD160 fdc441190110a4ae4a54a4e2abd307db7f0111aa SHA1 48c36e06ca0cd1cdc1a9c6a241e231f896eefd26 SHA256 7e01665079eef81625c4761cc5c08a3b53b97de90fb0728d64f5a86a3bc59009
+DIST transcode-1.1.7.tar.bz2 2183627 RMD160 faa854acbbfd52faaa216505176f94d756d77841 SHA1 e35df68b960eb56ef0a59a4cdbed1491be56aee6 SHA256 1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92
 EBUILD transcode-1.1.5-r2.ebuild 4068 RMD160 28a0702c2d17db840b4914e679436103bcc0e32b SHA1 c6151bb2cab015e00ea8af9bcb08f3909e96ce18 SHA256 270250fe0f65571ed21827260ebed39e4430d0a442458c0bdece21281b190841
-MISC ChangeLog 48302 RMD160 cec48ee10ccdca66f50d071a5c39374143f4eb7c SHA1 360d0d4c68f3bb69eda5fd2131f34dc8f5018e89 SHA256 5a1bda0ac2b3cdaf4a385af7b9bdc6b0d6b5d7b05fb0f557df2cb9bbaeaf71fa
+EBUILD transcode-1.1.7.ebuild 3011 RMD160 b48cb24438b32785ba9fe0a6f1406a68b937f404 SHA1 564a3d6e2062909a925cd96c900b7c5922169299 SHA256 eb317892d8d66a0e5bd59a7ac09c311871e1351cc7d256686b405aee9e1c9e3e
+MISC ChangeLog 48470 RMD160 935cc729dbcabed34de64bed44cbfc68ec0c55e7 SHA1 e5b25172468c4b99bf15056a255924f5ec012fb1 SHA256 89a6a888ded953a834ef0d3498b06ff39b5e81398ca7b6c55a273ccf9329e1bc
 MISC metadata.xml 444 RMD160 af149b7604eda71e81265e34df694127e22d6614 SHA1 24254d62a1f342d7b5ca933da99f4fce5876da6d SHA256 aa72df101b5326a3ed9f47121b70546c60c45d486d70574d8f46bfc4e374ffdf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7aaEIACgkQvFcC4BYPU0r29wCeIPKCf44vzaf0KkbNCZNHjJMC
-f6cAoMA5ZafIbS3VVrX79jYO9YEo2s0z
-=Ym3L
+iQEcBAEBAgAGBQJO3caSAAoJEEdUh39IaPFNLYEH/3LJMP4pS+TYAvVLsjCWuZM/
+IXqwrGde2Q2cE6Elfvwt+6xaopWTTRqAM2NB0+SUafGSHd+y1gbsO+Fn968HOGpq
+/UQIjrLZnyppANCD1bmZ1nq3l+os+tYhp5/pZJcpQ+OThHfqdTESRTgqQnZp/Le2
+o5+2jGBaDdgkaQWFNQfEa/O/iIYC1ZM3H9+55ncWxQkFSIlN4iulwaC0xyFDj5dj
+2HYI+hKhHp+3rkQrpTE+Miluo3DpxfcP2hSpBGhrASFpXjKVVs46xHiNF9mQYStX
+7Z7BU7/qf9SYRIjk+r16RgJk8TUrj+1q6OVOXSxGixGx5U7Kq1SACHrh1cTzwEQ=
+=/VXs
 -----END PGP SIGNATURE-----
diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg.patch
new file mode 100644
index 000000000000..be7a6cbaeb33
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.7-ffmpeg.patch
@@ -0,0 +1,51 @@
+--- encode/encode_lavc.c
++++ encode/encode_lavc.c
+@@ -955,8 +955,6 @@
+     /* 
+      * context *transcode* (not libavcodec) defaults
+      */
+-    pd->ff_vcontext.mb_qmin                 = 2;
+-    pd->ff_vcontext.mb_qmax                 = 31;
+     pd->ff_vcontext.max_qdiff               = 3;
+     pd->ff_vcontext.max_b_frames            = 0;
+     pd->ff_vcontext.me_range                = 0;
+@@ -1116,8 +1114,6 @@
+         //  handled by transcode core
+         //  { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
+         //  handled by transcode core
+-        { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
+-        { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
+         { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
+         { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
+         { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 },
+--- export/ffmpeg_cfg.c
++++ export/ffmpeg_cfg.c
+@@ -34,8 +34,6 @@
+ //int lavc_param_vqscale = 0;
+ //int lavc_param_vqmin = 2;
+ //int lavc_param_vqmax = 31;
+-int lavc_param_mb_qmin = 2;
+-int lavc_param_mb_qmax = 31;
+ int lavc_param_lmin = 2;
+ int lavc_param_lmax = 31;
+ int lavc_param_vqdiff = 3;
+@@ -143,8 +141,6 @@
+ //    {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+ //    {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+ //    {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+-    {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+-    {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+     {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
+     {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
+     {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+--- export/ffmpeg_cfg.h
++++ export/ffmpeg_cfg.h
+@@ -13,8 +13,6 @@
+ //extern int lavc_param_vqscale;
+ //extern int lavc_param_vqmin;
+ //extern int lavc_param_vqmax;
+-extern int lavc_param_mb_qmin;
+-extern int lavc_param_mb_qmax;
+ extern int lavc_param_lmin;
+ extern int lavc_param_lmax;
+ extern int lavc_param_vqdiff;
diff --git a/media-video/transcode/transcode-1.1.7.ebuild b/media-video/transcode/transcode-1.1.7.ebuild
new file mode 100644
index 000000000000..a63bf109d17f
--- /dev/null
+++ b/media-video/transcode/transcode-1.1.7.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.7.ebuild,v 1.1 2011/12/06 07:39:11 ssuominen Exp $
+
+EAPI=4
+inherit eutils libtool multilib
+
+DESCRIPTION="A suite of utilities for transcoding video and audio codecs in different containers"
+HOMEPAGE="http://tcforge.berlios.de/"
+SRC_URI="http://bitbucket.org/france/${PN}-tcforge/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="3dnow a52 aac alsa altivec dv dvd +iconv imagemagick jpeg lzo mjpeg mmx mp3 mpeg nuv ogg oss postproc quicktime sdl sse sse2 theora truetype v4l vorbis X x264 xml xvid"
+
+RDEPEND="
+	virtual/ffmpeg
+	a52? ( media-libs/a52dec )
+	aac? ( media-libs/faac )
+	alsa? ( media-libs/alsa-lib )
+	dv? ( media-libs/libdv )
+	dvd? ( media-libs/libdvdread )
+	iconv? ( virtual/libiconv )
+	imagemagick? ( media-gfx/imagemagick )
+	jpeg? ( virtual/jpeg )
+	lzo? ( >=dev-libs/lzo-2 )
+	mjpeg? ( media-video/mjpegtools )
+	mp3? ( media-sound/lame )
+	mpeg? ( media-libs/libmpeg2 )
+	ogg? ( media-libs/libogg )
+	postproc? ( media-video/ffmpeg )
+	quicktime? ( >=media-libs/libquicktime-1 )
+	sdl? ( >=media-libs/libsdl-1.2.5[X?] )
+	theora? ( media-libs/libtheora )
+	truetype? ( >=media-libs/freetype-2 )
+	v4l? ( media-libs/libv4l )
+	vorbis? ( media-libs/libvorbis )
+	X? ( x11-libs/libXpm x11-libs/libXaw x11-libs/libXv )
+	x264? ( media-libs/x264 )
+	xml? ( dev-libs/libxml2 )
+	xvid? ( media-libs/xvid )
+	"
+
+DEPEND="
+	${RDEPEND}
+	dev-util/pkgconfig
+	v4l? ( >=sys-kernel/linux-headers-2.6.11 )
+	"
+
+REQUIRED_USE="
+	sse? ( mmx )
+	sse2? ( mmx )
+	3dnow? ( mmx )
+	sse2? ( sse )
+	nuv? ( lzo )
+	"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ffmpeg.patch
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		$(use_enable mmx) \
+		$(use_enable 3dnow) \
+		$(use_enable sse) \
+		$(use_enable sse2) \
+		$(use_enable altivec) \
+		$(use_enable v4l libv4l2) \
+		$(use_enable v4l libv4lconvert) \
+		$(use_enable mpeg libmpeg2) \
+		$(use_enable mpeg libmpeg2convert) \
+		--enable-experimental \
+		--enable-deprecated \
+		$(use_enable v4l) \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		$(use_enable postproc libpostproc) \
+		$(use_enable truetype freetype2) \
+		$(use_enable mp3 lame) \
+		$(use_enable xvid) \
+		$(use_enable x264) \
+		$(use_enable ogg) \
+		$(use_enable vorbis) \
+		$(use_enable theora) \
+		$(use_enable dvd libdvdread) \
+		$(use_enable dv libdv) \
+		$(use_enable quicktime libquicktime) \
+		$(use_enable lzo) \
+		$(use_enable a52) \
+		$(use_enable aac faac) \
+		$(use_enable xml libxml2) \
+		$(use_enable mjpeg mjpegtools) \
+		$(use_enable sdl) \
+		$(use_enable imagemagick) \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable iconv) \
+		$(use_enable nuv) \
+		$(use_with X x) \
+		--with-mod-path=/usr/$(get_libdir)/transcode
+}
+
+src_install() {
+	emake DESTDIR="${D}" docsdir=/usr/share/doc/${PF} install
+	dodoc AUTHORS ChangeLog README STYLE TODO
+	find "${ED}"usr -name '*.la' -exec rm -f {} +
+}