From nobody Fri Mar 18 20:47:55 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B8EBA1A10EC3; Fri, 18 Mar 2022 20:47:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KKx0q4rJ4z3t5f; Fri, 18 Mar 2022 20:47:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647636475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dVsEUvYz3zsfcADUo87uC+FACszK/7qZTkM0HHpTypE=; b=f4fO8rVABcGgIpCOQYN+X9Khs4PPcJgI0tf/qU3QFZV/5wjqXisGVbpY7C3V4kl0S670jm 93O6aSAvZCqqzNWP4wKTpkvQW9TOjS0jdmgOq69te756VpQR3KJHbXMTm+WiNzb1f1RlIU o58f+Sal8pnboo0JlQ/zHsAzjfFv1zgpu3T7/gC4u23Vz3hecivPxRtI3o5daAt0RXyGC+ fpQUPR2KP4w59x848Yx0zoj8DeUi06NFavAe5J9NjFA53virqh0PzUz/6UlHxBDvOvoM85 /oljfrvXq4NgozH5CYrL1sXCd/kVwKZPywbtahnf2t1BuXnUD3TmOeLpLZr0HQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8686725CC4; Fri, 18 Mar 2022 20:47:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22IKlt9u096997; Fri, 18 Mar 2022 20:47:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22IKltrU096996; Fri, 18 Mar 2022 20:47:55 GMT (envelope-from git) Date: Fri, 18 Mar 2022 20:47:55 GMT Message-Id: <202203182047.22IKltrU096996@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: c65853b5ceaf - 2022Q1 - multimedia/libxine: unbreak DAV1D=on after 3468f1957cf2 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: c65853b5ceaf2cc33238732070849b0cf14b9f77 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647636475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dVsEUvYz3zsfcADUo87uC+FACszK/7qZTkM0HHpTypE=; b=HR/5PP7x6+4eYDoRCeMh7BUN8m7WGUzOEHMgvMXuMsweHSSMMXqPqI0jtPz4vNTyQdhazE 7QqOK6ONqiB8h8hYOHv3j9279ALM5owEaO4LiGq0Qd1B8X1FgAAVfi4emYpBPPDw30tdPc n32CKX+rEZOCSzWvZxQCLoIXfgLGRWGUiQK8lsVt4sagZvcSwb20ppYlFoAqW3HJsw3fId 3vGNWkg4hJfCwE/rCtL1F8KvmYoFp1hx2I8XQudv3A9no3QS8dUArHOKji9FDrdmlgbXCB e+H+FFJ7zD2F/LvWjVBZq+J5dNafITWVavwvXMFBEVd8VVm90SS9TMESk9zzDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647636475; a=rsa-sha256; cv=none; b=jkEsl4+Ridffies2GtYiJfTW+sD5ElDB6lnf7si4PnPlMtYAC6+RtNEqGm25oziRWa0xf4 nu+XEFPkk9rSaCRwbUtmytaeaRT8+6nnegWuCwciFMqe7eiI1iKpSVT75M7TNUZFYjMeq+ Rorf7xwIH239iQprKy9Xemj54w7SNzSxID+iQrujxXpMHnSwwF4v0aiFLiebCOOQexQomc dZeVe3RLwzbzYDzkleC6VvWM7RqbKjXwA4UaA7TbYBkoFZyk07gslXOyuns6veZgITWd73 JG+MzBHZDESw9neRFa5pr4Rhr0Bhn8qdEk+/trh35OLCjCl1OGN7oAMhgBkODw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=c65853b5ceaf2cc33238732070849b0cf14b9f77 commit c65853b5ceaf2cc33238732070849b0cf14b9f77 Author: VVD AuthorDate: 2022-03-18 17:36:44 +0000 Commit: Jan Beich CommitDate: 2022-03-18 20:47:43 +0000 multimedia/libxine: unbreak DAV1D=on after 3468f1957cf2 dav1d.c:547:12: error: no member named 'n_frame_threads' in 'struct Dav1dSettings' settings.n_frame_threads = (ncpu > 8) ? 4 : (ncpu < 2) ? 1 : ncpu/2; ~~~~~~~~ ^ dav1d.c:548:12: error: no member named 'n_tile_threads' in 'struct Dav1dSettings' settings.n_tile_threads = MAX(1, ncpu - settings.n_frame_threads + 1); ~~~~~~~~ ^ dav1d.c:548:52: error: no member named 'n_frame_threads' in 'struct Dav1dSettings' settings.n_tile_threads = MAX(1, ncpu - settings.n_frame_threads + 1); ~~~~~~~~ ^ dav1d.c:548:52: error: no member named 'n_frame_threads' in 'struct Dav1dSettings' settings.n_tile_threads = MAX(1, ncpu - settings.n_frame_threads + 1); ~~~~~~~~ ^ /usr/include/sys/param.h:306:34: note: expanded from macro 'MAX' #define MAX(a,b) (((a)>(b))?(a):(b)) ^ dav1d.c:551:22: error: no member named 'n_frame_threads' in 'struct Dav1dSettings' settings.n_frame_threads, settings.n_tile_threads); ~~~~~~~~ ^ dav1d.c:551:48: error: no member named 'n_tile_threads' in 'struct Dav1dSettings' settings.n_frame_threads, settings.n_tile_threads); ~~~~~~~~ ^ ../../include/xine/xineutils.h:687:40: note: expanded from macro 'xprintf' xine_log(xine, XINE_LOG_TRACE, __VA_ARGS__); \ ^~~~~~~~~~~ PR: 262651 (cherry picked from commit 3b3b0fa358409a78150119c36d8cd236de7f91fc) --- multimedia/libxine/files/patch-dav1d-1.0 | 47 ++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/multimedia/libxine/files/patch-dav1d-1.0 b/multimedia/libxine/files/patch-dav1d-1.0 new file mode 100644 index 000000000000..e18689712281 --- /dev/null +++ b/multimedia/libxine/files/patch-dav1d-1.0 @@ -0,0 +1,47 @@ +https://sourceforge.net/p/xine/tickets/11/ + +dav1d.c:547:12: error: no member named 'n_frame_threads' in 'struct Dav1dSettings' + settings.n_frame_threads = (ncpu > 8) ? 4 : (ncpu < 2) ? 1 : ncpu/2; + ~~~~~~~~ ^ +dav1d.c:548:12: error: no member named 'n_tile_threads' in 'struct Dav1dSettings' + settings.n_tile_threads = MAX(1, ncpu - settings.n_frame_threads + 1); + ~~~~~~~~ ^ +dav1d.c:548:52: error: no member named 'n_frame_threads' in 'struct Dav1dSettings' + settings.n_tile_threads = MAX(1, ncpu - settings.n_frame_threads + 1); + ~~~~~~~~ ^ +dav1d.c:548:52: error: no member named 'n_frame_threads' in 'struct Dav1dSettings' + settings.n_tile_threads = MAX(1, ncpu - settings.n_frame_threads + 1); + ~~~~~~~~ ^ +/usr/include/sys/param.h:306:34: note: expanded from macro 'MAX' +#define MAX(a,b) (((a)>(b))?(a):(b)) + ^ +dav1d.c:551:22: error: no member named 'n_frame_threads' in 'struct Dav1dSettings' + settings.n_frame_threads, settings.n_tile_threads); + ~~~~~~~~ ^ +dav1d.c:551:48: error: no member named 'n_tile_threads' in 'struct Dav1dSettings' + settings.n_frame_threads, settings.n_tile_threads); + ~~~~~~~~ ^ +../../include/xine/xineutils.h:687:40: note: expanded from macro 'xprintf' + xine_log(xine, XINE_LOG_TRACE, __VA_ARGS__); \ + ^~~~~~~~~~~ + +--- src/video_dec/dav1d.c.orig 2022-03-06 16:31:24 UTC ++++ src/video_dec/dav1d.c +@@ -544,11 +544,17 @@ static video_decoder_t *_open_plugin(video_decoder_cla + + /* 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;