diff options
Diffstat (limited to 'media-libs/xine-lib')
| -rw-r--r-- | media-libs/xine-lib/Manifest | 4 | ||||
| -rw-r--r-- | media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild | 13 | ||||
| -rw-r--r-- | media-libs/xine-lib/xine-lib-1.2.9999.ebuild | 13 |
3 files changed, 8 insertions, 22 deletions
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest index 84778b36edd7..987e4a30e363 100644 --- a/media-libs/xine-lib/Manifest +++ b/media-libs/xine-lib/Manifest @@ -1,5 +1,5 @@ AUX xine-lib-1.2.6-imagemagick7.patch 384 BLAKE2B 876c66e9e06b8f2437b1ec9945d4f1cf09efe1e57774280af501abf1a4214785dc875d6ca68515d48ebad37a90184b2db922034705df83592e1479741f15e726 SHA512 13badc72163f41a14fa85d84cbc835a396ab2bc195125025962257de4a41925e29c74159c3941472334f9eb10feee4278ea96288201689d5fcc48c494940ceb9 DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7 SHA512 bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c -EBUILD xine-lib-1.2.9-r2.ebuild 5318 BLAKE2B 4dc14f8a76ff132e75d26b4eea5b0da26683b7a65d45093b1a462d6335de93a4f33f357a2feeadb0edbb59e9a7bc82ce79a61e6cd557f4fee8836a5bd891b713 SHA512 64ab2305b764bd5a4dc0cee493dc323034af4ad52e1363db087fd07118b6695f3b3b01b3ec636d9116cbc260c7a3e13a7a2902689d15c2859c3a372e53f9dfdd -EBUILD xine-lib-1.2.9999.ebuild 5207 BLAKE2B db9eb0615a456a9b71860e0f8539a3f91f363bd145534f4a6f32d11db3c27e6bb9f34204ec1dc6d581fb33d5f36315bf8c873dbae5244e1210d1ddc0374190bc SHA512 78167fc4b4ec1cb33b5230ee219ca953745a2abe4b10606206a1dc97ca6d1f0f52b0a7187e72643def6931d4da2b8e53c5e81673e7df28f820a1a396b0c76279 +EBUILD xine-lib-1.2.9-r2.ebuild 5145 BLAKE2B 6fc935a7fe217bafcb1f9e9c02559da8ac2df0b56bc1200b7b29cd78445385a54f1ad463b9dbfa34c205486c23e8f2fa22c05aa34e52e226e8027988d940d261 SHA512 e98a1cb2efc4552e8b8d31c4b0a364e1ce97d9cfd8468abc7d76a741fef4a395f42510e6a63b2816a2afc2167219e825c44a9f182bb1562c6258512459bb73c7 +EBUILD xine-lib-1.2.9999.ebuild 5034 BLAKE2B f41eee641edac544ef230e33819c764e06d4e69ce2010f976f302598691b70e2a2cda68fbdd6234977996acdd771396f6f3e58c58dcb8d5e81f8771d1ff68968 SHA512 84e81689317d5701d28e14545af391b9760218f4664a9dbbebb173b69132dee3d9053931896513b0507211c48b2e61e8f46f10d377bf019a0fcd4f7500853ee5 MISC metadata.xml 2580 BLAKE2B 15f578e1434e0e507eee410a4e28cb87528998e6041569dbfbd65858829697e234987ec773dcb2328ea4dfd56b3992cf92ff1f185dd08d68605f2e10f950ba56 SHA512 85e34bb9a10120c27e144cfc56b9a4f5aa26f29593d0bc6382741549b75e0a8cb0192bdb3960b3482cecc49cd9d0ea3d65a5b30183b0fceb222ac635d1a236a8 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[@]}" } diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild index e8d87db18ee1..bf3fbf83a913 100644 --- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.9999.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:= ) @@ -150,6 +146,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} @@ -206,10 +203,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[@]}" } |