[xine-lib] Add patch for dav1d 1.0.0 support
commit 4b0c1c5714c59687d8444198fea30ba68086c7d7
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Fri Mar 25 10:15:59 2022 +0100
Add patch for dav1d 1.0.0 support
xine-lib-1.2.12-dav1d_100_support.patch | 40 +++++++++++++++++++++++++++++++++
xine-lib.spec | 9 +++++++-
2 files changed, 48 insertions(+), 1 deletion(-)
---
diff --git a/xine-lib-1.2.12-dav1d_100_support.patch
b/xine-lib-1.2.12-dav1d_100_support.patch
new file mode 100644
index 0000000..f2b66b2
--- /dev/null
+++ b/xine-lib-1.2.12-dav1d_100_support.patch
@@ -0,0 +1,40 @@
+# HG changeset patch
+# User Petri Hintukainen <phintuka(a)users.sourceforge.net>
+# Date 1648142359 -7200
+# Thu Mar 24 19:19:19 2022 +0200
+# Node ID 97248a71021428baa49e2b2af34f566a3257452a
+# Parent b044102cc61810eec217d3911028ec18f87408cc
+dav1d 1.0.0 support
+
+https://sourceforge.net/p/xine/tickets/11/
+
+diff -r b044102cc618 -r 97248a710214 ChangeLog
+--- a/ChangeLog Thu Mar 17 14:05:08 2022 +0200
++++ b/ChangeLog Thu Mar 24 19:19:19 2022 +0200
+@@ -1,3 +1,5 @@
++ * Add dav1d 1.0.0 support.
++
+ xine-lib (1.2.12) 2022-03-09
+ * Add string tree library (generic info parser).
+ * Add OpenSL ES audio output plugin.
+diff -r b044102cc618 -r 97248a710214 src/video_dec/dav1d.c
+--- a/src/video_dec/dav1d.c Thu Mar 17 14:05:08 2022 +0200
++++ b/src/video_dec/dav1d.c Thu Mar 24 19:19:19 2022 +0200
+@@ -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/xine-lib.spec b/xine-lib.spec
index 483e4c8..2fe5e4b 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -44,7 +44,7 @@
Summary: A multimedia engine
Name: xine-lib
Version: 1.2.12
-Release: 2%{?snapshot:.%{date}hg%{revision}}%{?dist}
+Release: 3%{?snapshot:.%{date}hg%{revision}}%{?dist}
License: GPLv2+
URL: https://www.xine-project.org/
%if ! 0%{?snapshot}
@@ -55,7 +55,10 @@ Source0: xine-lib-%{version}-%{date}hg%{revision}.tar.xz
# Script to make a snapshot
Source1: make_xinelib_snapshot.sh
+#
https://sourceforge.net/p/xine/xine-lib-1.2/ci/928cdea835e656d6e1411c767e...
Patch1: xine-lib-1.2.12-fix_older_libcaca.patch
+#
https://sourceforge.net/p/xine/xine-lib-1.2/ci/97248a71021428baa49e2b2af3...
+Patch2: xine-lib-1.2.12-dav1d_100_support.patch
Provides: xine-lib(plugin-abi) = %{plugin_abi}
%{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}}
@@ -151,6 +154,7 @@ This package contains extra plugins for %{name}:
%if ! 0%{?snapshot}
%setup -q
%patch1 -p1
+%patch2 -p1
%else
%setup -q -n %{name}-%{version}-%{date}hg%{revision}
%endif
@@ -356,6 +360,9 @@ mkdir -p %{buildroot}%{codecdir}
%changelog
+* Fri Mar 25 2022 Xavier Bachelot <xavier(a)bachelot.org> - 1.2.12-3
+- Add patch for dav1d 1.0.0 support
+
* Thu Mar 10 2022 Xavier Bachelot <xavier(a)bachelot.org> - 1.2.12-2
- Fix build on EL7 and EL8