Attachment 241642 Details for Bug 270977 – [patch] cpu_set_t is not in 12.4

[patch] [patch] cpu_set_t is not in 12.4

pr-cpu_set_t-undef.diff (text/plain), 1.57 KB, created by John Hein on 2023-04-21 21:03:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2023-04-21 21:03:56 UTC

Size: 1.57 KB

patch

obsolete

>diff --git a/multimedia/dav1d/Makefile b/multimedia/dav1d/Makefile
>index 785d2e34578b..d96461e705fa 100644
>--- a/multimedia/dav1d/Makefile
>+++ b/multimedia/dav1d/Makefile
>@@ -34,6 +34,7 @@ SDL_MESON_TRUE=	enable_examples
> 
> TEST_GL_TUPLE=	videolan:dav1d-test-data:b1bb21f24d1c97e6bcbbc2db9c39155c4354c4bc:testdata/tests/dav1d-test-data
> TEST_MESON_TRUE=enable_tests testdata_tests
>+TEST_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-tests-checkasm-checkasm.c
> 
> XXHASH_DESC=	xxHash 3 muxer
> XXHASH_BUILD_DEPENDS=	xxhash>0:devel/xxhash
>diff --git a/multimedia/dav1d/files/extra-patch-tests-checkasm-checkasm.c b/multimedia/dav1d/files/extra-patch-tests-checkasm-checkasm.c
>new file mode 100644
>index 000000000000..8a7784593ad2
>--- /dev/null
>+++ b/multimedia/dav1d/files/extra-patch-tests-checkasm-checkasm.c
>@@ -0,0 +1,20 @@
>+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)) {

Flags:

jbeich: maintainer-approval+

Actions: View | Diff

Attachments on bug 270977: 241629 | 241642 | 241694