Attachment #241642 for bug #270977

View | Details | Raw Unified | Return to bug 270977
Collapse All | Expand All

Lines 34-39 SDL_MESON_TRUE= enable_examples Link Here

(-)b/multimedia/dav1d/Makefile (+1 lines)
34		34
35	TEST_GL_TUPLE= videolan:dav1d-test-data:b1bb21f24d1c97e6bcbbc2db9c39155c4354c4bc:testdata/tests/dav1d-test-data	35	TEST_GL_TUPLE= videolan:dav1d-test-data:b1bb21f24d1c97e6bcbbc2db9c39155c4354c4bc:testdata/tests/dav1d-test-data
36	TEST_MESON_TRUE=enable_tests testdata_tests	36	TEST_MESON_TRUE=enable_tests testdata_tests
		37	TEST_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-tests-checkasm-checkasm.c
37		38
38	XXHASH_DESC= xxHash 3 muxer	39	XXHASH_DESC= xxHash 3 muxer
39	XXHASH_BUILD_DEPENDS= xxhash>0:devel/xxhash	40	XXHASH_BUILD_DEPENDS= xxhash>0:devel/xxhash




cpu_set_t does not exist in FreeBSD 13.0 or 12.4 or earlier. It exists
in 13.1 and later.  cpuset_t can be used instead.

This patch can be removed after the older releases are EOL and thus
no longer supported.

--- 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)) {

Return to bug 270977

Added Link Here

(-)b/multimedia/dav1d/files/extra-patch-tests-checkasm-checkasm.c (+20 lines)
1	cpu_set_t does not exist in FreeBSD 13.0 or 12.4 or earlier. It exists
2	in 13.1 and later. cpuset_t can be used instead.
3
4	This patch can be removed after the older releases are EOL and thus
5	no longer supported.
6
7	--- tests/checkasm/checkasm.c.orig 2023-02-14 16:39:08 UTC
8	+++ tests/checkasm/checkasm.c
9	@@ -620,7 +620,11 @@ int main(int argc, char *argv[]) {
10	fprintf(stderr, "checkasm: running on cpu %lu\n", affinity);
11	}
12	#elif defined(HAVE_PTHREAD_SETAFFINITY_NP) && defined(CPU_SET)
13	+#if defined(__FreeBSD__) && __FreeBSD__ < 13
14	+ cpuset_t set;
15	+#else
16	cpu_set_t set;
17	+#endif
18	CPU_ZERO(&set);
19	CPU_SET(affinity, &set);
20	if (pthread_setaffinity_np(pthread_self(), sizeof(set), &set)) {