Date: Mon, 13 Dec 2021 14:37:45 GMT From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 847d0ca93026 - main - multimedia/pipewire: Fix build under 14-CURRENT Message-ID: <202112131437.1BDEbjm5095324@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=847d0ca93026b53f79d728dae616b8f7a2676a77 commit 847d0ca93026b53f79d728dae616b8f7a2676a77 Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2021-12-12 22:33:42 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2021-12-13 14:37:29 +0000 multimedia/pipewire: Fix build under 14-CURRENT As of 77b2c2f81451db8119e4ea6398fe76813db790de FreeBSD 14-CURRENT includes sched_getcpu(). This conflicts with the static function included in the port. Check for it. MFH: 2021Q4 --- .../pipewire/files/patch-spa_tests_stress-ringbuffer.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/multimedia/pipewire/files/patch-spa_tests_stress-ringbuffer.c b/multimedia/pipewire/files/patch-spa_tests_stress-ringbuffer.c new file mode 100644 index 000000000000..fd1519662a0e --- /dev/null +++ b/multimedia/pipewire/files/patch-spa_tests_stress-ringbuffer.c @@ -0,0 +1,13 @@ +--- spa/tests/stress-ringbuffer.c.orig 2021-11-11 04:21:29.000000000 -0800 ++++ spa/tests/stress-ringbuffer.c 2021-12-12 12:11:15.939268000 -0800 +@@ -12,7 +12,10 @@ + #define MAX_VALUE 0x10000 + + #ifdef __FreeBSD__ ++#include <sys/param.h> ++#if __FreeBSD_version < 1400043 + static int sched_getcpu(void) { return -1; }; ++#endif + #endif + + static struct spa_ringbuffer rb;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112131437.1BDEbjm5095324>