| 1 |
commit: e03d4f7e0da37d663654b26e386652c3d96e27cc |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 2 07:49:06 2016 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 2 07:51:49 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e03d4f7e |
| 7 |
|
| 8 |
media-libs/xine-lib: 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 |
media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild | 10 ++++++---- |
| 14 |
media-libs/xine-lib/xine-lib-1.2.9999.ebuild | 8 +++++--- |
| 15 |
2 files changed, 11 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild |
| 18 |
index 543d87f..0d16682 100644 |
| 19 |
--- a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild |
| 20 |
+++ b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild |
| 21 |
@@ -1,8 +1,8 @@ |
| 22 |
-# Copyright 1999-2015 Gentoo Foundation |
| 23 |
+# Copyright 1999-2016 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
# $Id$ |
| 26 |
|
| 27 |
-EAPI=5 |
| 28 |
+EAPI=6 |
| 29 |
|
| 30 |
inherit flag-o-matic libtool multilib eutils |
| 31 |
|
| 32 |
@@ -49,7 +49,7 @@ RDEPEND="${NLS_RDEPEND} |
| 33 |
flac? ( media-libs/flac ) |
| 34 |
fusion? ( media-libs/FusionSound ) |
| 35 |
gtk? ( x11-libs/gdk-pixbuf:2 ) |
| 36 |
- imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) ) |
| 37 |
+ imagemagick? ( || ( media-gfx/imagemagick:= media-gfx/graphicsmagick ) ) |
| 38 |
jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) |
| 39 |
jpeg? ( virtual/jpeg:0 ) |
| 40 |
libcaca? ( media-libs/libcaca ) |
| 41 |
@@ -117,6 +117,8 @@ REQUIRED_USE="vidix? ( || ( X fbcon ) ) |
| 42 |
xinerama? ( X )" |
| 43 |
|
| 44 |
src_prepare() { |
| 45 |
+ default |
| 46 |
+ |
| 47 |
sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die |
| 48 |
|
| 49 |
if [[ ${PV} == *9999* ]]; then |
| 50 |
@@ -130,7 +132,7 @@ src_prepare() { |
| 51 |
for x in 0 1 2 3; do |
| 52 |
sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die |
| 53 |
done |
| 54 |
- has_version '>=media-video/ffmpeg-2.9' && epatch "${FILESDIR}/ffmpeg29.patch" |
| 55 |
+ has_version '>=media-video/ffmpeg-2.9' && eapply "${FILESDIR}/ffmpeg29.patch" |
| 56 |
} |
| 57 |
|
| 58 |
src_configure() { |
| 59 |
|
| 60 |
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild |
| 61 |
index eb4ee3b..79fdaae 100644 |
| 62 |
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild |
| 63 |
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild |
| 64 |
@@ -1,8 +1,8 @@ |
| 65 |
-# Copyright 1999-2015 Gentoo Foundation |
| 66 |
+# Copyright 1999-2016 Gentoo Foundation |
| 67 |
# Distributed under the terms of the GNU General Public License v2 |
| 68 |
# $Id$ |
| 69 |
|
| 70 |
-EAPI=5 |
| 71 |
+EAPI=6 |
| 72 |
|
| 73 |
inherit flag-o-matic libtool multilib |
| 74 |
|
| 75 |
@@ -49,7 +49,7 @@ RDEPEND="${NLS_RDEPEND} |
| 76 |
flac? ( media-libs/flac ) |
| 77 |
fusion? ( media-libs/FusionSound ) |
| 78 |
gtk? ( x11-libs/gdk-pixbuf:2 ) |
| 79 |
- imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) ) |
| 80 |
+ imagemagick? ( || ( media-gfx/imagemagick:= media-gfx/graphicsmagick ) ) |
| 81 |
jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) |
| 82 |
jpeg? ( virtual/jpeg:0 ) |
| 83 |
libcaca? ( media-libs/libcaca ) |
| 84 |
@@ -117,6 +117,8 @@ REQUIRED_USE="vidix? ( || ( X fbcon ) ) |
| 85 |
xinerama? ( X )" |
| 86 |
|
| 87 |
src_prepare() { |
| 88 |
+ default |
| 89 |
+ |
| 90 |
sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die |
| 91 |
|
| 92 |
if [[ ${PV} == *9999* ]]; then |
Archives