From nobody Fri Nov 8 06:38:04 2024 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 4Xl8QP6Xjdz5cFPX; Fri, 08 Nov 2024 06:38:05 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xl8QP065Sz52X2; Fri, 8 Nov 2024 06:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731047885; 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=wjsgJYHh1hAlkRL0nyOJ8ADpPIM3+FmhvOOw+yC/qJI=; b=dfqAcxwu7WbnAeuoHYB1ZbiC+1Mfjv7LTY5+a+TmfiB18EAUTe2aAU720mqbka1FaZxA6b TunlnR6V9KRJKmh6Qx5UsOOm8gc6dvFQJ0WP92nVC3e8b0AUYV6+HjK1IRznpibYvFELAM clKqaVG/1lMo/GXDpXHsel61j9uxjt3QnzgD5Z/UFvJPTP/xo+D4vCjE6DaFdj90MR21a7 2YduddZcTPOa91tWSgynPL8+pDM4HvC+PVBgjGqzI51vpLKH8bdQJth8ADQZH/EcZsXyX9 ubIFttrkClDEtsRPb+Qpe5eovuEdbmPAng5/zyqwWtUIknBK+/w/TY929uW05Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731047885; 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=wjsgJYHh1hAlkRL0nyOJ8ADpPIM3+FmhvOOw+yC/qJI=; b=CFfKAzjs16C+3wwqwHATvO5IyVWLF3d9RIXHSM102jQsvGBvcgWvSS64rQZ/7hVXpJF0q3 DGkTO3cEcky6p7orDdT9MXP4QnUzW+sScagLFba4ph6AlyYU4gU1K77sNRfvEidFFkaNXS 1szMVAb4O3BbP6/6gc4uwIkDPhb2n3667fAtbrAlwDilvPSvPWFTFwpqT751oMxA294EIO TeEL7Rmhc5o4ndME0pPx9ga/j4wBnC81TVChnfOlLUnX+eBgptAbPDC/bHXLJZk304vRIS saJsV0+wKaoSAV+sqxhgKFh38MfZNMNyDob/i/j8iGmpr+K2xDaJPCXfZG+E/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731047885; a=rsa-sha256; cv=none; b=Z6UOuR1j5hqVEuttwRIdjwvipwhiq2ECywUZJn0vLXtNa0y5kWrNrMcr64w5imsgWsXSVK CucrvD5AJqla/WnIZ1g/XBstfRkku8IEXeDD+yHokXTpgoqMNh4YFz2minrHsIkvOt/ATQ Mp3D5hBWp4iLQwfZGIGZUD53iZMCpGMSTW3x4wIX85JDpoiGTXCcqYJrI1LjdXTmteFrP2 nYu7Q6ipSrZKZUhcDF6KTAnrL5iZGSricKvXB5AE3JOt6jyc9kx8HfNhzwCexB1QwLsksk yAmYI1vK+Av+gfhhOLI4gHTY/EPxLFP/jwscMWkvRWeBp5F3q8xJj83CIkk0eQ== 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 4Xl8QN6M3pzJdP; Fri, 8 Nov 2024 06:38:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A86c4pm032689; Fri, 8 Nov 2024 06:38:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A86c43C032686; Fri, 8 Nov 2024 06:38:04 GMT (envelope-from git) Date: Fri, 8 Nov 2024 06:38:04 GMT Message-Id: <202411080638.4A86c43C032686@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: c1b0e405a2cb - main - audio/sfizz: update 1.2.1 =?utf-8?Q?=E2=86=92?= 1.2.3 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1b0e405a2cbcd9c1df873e05d059f439bf1a72c Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=c1b0e405a2cbcd9c1df873e05d059f439bf1a72c commit c1b0e405a2cbcd9c1df873e05d059f439bf1a72c Author: Yuri Victorovich AuthorDate: 2024-11-08 05:32:09 +0000 Commit: Yuri Victorovich CommitDate: 2024-11-08 06:37:38 +0000 audio/sfizz: update 1.2.1 → 1.2.3 --- audio/sfizz/Makefile | 83 +++++++--------------- audio/sfizz/distinfo | 36 ++++------ ...rnal_atomic__queue_include_atomic__queue_defs.h | 23 ------ ...4_vstgui_lib_platform_linux_x11fileselector.cpp | 11 --- ...editor_external_vstgui4_vstgui_lib_vstguibase.h | 11 --- ...__SDK_VST3__SDK_pluginterfaces_base_fplatform.h | 23 ------ ...external_cpuid_platform_src_platform_config.hpp | 8 +-- audio/sfizz/files/patch-src_sfizz_Synth.cpp | 10 +++ .../patch-src_sfizz_modulations_ModMatrix.cpp | 10 +++ audio/sfizz/pkg-plist | 59 +-------------- 10 files changed, 63 insertions(+), 211 deletions(-) diff --git a/audio/sfizz/Makefile b/audio/sfizz/Makefile index bf6b20b8827d..b9f7c1d487c2 100644 --- a/audio/sfizz/Makefile +++ b/audio/sfizz/Makefile @@ -1,6 +1,5 @@ PORTNAME= sfizz -DISTVERSION= 1.2.1 -PORTREVISION= 2 +DISTVERSION= 1.2.3 CATEGORIES= audio MAINTAINER= yuri@FreeBSD.org @@ -10,74 +9,40 @@ WWW= https://sfz.tools/sfizz/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_aarch64= fails to compile: fatal error: 'linux/auxvec.h' file not found, see https://github.com/sfztools/sfizz/issues/1118 -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 - -LIB_DEPENDS= libsndfile.so:audio/libsndfile +LIB_DEPENDS= libabsl_hash.so:devel/abseil RUN_DEPENDS= zenity:x11/zenity -USES= cmake compiler:c++17-lang localbase:ldflags pkgconfig +USES= cmake compiler:c++17-lang localbase:ldflags pkgconfig qt:5 +USE_QT= buildtools:build qmake:build widgets + USE_GITHUB= yes GH_ACCOUNT= sfztools -GH_TUPLE= \ - abseil:abseil-cpp:273292d1cfc0a94a65082ee350509af1d113344d:abseil_abseil_cpp/external/abseil-cpp \ - steinbergmedia:vst3_base:985fe019276ee03c2751a1736ba3b390678e29f2:steinbergmedia_vst3_base/plugins/vst/external/VST_SDK/VST3_SDK/base \ - steinbergmedia:vst3_pluginterfaces:93cef1afb7061e488625045ba5a82abaa83d27fe:steinbergmedia_vst3_pluginterfaces/plugins/vst/external/VST_SDK/VST3_SDK/pluginterfaces \ - steinbergmedia:vst3_public_sdk:9589800ed94573354bc29de45eec5744523fbfcb:steinbergmedia_vst3_public_sdk/plugins/vst/external/VST_SDK/VST3_SDK/public.sdk \ - sfztools:vstgui:630db26be83f8a1d4bd04926fa45ad10995d2b85:sfztools_vstgui/plugins/editor/external/vstgui4 \ - mackron:dr_libs:cac1785cee4abb455817b43d5dee33b49d61be2f:mackron_dr_libs/external/st_audiofile/thirdparty/dr_libs \ - sfztools:stb_vorbis:fc0bd698b26888da0a632da33f4c49b90763e69b:sfztools_stb_vorbis/external/st_audiofile/thirdparty/stb_vorbis \ +GH_TUPLE= mackron:dr_libs:e4a7765e598e9e54dc0f520b7e4416359bee80cc:mackron_dr_libs/external/st_audiofile/thirdparty/dr_libs \ sfztools:libaiff:78864a4a2e769e426be8cfd78ae7f5f72e236c33:sfztools_libaiff/external/st_audiofile/thirdparty/libaiff \ - sfztools:sfzt_auwrapper:014311ae45b86571e1ae3aaa03ebbd7db8b3a32e:sfztools_sfzt_auwrapper/plugins/vst/external/sfzt_auwrapper \ - gulrak:filesystem:8a2edd6:gulrak_filesystem/external/filesystem \ - simd-everywhere:simde:98075d0593f539762125dbb215d95e782a6ae344:simd_everywhere_simde/external/simde \ - nemequ:munit:da8f73412998e4f1adf1100dc187533a51af77fd:nemequ_munit/external/simde/test/munit \ - dr-soft:miniaudio:d1a166c83ab445b1c14bc83d37c84e18d172e5f5:dr_soft_miniaudio/external/st_audiofile/thirdparty/dr_libs/tests/external/miniaudio \ + gulrak:filesystem:8a2edd6d92ed820521d42c94d179462bf06b5ed3:gulrak_filesystem/external/filesystem \ + simd-everywhere:simde:2bf459d4ed6d7ed6b9f31bd9e07c91bace5009e0:simd_everywhere_simde/external/simde \ + dbry:WavPack:07ffb331d23c16e2d2979370441f63ea722760bc:dbry_WavPack/external/st_audiofile/thirdparty/wavpack \ + doctest:doctest:86892fc480f80fb57d9a3926cb506c0e974489d8:doctest_doctest/external/invoke.hpp/vendors/doctest \ + nemequ:munit:da8f73412998e4f1adf1100dc187533a51af77fd:nemequ_munit/external/simde/test/munit \ + dr-soft:miniaudio:d1a166c83ab445b1c14bc83d37c84e18d172e5f5:dr_soft_miniaudio/external/st_audiofile/thirdparty/dr_libs/tests/external/miniaudio USE_LDCONFIG= yes -OPTIONS_DEFINE= JACK LV2 VST -OPTIONS_DEFAULT= JACK LV2 VST -OPTIONS_EXCLUDE_powerpc= VST -OPTIONS_EXCLUDE_powerpc64= VST -OPTIONS_EXCLUDE_powerpc64le= VST +CMAKE_ON= SFIZZ_USE_SYSTEM_ABSEIL +CMAKE_ARGS= -DCMAKE_CXX_STANDARD=17 + +OPTIONS_DEFINE= JACK +OPTIONS_DEFAULT= JACK OPTIONS_SUB= yes JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CMAKE_BOOL= SFIZZ_JACK -LV2_DESC= Install the LV2 plugin -LV2_USES= gnome xorg -LV2_USE= GNOME=cairo,glib20,pango XORG=x11,ice,sm,xcb,xext -LV2_BUILD_DEPENDS= lv2>0:audio/lv2 -LV2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libharfbuzz.so:print/harfbuzz \ - libxcb-cursor.so:x11/xcb-util-cursor \ - libxcb-keysyms.so:x11/xcb-util-keysyms \ - libxcb-util.so:x11/xcb-util \ - libxkbcommon.so:x11/libxkbcommon -LV2_CMAKE_BOOL= SFIZZ_LV2 - -VST_DESC= Install the VST plugin -VST_USES= ${LV2_USES} -VST_USE= ${LV2_USE} -VST_LIB_DEPENDS= ${LV2_LIB_DEPENDS} -VST_CMAKE_BOOL= SFIZZ_VST - -.include - -post-install-LV2-on: - @${STRIP_CMD} \ - ${STAGEDIR}${PREFIX}/lib/lv2/sfizz.lv2/Contents/Binary/sfizz.so \ - ${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 +post-patch: + # fix conflict of CACHE_LINE_SIZE with system-defined macro + @${REINPLACE_CMD} \ + -e 's|CACHE_LINE_SIZE|CACHE_LINE_SIZEx|' \ + ${WRKSRC}/external/atomic_queue/include/atomic_queue/atomic_queue.h \ + ${WRKSRC}/external/atomic_queue/include/atomic_queue/defs.h -.include +.include diff --git a/audio/sfizz/distinfo b/audio/sfizz/distinfo index d94c95c21d9b..1b4b18972ddd 100644 --- a/audio/sfizz/distinfo +++ b/audio/sfizz/distinfo @@ -1,28 +1,18 @@ -TIMESTAMP = 1681673912 -SHA256 (sfztools-sfizz-1.2.1_GH0.tar.gz) = 81ef09e09e78ed3241a38e2efde4a551923e8fcf221b2ae1c51351bc9ab86e00 -SIZE (sfztools-sfizz-1.2.1_GH0.tar.gz) = 15050962 -SHA256 (abseil-abseil-cpp-273292d1cfc0a94a65082ee350509af1d113344d_GH0.tar.gz) = 94aef187f688665dc299d09286bfa0d22c4ecb86a80b156dff6aabadc5a5c26d -SIZE (abseil-abseil-cpp-273292d1cfc0a94a65082ee350509af1d113344d_GH0.tar.gz) = 1957519 -SHA256 (steinbergmedia-vst3_base-985fe019276ee03c2751a1736ba3b390678e29f2_GH0.tar.gz) = 7eaf215f5f95fcdda6261b4e1c45a0d24e4bfb68dc2292ad3c0156b7a8d99f2a -SIZE (steinbergmedia-vst3_base-985fe019276ee03c2751a1736ba3b390678e29f2_GH0.tar.gz) = 62213 -SHA256 (steinbergmedia-vst3_pluginterfaces-93cef1afb7061e488625045ba5a82abaa83d27fe_GH0.tar.gz) = 152f37370d1c284f0eda9e4e43db54e1c0bf5fc3cf1ef6f5fabc9a3314c38f73 -SIZE (steinbergmedia-vst3_pluginterfaces-93cef1afb7061e488625045ba5a82abaa83d27fe_GH0.tar.gz) = 95833 -SHA256 (steinbergmedia-vst3_public_sdk-9589800ed94573354bc29de45eec5744523fbfcb_GH0.tar.gz) = d5519df35613c1e7047ffa4570f1b2a99bd82d2028156b4c5b461a55991c5c7a -SIZE (steinbergmedia-vst3_public_sdk-9589800ed94573354bc29de45eec5744523fbfcb_GH0.tar.gz) = 12335277 -SHA256 (sfztools-vstgui-630db26be83f8a1d4bd04926fa45ad10995d2b85_GH0.tar.gz) = 6dc88e738f0faa323c9e7bc20c29a18df70fffa22d381000adeb801897601df9 -SIZE (sfztools-vstgui-630db26be83f8a1d4bd04926fa45ad10995d2b85_GH0.tar.gz) = 3670925 -SHA256 (mackron-dr_libs-cac1785cee4abb455817b43d5dee33b49d61be2f_GH0.tar.gz) = ebef38a04050371438eb7b7106ed43cb2d5ae819e3253d8f40886c9cb92b5330 -SIZE (mackron-dr_libs-cac1785cee4abb455817b43d5dee33b49d61be2f_GH0.tar.gz) = 492522 -SHA256 (sfztools-stb_vorbis-fc0bd698b26888da0a632da33f4c49b90763e69b_GH0.tar.gz) = 8680dbe05fe2f9864122a160d74ab9aa169d765380a1210c71fff5d5615be483 -SIZE (sfztools-stb_vorbis-fc0bd698b26888da0a632da33f4c49b90763e69b_GH0.tar.gz) = 52157 +TIMESTAMP = 1730801871 +SHA256 (sfztools-sfizz-1.2.3_GH0.tar.gz) = fc1d7864516546e237e7c6115dc76d187924af32ec8eafb97b03a7efec9aa49d +SIZE (sfztools-sfizz-1.2.3_GH0.tar.gz) = 14107198 +SHA256 (mackron-dr_libs-e4a7765e598e9e54dc0f520b7e4416359bee80cc_GH0.tar.gz) = 605b811a714e1e98717f6986dc9afe3b8fb65399b3b471e5e3ac41bd16fa05d3 +SIZE (mackron-dr_libs-e4a7765e598e9e54dc0f520b7e4416359bee80cc_GH0.tar.gz) = 518698 SHA256 (sfztools-libaiff-78864a4a2e769e426be8cfd78ae7f5f72e236c33_GH0.tar.gz) = a0db06448a9cf8de4df08f40d7ad7169c73e97b78a4477feb31dfbd2662277df SIZE (sfztools-libaiff-78864a4a2e769e426be8cfd78ae7f5f72e236c33_GH0.tar.gz) = 27293 -SHA256 (sfztools-sfzt_auwrapper-014311ae45b86571e1ae3aaa03ebbd7db8b3a32e_GH0.tar.gz) = 4d1b19e431c541320c1a118642b6b7ebcbeecf1b6a59ef73f56fc41e0fa85876 -SIZE (sfztools-sfzt_auwrapper-014311ae45b86571e1ae3aaa03ebbd7db8b3a32e_GH0.tar.gz) = 26454 -SHA256 (gulrak-filesystem-8a2edd6_GH0.tar.gz) = d374a61276fa9c218df6da2a4d8b8866baecb81d4609875c48b5cd4c2dd6df3e -SIZE (gulrak-filesystem-8a2edd6_GH0.tar.gz) = 211142 -SHA256 (simd-everywhere-simde-98075d0593f539762125dbb215d95e782a6ae344_GH0.tar.gz) = 5f953eb19d8472304103cd8222d65ff75d99dd2f83e9076a72b5bc2f972bce31 -SIZE (simd-everywhere-simde-98075d0593f539762125dbb215d95e782a6ae344_GH0.tar.gz) = 4714765 +SHA256 (gulrak-filesystem-8a2edd6d92ed820521d42c94d179462bf06b5ed3_GH0.tar.gz) = 3742a0d47da885da0e671008d72e7de5b7dbc3ccd3eed731166268b52e176cd4 +SIZE (gulrak-filesystem-8a2edd6d92ed820521d42c94d179462bf06b5ed3_GH0.tar.gz) = 211264 +SHA256 (simd-everywhere-simde-2bf459d4ed6d7ed6b9f31bd9e07c91bace5009e0_GH0.tar.gz) = 03f466eae94075d8bf5224d81eb9a396d2acfd2a37fc622d0941dfba1bf52e5d +SIZE (simd-everywhere-simde-2bf459d4ed6d7ed6b9f31bd9e07c91bace5009e0_GH0.tar.gz) = 6125924 +SHA256 (dbry-WavPack-07ffb331d23c16e2d2979370441f63ea722760bc_GH0.tar.gz) = d96f0b92720cd222eb869ad0db1068bfd5abc5f9dc37746ebce68ba73c4790f4 +SIZE (dbry-WavPack-07ffb331d23c16e2d2979370441f63ea722760bc_GH0.tar.gz) = 2019240 +SHA256 (doctest-doctest-86892fc480f80fb57d9a3926cb506c0e974489d8_GH0.tar.gz) = 15c96772a864cac38b14695b645332c981f87cce66cca8c87f57b158df5ae86b +SIZE (doctest-doctest-86892fc480f80fb57d9a3926cb506c0e974489d8_GH0.tar.gz) = 2293945 SHA256 (nemequ-munit-da8f73412998e4f1adf1100dc187533a51af77fd_GH0.tar.gz) = 835a9ee03e3b9560af5a2e4465394e00337398f5baba9d686083b8e1d93f0c30 SIZE (nemequ-munit-da8f73412998e4f1adf1100dc187533a51af77fd_GH0.tar.gz) = 27727 SHA256 (dr-soft-miniaudio-d1a166c83ab445b1c14bc83d37c84e18d172e5f5_GH0.tar.gz) = 336576323b6f56d506ac5265344d522948e24e5e72031ff1dc6cc4537232bfb1 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 deleted file mode 100644 index a60be28c6744..000000000000 --- a/audio/sfizz/files/patch-external_atomic__queue_include_atomic__queue_defs.h +++ /dev/null @@ -1,23 +0,0 @@ ---- 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 - - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/audio/sfizz/files/patch-plugins_editor_external_vstgui4_vstgui_lib_platform_linux_x11fileselector.cpp b/audio/sfizz/files/patch-plugins_editor_external_vstgui4_vstgui_lib_platform_linux_x11fileselector.cpp deleted file mode 100644 index ac363b6a766e..000000000000 --- a/audio/sfizz/files/patch-plugins_editor_external_vstgui4_vstgui_lib_platform_linux_x11fileselector.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/editor/external/vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp.orig 2022-07-27 03:15:46 UTC -+++ plugins/editor/external/vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp -@@ -14,6 +14,8 @@ - #include - extern "C" { extern char **environ; } - -+#define execvpe(a, b, c) execvp(a, b) -+ - //------------------------------------------------------------------------ - namespace VSTGUI { - namespace X11 { diff --git a/audio/sfizz/files/patch-plugins_editor_external_vstgui4_vstgui_lib_vstguibase.h b/audio/sfizz/files/patch-plugins_editor_external_vstgui4_vstgui_lib_vstguibase.h deleted file mode 100644 index 20c193a42f23..000000000000 --- a/audio/sfizz/files/patch-plugins_editor_external_vstgui4_vstgui_lib_vstguibase.h +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/editor/external/vstgui4/vstgui/lib/vstguibase.h.orig 2022-07-27 03:11:58 UTC -+++ plugins/editor/external/vstgui4/vstgui/lib/vstguibase.h -@@ -134,7 +134,7 @@ - using std::min; - using std::max; - --#elif defined(__linux__) -+#elif defined(__linux__) || defined(__FreeBSD__) - #include - #include - #include diff --git a/audio/sfizz/files/patch-plugins_vst_external_VST__SDK_VST3__SDK_pluginterfaces_base_fplatform.h b/audio/sfizz/files/patch-plugins_vst_external_VST__SDK_VST3__SDK_pluginterfaces_base_fplatform.h deleted file mode 100644 index 0c1f40ef5cd4..000000000000 --- a/audio/sfizz/files/patch-plugins_vst_external_VST__SDK_VST3__SDK_pluginterfaces_base_fplatform.h +++ /dev/null @@ -1,23 +0,0 @@ ---- plugins/vst/external/VST_SDK/VST3_SDK/pluginterfaces/base/fplatform.h.orig 2022-07-27 05:18:10 UTC -+++ plugins/vst/external/VST_SDK/VST3_SDK/pluginterfaces/base/fplatform.h -@@ -95,7 +95,7 @@ - //----------------------------------------------------------------------------- - // LINUX - //----------------------------------------------------------------------------- --#elif __gnu_linux__ || __linux__ -+#elif __gnu_linux__ || __linux__ || __FreeBSD__ - #define SMTG_OS_LINUX 1 - #define SMTG_OS_MACOS 0 - #define SMTG_OS_WINDOWS 0 -@@ -107,7 +107,11 @@ - #define SMTG_CPU_ARM __arm__ - #define SMTG_CPU_ARM_64 __aarch64__ - -+# ifdef __FreeBSD__ -+ #include -+# else - #include -+# endif - #if __BYTE_ORDER == __LITTLE_ENDIAN - #define BYTEORDER kLittleEndian - #else diff --git a/audio/sfizz/files/patch-src_external_cpuid_platform_src_platform_config.hpp b/audio/sfizz/files/patch-src_external_cpuid_platform_src_platform_config.hpp index ca4ef91f2027..4fc2177075df 100644 --- a/audio/sfizz/files/patch-src_external_cpuid_platform_src_platform_config.hpp +++ b/audio/sfizz/files/patch-src_external_cpuid_platform_src_platform_config.hpp @@ -1,4 +1,4 @@ ---- src/external/cpuid/platform/src/platform/config.hpp.orig 2022-07-27 00:05:49 UTC +--- src/external/cpuid/platform/src/platform/config.hpp.orig 2024-11-05 10:07:15 UTC +++ src/external/cpuid/platform/src/platform/config.hpp @@ -11,7 +11,7 @@ // http://sourceforge.net/p/predef/wiki/Architectures/ @@ -6,6 +6,6 @@ // Detect operating systems -#if defined(__linux__) +#if defined(__linux__) || defined(__FreeBSD__) - #define PLATFORM_LINUX 1 - #if defined(__ANDROID__) - #define PLATFORM_ANDROID 1 + #define PLATFORM_LINUX 1 + #if defined(__ANDROID__) + #define PLATFORM_ANDROID 1 diff --git a/audio/sfizz/files/patch-src_sfizz_Synth.cpp b/audio/sfizz/files/patch-src_sfizz_Synth.cpp new file mode 100644 index 000000000000..187933b30f23 --- /dev/null +++ b/audio/sfizz/files/patch-src_sfizz_Synth.cpp @@ -0,0 +1,10 @@ +--- src/sfizz/Synth.cpp.orig 2024-11-05 10:32:04 UTC ++++ src/sfizz/Synth.cpp +@@ -33,6 +33,7 @@ + #include "parser/Parser.h" + #include + #include ++#include + #include + #include + #include diff --git a/audio/sfizz/files/patch-src_sfizz_modulations_ModMatrix.cpp b/audio/sfizz/files/patch-src_sfizz_modulations_ModMatrix.cpp new file mode 100644 index 000000000000..9cc44b66ee12 --- /dev/null +++ b/audio/sfizz/files/patch-src_sfizz_modulations_ModMatrix.cpp @@ -0,0 +1,10 @@ +--- src/sfizz/modulations/ModMatrix.cpp.orig 2024-11-08 05:26:15 UTC ++++ src/sfizz/modulations/ModMatrix.cpp +@@ -13,6 +13,7 @@ + #include "SIMDHelpers.h" + #include "utility/Debug.h" + #include ++#include + #include + #include + #include diff --git a/audio/sfizz/pkg-plist b/audio/sfizz/pkg-plist index 60c95a0e454a..2d0747c381d2 100644 --- a/audio/sfizz/pkg-plist +++ b/audio/sfizz/pkg-plist @@ -5,62 +5,7 @@ include/sfizz.hpp include/sfizz_message.h lib/libsfizz.so lib/libsfizz.so.1 -lib/libsfizz.so.1.2.1 -%%LV2%%lib/lv2/sfizz.lv2/Contents/Binary/sfizz.so -%%LV2%%lib/lv2/sfizz.lv2/Contents/Binary/sfizz_ui.so -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/DefaultInstrument.sfz -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/DefaultScale.scl -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/Fonts/Roboto-Regular.ttf -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/Fonts/sfizz-fluentui-system-f20.ttf -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/Fonts/sfizz-fluentui-system-r20.ttf -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/Fonts/sfizz-misc-icons.ttf -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/Themes/Dark/theme.xml -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/Themes/Default/theme.xml -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/background.png -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/background@2x.png -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/background_button_about.png -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/background_button_about@2x.png -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/icon_white.png -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/icon_white@2x.png -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/knob48.png -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/knob48@2x.png -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/logo.png -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/logo_orange.png -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/logo_text.png -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/logo_text@2x.png -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/logo_text_shaded.png -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/logo_text_shaded@2x.png -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/logo_text_white.png -%%LV2%%lib/lv2/sfizz.lv2/Contents/Resources/logo_text_white@2x.png -%%LV2%%lib/lv2/sfizz.lv2/LICENSE.md -%%LV2%%lib/lv2/sfizz.lv2/controllers.ttl -%%LV2%%lib/lv2/sfizz.lv2/manifest.ttl -%%LV2%%lib/lv2/sfizz.lv2/sfizz.ttl -%%LV2%%lib/lv2/sfizz.lv2/sfizz_ui.ttl -%%VST%%lib/vst3/sfizz.vst3/Contents/Resources/Fonts/Roboto-Regular.ttf -%%VST%%lib/vst3/sfizz.vst3/Contents/Resources/Fonts/sfizz-fluentui-system-f20.ttf -%%VST%%lib/vst3/sfizz.vst3/Contents/Resources/Fonts/sfizz-fluentui-system-r20.ttf -%%VST%%lib/vst3/sfizz.vst3/Contents/Resources/Fonts/sfizz-misc-icons.ttf -%%VST%%lib/vst3/sfizz.vst3/Contents/Resources/Themes/Dark/theme.xml -%%VST%%lib/vst3/sfizz.vst3/Contents/Resources/Themes/Default/theme.xml -%%VST%%lib/vst3/sfizz.vst3/Contents/Resources/background.png -%%VST%%lib/vst3/sfizz.vst3/Contents/Resources/background@2x.png -%%VST%%lib/vst3/sfizz.vst3/Contents/Resources/background_button_about.png -%%VST%%lib/vst3/sfizz.vst3/Contents/Resources/background_button_about@2x.png -%%VST%%lib/vst3/sfizz.vst3/Contents/Resources/icon_white.png -%%VST%%lib/vst3/sfizz.vst3/Contents/Resources/icon_white@2x.png -%%VST%%lib/vst3/sfizz.vst3/Contents/Resources/knob48.png -%%VST%%lib/vst3/sfizz.vst3/Contents/Resources/knob48@2x.png -%%VST%%lib/vst3/sfizz.vst3/Contents/Resources/logo.png -%%VST%%lib/vst3/sfizz.vst3/Contents/Resources/logo_orange.png -%%VST%%lib/vst3/sfizz.vst3/Contents/Resources/logo_text.png -%%VST%%lib/vst3/sfizz.vst3/Contents/Resources/logo_text@2x.png -%%VST%%lib/vst3/sfizz.vst3/Contents/Resources/logo_text_shaded.png -%%VST%%lib/vst3/sfizz.vst3/Contents/Resources/logo_text_shaded@2x.png -%%VST%%lib/vst3/sfizz.vst3/Contents/Resources/logo_text_white.png -%%VST%%lib/vst3/sfizz.vst3/Contents/Resources/logo_text_white@2x.png -%%VST%%lib/vst3/sfizz.vst3/Contents/x86_64-linux/sfizz.so -%%VST%%lib/vst3/sfizz.vst3/gpl-3.0.txt +lib/libsfizz.so.1.2.3 libdata/pkgconfig/sfizz.pc -%%JACK%%share/man/man1/sfizz_jack.1.gz +share/man/man1/sfizz_jack.1.gz share/man/man1/sfizz_render.1.gz