| 1 |
commit: ceca6e9d146501b6490c760489b40e3133edddfb |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 2 08:43:00 2016 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 2 10:25:07 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceca6e9d |
| 7 |
|
| 8 |
media-video/transcode: Added slotdep for imagemagick. Bumped to EAPI-6. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/transcode-1.1.7-ffmpeg-0.10.patch | 4 +-- |
| 14 |
.../transcode/files/transcode-1.1.7-ffmpeg.patch | 12 +++---- |
| 15 |
.../transcode/files/transcode-1.1.7-libav-9.patch | 8 ++--- |
| 16 |
media-video/transcode/transcode-1.1.7-r3.ebuild | 40 +++++++++++++--------- |
| 17 |
4 files changed, 35 insertions(+), 29 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
index ea737c8..5879b24 100644 |
| 21 |
--- a/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.10.patch |
| 22 |
+++ b/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.10.patch |
| 23 |
@@ -1,7 +1,7 @@ |
| 24 |
http://bugs.gentoo.org/401287 |
| 25 |
|
| 26 |
---- filter/filter_pp.c |
| 27 |
-+++ filter/filter_pp.c |
| 28 |
+--- a/filter/filter_pp.c |
| 29 |
++++ b/filter/filter_pp.c |
| 30 |
@@ -38,8 +38,8 @@ |
| 31 |
|
| 32 |
/* FIXME: these use the filter ID as an index--the ID can grow |
| 33 |
|
| 34 |
diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg.patch |
| 35 |
index be7a6cb..1e74598 100644 |
| 36 |
--- a/media-video/transcode/files/transcode-1.1.7-ffmpeg.patch |
| 37 |
+++ b/media-video/transcode/files/transcode-1.1.7-ffmpeg.patch |
| 38 |
@@ -1,5 +1,5 @@ |
| 39 |
---- encode/encode_lavc.c |
| 40 |
-+++ encode/encode_lavc.c |
| 41 |
+--- a/encode/encode_lavc.c |
| 42 |
++++ b/encode/encode_lavc.c |
| 43 |
@@ -955,8 +955,6 @@ |
| 44 |
/* |
| 45 |
* context *transcode* (not libavcodec) defaults |
| 46 |
@@ -18,8 +18,8 @@ |
| 47 |
{ "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, |
| 48 |
{ "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, |
| 49 |
{ "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 }, |
| 50 |
---- export/ffmpeg_cfg.c |
| 51 |
-+++ export/ffmpeg_cfg.c |
| 52 |
+--- a/export/ffmpeg_cfg.c |
| 53 |
++++ b/export/ffmpeg_cfg.c |
| 54 |
@@ -34,8 +34,6 @@ |
| 55 |
//int lavc_param_vqscale = 0; |
| 56 |
//int lavc_param_vqmin = 2; |
| 57 |
@@ -38,8 +38,8 @@ |
| 58 |
{"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, |
| 59 |
{"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, |
| 60 |
{"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, |
| 61 |
---- export/ffmpeg_cfg.h |
| 62 |
-+++ export/ffmpeg_cfg.h |
| 63 |
+--- a/export/ffmpeg_cfg.h |
| 64 |
++++ b/export/ffmpeg_cfg.h |
| 65 |
@@ -13,8 +13,6 @@ |
| 66 |
//extern int lavc_param_vqscale; |
| 67 |
//extern int lavc_param_vqmin; |
| 68 |
|
| 69 |
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 |
| 70 |
index 9f2d235..a67fb68 100644 |
| 71 |
--- a/media-video/transcode/files/transcode-1.1.7-libav-9.patch |
| 72 |
+++ b/media-video/transcode/files/transcode-1.1.7-libav-9.patch |
| 73 |
@@ -1,5 +1,5 @@ |
| 74 |
---- ./import/probe_ffmpeg.c.original 2013-04-22 20:04:51.058081388 +0200 |
| 75 |
-+++ ./import/probe_ffmpeg.c 2013-04-22 20:05:25.744081897 +0200 |
| 76 |
+--- a/import/probe_ffmpeg.c |
| 77 |
++++ b/import/probe_ffmpeg.c |
| 78 |
@@ -109,7 +109,7 @@ void probe_ffmpeg(info_t *ipipe) |
| 79 |
return; |
| 80 |
} |
| 81 |
@@ -9,8 +9,8 @@ |
| 82 |
if (ret < 0) { |
| 83 |
tc_log_error(__FILE__, "unable to fetch informations from '%s'" |
| 84 |
" (libavformat failure)", |
| 85 |
---- ./import/decode_lavc.c.original 2013-04-22 20:06:17.260082652 +0200 |
| 86 |
-+++ ./import/decode_lavc.c 2013-04-22 20:07:47.564083975 +0200 |
| 87 |
+--- a/import/decode_lavc.c |
| 88 |
++++ b/import/decode_lavc.c |
| 89 |
@@ -170,7 +170,7 @@ void decode_lavc(decode_t *decode) |
| 90 |
|
| 91 |
// Set these to the expected values so that ffmpeg's decoder can |
| 92 |
|
| 93 |
diff --git a/media-video/transcode/transcode-1.1.7-r3.ebuild b/media-video/transcode/transcode-1.1.7-r3.ebuild |
| 94 |
index 1c740b9..04ed86a 100644 |
| 95 |
--- a/media-video/transcode/transcode-1.1.7-r3.ebuild |
| 96 |
+++ b/media-video/transcode/transcode-1.1.7-r3.ebuild |
| 97 |
@@ -1,8 +1,8 @@ |
| 98 |
-# Copyright 1999-2015 Gentoo Foundation |
| 99 |
+# Copyright 1999-2016 Gentoo Foundation |
| 100 |
# Distributed under the terms of the GNU General Public License v2 |
| 101 |
# $Id$ |
| 102 |
|
| 103 |
-EAPI=5 |
| 104 |
+EAPI=6 |
| 105 |
inherit eutils libtool multilib |
| 106 |
|
| 107 |
DESCRIPTION="A suite of utilities for transcoding video and audio codecs in different containers" |
| 108 |
@@ -22,8 +22,8 @@ RDEPEND=" |
| 109 |
dv? ( media-libs/libdv ) |
| 110 |
dvd? ( media-libs/libdvdread ) |
| 111 |
iconv? ( virtual/libiconv ) |
| 112 |
- imagemagick? ( media-gfx/imagemagick ) |
| 113 |
- jpeg? ( virtual/jpeg ) |
| 114 |
+ imagemagick? ( media-gfx/imagemagick:= ) |
| 115 |
+ jpeg? ( virtual/jpeg:= ) |
| 116 |
lzo? ( >=dev-libs/lzo-2 ) |
| 117 |
mjpeg? ( media-video/mjpegtools ) |
| 118 |
mp3? ( media-sound/lame ) |
| 119 |
@@ -55,19 +55,25 @@ REQUIRED_USE=" |
| 120 |
nuv? ( lzo ) |
| 121 |
" |
| 122 |
|
| 123 |
+PATCHES=( |
| 124 |
+ "${FILESDIR}"/${P}-ffmpeg.patch |
| 125 |
+ "${FILESDIR}"/${P}-ffmpeg-0.10.patch |
| 126 |
+ "${FILESDIR}"/${P}-ffmpeg-0.11.patch |
| 127 |
+ "${FILESDIR}"/${P}-preset-free.patch |
| 128 |
+ "${FILESDIR}"/${P}-libav-9.patch |
| 129 |
+ "${FILESDIR}"/${P}-libav-10.patch |
| 130 |
+ "${FILESDIR}"/${P}-preset-force.patch |
| 131 |
+ "${FILESDIR}"/${P}-ffmpeg2.patch |
| 132 |
+ "${FILESDIR}"/${P}-freetype251.patch |
| 133 |
+ "${FILESDIR}"/${P}-ffmpeg24.patch |
| 134 |
+) |
| 135 |
+ |
| 136 |
src_prepare() { |
| 137 |
- epatch \ |
| 138 |
- "${FILESDIR}"/${P}-ffmpeg.patch \ |
| 139 |
- "${FILESDIR}"/${P}-ffmpeg-0.10.patch \ |
| 140 |
- "${FILESDIR}"/${P}-ffmpeg-0.11.patch \ |
| 141 |
- "${FILESDIR}"/${P}-preset-free.patch \ |
| 142 |
- "${FILESDIR}"/${P}-libav-9.patch \ |
| 143 |
- "${FILESDIR}"/${P}-libav-10.patch \ |
| 144 |
- "${FILESDIR}"/${P}-preset-force.patch \ |
| 145 |
- "${FILESDIR}"/${P}-ffmpeg2.patch \ |
| 146 |
- "${FILESDIR}"/${P}-freetype251.patch \ |
| 147 |
- "${FILESDIR}"/${P}-ffmpeg24.patch |
| 148 |
- has_version '>=media-video/ffmpeg-2.8' && epatch "${FILESDIR}"/${P}-ffmpeg29.patch |
| 149 |
+ if has_version '>=media-video/ffmpeg-2.8' ; then |
| 150 |
+ PATCHES+=( "${FILESDIR}"/${P}-ffmpeg29.patch ) |
| 151 |
+ fi |
| 152 |
+ |
| 153 |
+ default |
| 154 |
|
| 155 |
elibtoolize |
| 156 |
} |
| 157 |
@@ -120,5 +126,5 @@ src_configure() { |
| 158 |
src_install() { |
| 159 |
emake DESTDIR="${D}" docsdir=/usr/share/doc/${PF} install |
| 160 |
dodoc AUTHORS ChangeLog README STYLE TODO |
| 161 |
- find "${ED}"usr -name '*.la' -exec rm -f {} + |
| 162 |
+ prune_libtool_files --all |
| 163 |
} |
Archives