Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1648996351289840"
MIME-Version: 1.0
Date: Sun, 3 Apr 2022 14:32:31 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/multimedia/xine-lib
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20220403143231.EC35FFB24@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1648996351289840
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Sun Apr  3 14:32:31 UTC 2022

Modified Files:
	pkgsrc/multimedia/xine-lib: distinfo
Added Files:
	pkgsrc/multimedia/xine-lib/patches: patch-src_video__dec_dav1d.c

Log Message:
xine-lib: fix build with latest dav1d


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 pkgsrc/multimedia/xine-lib/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/xine-lib/patches/patch-src_video__dec_dav1d.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1648996351289840
Content-Disposition: inline
Content-Length: 2517
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/multimedia/xine-lib/distinfo
diff -u pkgsrc/multimedia/xine-lib/distinfo:1.117 pkgsrc/multimedia/xine-lib/distinfo:1.118
--- pkgsrc/multimedia/xine-lib/distinfo:1.117	Tue Oct 26 11:01:20 2021
+++ pkgsrc/multimedia/xine-lib/distinfo	Sun Apr  3 14:32:31 2022
@@ -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-pp.c) = f5be
 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

Added files:

Index: pkgsrc/multimedia/xine-lib/patches/patch-src_video__dec_dav1d.c
diff -u /dev/null pkgsrc/multimedia/xine-lib/patches/patch-src_video__dec_dav1d.c:1.1
--- /dev/null	Sun Apr  3 14:32:31 2022
+++ pkgsrc/multimedia/xine-lib/patches/patch-src_video__dec_dav1d.c	Sun Apr  3 14:32:31 2022
@@ -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;


--_----------=_1648996351289840--