From 17bf1b8ccc41efafe8ba23cf98646c4f9eec45e1 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Fri, 16 Oct 2015 14:04:52 +0200 Subject: media-tv/tvheadend: Fix usage of ffmpeg vs libav flags. ffmpeg flag means enable ffmpeg or libav. libav flags means use libav, lack of it use ffmpeg. Package-Manager: portage-2.2.23 --- media-tv/tvheadend/tvheadend-4.0.6.ebuild | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'media-tv/tvheadend') diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild index 512a53dfd77..ec292853325 100644 --- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild +++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild @@ -23,10 +23,12 @@ RDEPEND="dev-libs/openssl:= ccache? ( dev-util/ccache sys-libs/zlib ) dbus? ( sys-apps/dbus ) dvb? ( virtual/linuxtv-dvb-headers ) - ffmpeg? ( virtual/ffmpeg ) + ffmpeg? ( + !libav? ( media-video/ffmpeg:0= ) + libav? ( media-video/libav:= ) + ) hdhomerun? ( media-libs/libhdhomerun ) iconv? ( virtual/libiconv ) - libav? ( media-video/libav ) imagecache? ( net-misc/curl ) uriparser? ( dev-libs/uriparser ) zlib? ( sys-libs/zlib ) @@ -80,7 +82,6 @@ src_configure() { --disable-kqueue \ $(use_enable ffmpeg libav) \ $(use_enable hdhomerun hdhomerun_client) \ - $(use_enable libav) \ $(use_enable imagecache) \ $(use_enable inotify) \ $(use_enable iptv) \ -- cgit v1.2.1