Date: Tue, 25 Apr 2023 00:47:29 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a50457696509 - main - multimedia/dav1d: unbreak TEST=on on FreeBSD < 13 after 17e9745faede Message-ID: <202304250047.33P0lTtI074407@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=a50457696509832e70738d2afa9f68e11ab4e171 commit a50457696509832e70738d2afa9f68e11ab4e171 Author: John Hein <jcfyecrayz@liamekaens.com> AuthorDate: 2023-04-21 21:03:56 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-04-25 00:44:41 +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 --- 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 <sched.h> via <pthread.h> + +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)) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304250047.33P0lTtI074407>