diff options
| -rw-r--r-- | media-video/transcode/ChangeLog | 8 | ||||
| -rw-r--r-- | media-video/transcode/files/transcode-1.1.7-ffmpeg.patch | 51 | ||||
| -rw-r--r-- | media-video/transcode/transcode-1.1.7.ebuild | 109 |
3 files changed, 167 insertions, 1 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/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 {} + +} |