From nobody Tue Apr 25 00:48:55 2023 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 4Q53KM5ydGz466sd; Tue, 25 Apr 2023 00:48: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 4Q53KM42x8z4H4f; Tue, 25 Apr 2023 00:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682383735; 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=eGrPxuJ14hwK+2Aw1vP+3bC5t07W/Pz3WyWpYJde1yE=; b=Oj9bvY143EskMF5KznS39FZWsReuUQKnr8EAbvwP8LieqqSOG8KEHWxoDwbeDUK9zlUoV1 AL/xRzO33EiDGfLE0dMqyatWg1Ag5Hl5f6zQf9jdoHgyO+RbGoJOqBklCAdOWpAMIDk70P iqW9PvN6nCOPzJYXphska91NyyNToNJHMJIB8TJowx9pdrDKt8bscDY6hewBzuIUU1ibF8 qE0Pry6yI+qNCvl1fRlNeTb7XV66X/M8DmMxaiQDOHxDXfEswAq5eUtj8ArNYrYL9GXLrG 6Fj+zqTw4V2CAG8q3ZHdsO/5kT9G/8UtaNxm73T8XHr/ZASuJHvhJXjeHm3KsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682383735; 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=eGrPxuJ14hwK+2Aw1vP+3bC5t07W/Pz3WyWpYJde1yE=; b=GRgkoB2NENb5zopwviIk2cqL8cUWGA8C1b2J9oeTznMg5aYg/dsF7njF1kk720vCgFVPVQ uQFg+bGRpnTHLZKTnfgXkDGv9pWf/gC265we5eymxYgqE0loT+MPcf3hjYvrs2Y6bghh7o iyasim/D7g2kpWaMm/Z30FXK2gg6d5j4NRV2sN/PP05SAmT0gKJ7i3RxfApFwuT+clWFwD vnYsTgoXE+ore0vDchnps1MwmXbhXKp4rtDLHJFbS2iraTPQWQOodUs3TNMSBBfogjuEUC flSC+IB3ybhnS6LrVzI9J3tB2cGDirtlwSO221cgTZuOrHcAgrdPifIqXA2Jpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682383735; a=rsa-sha256; cv=none; b=Y60tW9ADGQJYIPuYaomHmgLyYkfu0Ar5whcLBTbKo+/XrTPxfVecElab+/j/HZDqWowz77 tfMDrl7C6MHpkAt2hwp+9h/F406RJDowVXnuSXwr5JiU225K1MGpJE7Eq0P9bxcLw6WJka DCWuIwi0cPZW5cngmMKmlJcPe6sb61XQtPdcmV0NBmVklooawyFQAd0pupKTTdyRuNoROs //RMXx1nT5+QLtCleOZ92jjdtSjk3B1gM1tMmuwM3G54DRSsw/qvzDiaTtYAVTaxtP2uHM MfbL5B7pOGss5sqampJZmxTCD3JYNTKC4rJjdQB/RUoiOiENe7TjWKbpfEyo2w== 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 4Q53KM381hzn02; Tue, 25 Apr 2023 00:48: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 33P0mtKJ074909; Tue, 25 Apr 2023 00:48:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33P0mtid074908; Tue, 25 Apr 2023 00:48:55 GMT (envelope-from git) Date: Tue, 25 Apr 2023 00:48:55 GMT Message-Id: <202304250048.33P0mtid074908@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: d8032adfa543 - 2023Q2 - multimedia/dav1d: unbreak TEST=on on FreeBSD < 13 after 17e9745faede 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/2023Q2 X-Git-Reftype: branch X-Git-Commit: d8032adfa543d561592525ac9142cc144954c7e0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d8032adfa543d561592525ac9142cc144954c7e0 commit d8032adfa543d561592525ac9142cc144954c7e0 Author: John Hein AuthorDate: 2023-04-21 21:03:56 +0000 Commit: Jan Beich CommitDate: 2023-04-25 00:47:57 +0000 multimedia/dav1d: unbreak TEST=on on FreeBSD < 13 after 17e9745faede ../tests/checkasm/checkasm.c:623:13: error: unknown type name 'cpu_set_t'; did you mean 'cpuset_t'? cpu_set_t set; ^~~~~~~~~ cpuset_t /usr/include/sys/_cpuset.h:50:24: note: 'cpuset_t' declared here typedef struct _cpuset cpuset_t; ^ PR: 270977 Reported by: Ross McKelvie (cherry picked from commit a50457696509832e70738d2afa9f68e11ab4e171) --- multimedia/dav1d/files/patch-freebsd12 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/multimedia/dav1d/files/patch-freebsd12 b/multimedia/dav1d/files/patch-freebsd12 new file mode 100644 index 000000000000..6376c4a5a863 --- /dev/null +++ b/multimedia/dav1d/files/patch-freebsd12 @@ -0,0 +1,19 @@ +Drop after FreeBSD 12.4 EOL around 2023-12-31 +FreeBSD >= 13.1 pulls cpu_set_t from via + +https://cgit.freebsd.org/src/commit/?id=379bfb2aa9e9 + +--- tests/checkasm/checkasm.c.orig 2023-02-14 16:39:08 UTC ++++ tests/checkasm/checkasm.c +@@ -620,7 +620,11 @@ int main(int argc, char *argv[]) { + fprintf(stderr, "checkasm: running on cpu %lu\n", affinity); + } + #elif defined(HAVE_PTHREAD_SETAFFINITY_NP) && defined(CPU_SET) ++#if defined(__FreeBSD__) && __FreeBSD__ < 13 ++ cpuset_t set; ++#else + cpu_set_t set; ++#endif + CPU_ZERO(&set); + CPU_SET(affinity, &set); + if (pthread_setaffinity_np(pthread_self(), sizeof(set), &set)) {