media-libs/xine-lib: fix automagic libaom, dav1d; fix build with dav1d-1.0.0

Closes: https://bugs.gentoo.org/835791
Signed-off-by: Sam James <sam@gentoo.org>

5 files changed, 45 insertions, 6 deletions

diff --git a/media-libs/xine-lib/files/xine-lib-1.2.12-dav1d-1.0.0.patch b/media-libs/xine-lib/files/xine-lib-1.2.12-dav1d-1.0.0.patch
new file mode 100644
index 000000000000..cb3253cf99a5
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.2.12-dav1d-1.0.0.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/835791
+https://sourceforge.net/p/xine/tickets/11/
+--- a/src/video_dec/dav1d.c
++++ b/src/video_dec/dav1d.c
+@@ -544,11 +544,17 @@
+
+   /* multithreading */
+   ncpu = xine_cpu_count();
++#if DAV1D_API_VERSION_MAJOR > 5
++  settings.n_threads = ncpu + 1;
++  xprintf(stream->xine, XINE_VERBOSITY_DEBUG, LOG_MODULE ": "
++            "Using %d threads\n", settings.n_threads);
++#else
+   settings.n_frame_threads = (ncpu > 8) ? 4 : (ncpu < 2) ? 1 : ncpu/2;
+   settings.n_tile_threads = MAX(1, ncpu - settings.n_frame_threads + 1);
+   xprintf(stream->xine, XINE_VERBOSITY_DEBUG, LOG_MODULE ": "
+             "Using %d frame threads, %d tile threads\n",
+             settings.n_frame_threads, settings.n_tile_threads);
++#endif
+
+   /* dri frame allocator */
+   settings.allocator.cookie = this;
diff --git a/media-libs/xine-lib/metadata.xml b/media-libs/xine-lib/metadata.xml
index 387486f97a70..8eb50e96f2ff 100644
--- a/media-libs/xine-lib/metadata.xml
+++ b/media-libs/xine-lib/metadata.xml
@@ -8,6 +8,9 @@
 		<flag name="bluray">
 			Enable playback of Blu-ray filesystems using <pkg>media-libs/libbluray</pkg>
 		</flag>
+		<flag name="dav1d">
+			Enable support for <pkg>media-libs/dav1d</pkg> AV1 decoder
+		</flag>
 		<flag name="dxr3">
 			Enable support for DXR3 mpeg acceleration cards.
 		</flag>
diff --git a/media-libs/xine-lib/xine-lib-1.2.12.ebuild b/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
index b3f3393bc258..29f22fbfac90 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
@@ -24,14 +24,14 @@ 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 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}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dav1d 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
 	>=sys-devel/libtool-2.2.6b
 	virtual/pkgconfig
 "
-RDEPEND="${NLS_RDEPEND}
+RDEPEND="
 	dev-libs/libxdg-basedir
 	media-libs/libdvdnav
 	media-video/ffmpeg:0=
@@ -43,6 +43,7 @@ RDEPEND="${NLS_RDEPEND}
 	alsa? ( media-libs/alsa-lib )
 	bluray? ( >=media-libs/libbluray-0.2.1:= )
 	css? ( >=media-libs/libdvdcss-1.2.10 )
+	dav1d? ( media-libs/dav1d:= )
 	dts? ( media-libs/libdca )
 	dxr3? ( media-libs/libfame )
 	flac? ( media-libs/flac )
@@ -100,7 +101,6 @@ RDEPEND="${NLS_RDEPEND}
 	xvmc? ( x11-libs/libXvMC )
 "
 DEPEND="${RDEPEND}
-	${NLS_DEPEND}
 	oss? ( virtual/os-headers )
 	v4l? ( virtual/os-headers )
 	X? (
@@ -117,6 +117,10 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.12-dav1d-1.0.0.patch
+)
+
 src_prepare() {
 	default
 
@@ -158,6 +162,8 @@ src_configure() {
 		--with-xv-path=/usr/$(get_libdir)
 		--without-esound
 		--without-fusionsound
+		# Added dav1d for now. Could support both? Does it need to be XOR?
+		--without-libaom
 		$(use_enable a52 a52dec)
 		$(use_enable aac faad)
 		$(use_enable aalib)
@@ -194,6 +200,7 @@ src_configure() {
 		$(use_enable vpx)
 		$(use_enable wayland)
 		$(use_with alsa)
+		$(use_with dav1d)
 		$(use_with flac libflac)
 		$(use_with imagemagick)
 		$(use_with jack)
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 b3f3393bc258..4552c8b34a71 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -24,14 +24,14 @@ 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 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}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dav1d 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
 	>=sys-devel/libtool-2.2.6b
 	virtual/pkgconfig
 "
-RDEPEND="${NLS_RDEPEND}
+RDEPEND="
 	dev-libs/libxdg-basedir
 	media-libs/libdvdnav
 	media-video/ffmpeg:0=
@@ -43,6 +43,7 @@ RDEPEND="${NLS_RDEPEND}
 	alsa? ( media-libs/alsa-lib )
 	bluray? ( >=media-libs/libbluray-0.2.1:= )
 	css? ( >=media-libs/libdvdcss-1.2.10 )
+	dav1d? ( media-libs/dav1d:= )
 	dts? ( media-libs/libdca )
 	dxr3? ( media-libs/libfame )
 	flac? ( media-libs/flac )
@@ -100,7 +101,6 @@ RDEPEND="${NLS_RDEPEND}
 	xvmc? ( x11-libs/libXvMC )
 "
 DEPEND="${RDEPEND}
-	${NLS_DEPEND}
 	oss? ( virtual/os-headers )
 	v4l? ( virtual/os-headers )
 	X? (
@@ -158,6 +158,8 @@ src_configure() {
 		--with-xv-path=/usr/$(get_libdir)
 		--without-esound
 		--without-fusionsound
+		# Added dav1d for now. Could support both? Does it need to be XOR?
+		--without-libaom
 		$(use_enable a52 a52dec)
 		$(use_enable aac faad)
 		$(use_enable aalib)
@@ -194,6 +196,7 @@ src_configure() {
 		$(use_enable vpx)
 		$(use_enable wayland)
 		$(use_with alsa)
+		$(use_with dav1d)
 		$(use_with flac libflac)
 		$(use_with imagemagick)
 		$(use_with jack)
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 0249cc604189..2a1a7bd62919 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Sam James <sam@gentoo.org> (2022-03-22)
+# media-libs/dav1d not keyworded here
+media-libs/xine-lib dav1d
+
 # Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
 # Untested useflag on other arches, needs keywording
 media-video/ffmpeg vmaf