From owner-dev-commits-ports-all@freebsd.org Thu Jun 17 00:07:47 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 69BDE647FA7; Thu, 17 Jun 2021 00:07:47 +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 4G52SM2bQBz4bV4; Thu, 17 Jun 2021 00:07:47 +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 4142325322; Thu, 17 Jun 2021 00:07:47 +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 15H07lvh023716; Thu, 17 Jun 2021 00:07:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15H07lVE023715; Thu, 17 Jun 2021 00:07:47 GMT (envelope-from git) Date: Thu, 17 Jun 2021 00:07:47 GMT Message-Id: <202106170007.15H07lVE023715@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 6a7e7adbca15 - main - audio/sfizz: fix build on powerpc* MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a7e7adbca15546da4181cd1d0b2d4cd72953303 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2021 00:07:47 -0000 The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=6a7e7adbca15546da4181cd1d0b2d4cd72953303 commit 6a7e7adbca15546da4181cd1d0b2d4cd72953303 Author: Piotr Kubaj AuthorDate: 2021-06-17 00:07:38 +0000 Commit: Piotr Kubaj CommitDate: 2021-06-17 00:07:38 +0000 audio/sfizz: fix build on powerpc* ori 0,0,0 is nop instruction on powerpc* Additional headers are necessary: In file included from /wrkdirs/usr/ports/audio/sfizz/work/sfizz-0.4.0/external/abseil-cpp/absl/base/internal/unscaledcycleclock.cc:27: /usr/include/sys/sysctl.h:1185:25: error: unknown type name 'u_int' int sysctl(const int *, u_int, void *, size_t *, const void *, size_t); ^ /wrkdirs/usr/ports/audio/sfizz/work/sfizz-0.4.0/external/abseil-cpp/absl/base/internal/unscaledcycleclock.cc:91:10: error: unknown type name 'once_flag' static once_flag init_timebase_frequency_once; ^ /wrkdirs/usr/ports/audio/sfizz/work/sfizz-0.4.0/external/abseil-cpp/absl/base/internal/unscaledcycleclock.cc:93:18: error: no member named 'LowLevelCallOnce' in namespace 'absl::lts_2020_02_25::base_internal' base_internal::LowLevelCallOnce(&init_timebase_frequency_once, [&]() { --- ...nal_abseil-cpp_absl_base_internal_unscaledcycleclock.cc | 14 ++++++++++++++ audio/sfizz/files/patch-src_external_atomic__queue_defs.h | 13 ++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/audio/sfizz/files/patch-external_abseil-cpp_absl_base_internal_unscaledcycleclock.cc b/audio/sfizz/files/patch-external_abseil-cpp_absl_base_internal_unscaledcycleclock.cc new file mode 100644 index 000000000000..7b0b8cd82099 --- /dev/null +++ b/audio/sfizz/files/patch-external_abseil-cpp_absl_base_internal_unscaledcycleclock.cc @@ -0,0 +1,14 @@ +--- external/abseil-cpp/absl/base/internal/unscaledcycleclock.cc.orig 2021-06-16 13:17:13 UTC ++++ external/abseil-cpp/absl/base/internal/unscaledcycleclock.cc +@@ -24,8 +24,10 @@ + #ifdef __GLIBC__ + #include + #elif defined(__FreeBSD__) +-#include ++#include "absl/base/call_once.h" + #include ++#include ++#include + #endif + #endif + diff --git a/audio/sfizz/files/patch-src_external_atomic__queue_defs.h b/audio/sfizz/files/patch-src_external_atomic__queue_defs.h index 7060dfbfb388..f0bb602e4b16 100644 --- a/audio/sfizz/files/patch-src_external_atomic__queue_defs.h +++ b/audio/sfizz/files/patch-src_external_atomic__queue_defs.h @@ -1,4 +1,4 @@ ---- src/external/atomic_queue/defs.h.orig 2020-04-20 01:14:22 UTC +--- src/external/atomic_queue/defs.h.orig 2020-07-23 22:01:34 UTC +++ src/external/atomic_queue/defs.h @@ -6,11 +6,15 @@ @@ -26,3 +26,14 @@ static inline void spin_loop_pause() noexcept { #if (defined(__ARM_ARCH_6K__) || \ defined(__ARM_ARCH_6Z__) || \ +@@ -37,6 +41,10 @@ static inline void spin_loop_pause() noexcept { + #endif + } + } // namespace atomic_queue ++#elif defined(__powerpc__) ++static inline void spin_loop_pause() noexcept { ++ asm volatile("ori 0,0,0" ::: "memory"); ++} + #else + #error "Unknown CPU architecture." + #endif