summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2016-05-02 10:43:00 +0200
committerLars Wendler <polynomial-c@gentoo.org>2016-05-02 12:25:07 +0200
commitceca6e9d146501b6490c760489b40e3133edddfb (patch)
tree35d984ebf328ec814664af63d252ae1ddec6193b /media-video/transcode
parentdev-python/sqlalchemy-rqlite: fix metadata.xml maintainer type (diff)
downloadgentoo-ceca6e9d146501b6490c760489b40e3133edddfb.tar.gz
gentoo-ceca6e9d146501b6490c760489b40e3133edddfb.tar.bz2
gentoo-ceca6e9d146501b6490c760489b40e3133edddfb.zip
media-video/transcode: Added slotdep for imagemagick. Bumped to EAPI-6.
Package-Manager: portage-2.2.28 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'media-video/transcode')
-rw-r--r--media-video/transcode/files/transcode-1.1.7-ffmpeg-0.10.patch4
-rw-r--r--media-video/transcode/files/transcode-1.1.7-ffmpeg.patch12
-rw-r--r--media-video/transcode/files/transcode-1.1.7-libav-9.patch8
-rw-r--r--media-video/transcode/transcode-1.1.7-r3.ebuild40
4 files changed, 35 insertions, 29 deletions
diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.10.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.10.patch
index ea737c8b098..5879b24d267 100644
--- a/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.10.patch
+++ b/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.10.patch
@@ -1,7 +1,7 @@
http://bugs.gentoo.org/401287
---- filter/filter_pp.c
-+++ filter/filter_pp.c
+--- a/filter/filter_pp.c
++++ b/filter/filter_pp.c
@@ -38,8 +38,8 @@
/* FIXME: these use the filter ID as an index--the ID can grow
diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg.patch
index be7a6cbaeb3..1e7459830c1 100644
--- a/media-video/transcode/files/transcode-1.1.7-ffmpeg.patch
+++ b/media-video/transcode/files/transcode-1.1.7-ffmpeg.patch
@@ -1,5 +1,5 @@
---- encode/encode_lavc.c
-+++ encode/encode_lavc.c
+--- a/encode/encode_lavc.c
++++ b/encode/encode_lavc.c
@@ -955,8 +955,6 @@
/*
* context *transcode* (not libavcodec) defaults
@@ -18,8 +18,8 @@
{ "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
+--- a/export/ffmpeg_cfg.c
++++ b/export/ffmpeg_cfg.c
@@ -34,8 +34,6 @@
//int lavc_param_vqscale = 0;
//int lavc_param_vqmin = 2;
@@ -38,8 +38,8 @@
{"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
+--- a/export/ffmpeg_cfg.h
++++ b/export/ffmpeg_cfg.h
@@ -13,8 +13,6 @@
//extern int lavc_param_vqscale;
//extern int lavc_param_vqmin;
diff --git a/media-video/transcode/files/transcode-1.1.7-libav-9.patch b/media-video/transcode/files/transcode-1.1.7-libav-9.patch
index 9f2d2351f4f..a67fb68c698 100644
--- a/media-video/transcode/files/transcode-1.1.7-libav-9.patch
+++ b/media-video/transcode/files/transcode-1.1.7-libav-9.patch
@@ -1,5 +1,5 @@
---- ./import/probe_ffmpeg.c.original 2013-04-22 20:04:51.058081388 +0200
-+++ ./import/probe_ffmpeg.c 2013-04-22 20:05:25.744081897 +0200
+--- a/import/probe_ffmpeg.c
++++ b/import/probe_ffmpeg.c
@@ -109,7 +109,7 @@ void probe_ffmpeg(info_t *ipipe)
return;
}
@@ -9,8 +9,8 @@
if (ret < 0) {
tc_log_error(__FILE__, "unable to fetch informations from '%s'"
" (libavformat failure)",
---- ./import/decode_lavc.c.original 2013-04-22 20:06:17.260082652 +0200
-+++ ./import/decode_lavc.c 2013-04-22 20:07:47.564083975 +0200
+--- a/import/decode_lavc.c
++++ b/import/decode_lavc.c
@@ -170,7 +170,7 @@ void decode_lavc(decode_t *decode)
// Set these to the expected values so that ffmpeg's decoder can
diff --git a/media-video/transcode/transcode-1.1.7-r3.ebuild b/media-video/transcode/transcode-1.1.7-r3.ebuild
index 1c740b9a5ce..04ed86ae92b 100644
--- a/media-video/transcode/transcode-1.1.7-r3.ebuild
+++ b/media-video/transcode/transcode-1.1.7-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit eutils libtool multilib
DESCRIPTION="A suite of utilities for transcoding video and audio codecs in different containers"
@@ -22,8 +22,8 @@ RDEPEND="
dv? ( media-libs/libdv )
dvd? ( media-libs/libdvdread )
iconv? ( virtual/libiconv )
- imagemagick? ( media-gfx/imagemagick )
- jpeg? ( virtual/jpeg )
+ imagemagick? ( media-gfx/imagemagick:= )
+ jpeg? ( virtual/jpeg:= )
lzo? ( >=dev-libs/lzo-2 )
mjpeg? ( media-video/mjpegtools )
mp3? ( media-sound/lame )
@@ -55,19 +55,25 @@ REQUIRED_USE="
nuv? ( lzo )
"
+PATCHES=(
+ "${FILESDIR}"/${P}-ffmpeg.patch
+ "${FILESDIR}"/${P}-ffmpeg-0.10.patch
+ "${FILESDIR}"/${P}-ffmpeg-0.11.patch
+ "${FILESDIR}"/${P}-preset-free.patch
+ "${FILESDIR}"/${P}-libav-9.patch
+ "${FILESDIR}"/${P}-libav-10.patch
+ "${FILESDIR}"/${P}-preset-force.patch
+ "${FILESDIR}"/${P}-ffmpeg2.patch
+ "${FILESDIR}"/${P}-freetype251.patch
+ "${FILESDIR}"/${P}-ffmpeg24.patch
+)
+
src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-ffmpeg.patch \
- "${FILESDIR}"/${P}-ffmpeg-0.10.patch \
- "${FILESDIR}"/${P}-ffmpeg-0.11.patch \
- "${FILESDIR}"/${P}-preset-free.patch \
- "${FILESDIR}"/${P}-libav-9.patch \
- "${FILESDIR}"/${P}-libav-10.patch \
- "${FILESDIR}"/${P}-preset-force.patch \
- "${FILESDIR}"/${P}-ffmpeg2.patch \
- "${FILESDIR}"/${P}-freetype251.patch \
- "${FILESDIR}"/${P}-ffmpeg24.patch
- has_version '>=media-video/ffmpeg-2.8' && epatch "${FILESDIR}"/${P}-ffmpeg29.patch
+ if has_version '>=media-video/ffmpeg-2.8' ; then
+ PATCHES+=( "${FILESDIR}"/${P}-ffmpeg29.patch )
+ fi
+
+ default
elibtoolize
}
@@ -120,5 +126,5 @@ src_configure() {
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 {} +
+ prune_libtool_files --all
}