From nobody Mon Dec 13 14:37:45 2021 X-Original-To: dev-commits-ports-main@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 2A35B18DD6A4; Mon, 13 Dec 2021 14:37:48 +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 4JCPHY6jJ2z3PGh; Mon, 13 Dec 2021 14:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 6C28716247; Mon, 13 Dec 2021 14:37:45 +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 1BDEbjUP095325; Mon, 13 Dec 2021 14:37:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BDEbjm5095324; Mon, 13 Dec 2021 14:37:45 GMT (envelope-from git) Date: Mon, 13 Dec 2021 14:37:45 GMT Message-Id: <202112131437.1BDEbjm5095324@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 847d0ca93026 - main - multimedia/pipewire: Fix build under 14-CURRENT List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 847d0ca93026b53f79d728dae616b8f7a2676a77 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639406266; 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=7MLZtzChL4bNzLlApxqAfdOUVoB3BkW2M42333K0il0=; b=Cfum95tEfBmXFZLe0iMeBQkShHWwVJYiEwmEcmKjBPvEeXno3tLhYaw5CqislkieZerFos 2BI4smasiv29JQ2tl7m5y9hiHtI0UKBtDY+AEuxe7Or9j6YPmjW+kFj9jG0G5PgFY0zmoL HpZI8nLaFv0MOrZYg3X6aFqTdxG7oU4zi2G8lVkKIoVc7tzBmUA6GonoAgeaHgKpTKNvNj gK+iuX64TX8fKo4yA+ndjSKNbgeD3QerNIstXQiedlQzxqAxx3j0hfPqNctAlVIEMNGkvp KMNizDPtjgDP+giYifW9DRXk04wTnlpYAf1ipbAvjWUSnCAWgVZgI70rw00jYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639406266; a=rsa-sha256; cv=none; b=GmmTRTs+DsIgHdjCthGmGWJ7NFjcI7JVXZYwfCi2Imqw6oLs0qzh3TeUzCN0kKUnMU9JrN N17e5LRK3Ch1MG17p2CINqTg2TQRkrJxr0r78YLsxCYUMSpEmiCbMVSjU/BAe+8VBNwImB Adsn4rADU0FTtz9aR4gLxP5BZrnrvq5LySnA6ilz2d5EQhBMG2KFNe8pbtzchzZmZ5hxZ8 6+H8p4FzKF8eeXGzZR/zmyAGuehi+42vG36MKI1CpeReXr3nBXeS/xrqIVzQn3CjkH8Q0X o+PftwhjgRqFsnJ9057UvAosweJ8DdJhlakH9eVCi/1NAmDP3Y5grzwO0rYb/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=847d0ca93026b53f79d728dae616b8f7a2676a77 commit 847d0ca93026b53f79d728dae616b8f7a2676a77 Author: Cy Schubert AuthorDate: 2021-12-12 22:33:42 +0000 Commit: Cy Schubert 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 ++#if __FreeBSD_version < 1400043 + static int sched_getcpu(void) { return -1; }; ++#endif + #endif + + static struct spa_ringbuffer rb;