pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia/xine-lib xine-lib: fix build with latest dav1d



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6f56569dbda3
branches:  trunk
changeset: 376198:6f56569dbda3
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Apr 03 14:32:31 2022 +0000

description:
xine-lib: fix build with latest dav1d

diffstat:

 multimedia/xine-lib/distinfo                             |   3 +-
 multimedia/xine-lib/patches/patch-src_video__dec_dav1d.c |  24 ++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)

diffs (44 lines):

diff -r fc324f418d4c -r 6f56569dbda3 multimedia/xine-lib/distinfo
--- a/multimedia/xine-lib/distinfo      Sun Apr 03 14:22:36 2022 +0000
+++ b/multimedia/xine-lib/distinfo      Sun Apr 03 14:32:31 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.117 2021/10/26 11:01:20 nia Exp $
+$NetBSD: distinfo,v 1.118 2022/04/03 14:32:31 wiz Exp $
 
 BLAKE2s (xine-lib-1.2.11.tar.xz) = 48720e7a7bc299a2bca75dd2307f48a6f6089c1b356fc21a6dc892d5050057d2
 SHA512 (xine-lib-1.2.11.tar.xz) = 8208e4699819465ec9e820530f27b6129ee954ea17ab474eb9eda12137af1417ed5260830c1006ce32266a3913d22ba9957689bb5552464908038a1b8a8efbcf
@@ -26,5 +26,6 @@
 SHA1 (patch-src-post-planar-unsharp.c) = 9f29c624f96a91760df960343096247d8c09c58d
 SHA1 (patch-src_input_input__http.c) = 80de20be0f99efa5cb67230c900acbf6e4ee9e7c
 SHA1 (patch-src_input_input__pvr.c) = b6429e9a7c9309cbe9eb1bf5f50ab6b6c06d5b0c
+SHA1 (patch-src_video__dec_dav1d.c) = b2228106e3eecb6d1695038fead0e5d9f5b4746a
 SHA1 (patch-src_video__out_Makefile.am) = 623e41b3f142426c5128c6c61c6ebefee170734e
 SHA1 (patch-src_video__out_macosx_Makefile.am) = 8350a75e3a4c0b2f684e07dcc18259fcc5b28115
diff -r fc324f418d4c -r 6f56569dbda3 multimedia/xine-lib/patches/patch-src_video__dec_dav1d.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/xine-lib/patches/patch-src_video__dec_dav1d.c  Sun Apr 03 14:32:31 2022 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_video__dec_dav1d.c,v 1.1 2022/04/03 14:32:31 wiz Exp $
+
+dav1d 1.0.0 compatibility from upstream.
+
+--- src/video_dec/dav1d.c.orig 2020-11-19 10:30:37.000000000 +0000
++++ src/video_dec/dav1d.c
+@@ -537,11 +544,17 @@ static video_decoder_t *_open_plugin(vid
+ 
+   /* 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;



Home | Main Index | Thread Index | Old Index