From nobody Sun Feb 20 15:51:43 2022 X-Original-To: dev-commits-ports-all@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 5CAE819DE7CC; Sun, 20 Feb 2022 15:51:43 +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 4K1qg329s4z3ktK; Sun, 20 Feb 2022 15:51:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645372303; 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=fwM9Uey7DL7ZIBNIHaRqp0ucu+eFAin8wWiVoQfmmxw=; b=McFQP6A6icF7ZumXmW+RTI6iPsyBMsN7knsDtJR6M/yiGi/bONqfTGjoTS8iKD4yO2Z+8O njjbPkssdddm2zIyAJp/OtxAocBDArCYlywl8n881d321wLHF2189ImOa3mXddeG9nmbN9 HNjm4B0uNRHzko1CIobYZeu3VTJwMnk/X+sNfkuV5eM8blPWHan0kXTnBY9WvlfaTmiXv0 pItciwE8ukbQTOjL0W0zAERTy8VQZCE/OAQ6Hz28BFxbmQwIDienMwDMe3vKLkZq6uTgMI /QG0X3rp9SDPbBtJCcfiM3SQG1pjsEnQ2eCLUrtyUR1kGUemFZORY642XR4LRg== 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 2A8BA1F643; Sun, 20 Feb 2022 15:51:43 +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 21KFphjp028206; Sun, 20 Feb 2022 15:51:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21KFphXc028205; Sun, 20 Feb 2022 15:51:43 GMT (envelope-from git) Date: Sun, 20 Feb 2022 15:51:43 GMT Message-Id: <202202201551.21KFphXc028205@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: 6cdc201667ed - 2022Q1 - multimedia/emby-server-devel: remove after 7bd8fb0a8c61 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 6cdc201667ed247d03767c119d46c7fe9cce2f98 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645372303; 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=fwM9Uey7DL7ZIBNIHaRqp0ucu+eFAin8wWiVoQfmmxw=; b=GhZ3B2ATgkuubojLr0SIz3Deqwtm7IoG5fb4zOQEg1ERTcMsuSVa2WV84B+1Nhbt3vggE2 S+KTzsech0V25aLJpIB3kgNMI7SOhirbWhb6Rzfw6DLbqyXC7BHkCIPHojYL6mcvqBSQ+y RcURU0ym5sOWIIaQxyCfimIqlpB0ck88RrNp2txboyezBqUMGrKNipoIRPUsBdqCFoRvBi /olvpkqmDU6glaxYO0VXcCeasxAbXNYRUCwVgQbIaZii5GkCcEAJYcK9RlVBeZCmIYPsdv BSMsxSiCfpilHp/yS9dqkPKGsRa5tT6p0On+qq4SPiOefYVbi65Lz5cnbPgXPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645372303; a=rsa-sha256; cv=none; b=jK+QPI6MpnE9mDgrp6qiqNV74DbvuqtOKjx5MVIsfhk5YfCe3fTK1Zptnw4hZaSAVMbADb nm2dG/2mWdc6I+3Spa/Qi96OZvZa6WCPkKzpGCJ/cqBPTQ+vCrNN1zCcqSrCYqGehw0A5E ezPH2/3vQVlluHu2nxiiPUHG8nlZL7ZopccPAxnh017hTt8QzVZeOf6BbMBLPkXSr6PswK L8Ki0otLWCyT5QDPCbbNmubM1l0hN/m7iiBbVZeR3F9pEwPCIY/2VSLv0zfSOmDYhLpXTt inR/ovpscmbw2trXxOVGJiXyLIq4b+uMGgqXyFDDApKV+/y7stTkBEWMuzfxXQ== 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=6cdc201667ed247d03767c119d46c7fe9cce2f98 commit 6cdc201667ed247d03767c119d46c7fe9cce2f98 Author: Jan Beich AuthorDate: 2022-02-20 15:49:02 +0000 Commit: Jan Beich CommitDate: 2022-02-20 15:49:05 +0000 multimedia/emby-server-devel: remove after 7bd8fb0a8c61 1132f2bb1d88 is missing on 2022Q1 branch, so drop a patch for non-existent port. --- multimedia/emby-server-devel/files/patch-dav1d-1.0 | 111 --------------------- 1 file changed, 111 deletions(-) diff --git a/multimedia/emby-server-devel/files/patch-dav1d-1.0 b/multimedia/emby-server-devel/files/patch-dav1d-1.0 deleted file mode 100644 index 1c4ca68a21f9..000000000000 --- a/multimedia/emby-server-devel/files/patch-dav1d-1.0 +++ /dev/null @@ -1,111 +0,0 @@ -https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/5e61fce832f7 - -libavcodec/libdav1d.c:137:7: error: no member named 'n_tile_threads' in 'struct Dav1dSettings' - s.n_tile_threads = dav1d->tile_threads - ~ ^ -libavcodec/libdav1d.c:139:52: error: use of undeclared identifier 'DAV1D_MAX_TILE_THREADS' - : FFMIN(floor(sqrt(threads)), DAV1D_MAX_TILE_THREADS); - ^ -libavcodec/libdav1d.c:139:52: error: use of undeclared identifier 'DAV1D_MAX_TILE_THREADS' -libavcodec/libdav1d.c:140:7: error: no member named 'n_frame_threads' in 'struct Dav1dSettings' - s.n_frame_threads = dav1d->frame_threads - ~ ^ -libavcodec/libdav1d.c:142:48: error: no member named 'n_tile_threads' in 'struct Dav1dSettings' - : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS); - ~ ^ -./libavutil/common.h:96:22: note: expanded from macro 'FFMIN' -#define FFMIN(a,b) ((a) > (b) ? (b) : (a)) - ^ -libavcodec/libdav1d.c:142:65: error: use of undeclared identifier 'DAV1D_MAX_FRAME_THREADS'; did you mean 'DAV1D_OBU_FRAME_HDR'? - : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS); - ^~~~~~~~~~~~~~~~~~~~~~~ - DAV1D_OBU_FRAME_HDR -./libavutil/common.h:96:28: note: expanded from macro 'FFMIN' -#define FFMIN(a,b) ((a) > (b) ? (b) : (a)) - ^ -/usr/local/include/dav1d/headers.h:48:5: note: 'DAV1D_OBU_FRAME_HDR' declared here - DAV1D_OBU_FRAME_HDR = 3, - ^ -libavcodec/libdav1d.c:142:65: error: use of undeclared identifier 'DAV1D_MAX_FRAME_THREADS'; did you mean 'DAV1D_OBU_FRAME_HDR'? - : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS); - ^~~~~~~~~~~~~~~~~~~~~~~ - DAV1D_OBU_FRAME_HDR -./libavutil/common.h:96:34: note: expanded from macro 'FFMIN' -#define FFMIN(a,b) ((a) > (b) ? (b) : (a)) - ^ -/usr/local/include/dav1d/headers.h:48:5: note: 'DAV1D_OBU_FRAME_HDR' declared here - DAV1D_OBU_FRAME_HDR = 3, - ^ -libavcodec/libdav1d.c:142:48: error: no member named 'n_tile_threads' in 'struct Dav1dSettings' - : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS); - ~ ^ -./libavutil/common.h:96:40: note: expanded from macro 'FFMIN' -#define FFMIN(a,b) ((a) > (b) ? (b) : (a)) - ^ -libavcodec/libdav1d.c:144:14: error: no member named 'n_frame_threads' in 'struct Dav1dSettings' - s.n_frame_threads, s.n_tile_threads); - ~ ^ -libavcodec/libdav1d.c:144:33: error: no member named 'n_tile_threads' in 'struct Dav1dSettings' - s.n_frame_threads, s.n_tile_threads); - ~ ^ -libavcodec/libdav1d.c:378:94: error: use of undeclared identifier 'DAV1D_MAX_TILE_THREADS' - { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_TILE_THREADS, VD }, - ^ -libavcodec/libdav1d.c:379:97: error: use of undeclared identifier 'DAV1D_MAX_FRAME_THREADS'; did you mean 'DAV1D_OBU_FRAME_HDR'? - { "framethreads", "Frame threads", OFFSET(frame_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_THREADS, VD }, - ^~~~~~~~~~~~~~~~~~~~~~~ - DAV1D_OBU_FRAME_HDR -/usr/local/include/dav1d/headers.h:48:5: note: 'DAV1D_OBU_FRAME_HDR' declared here - DAV1D_OBU_FRAME_HDR = 3, - ^ - ---- libavcodec/libdav1d.c.orig 2021-05-11 03:40:43 UTC -+++ libavcodec/libdav1d.c -@@ -30,6 +30,9 @@ - #include "decode.h" - #include "internal.h" - -+#define FF_DAV1D_VERSION_AT_LEAST(x,y) \ -+ (DAV1D_API_VERSION_MAJOR > (x) || DAV1D_API_VERSION_MAJOR == (x) && DAV1D_API_VERSION_MINOR >= (y)) -+ - typedef struct Libdav1dContext { - AVClass *class; - Dav1dContext *c; -@@ -134,6 +137,15 @@ static av_cold int libdav1d_init(AVCodecContext *c) - if (dav1d->apply_grain >= 0) - s.apply_grain = dav1d->apply_grain; - -+#if FF_DAV1D_VERSION_AT_LEAST(6,0) -+ if (dav1d->frame_threads || dav1d->tile_threads) -+ s.n_threads = FFMAX(dav1d->frame_threads, dav1d->tile_threads); -+ else -+ s.n_threads = FFMIN(threads, DAV1D_MAX_THREADS); -+ s.max_frame_delay = (c->flags & AV_CODEC_FLAG_LOW_DELAY) ? 1 : s.n_threads; -+ av_log(c, AV_LOG_DEBUG, "Using %d threads, %d max_frame_delay\n", -+ s.n_threads, s.max_frame_delay); -+#else - s.n_tile_threads = dav1d->tile_threads - ? dav1d->tile_threads - : FFMIN(floor(sqrt(threads)), DAV1D_MAX_TILE_THREADS); -@@ -142,6 +154,7 @@ static av_cold int libdav1d_init(AVCodecContext *c) - : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS); - av_log(c, AV_LOG_DEBUG, "Using %d frame threads, %d tile threads\n", - s.n_frame_threads, s.n_tile_threads); -+#endif - - res = dav1d_open(&dav1d->c, &s); - if (res < 0) -@@ -371,6 +384,13 @@ static av_cold int libdav1d_close(AVCodecContext *c) - - return 0; - } -+ -+#ifndef DAV1D_MAX_FRAME_THREADS -+#define DAV1D_MAX_FRAME_THREADS DAV1D_MAX_THREADS -+#endif -+#ifndef DAV1D_MAX_TILE_THREADS -+#define DAV1D_MAX_TILE_THREADS DAV1D_MAX_THREADS -+#endif - - #define OFFSET(x) offsetof(Libdav1dContext, x) - #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM