commit: 3085007548ea60ffbea0b6d04d285acccdd96c18 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jan 9 04:52:56 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Mar 4 01:44:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30850075
media-libs/xine-lib: fix automagic on nfs, libssh2, wayland Closes: #19000 Closes: https://bugs.gentoo.org/761445 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/xine-lib/metadata.xml | 6 ++++++ media-libs/xine-lib/xine-lib-1.2.10.ebuild | 10 ++++++++-- media-libs/xine-lib/xine-lib-1.2.11.ebuild | 10 ++++++++-- media-libs/xine-lib/xine-lib-1.2.9999.ebuild | 10 ++++++++-- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/media-libs/xine-lib/metadata.xml b/media-libs/xine-lib/metadata.xml index dddaa6727e7..e793509c28b 100644 --- a/media-libs/xine-lib/metadata.xml +++ b/media-libs/xine-lib/metadata.xml @@ -35,6 +35,9 @@ the file's data. mmap() access should be faster, but might misbehave if the device where the file resides in is removed during playback. </flag> + <flag name="nfs"> + Allow accessing NFS shares via <pkg>net-fs/libnfs</pkg>. + </flag> <flag name="truetype"> Use <pkg>media-libs/freetype</pkg> for font rendering and <pkg>media-libs/fontconfig</pkg> for font discovery. Enabling this USE flag @@ -43,6 +46,9 @@ is still experimental, and might not be as good looking as the bitmap fonts used with this USE flag disabled. </flag> + <flag name="sftp"> + Use <pkg>net-libs/libssh2</pkg> to access SFTP servers. + </flag> <flag name="vdr"> Build the VDR plugin </flag> diff --git a/media-libs/xine-lib/xine-lib-1.2.10.ebuild b/media-libs/xine-lib/xine-lib-1.2.10.ebuild index 49cb170173d..74bf3582873 100644 --- a/media-libs/xine-lib/xine-lib-1.2.10.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,7 +24,7 @@ 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 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 nfs opengl oss pulseaudio samba sdl sftp speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}" RDEPEND="${NLS_RDEPEND} dev-libs/libxdg-basedir @@ -50,12 +50,14 @@ RDEPEND="${NLS_RDEPEND} mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) + nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) + sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg @@ -82,6 +84,7 @@ RDEPEND="${NLS_RDEPEND} ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) + wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext @@ -170,10 +173,12 @@ src_configure() { $(use_enable mng) $(use_enable modplug) $(use_enable musepack) + $(use_enable nfs) $(use_enable opengl) $(use_enable opengl glu) $(use_enable oss) $(use_enable samba) + $(use_enable sftp) $(use_enable v4l libv4l) $(use_enable v4l v4l2) $(use_enable vaapi) @@ -185,6 +190,7 @@ src_configure() { $(use_enable vcd) $(use_enable vdr) $(use_enable vpx) + $(use_enable wayland) $(use_with alsa) $(use_with flac libflac) $(use_with imagemagick) diff --git a/media-libs/xine-lib/xine-lib-1.2.11.ebuild b/media-libs/xine-lib/xine-lib-1.2.11.ebuild index 1b99ceacbd4..e683322d35d 100644 --- a/media-libs/xine-lib/xine-lib-1.2.11.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,7 +24,7 @@ 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 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 nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}" BDEPEND=" app-arch/xz-utils @@ -55,12 +55,14 @@ RDEPEND="${NLS_RDEPEND} mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) + nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) + sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg @@ -87,6 +89,7 @@ RDEPEND="${NLS_RDEPEND} ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) + wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext @@ -172,10 +175,12 @@ src_configure() { $(use_enable mng) $(use_enable modplug) $(use_enable musepack) + $(use_enable nfs) $(use_enable opengl) $(use_enable opengl glu) $(use_enable oss) $(use_enable samba) + $(use_enable sftp) $(use_enable v4l libv4l) $(use_enable v4l v4l2) $(use_enable vaapi) @@ -187,6 +192,7 @@ src_configure() { $(use_enable vcd) $(use_enable vdr) $(use_enable vpx) + $(use_enable wayland) $(use_with alsa) $(use_with flac libflac) $(use_with imagemagick) 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 1b99ceacbd4..e683322d35d 100644 --- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,7 +24,7 @@ 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 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 nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}" BDEPEND=" app-arch/xz-utils @@ -55,12 +55,14 @@ RDEPEND="${NLS_RDEPEND} mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) + nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) + sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg @@ -87,6 +89,7 @@ RDEPEND="${NLS_RDEPEND} ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) + wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext @@ -172,10 +175,12 @@ src_configure() { $(use_enable mng) $(use_enable modplug) $(use_enable musepack) + $(use_enable nfs) $(use_enable opengl) $(use_enable opengl glu) $(use_enable oss) $(use_enable samba) + $(use_enable sftp) $(use_enable v4l libv4l) $(use_enable v4l v4l2) $(use_enable vaapi) @@ -187,6 +192,7 @@ src_configure() { $(use_enable vcd) $(use_enable vdr) $(use_enable vpx) + $(use_enable wayland) $(use_with alsa) $(use_with flac libflac) $(use_with imagemagick)
