git: 7e1d8941c0a3 - main - audio/sfizz: Update 0.4.0 -> 1.2.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 27 Jul 2022 08:31:18 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7e1d8941c0a31d7a43588de008c7c0da453d5033
commit 7e1d8941c0a31d7a43588de008c7c0da453d5033
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-07-27 08:30:17 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-07-27 08:31:15 +0000
audio/sfizz: Update 0.4.0 -> 1.2.0
---
audio/sfizz/Makefile | 54 +++++++++++++++-----
audio/sfizz/distinfo | 42 +++++++++++-----
audio/sfizz/files/patch-cmake_SfizzConfig.cmake | 11 ----
...il-cpp_absl_base_internal_unscaledcycleclock.cc | 14 ------
...4_vstgui_lib_platform_linux_x11fileselector.cpp | 11 ++++
...editor_external_vstgui4_vstgui_lib_vstguibase.h | 11 ++++
...__SDK_VST3__SDK_pluginterfaces_base_fplatform.h | 23 +++++++++
.../files/patch-src_external_atomic__queue_defs.h | 39 ---------------
...external_cpuid_platform_src_platform_config.hpp | 4 +-
...puid_src_cpuid_detail_init__linux__gcc__arm.hpp | 12 -----
.../files/patch-src_external_ghc_filesystem.hpp | 11 ----
...__SDK_VST3__SDK_vstgui4_vstgui_lib_vstguibase.h | 11 ----
audio/sfizz/pkg-plist | 58 ++++++++++++++++++++--
13 files changed, 170 insertions(+), 131 deletions(-)
diff --git a/audio/sfizz/Makefile b/audio/sfizz/Makefile
index 80f47c7b09ca..9388fb577d20 100644
--- a/audio/sfizz/Makefile
+++ b/audio/sfizz/Makefile
@@ -1,45 +1,73 @@
PORTNAME= sfizz
-DISTVERSION= 0.4.0
-PORTREVISION= 2
+DISTVERSION= 1.2.0
CATEGORIES= audio
MAINTAINER= yuri@FreeBSD.org
COMMENT= SFZ parser and synth C++ library & LV2/VST3 plugins
LICENSE= BSD2CLAUSE
-LICENSE_FILE= ${WRKSRC}/LICENSE.md
+LICENSE_FILE= ${WRKSRC}/LICENSE
-BROKEN_riscv64= fails to compile: src/external/atomic_queue/defs.h:45:2: Unknown CPU architecture.
+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
-USES= cmake compiler:c++11-lib localbase:ldflags pkgconfig
+USES= cmake compiler:c++17-lang localbase:ldflags pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= sfztools
GH_TUPLE= \
- abseil:abseil-cpp:df3ea785d8c30a9503321a3d35ee7d35808f190d:abseil_abseil_cpp/external/abseil-cpp \
- steinbergmedia:vst3_base:4f6a7184f20f40a7c940a6717e6e0d8b35eeea63:steinbergmedia_vst3_base/vst/external/VST_SDK/VST3_SDK/base \
- sfztools:vst3_pluginterfaces:8c07a58d84c544a73e1ccad2efae200505796773:sfztools_vst3_pluginterfaces/vst/external/VST_SDK/VST3_SDK/pluginterfaces \
- sfztools:vst3_public_sdk:ff836e8c02bd28c902f5e3e75353a86f65008a77:sfztools_vst3_public_sdk/vst/external/VST_SDK/VST3_SDK/public.sdk \
- sfztools:vstgui:c6a7f607c21a7353e922a6d45e54d6c56d5a6745:sfztools_vstgui/vst/external/VST_SDK/VST3_SDK/vstgui4
+ abseil:abseil-cpp:215105818dfde3174fe799600bb0f3cae233d0bf: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 \
+ sfztools:libaiff:78864a4a2e769e426be8cfd78ae7f5f72e236c33:sfztools_libaiff/external/st_audiofile/thirdparty/libaiff \
+ sfztools:sfzt_auwrapper:014311ae45b86571e1ae3aaa03ebbd7db8b3a32e:sfztools_sfzt_auwrapper/plugins/vst/external/sfzt_auwrapper \
+ gulrak:filesystem:614bbe87b80435d87ab8791564370e0c1d13627d: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 \
+
USE_LDCONFIG= yes
OPTIONS_DEFINE= JACK LV2 VST
-OPTIONS_DEFAULT= JACK LV2
+OPTIONS_DEFAULT= JACK LV2 VST
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
-VST_BROKEN= Compilation issues, need to investogate
post-install-LV2-on:
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lv2/sfizz.lv2/sfizz.so
+ @${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:
+ @${STRIP_CMD} \
+ ${STAGEDIR}${PREFIX}/lib/vst3/sfizz.vst3/Contents/x86_64-linux/sfizz.so
.include <bsd.port.mk>
diff --git a/audio/sfizz/distinfo b/audio/sfizz/distinfo
index 24189606e1c8..30e59e8095fc 100644
--- a/audio/sfizz/distinfo
+++ b/audio/sfizz/distinfo
@@ -1,13 +1,29 @@
-TIMESTAMP = 1595907456
-SHA256 (sfztools-sfizz-0.4.0_GH0.tar.gz) = d73003743c4ca88eab3ee6175e366f1f034e40563199dccbf11ca7aadda56535
-SIZE (sfztools-sfizz-0.4.0_GH0.tar.gz) = 13977077
-SHA256 (abseil-abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d_GH0.tar.gz) = f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a
-SIZE (abseil-abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d_GH0.tar.gz) = 1679879
-SHA256 (steinbergmedia-vst3_base-4f6a7184f20f40a7c940a6717e6e0d8b35eeea63_GH0.tar.gz) = e3fc07094850115b26c84301bc3a49e880d42b715ca2900b7e2642105ed98497
-SIZE (steinbergmedia-vst3_base-4f6a7184f20f40a7c940a6717e6e0d8b35eeea63_GH0.tar.gz) = 61890
-SHA256 (sfztools-vst3_pluginterfaces-8c07a58d84c544a73e1ccad2efae200505796773_GH0.tar.gz) = 02e5c4876a77e8f9b2bc9d4fc6be7579f8187270750bea462da4a31edf62f206
-SIZE (sfztools-vst3_pluginterfaces-8c07a58d84c544a73e1ccad2efae200505796773_GH0.tar.gz) = 88523
-SHA256 (sfztools-vst3_public_sdk-ff836e8c02bd28c902f5e3e75353a86f65008a77_GH0.tar.gz) = 42463a2aa9bac0b45ce7b4df6c19dd1b57ba246f0f77528b35ab41b846c1550c
-SIZE (sfztools-vst3_public_sdk-ff836e8c02bd28c902f5e3e75353a86f65008a77_GH0.tar.gz) = 5884643
-SHA256 (sfztools-vstgui-c6a7f607c21a7353e922a6d45e54d6c56d5a6745_GH0.tar.gz) = d260594c9fd3aad8164d08ed0688a12fa6ef519da6af3c5e139f4e973de0093d
-SIZE (sfztools-vstgui-c6a7f607c21a7353e922a6d45e54d6c56d5a6745_GH0.tar.gz) = 3508421
+TIMESTAMP = 1658593755
+SHA256 (sfztools-sfizz-1.2.0_GH0.tar.gz) = 9a59aa115fddd29d184c9b228e8400f7bb7b15287b4a3ca94d0ab7972d5af87a
+SIZE (sfztools-sfizz-1.2.0_GH0.tar.gz) = 15071930
+SHA256 (abseil-abseil-cpp-215105818dfde3174fe799600bb0f3cae233d0bf_GH0.tar.gz) = 237e2e6aec7571ae90d961d02de19f56861a7417acbbc15713b8926e39d461ed
+SIZE (abseil-abseil-cpp-215105818dfde3174fe799600bb0f3cae233d0bf_GH0.tar.gz) = 1883165
+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
+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-614bbe87b80435d87ab8791564370e0c1d13627d_GH0.tar.gz) = 203360b131364acd24eac25842cda5d1bcc53d12756bd7adfa1031f06aa5dabf
+SIZE (gulrak-filesystem-614bbe87b80435d87ab8791564370e0c1d13627d_GH0.tar.gz) = 177009
+SHA256 (simd-everywhere-simde-98075d0593f539762125dbb215d95e782a6ae344_GH0.tar.gz) = 5f953eb19d8472304103cd8222d65ff75d99dd2f83e9076a72b5bc2f972bce31
+SIZE (simd-everywhere-simde-98075d0593f539762125dbb215d95e782a6ae344_GH0.tar.gz) = 4714765
+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
+SIZE (dr-soft-miniaudio-d1a166c83ab445b1c14bc83d37c84e18d172e5f5_GH0.tar.gz) = 601337
diff --git a/audio/sfizz/files/patch-cmake_SfizzConfig.cmake b/audio/sfizz/files/patch-cmake_SfizzConfig.cmake
deleted file mode 100644
index 47e72514e597..000000000000
--- a/audio/sfizz/files/patch-cmake_SfizzConfig.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/SfizzConfig.cmake.orig 2020-07-23 22:01:34 UTC
-+++ cmake/SfizzConfig.cmake
-@@ -69,7 +69,7 @@ if (USE_LIBCPP)
- add_compile_options(-stdlib=libc++)
- # Presumably need the above for linking too, maybe other options missing as well
- add_link_options(-stdlib=libc++) # New command on CMake master, not in 3.12 release
-- add_link_options(-lc++abi) # New command on CMake master, not in 3.12 release
-+ #add_link_options(-lc++abi) # New command on CMake master, not in 3.12 release
- endif()
-
- add_library(sfizz-pugixml STATIC "src/external/pugixml/src/pugixml.cpp")
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
deleted file mode 100644
index 7b0b8cd82099..000000000000
--- a/audio/sfizz/files/patch-external_abseil-cpp_absl_base_internal_unscaledcycleclock.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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 <sys/platform/ppc.h>
- #elif defined(__FreeBSD__)
--#include <sys/sysctl.h>
-+#include "absl/base/call_once.h"
- #include <sys/types.h>
-+#include <sys/sysctl.h>
-+#include <threads.h>
- #endif
- #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
new file mode 100644
index 000000000000..ac363b6a766e
--- /dev/null
+++ b/audio/sfizz/files/patch-plugins_editor_external_vstgui4_vstgui_lib_platform_linux_x11fileselector.cpp
@@ -0,0 +1,11 @@
+--- 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 <cassert>
+ 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
new file mode 100644
index 000000000000..20c193a42f23
--- /dev/null
+++ b/audio/sfizz/files/patch-plugins_editor_external_vstgui4_vstgui_lib_vstguibase.h
@@ -0,0 +1,11 @@
+--- 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 <cstdint>
+ #include <type_traits>
+ #include <algorithm>
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
new file mode 100644
index 000000000000..0c1f40ef5cd4
--- /dev/null
+++ b/audio/sfizz/files/patch-plugins_vst_external_VST__SDK_VST3__SDK_pluginterfaces_base_fplatform.h
@@ -0,0 +1,23 @@
+--- 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 <sys/endian.h>
++# else
+ #include <endian.h>
++# endif
+ #if __BYTE_ORDER == __LITTLE_ENDIAN
+ #define BYTEORDER kLittleEndian
+ #else
diff --git a/audio/sfizz/files/patch-src_external_atomic__queue_defs.h b/audio/sfizz/files/patch-src_external_atomic__queue_defs.h
deleted file mode 100644
index f0bb602e4b16..000000000000
--- a/audio/sfizz/files/patch-src_external_atomic__queue_defs.h
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/external/atomic_queue/defs.h.orig 2020-07-23 22:01:34 UTC
-+++ src/external/atomic_queue/defs.h
-@@ -6,11 +6,15 @@
-
- #include <atomic>
-
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
-+#include <machine/param.h> // for CACHE_LINE_SIZE
-+#endif
-+
- #if defined(__x86_64__) || defined(_M_X64) || \
- defined(__i386__) || defined(_M_IX86)
- #include <emmintrin.h>
- namespace atomic_queue {
--constexpr int CACHE_LINE_SIZE = 64;
-+//constexpr int CACHE_LINE_SIZE = 64;
- static inline void spin_loop_pause() noexcept {
- _mm_pause();
- }
-@@ -18,7 +22,7 @@ static inline void spin_loop_pause() noexcept {
- #elif defined(__arm__) || defined(__aarch64__)
- // TODO: These need to be verified as I do not have access to ARM platform.
- namespace atomic_queue {
--constexpr int CACHE_LINE_SIZE = 64;
-+//constexpr int CACHE_LINE_SIZE = 64;
- 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
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 ba299ba00c7c..ca4ef91f2027 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,11 +1,11 @@
---- src/external/cpuid/platform/src/platform/config.hpp.orig 2020-04-20 01:17:24 UTC
+--- src/external/cpuid/platform/src/platform/config.hpp.orig 2022-07-27 00:05:49 UTC
+++ src/external/cpuid/platform/src/platform/config.hpp
@@ -11,7 +11,7 @@
// http://sourceforge.net/p/predef/wiki/Architectures/
// Detect operating systems
-#if defined(__linux__)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__)
++#if defined(__linux__) || defined(__FreeBSD__)
#define PLATFORM_LINUX 1
#if defined(__ANDROID__)
#define PLATFORM_ANDROID 1
diff --git a/audio/sfizz/files/patch-src_external_cpuid_src_cpuid_detail_init__linux__gcc__arm.hpp b/audio/sfizz/files/patch-src_external_cpuid_src_cpuid_detail_init__linux__gcc__arm.hpp
deleted file mode 100644
index 168957c7d30c..000000000000
--- a/audio/sfizz/files/patch-src_external_cpuid_src_cpuid_detail_init__linux__gcc__arm.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/external/cpuid/src/cpuid/detail/init_linux_gcc_arm.hpp.orig 2021-09-13 17:35:44 UTC
-+++ src/external/cpuid/src/cpuid/detail/init_linux_gcc_arm.hpp
-@@ -11,7 +11,9 @@
-
- #include <elf.h>
- #include <fcntl.h>
-+#if defined(__linux__)
- #include <linux/auxvec.h>
-+#endif
- #include <unistd.h>
-
- #include "cpuinfo_impl.hpp"
diff --git a/audio/sfizz/files/patch-src_external_ghc_filesystem.hpp b/audio/sfizz/files/patch-src_external_ghc_filesystem.hpp
deleted file mode 100644
index de2a9f52075a..000000000000
--- a/audio/sfizz/files/patch-src_external_ghc_filesystem.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/external/ghc/filesystem.hpp.orig 2020-04-20 01:09:03 UTC
-+++ src/external/ghc/filesystem.hpp
-@@ -43,7 +43,7 @@
- #ifndef GHC_OS_DETECTED
- #if defined(__APPLE__) && defined(__MACH__)
- #define GHC_OS_MACOS
--#elif defined(__linux__)
-+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__)
- #define GHC_OS_LINUX
- #if defined(__ANDROID__)
- #define GHC_OS_ANDROID
diff --git a/audio/sfizz/files/patch-vst_external_VST__SDK_VST3__SDK_vstgui4_vstgui_lib_vstguibase.h b/audio/sfizz/files/patch-vst_external_VST__SDK_VST3__SDK_vstgui4_vstgui_lib_vstguibase.h
deleted file mode 100644
index c8c60d151a59..000000000000
--- a/audio/sfizz/files/patch-vst_external_VST__SDK_VST3__SDK_vstgui4_vstgui_lib_vstguibase.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- vst/external/VST_SDK/VST3_SDK/vstgui4/vstgui/lib/vstguibase.h.orig 2020-04-20 01:31:17 UTC
-+++ vst/external/VST_SDK/VST3_SDK/vstgui4/vstgui/lib/vstguibase.h
-@@ -134,7 +134,7 @@
- using std::min;
- using std::max;
-
--#elif defined(__linux__)
-+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__)
- #include <cstdint>
- #include <type_traits>
- #include <algorithm>
diff --git a/audio/sfizz/pkg-plist b/audio/sfizz/pkg-plist
index a0b5fb775fb2..4fbe3d0a95ed 100644
--- a/audio/sfizz/pkg-plist
+++ b/audio/sfizz/pkg-plist
@@ -2,13 +2,61 @@
bin/sfizz_render
include/sfizz.h
include/sfizz.hpp
-lib/libsfizz.a
+include/sfizz_message.h
lib/libsfizz.so
-lib/libsfizz.so.0
-%%LV2%%lib/lv2/sfizz.lv2/Resources/DefaultInstrument.sfz
-%%LV2%%lib/lv2/sfizz.lv2/Resources/DefaultScale.scl
+lib/libsfizz.so.1
+lib/libsfizz.so.1.2.0
+%%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/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.so
%%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/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
libdata/pkgconfig/sfizz.pc
+%%JACK%%share/man/man1/sfizz_jack.gz
+share/man/man1/sfizz_render.gz