summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild')
-rw-r--r--media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild10
1 files changed, 6 insertions, 4 deletions
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
index 543d87f028b5..0d16682d8803 100644
--- a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.6-r1.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 flag-o-matic libtool multilib eutils
@@ -49,7 +49,7 @@ RDEPEND="${NLS_RDEPEND}
flac? ( media-libs/flac )
fusion? ( media-libs/FusionSound )
gtk? ( x11-libs/gdk-pixbuf:2 )
- imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
+ imagemagick? ( || ( media-gfx/imagemagick:= media-gfx/graphicsmagick ) )
jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
jpeg? ( virtual/jpeg:0 )
libcaca? ( media-libs/libcaca )
@@ -117,6 +117,8 @@ REQUIRED_USE="vidix? ( || ( X fbcon ) )
xinerama? ( X )"
src_prepare() {
+ default
+
sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
if [[ ${PV} == *9999* ]]; then
@@ -130,7 +132,7 @@ src_prepare() {
for x in 0 1 2 3; do
sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die
done
- has_version '>=media-video/ffmpeg-2.9' && epatch "${FILESDIR}/ffmpeg29.patch"
+ has_version '>=media-video/ffmpeg-2.9' && eapply "${FILESDIR}/ffmpeg29.patch"
}
src_configure() {