From nobody Tue Feb 07 02:46:52 2023 X-Original-To: dev-commits-ports-all@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 4P9nb13Bm9z3nm6w; Tue, 7 Feb 2023 02:46:53 +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 4P9nb10w3Cz3hM2; Tue, 7 Feb 2023 02:46:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675738013; 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=ZRUv1TNXzDwJHqIwi13AzmlGlXNtHoDd4GHwuQ9TjFI=; b=rc9fKyMK8Z5uupNwmQC3PzKPJn2xaHG7lqVzIj1tAI8TJXqYWgdgeyQUfbEt3C4RBsliaP o7Lb/Cvd5eKlfWnl/nHvyarwGVH4IDNwYiW9DHMhRFLkEOzI1AxXI95BU2xlC4OuV7e/M2 XhbvyCnO/ZdqjV3eFtlsrgW4zL17ZYljGyF3YJqwAG6K/QE9YRda4MNeaHQqiJWzRdnc3+ B71yLQGyp1yfjJpq1IM2cTP85aVcVONLucVv9HXYR4UuYc8vjuorE7h4StT/aZbux+BRgK 428B1QXq528SOgXQ77tsyYAFUqEB1Vy676bBHNRFpCat6t12dcJ8d0vtWUk4LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675738013; 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=ZRUv1TNXzDwJHqIwi13AzmlGlXNtHoDd4GHwuQ9TjFI=; b=RC8yrU4XBVRlXUAKYquv1jPOXFDkXf2KYovhAXtTiMkJ6u9v4GlBXqT9xqLsNmKpNNTmmC M2mGB7eciBxZDp9arWHcHKFTc2c/Gr/Ss0HEFDNvgZ0NpwbJGyrwuWDoMg2Cc4ZykEiIZp snDehZnYMxtNu2O5vEuH81AJ5261r8Pj6YwS64C1PKJO4R58jq2BiUFacsa1VvRhdKJgLH AbWyAzLi5MntbFVz9iIXscRm6qFQ8bsuONgjXlRARGeDEq60Cz6furNRRoJ3e2nJFhGCS0 yCZqzPMXaAT8ztZqK9ZT2lGzRsEDcSARDArmtPdGjcgMqH0J8WdMXn/5Av99AA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675738013; a=rsa-sha256; cv=none; b=I1UjWtKT39v613Wwxw5pysNJvk5Z2fwdKZReQZPcdHnqBgGm+mLHDfaBpcXrvBfC8fcnio eLVBHXd42hiMTtZPspA1AHUq2tuJQx57eNl/eZG8EzouZ/A+VIfkzDk3LH6uSybulGK5a/ n5ItlCIHSk+ckuTaM0ouUfatP2S0lAzpZVR2TPDcDS1t/V6bKHqatA9OdKgsUek3ANo9Zz Ta/lPraA0Lu/kgxVgMCiNLK0e0/7zoTOTKWcV9QqSfKfUm6r6uTA2ftEnhzseGRTaFAXG1 tZ2qptZH7Oo/vjd0m9QpZTiKs9R0xXJahJo0m6pOsUaabl/GmI56h6lKGHVybg== 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 4P9nb100Tcz10rK; Tue, 7 Feb 2023 02:46:53 +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 3172kqN9035531; Tue, 7 Feb 2023 02:46:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3172kqJL035530; Tue, 7 Feb 2023 02:46:52 GMT (envelope-from git) Date: Tue, 7 Feb 2023 02:46:52 GMT Message-Id: <202302070246.3172kqJL035530@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Piotr Kubaj Subject: git: 6eec2190c57a - 2023Q1 - audio/sfizz: fix build on powerpc* and probably also riscv64 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org 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/2023Q1 X-Git-Reftype: branch X-Git-Commit: 6eec2190c57aa7ca7d81fb56e175ba5e4534caeb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=6eec2190c57aa7ca7d81fb56e175ba5e4534caeb commit 6eec2190c57aa7ca7d81fb56e175ba5e4534caeb Author: Piotr Kubaj AuthorDate: 2023-02-07 02:44:57 +0000 Commit: Piotr Kubaj CommitDate: 2023-02-07 02:46:48 +0000 audio/sfizz: fix build on powerpc* and probably also riscv64 1. Apply https://github.com/max0x7ba/atomic_queue/commit/ee3d91cf131e56aa3302a43aeebf7b57a3c97b06 2. Use abseil patch from other ports. 3. Run the strip command meant obviously only for amd64 only on amd64. (cherry picked from commit 6e55f1e845ca3c435aa3b83daad230041525ff77) --- audio/sfizz/Makefile | 3 ++- ...il-cpp_absl_base_internal_unscaledcycleclock.cc | 13 ++++++++++++ ...rnal_atomic__queue_include_atomic__queue_defs.h | 23 ++++++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/audio/sfizz/Makefile b/audio/sfizz/Makefile index 5f29e7b000df..df77621ecca0 100644 --- a/audio/sfizz/Makefile +++ b/audio/sfizz/Makefile @@ -13,7 +13,6 @@ BROKEN_aarch64= fails to compile: fatal error: 'linux/auxvec.h' file not found, BROKEN_armv6= fails to compile: src/external/cpuid/src/cpuid/detail/init_linux_gcc_arm.hpp: unknown type name 'Elf32_auxv_t', see https://github.com/sfztools/sfizz/issues/1116 BROKEN_armv7= fails to compile: src/external/cpuid/src/cpuid/detail/init_linux_gcc_arm.hpp: unknown type name 'Elf32_auxv_t', see https://github.com/sfztools/sfizz/issues/1116 BROKEN_i386= fails to compile: unknown type name 'Elf64_Auxinfo', see https://github.com/sfztools/sfizz/issues/1110 -BROKEN_riscv64= fails to compile: src/external/atomic_queue/defs.h:45:2: Unknown CPU architecture LIB_DEPENDS= libsndfile.so:audio/libsndfile RUN_DEPENDS= zenity:x11/zenity @@ -78,7 +77,9 @@ post-install-LV2-on: ${STAGEDIR}${PREFIX}/lib/lv2/sfizz.lv2/Contents/Binary/sfizz_ui.so post-install-VST-on: +.if ${ARCH} == amd64 @${STRIP_CMD} \ ${STAGEDIR}${PREFIX}/lib/vst3/sfizz.vst3/Contents/x86_64-linux/sfizz.so +.endif .include 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..9495230c28b8 --- /dev/null +++ b/audio/sfizz/files/patch-external_abseil-cpp_absl_base_internal_unscaledcycleclock.cc @@ -0,0 +1,13 @@ +--- external/abseil-cpp/absl/base/internal/unscaledcycleclock.cc.orig 2023-02-07 02:19:11 UTC ++++ external/abseil-cpp/absl/base/internal/unscaledcycleclock.cc +@@ -24,8 +24,9 @@ + #ifdef __GLIBC__ + #include + #elif defined(__FreeBSD__) +-#include ++#include "absl/base/call_once.h" + #include ++#include + #endif + #endif + diff --git a/audio/sfizz/files/patch-external_atomic__queue_include_atomic__queue_defs.h b/audio/sfizz/files/patch-external_atomic__queue_include_atomic__queue_defs.h new file mode 100644 index 000000000000..a60be28c6744 --- /dev/null +++ b/audio/sfizz/files/patch-external_atomic__queue_include_atomic__queue_defs.h @@ -0,0 +1,23 @@ +--- external/atomic_queue/include/atomic_queue/defs.h.orig 2023-02-07 02:20:07 UTC ++++ external/atomic_queue/include/atomic_queue/defs.h +@@ -36,8 +36,19 @@ static inline void spin_loop_pause() noexcept { + #endif + } + } // namespace atomic_queue ++#elif defined(__ppc64__) || defined(__powerpc64__) ++namespace atomic_queue { ++constexpr int CACHE_LINE_SIZE = 128; // TODO: Review that this is the correct value. ++static inline void spin_loop_pause() noexcept { ++ asm volatile("or 31,31,31 # very low priority"); // TODO: Review and benchmark that this is the right instruction. ++} ++} // namespace atomic_queue + #else +-#error "Unknown CPU architecture." ++#warning "Unknown CPU architecture. Using L1 cache line size of 64 bytes and no spinloop pause instruction." ++namespace atomic_queue { ++constexpr int CACHE_LINE_SIZE = 64; // TODO: Review that this is the correct value. ++static inline void spin_loop_pause() noexcept {} ++} // namespace atomic_queue + #endif + + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////