diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
commit | deba8115d2c2af26df42966b91ef04ff4dd79cde (patch) | |
tree | 9a48f42594e1a9e6b2020d5535a784314434d7a7 /media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild | |
parent | 38423c67c8a23f6a1bc42038193182e2da3116eb (diff) |
gentoo resync : 14.05.2020
Diffstat (limited to 'media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild')
-rw-r--r-- | media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild index 57cd4e37dc9a..f1ccbed79848 100644 --- a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild @@ -24,11 +24,12 @@ HOMEPAGE="http://xine.sourceforge.net/" LICENSE="GPL-2" SLOT="1" -IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X xinerama +xv xvmc ${NLS_IUSE}" +IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X xinerama +xv xvmc ${NLS_IUSE}" RDEPEND="${NLS_RDEPEND} dev-libs/libxdg-basedir media-libs/libdvdnav + media-video/ffmpeg:0= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) @@ -44,11 +45,6 @@ RDEPEND="${NLS_RDEPEND} imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) - !libav? ( media-video/ffmpeg:0= ) - libav? ( - media-libs/libpostproc:0= - media-video/libav:0= - ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) @@ -154,6 +150,7 @@ src_configure() { --disable-real-codecs --disable-v4l --disable-w32dll + --enable-avformat --with-external-dvdnav --with-real-codecs-path=/usr/$(get_libdir)/codecs --with-w32-path=${win32dir} @@ -210,10 +207,6 @@ src_configure() { ) [[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) ) - if ! use libav && has_version '>=media-video/ffmpeg-2.2:0'; then - myconf+=( --enable-avformat ) #507474 - fi - econf "${myconf[@]}" } |