From 43793fab84041cfc5c60c0151d1591b8a69fb24a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Aug 2018 07:36:27 +0100 Subject: gentoo resync : 25.08.2018 --- media-libs/xine-lib/Manifest | 6 +- media-libs/xine-lib/metadata.xml | 3 - media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild | 226 -------------------------- media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild | 229 +++++++++++++++++++++++++++ media-libs/xine-lib/xine-lib-1.2.9999.ebuild | 49 +++--- 5 files changed, 258 insertions(+), 255 deletions(-) delete mode 100644 media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild create mode 100644 media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild (limited to 'media-libs/xine-lib') diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest index b5961779df79..9cbbb1c88470 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-r1.ebuild 5465 BLAKE2B 228635a52f9a391bfdefab38040eed72941bf7d3a01d5169fec82eab24c8ba1788856bda2c8c2746fd8143863d5df5da575035dc01b091c50f3d69d05e1eaaf5 SHA512 7bebed6e02042ecb0a22ad8fd73ecb42a7b38e84ef61d5cdd84264437121e86201404975e6a877aa234a2f7dfd755bf529a4a1b45d9ace33fcb30b003f49ee60 -EBUILD xine-lib-1.2.9999.ebuild 5353 BLAKE2B cd2702c8604e9b9ec7cb0eba1df213df2860ae2a7f6a5404cd10ec20b819433e5fa6bfb45ce3f987c9323a44e71005c29008c12bad1c0711e03853b700c70412 SHA512 287424631d94d2f05e50bba16b53069a00aa28ae205e2b46514e8d4aea6800748c0710bc1755c0d8d007be3ab3af4ecafca537c9f9ead7c063ebce3168fe3b34 -MISC metadata.xml 2668 BLAKE2B 64956b27b10284478ae15509a1aa4a1408104c1e98263ac7e1ea376cbb8e596f532e049f4b3381c51f86d4cd4187784be6ad481177ffc62aef0964c90094d6b1 SHA512 17263da5cdc28752dc9344b9806665d236d8a5d3ccad7b19209912a3510b17c9d6587fd1aa847e509a3c4accd53cc96c7d1fc476f6adf9aa63c90b7eed45183b +EBUILD xine-lib-1.2.9-r2.ebuild 5355 BLAKE2B 51850a735106de45ee02196dfffb877808a8990762123a3a359bba173426d9bec09385899fcb356cbfac9a542ce029208b23575a18d56c6320dd14e6a8c089fc SHA512 4cc3a1c26122fbfbe7413e8594ce82ace1e0d15585e7e6f1b43dff548cdaa3e9ef0cf42d23fa362d8a30a599e8e6b560d918aec3b07734b2c82d617ece5073a5 +EBUILD xine-lib-1.2.9999.ebuild 5243 BLAKE2B 8888c9919af784852b6559444a68a9893bda5c12eca5b930f026231c686eb8aba342345e5848c40ae73f4a138bd1c43194290f07df15927f992da0f09fab022f SHA512 9501d294ecb056060f1cbc9b3367ab48ca56e30bd3448f13027ec51764a707a70db707852587a68a29896fffd302e00cc22c602436e90a049f3d3a161bedbf66 +MISC metadata.xml 2580 BLAKE2B 15f578e1434e0e507eee410a4e28cb87528998e6041569dbfbd65858829697e234987ec773dcb2328ea4dfd56b3992cf92ff1f185dd08d68605f2e10f950ba56 SHA512 85e34bb9a10120c27e144cfc56b9a4f5aa26f29593d0bc6382741549b75e0a8cb0192bdb3960b3482cecc49cd9d0ea3d65a5b30183b0fceb222ac635d1a236a8 diff --git a/media-libs/xine-lib/metadata.xml b/media-libs/xine-lib/metadata.xml index 9d10869197e7..18cafd445906 100644 --- a/media-libs/xine-lib/metadata.xml +++ b/media-libs/xine-lib/metadata.xml @@ -18,9 +18,6 @@ container (OggFLAC), but might have better support for exotic features like 24-bit samples or 96kHz sample rates. - - Enable support for the Fusion audio sub system - Build the gdkpixbuf-based image decoder plugin. diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild deleted file mode 100644 index 8b7764e24710..000000000000 --- a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild +++ /dev/null @@ -1,226 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic libtool multilib - -if [[ ${PV} == *9999* ]]; then - EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2" - inherit autotools mercurial - unset NLS_IUSE - NLS_DEPEND="sys-devel/gettext" - NLS_RDEPEND="virtual/libintl" -else - KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd" - SRC_URI="mirror://sourceforge/xine/${P}.tar.xz" - NLS_IUSE="nls" - NLS_DEPEND="nls? ( sys-devel/gettext )" - NLS_RDEPEND="nls? ( virtual/libintl )" -fi - -DESCRIPTION="Core libraries for Xine movie player" -HOMEPAGE="http://xine.sourceforge.net/" - -LICENSE="GPL-2" -SLOT="1" -IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac fusionsound 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 +xcb xinerama +xv xvmc ${NLS_IUSE}" - -RDEPEND="${NLS_RDEPEND} - dev-libs/libxdg-basedir - media-libs/libdvdnav - sys-libs/zlib - virtual/libiconv - a52? ( media-libs/a52dec ) - aac? ( media-libs/faad2 ) - aalib? ( media-libs/aalib ) - alsa? ( media-libs/alsa-lib ) - bluray? ( >=media-libs/libbluray-0.2.1:= ) - css? ( >=media-libs/libdvdcss-1.2.10 ) - dts? ( media-libs/libdca ) - dxr3? ( media-libs/libfame ) - flac? ( media-libs/flac ) - fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) - gtk? ( x11-libs/gdk-pixbuf:2 ) - imagemagick? ( virtual/imagemagick-tools ) - jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) - 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 ) - modplug? ( >=media-libs/libmodplug-0.8.8.1 ) - musepack? ( >=media-sound/musepack-tools-444 ) - opengl? ( - virtual/glu - virtual/opengl - ) - pulseaudio? ( media-sound/pulseaudio ) - samba? ( net-fs/samba ) - sdl? ( media-libs/libsdl ) - speex? ( - media-libs/libogg - media-libs/speex - ) - theora? ( - media-libs/libogg - media-libs/libtheora - ) - truetype? ( - media-libs/fontconfig - media-libs/freetype:2 - ) - v4l? ( media-libs/libv4l ) - vaapi? ( x11-libs/libva:0=[X,opengl] ) - vcd? ( - >=media-video/vcdimager-0.7.23 - dev-libs/libcdio:0=[-minimal] - ) - vdpau? ( x11-libs/libvdpau ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) - vpx? ( media-libs/libvpx:0= ) - wavpack? ( media-sound/wavpack ) - X? ( - x11-libs/libX11 - x11-libs/libXext - ) - xcb? ( x11-libs/libxcb ) - xinerama? ( x11-libs/libXinerama ) - xv? ( x11-libs/libXv ) - xvmc? ( x11-libs/libXvMC )" -DEPEND="${RDEPEND} - ${NLS_DEPEND} - app-arch/xz-utils - virtual/pkgconfig - >=sys-devel/libtool-2.2.6b - oss? ( virtual/os-headers ) - v4l? ( virtual/os-headers ) - X? ( - x11-base/xorg-proto - x11-libs/libXt - ) - xv? ( x11-base/xorg-proto ) - xvmc? ( x11-base/xorg-proto ) - xinerama? ( x11-base/xorg-proto )" -REQUIRED_USE="vidix? ( || ( X fbcon ) ) - xv? ( X ) - xinerama? ( X )" - -src_prepare() { - default - - if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then - eapply "${FILESDIR}/${PN}-1.2.6-imagemagick7.patch" - fi - - sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die - - if [[ "${PV}" = *9999* ]] ; then - eautoreconf - else - elibtoolize - fi - - local x - for x in 0 1 2 3; do - sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die - done -} - -src_configure() { - [[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519 - - local win32dir #197236 - if has_multilib_profile; then - win32dir=/usr/$(ABI="x86" get_libdir)/win32 - else - win32dir=/usr/$(get_libdir)/win32 - fi - - local myconf=( - --disable-directfb - --disable-gnomevfs - --disable-optimizations - --disable-real-codecs - --disable-v4l - --disable-w32dll - --with-external-dvdnav - --with-real-codecs-path=/usr/$(get_libdir)/codecs - --with-w32-path=${win32dir} - --with-xv-path=/usr/$(get_libdir) - --without-esound - $(use_enable a52 a52dec) - $(use_enable aac faad) - $(use_enable aalib) - $(use_enable altivec) - $(use_enable bluray) - $(use_enable dts) - $(use_enable dvb) - $(use_enable dxr3) - $(use_enable fbcon fb) - $(use_enable gtk gdkpixbuf) - $(use_enable ipv6) - $(use_enable jpeg libjpeg) - $(use_enable mad) - $(use_enable mmap) - $(use_enable mng) - $(use_enable modplug) - $(use_enable musepack) - $(use_enable opengl) - $(use_enable opengl glu) - $(use_enable oss) - $(use_enable samba) - $(use_enable v4l libv4l) - $(use_enable v4l v4l2) - $(use_enable vaapi) - $(use_enable vdpau) - $(use_enable vis) - $(use_enable vidix) - $(use_enable xinerama) - $(use_enable xvmc) - $(use_enable vcd) - $(use_enable vdr) - $(use_enable vpx) - $(use_with alsa) - $(use_with flac libflac) - $(use_with fusionsound) - $(use_with imagemagick) - $(use_with jack) - $(use_with libcaca caca) - $(use_with pulseaudio) - $(use_with sdl) - $(use_with speex) - $(use_with theora) - $(use_with truetype fontconfig) - $(use_with truetype freetype) - $(use_with vorbis) - $(use_with wavpack) - $(use_with X x) - $(use_with xcb) - ) - [[ ${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[@]}" -} - -src_compile() { - # enable verbose building, bug #448140 - emake V=1 -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die - rm -f "${ED}"usr/share/doc/${PF}/COPYING -} 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 new file mode 100644 index 000000000000..ffafb74e6957 --- /dev/null +++ b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild @@ -0,0 +1,229 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic libtool + +if [[ ${PV} == *9999* ]]; then + EHG_REPO_URI="http://hg.code.sf.net/p/xine/xine-lib-1.2" + inherit autotools mercurial + unset NLS_IUSE + NLS_DEPEND="sys-devel/gettext" + NLS_RDEPEND="virtual/libintl" +else + KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd" + SRC_URI="mirror://sourceforge/xine/${P}.tar.xz" + NLS_IUSE="nls" + NLS_DEPEND="nls? ( sys-devel/gettext )" + NLS_RDEPEND="nls? ( virtual/libintl )" +fi + +DESCRIPTION="Core libraries for Xine movie player" +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 +xcb xinerama +xv xvmc ${NLS_IUSE}" + +RDEPEND="${NLS_RDEPEND} + dev-libs/libxdg-basedir + media-libs/libdvdnav + sys-libs/zlib:= + virtual/libiconv + a52? ( media-libs/a52dec ) + aac? ( media-libs/faad2 ) + aalib? ( media-libs/aalib ) + alsa? ( media-libs/alsa-lib ) + bluray? ( >=media-libs/libbluray-0.2.1:= ) + css? ( >=media-libs/libdvdcss-1.2.10 ) + dts? ( media-libs/libdca ) + dxr3? ( media-libs/libfame ) + flac? ( media-libs/flac ) + gtk? ( x11-libs/gdk-pixbuf:2 ) + 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:= ) + modplug? ( >=media-libs/libmodplug-0.8.8.1 ) + musepack? ( >=media-sound/musepack-tools-444 ) + opengl? ( + virtual/glu + virtual/opengl + ) + pulseaudio? ( media-sound/pulseaudio ) + samba? ( net-fs/samba ) + sdl? ( media-libs/libsdl ) + speex? ( + media-libs/libogg + media-libs/speex + ) + theora? ( + media-libs/libogg + media-libs/libtheora + ) + truetype? ( + media-libs/fontconfig + media-libs/freetype:2 + ) + v4l? ( media-libs/libv4l ) + vaapi? ( x11-libs/libva:0=[X,opengl] ) + vcd? ( + >=media-video/vcdimager-0.7.23 + dev-libs/libcdio:0=[-minimal] + ) + vdpau? ( x11-libs/libvdpau ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + vpx? ( media-libs/libvpx:0= ) + wavpack? ( media-sound/wavpack ) + X? ( + x11-libs/libX11 + x11-libs/libXext + ) + xcb? ( x11-libs/libxcb ) + xinerama? ( x11-libs/libXinerama ) + xv? ( x11-libs/libXv ) + xvmc? ( x11-libs/libXvMC ) +" +DEPEND="${RDEPEND} + ${NLS_DEPEND} + app-arch/xz-utils + >=sys-devel/libtool-2.2.6b + virtual/pkgconfig + oss? ( virtual/os-headers ) + v4l? ( virtual/os-headers ) + X? ( + x11-base/xorg-proto + x11-libs/libXt + ) + xv? ( x11-base/xorg-proto ) + xvmc? ( x11-base/xorg-proto ) + xinerama? ( x11-base/xorg-proto ) +" +REQUIRED_USE=" + vidix? ( || ( X fbcon ) ) + xv? ( X ) + xinerama? ( X ) +" + +src_prepare() { + default + + if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then + eapply "${FILESDIR}/${PN}-1.2.6-imagemagick7.patch" + fi + + sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die + + if [[ "${PV}" = *9999* ]] ; then + eautoreconf + else + elibtoolize + fi + + local x + for x in 0 1 2 3; do + sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die + done +} + +src_configure() { + [[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519 + + local win32dir #197236 + if has_multilib_profile; then + win32dir=/usr/$(ABI="x86" get_libdir)/win32 + else + win32dir=/usr/$(get_libdir)/win32 + fi + + local myconf=( + --disable-directfb + --disable-gnomevfs + --disable-optimizations + --disable-real-codecs + --disable-v4l + --disable-w32dll + --with-external-dvdnav + --with-real-codecs-path=/usr/$(get_libdir)/codecs + --with-w32-path=${win32dir} + --with-xv-path=/usr/$(get_libdir) + --without-esound + --without-fusionsound + $(use_enable a52 a52dec) + $(use_enable aac faad) + $(use_enable aalib) + $(use_enable altivec) + $(use_enable bluray) + $(use_enable dts) + $(use_enable dvb) + $(use_enable dxr3) + $(use_enable fbcon fb) + $(use_enable gtk gdkpixbuf) + $(use_enable ipv6) + $(use_enable jpeg libjpeg) + $(use_enable mad) + $(use_enable mmap) + $(use_enable mng) + $(use_enable modplug) + $(use_enable musepack) + $(use_enable opengl) + $(use_enable opengl glu) + $(use_enable oss) + $(use_enable samba) + $(use_enable v4l libv4l) + $(use_enable v4l v4l2) + $(use_enable vaapi) + $(use_enable vdpau) + $(use_enable vis) + $(use_enable vidix) + $(use_enable xinerama) + $(use_enable xvmc) + $(use_enable vcd) + $(use_enable vdr) + $(use_enable vpx) + $(use_with alsa) + $(use_with flac libflac) + $(use_with imagemagick) + $(use_with jack) + $(use_with libcaca caca) + $(use_with pulseaudio) + $(use_with sdl) + $(use_with speex) + $(use_with theora) + $(use_with truetype fontconfig) + $(use_with truetype freetype) + $(use_with vorbis) + $(use_with wavpack) + $(use_with X x) + $(use_with xcb) + ) + [[ ${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[@]}" +} + +src_compile() { + # enable verbose building, bug #448140 + emake V=1 +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die + rm -f "${ED}"usr/share/doc/${PF}/COPYING || die +} 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 053e16e28383..07cffc7a62f0 100644 --- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild @@ -3,10 +3,10 @@ EAPI=6 -inherit flag-o-matic libtool multilib +inherit flag-o-matic libtool if [[ ${PV} == *9999* ]]; then - EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2" + EHG_REPO_URI="http://hg.code.sf.net/p/xine/xine-lib-1.2" inherit autotools mercurial unset NLS_IUSE NLS_DEPEND="sys-devel/gettext" @@ -24,12 +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 fusionsound 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 +xcb xinerama +xv xvmc ${NLS_IUSE}" +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 +xcb xinerama +xv xvmc ${NLS_IUSE}" RDEPEND="${NLS_RDEPEND} dev-libs/libxdg-basedir media-libs/libdvdnav - sys-libs/zlib + sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) @@ -40,78 +40,81 @@ RDEPEND="${NLS_RDEPEND} dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) - fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) - jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) + 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 ) + mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) opengl? ( virtual/glu virtual/opengl - ) + ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex - ) + ) theora? ( media-libs/libogg media-libs/libtheora - ) + ) truetype? ( media-libs/fontconfig media-libs/freetype:2 - ) + ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:0=[X,opengl] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:0=[-minimal] - ) + ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis - ) + ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) X? ( x11-libs/libX11 x11-libs/libXext - ) + ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) - xvmc? ( x11-libs/libXvMC )" + xvmc? ( x11-libs/libXvMC ) +" DEPEND="${RDEPEND} ${NLS_DEPEND} app-arch/xz-utils - virtual/pkgconfig >=sys-devel/libtool-2.2.6b + virtual/pkgconfig oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( x11-base/xorg-proto x11-libs/libXt - ) + ) xv? ( x11-base/xorg-proto ) xvmc? ( x11-base/xorg-proto ) - xinerama? ( x11-base/xorg-proto )" -REQUIRED_USE="vidix? ( || ( X fbcon ) ) + xinerama? ( x11-base/xorg-proto ) +" +REQUIRED_USE=" + vidix? ( || ( X fbcon ) ) xv? ( X ) - xinerama? ( X )" + xinerama? ( X ) +" src_prepare() { default @@ -152,6 +155,7 @@ src_configure() { --with-w32-path=${win32dir} --with-xv-path=/usr/$(get_libdir) --without-esound + --without-fusionsound $(use_enable a52 a52dec) $(use_enable aac faad) $(use_enable aalib) @@ -186,7 +190,6 @@ src_configure() { $(use_enable vpx) $(use_with alsa) $(use_with flac libflac) - $(use_with fusionsound) $(use_with imagemagick) $(use_with jack) $(use_with libcaca caca) @@ -218,5 +221,5 @@ src_compile() { src_install() { default find "${D}" -name '*.la' -delete || die - rm -f "${ED}"usr/share/doc/${PF}/COPYING + rm -f "${ED}"usr/share/doc/${PF}/COPYING || die } -- cgit v1.2.3