Date: Thursday, May 18, 2023 @ 02:09:57 Author: grawlinson Revision: 1463025
archrelease: copy trunk to community-x86_64 Added: surge-xt/repos/community-x86_64/PKGBUILD (from rev 1463024, surge-xt/trunk/PKGBUILD) surge-xt/repos/community-x86_64/devendor-libs.patch (from rev 1463024, surge-xt/trunk/devendor-libs.patch) surge-xt/repos/community-x86_64/fix-lv2-ftbfs.patch (from rev 1463024, surge-xt/trunk/fix-lv2-ftbfs.patch) surge-xt/repos/community-x86_64/improve-reproducibility.patch (from rev 1463024, surge-xt/trunk/improve-reproducibility.patch) Deleted: surge-xt/repos/community-x86_64/PKGBUILD surge-xt/repos/community-x86_64/devendor-libs.patch surge-xt/repos/community-x86_64/fix-lv2-ftbfs.patch surge-xt/repos/community-x86_64/improve-reproducibility.patch -------------------------------+ PKGBUILD | 519 +++++++++++++++++++++++----------------- devendor-libs.patch | 89 +++--- fix-lv2-ftbfs.patch | 22 - improve-reproducibility.patch | 104 ++++---- 4 files changed, 407 insertions(+), 327 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2023-05-18 02:07:43 UTC (rev 1463024) +++ PKGBUILD 2023-05-18 02:09:57 UTC (rev 1463025) @@ -1,219 +0,0 @@ -# Maintainer: George Rawlinson <grawlin...@archlinux.org> -# Contributor: OSAMC <https://github.com/osam-cologne/archlinux-proaudio> -# Contributor: Bleuzen <supgesu at gmail dot com> -# Contributor: David Runge <dv...@archlinux.org> -# Contributor: Florian Hülsmann <f...@cbix.de> - -pkgname=surge-xt -pkgver=1.1.2 -pkgrel=1 -pkgdesc='Subtractive hybrid synthesizer' -arch=('x86_64') -url='https://surge-synthesizer.github.io' -license=('GPL3') -groups=('pro-audio' 'vst3-plugins' 'clap-plugins' 'lv2-plugins') -depends=( - 'glibc' - 'gcc-libs' - 'cairo' - 'fontconfig' - 'freetype2' - 'libx11' - 'libxcb' - 'libxkbcommon-x11' - 'xcb-util' - 'xcb-util-cursor' - 'xcb-util-image' - 'xcb-util-keysyms' - 'xcb-util-renderutil' - 'xdg-utils' - 'hicolor-icon-theme' - 'fmt' - 'libsamplerate' -) -makedepends=( - 'git' - 'cmake' - 'libsndfile' - 'python' - 'libxrandr' - 'libxinerama' - 'libxcursor' - 'alsa-lib' - 'jack' - 'webkit2gtk' - 'ripgrep' - 'lv2' - 'juce' -) -optdepends=( - 'jack: backend for standalone' - 'alsa-lib: backend for standalone' - 'vst3-host: for VST3 plugins' - 'clap-host: for CLAP plugins' - 'lv2-host: for LV2 plugins' -) -options=('!lto' 'debug') # LTO disabled due to crashes at application startup -_commit='d3568a9ae6c8555590e06e55ed9cc6965a939f91' -source=( - "$pkgname::git+https://github.com/surge-synthesizer/surge#commit=$_commit" - 'improve-reproducibility.patch' - 'devendor-libs.patch' - 'fix-lv2-ftbfs.patch' - 'github.com-surge-synthesizer-tuning-library::git+https://github.com/surge-synthesizer/tuning-library' - 'github.com-surge-synthesizer-eurorack::git+https://github.com/surge-synthesizer/eurorack' - 'github.com-surge-synthesizer-JUCE::git+https://github.com/surge-synthesizer/JUCE' - 'github.com-surge-synthesizer-sst-plugininfra::git+https://github.com/surge-synthesizer/sst-plugininfra' - 'github.com-surge-synthesizer-sst-cpputils::git+https://github.com/surge-synthesizer/sst-cpputils' - 'github.com-surge-synthesizer-sst-filters::git+https://github.com/surge-synthesizer/sst-filters' - 'github.com-surge-synthesizer-sst-waveshapers::git+https://github.com/surge-synthesizer/sst-waveshapers' - 'github.com-free-audio-clap::git+https://github.com/free-audio/clap' - 'github.com-free-audio-clap-helpers::git+https://github.com/free-audio/clap-helpers' - 'github.com-free-audio-clap-juce-extensions::git+https://github.com/free-audio/clap-juce-extensions' - 'github.com-simd-everywhere-simde::git+https://github.com/simd-everywhere/simde' - 'github.com-ODDSound-MTS-ESP::git+https://github.com/ODDSound/MTS-ESP' - 'github.com-LuaJIT-LuaJIT::git+https://github.com/LuaJIT/LuaJIT' - 'github.com-taocpp-PEGTL::git+https://github.com/taocpp/PEGTL' - 'github.com-gulrak-filesystem::git+https://github.com/gulrak/filesystem' - 'github.com-lv2-porting-project-JUCE::git+https://github.com/lv2-porting-project/JUCE#branch=lv2' -) -b2sums=('SKIP' - '6e71b56ffde699319def99e03637d9c3fb6197a6e0637b9f44b52a9207a8e06c8d482c05cdd711ec2c5901f403381dda70e786bca6b56cce14dc449325f24761' - '6bbeef320c380fb8bf9339add847bf7db237a2f93f544c2237e2d51ef9a1f497916539ace523c9b0911acabc755d872d5318170887aa62b27654eee40de6b693' - 'c43e5a1b9605243be07ab3903885836a2199787f0c7a8dc6ae2be9d8d4a91bcf07fde520c3440f1be425194476065cb287b99446b144c5cd76d012fb0f10f35e' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP') - -pkgver() { - cd "$pkgname" - - git describe --tags | sed 's/^release_xt_//' -} - -prepare() { - cd "$pkgname" - - # explicitly state which submodules to use, - # omitting devendored & unused submodules - git submodule init \ - libs/tuning-library \ - libs/simde \ - libs/eurorack/eurorack \ - libs/oddsound-mts/MTS-ESP \ - libs/JUCE \ - libs/LuaJitLib/LuaJIT \ - libs/PEGTL \ - libs/sst/sst-plugininfra \ - libs/sst/sst-cpputils \ - libs/clap-juce-extensions \ - libs/sst/sst-filters \ - libs/sst/sst-waveshapers - - git config submodule.libs/tuning-library.url "$srcdir/github.com-surge-synthesizer-tuning-library" - git config submodule.libs/simde.url "$srcdir/github.com-simd-everywhere-simde" - git config submodule.libs/eurorack/eurorack.url "$srcdir/github.com-surge-synthesizer-eurorack" - git config submodule.libs/oddsound-mts/MTS-ESP.url "$srcdir/github.com-ODDSound-MTS-ESP" - git config submodule.libs/JUCE.url "$srcdir/github.com-surge-synthesizer-JUCE" - git config submodule.libs/LuaJitLib/LuaJIT.url "$srcdir/github.com-LuaJIT-LuaJIT" - git config submodule.libs/PEGTL.url "$srcdir/github.com-taocpp-PEGTL" - git config submodule.libs/sst/sst-plugininfra.url "$srcdir/github.com-surge-synthesizer-sst-plugininfra" - git config submodule.libs/sst/sst-cpputils.url "$srcdir/github.com-surge-synthesizer-sst-cpputils" - git config submodule.libs/clap-juce-extensions.url "$srcdir/github.com-free-audio-clap-juce-extensions" - git config submodule.libs/sst/sst-filters.url "$srcdir/github.com-surge-synthesizer-sst-filters" - git config submodule.libs/sst/sst-waveshapers.url "$srcdir/github.com-surge-synthesizer-sst-waveshapers" - - git -c protocol.file.allow=always submodule update - - # setup git submodules for clap-juce-extensions - pushd libs/clap-juce-extensions - git submodule init - git config submodule.clap-libs/clap.url "$srcdir/github.com-free-audio-clap" - git config submodule.clap-libs/clap-helpers.url "$srcdir/github.com-free-audio-clap-helpers" - git -c protocol.file.allow=always submodule update - popd - - # setup git submodules for sst-plugininfra - pushd libs/sst/sst-plugininfra - git submodule init - git config submodule.libs/filesystem/filesystem.url "$srcdir/github.com-gulrak-filesystem" - git -c protocol.file.allow=always submodule update - popd - - # first shot at improving reproducibility: - # https://github.com/surge-synthesizer/surge/issues/2389 - patch -p1 -i "$srcdir/improve-reproducibility.patch" - - # devendor libs - patch -p1 -i "$srcdir/devendor-libs.patch" - rg --files-with-matches 'include "fmt/core.h"' | xargs -I@ sed 's|"fmt/core.h"|<fmt/core.h>|g' -i @ - rg --files-with-matches 'include "samplerate.h"' | xargs -I@ sed 's|"samplerate.h"|<samplerate.h>|g' -i @ - - # add missing LV2 header - cd "$srcdir/github.com-lv2-porting-project-JUCE" - patch -p1 -i "$srcdir/fix-lv2-ftbfs.patch" -} - -build() { - # binaries and shared libs have executable stack: - # https://github.com/surge-synthesizer/surge/issues/1701 - export LDFLAGS="$LDFLAGS,-z,noexecstack" - - cmake \ - -B build \ - -S "$pkgname" \ - -DCMAKE_INSTALL_PREFIX='/usr' \ - -DCMAKE_INSTALL_LIBDIR='/usr/lib' \ - -DCMAKE_BUILD_TYPE=Release \ - -W no-dev \ - -DSURGE_BUILD_TESTRUNNER=OFF - - cmake --build build - - # build LV2 plugin - cmake \ - -B build-lv2 \ - -S "$pkgname" \ - -DCMAKE_INSTALL_PREFIX='/usr' \ - -DCMAKE_INSTALL_LIBDIR='/usr/lib' \ - -DCMAKE_BUILD_TYPE=Release \ - -W no-dev \ - -DSURGE_BUILD_TESTRUNNER=OFF \ - -DJUCE_SUPPORTS_LV2=True \ - -DSURGE_JUCE_PATH="$srcdir/github.com-lv2-porting-project-JUCE" - - cmake --build build-lv2 --target surge-xt_LV2 surge-fx_LV2 --parallel -} - -package() { - DESTDIR="$pkgdir" cmake --install build - - # LV2 plugin - install -vd "$pkgdir/usr/lib/lv2" - cp -vr build-lv2/surge_xt_products/*.lv2 "$pkgdir/usr/lib/lv2" - - cd "$pkgname" - - # documentation - install -vDm644 -t "$pkgdir/usr/share/doc/$pkgname" AUTHORS README.md doc/* - - # application icons & desktop files - install -vd "$pkgdir/usr/share/"{applications,icons} - cd scripts/installer_linux - cp -r assets/icons/hicolor "$pkgdir/usr/share/icons" - cp -r assets/icons/scalable "$pkgdir/usr/share/icons/hicolor" - install -vDm644 -t "$pkgdir/usr/share/applications" assets/applications/*.desktop -} Copied: surge-xt/repos/community-x86_64/PKGBUILD (from rev 1463024, surge-xt/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2023-05-18 02:09:57 UTC (rev 1463025) @@ -0,0 +1,300 @@ +# Maintainer: George Rawlinson <grawlin...@archlinux.org> +# Contributor: OSAMC <https://github.com/osam-cologne/archlinux-proaudio> +# Contributor: Bleuzen <supgesu at gmail dot com> +# Contributor: David Runge <dv...@archlinux.org> +# Contributor: Florian Hülsmann <f...@cbix.de> + +pkgbase=surge-xt +pkgname=( + 'surge-xt' + 'surge-xt-common' + 'surge-xt-standalone' + 'surge-xt-vst3' + 'surge-xt-clap' + 'surge-xt-lv2' +) +pkgver=1.2.3 +pkgrel=1 +pkgdesc='Subtractive hybrid synthesizer' +arch=('x86_64') +url='https://surge-synthesizer.github.io' +license=('GPL3') +groups=('pro-audio') +_common_depends=( + 'glibc' + 'gcc-libs' + 'cairo' + 'fontconfig' + 'freetype2' + 'libx11' + 'libxcb' + 'libxkbcommon-x11' + 'xcb-util' + 'xcb-util-cursor' + 'xcb-util-image' + 'xcb-util-keysyms' + 'xcb-util-renderutil' + 'xdg-utils' + 'fmt' + 'libsamplerate' +) +makedepends=( + "${_common_depends[@]}" + 'git' + 'cmake' + 'libsndfile' + 'python' + 'libxrandr' + 'libxinerama' + 'libxcursor' + 'alsa-lib' + 'jack' + 'webkit2gtk' + 'ripgrep' + 'lv2' + 'juce' +) +options=('!lto') # LTO disabled due to crashes at application startup +_commit='bb8dd2b398cfa8d6d1a20daf7dee2cb4e8097dbf' +source=( + "$pkgbase::git+https://github.com/surge-synthesizer/surge#commit=$_commit" + 'improve-reproducibility.patch' + 'devendor-libs.patch' + 'fix-lv2-ftbfs.patch' + 'github.com-surge-synthesizer-tuning-library::git+https://github.com/surge-synthesizer/tuning-library' + 'github.com-surge-synthesizer-eurorack::git+https://github.com/surge-synthesizer/eurorack' + 'github.com-surge-synthesizer-JUCE::git+https://github.com/surge-synthesizer/JUCE' + 'github.com-surge-synthesizer-sst-plugininfra::git+https://github.com/surge-synthesizer/sst-plugininfra' + 'github.com-surge-synthesizer-sst-cpputils::git+https://github.com/surge-synthesizer/sst-cpputils' + 'github.com-surge-synthesizer-sst-filters::git+https://github.com/surge-synthesizer/sst-filters' + 'github.com-surge-synthesizer-sst-waveshapers::git+https://github.com/surge-synthesizer/sst-waveshapers' + 'github.com-surge-synthesizer-pffft::git+https://github.com/surge-synthesizer/pffft' + 'github.com-free-audio-clap::git+https://github.com/free-audio/clap' + 'github.com-free-audio-clap-helpers::git+https://github.com/free-audio/clap-helpers' + 'github.com-free-audio-clap-juce-extensions::git+https://github.com/free-audio/clap-juce-extensions' + 'github.com-simd-everywhere-simde::git+https://github.com/simd-everywhere/simde' + 'github.com-ODDSound-MTS-ESP::git+https://github.com/ODDSound/MTS-ESP' + 'github.com-LuaJIT-LuaJIT::git+https://github.com/LuaJIT/LuaJIT' + 'github.com-taocpp-PEGTL::git+https://github.com/taocpp/PEGTL' + 'github.com-gulrak-filesystem::git+https://github.com/gulrak/filesystem' + 'github.com-lv2-porting-project-JUCE::git+https://github.com/lv2-porting-project/JUCE#branch=lv2' +) +b2sums=('SKIP' + '6e71b56ffde699319def99e03637d9c3fb6197a6e0637b9f44b52a9207a8e06c8d482c05cdd711ec2c5901f403381dda70e786bca6b56cce14dc449325f24761' + '35ae92a5363334901810d801238ab9e655c2db5695d085bbc431291ef107c5726d2aa919de77fba154ab63b3875df772cc5fd1531c0adcb9215cac99500ba832' + 'c43e5a1b9605243be07ab3903885836a2199787f0c7a8dc6ae2be9d8d4a91bcf07fde520c3440f1be425194476065cb287b99446b144c5cd76d012fb0f10f35e' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP') + +pkgver() { + cd "$pkgbase" + + git describe --tags | sed 's/^release_xt_//' +} + +prepare() { + cd "$pkgbase" + + # explicitly state which submodules to use, + # omitting devendored & unused submodules + git submodule init \ + libs/tuning-library \ + libs/simde \ + libs/eurorack/eurorack \ + libs/oddsound-mts/MTS-ESP \ + libs/JUCE \ + libs/LuaJitLib/LuaJIT \ + libs/PEGTL \ + libs/sst/sst-plugininfra \ + libs/sst/sst-cpputils \ + libs/clap-juce-extensions \ + libs/sst/sst-filters \ + libs/sst/sst-waveshapers \ + libs/pffft + + git config submodule.libs/tuning-library.url "$srcdir/github.com-surge-synthesizer-tuning-library" + git config submodule.libs/simde.url "$srcdir/github.com-simd-everywhere-simde" + git config submodule.libs/eurorack/eurorack.url "$srcdir/github.com-surge-synthesizer-eurorack" + git config submodule.libs/oddsound-mts/MTS-ESP.url "$srcdir/github.com-ODDSound-MTS-ESP" + git config submodule.libs/JUCE.url "$srcdir/github.com-surge-synthesizer-JUCE" + git config submodule.libs/LuaJitLib/LuaJIT.url "$srcdir/github.com-LuaJIT-LuaJIT" + git config submodule.libs/PEGTL.url "$srcdir/github.com-taocpp-PEGTL" + git config submodule.libs/sst/sst-plugininfra.url "$srcdir/github.com-surge-synthesizer-sst-plugininfra" + git config submodule.libs/sst/sst-cpputils.url "$srcdir/github.com-surge-synthesizer-sst-cpputils" + git config submodule.libs/clap-juce-extensions.url "$srcdir/github.com-free-audio-clap-juce-extensions" + git config submodule.libs/sst/sst-filters.url "$srcdir/github.com-surge-synthesizer-sst-filters" + git config submodule.libs/sst/sst-waveshapers.url "$srcdir/github.com-surge-synthesizer-sst-waveshapers" + git config submodule.libs/pffft.url "$srcdir/github.com-surge-synthesizer-pffft" + + git -c protocol.file.allow=always submodule update + + # setup git submodules for clap-juce-extensions + pushd libs/clap-juce-extensions + git submodule init + git config submodule.clap-libs/clap.url "$srcdir/github.com-free-audio-clap" + git config submodule.clap-libs/clap-helpers.url "$srcdir/github.com-free-audio-clap-helpers" + git -c protocol.file.allow=always submodule update + popd + + # setup git submodules for sst-plugininfra + pushd libs/sst/sst-plugininfra + git submodule init + git config submodule.libs/filesystem/filesystem.url "$srcdir/github.com-gulrak-filesystem" + git -c protocol.file.allow=always submodule update + popd + + # first shot at improving reproducibility: + # https://github.com/surge-synthesizer/surge/issues/2389 + patch -p1 -i "$srcdir/improve-reproducibility.patch" + + # devendor libs + patch -p1 -i "$srcdir/devendor-libs.patch" + rg --files-with-matches 'include "fmt/core.h"' | xargs -I@ sed 's|"fmt/core.h"|<fmt/core.h>|g' -i @ + rg --files-with-matches 'include "samplerate.h"' | xargs -I@ sed 's|"samplerate.h"|<samplerate.h>|g' -i @ + + # add missing LV2 header + pushd "$srcdir/github.com-lv2-porting-project-JUCE" + patch -p1 -i "$srcdir/fix-lv2-ftbfs.patch" + popd + + # FTBFS due to GCC13 + git cherry-pick --no-commit d2fba1c6ff02cbdfa9db2ce06508745c247629b5 +} + +build() { + # binaries and shared libs have executable stack: + # https://github.com/surge-synthesizer/surge/issues/1701 + export LDFLAGS="$LDFLAGS,-z,noexecstack" + + cmake \ + -B build \ + -S "$pkgbase" \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_INSTALL_LIBDIR='/usr/lib' \ + -DCMAKE_BUILD_TYPE=Release \ + -W no-dev \ + -DSURGE_BUILD_TESTRUNNER=OFF + + cmake --build build + + # build LV2 plugin + cmake \ + -B build-lv2 \ + -S "$pkgbase" \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_INSTALL_LIBDIR='/usr/lib' \ + -DCMAKE_BUILD_TYPE=Release \ + -W no-dev \ + -DSURGE_BUILD_TESTRUNNER=OFF \ + -DJUCE_SUPPORTS_LV2=True \ + -DSURGE_JUCE_PATH="$srcdir/github.com-lv2-porting-project-JUCE" + + cmake --build build-lv2 --target surge-xt_LV2 surge-fx_LV2 --parallel +} + +package_surge-xt() { + depends=($pkgbase-{common,standalone,vst3,clap,lv2}=$pkgver) + + # complete install, followed by… + DESTDIR="$pkgdir" cmake --install build + + # …moving items out for split packages… + mv "$pkgdir/usr/share/surge-xt" usr-share + mv "$pkgdir/usr/bin" usr-bin + mv "$pkgdir/usr/lib" usr-lib + + # …then remove leftovers + rm -rvf "$pkgdir/usr" +} + +package_surge-xt-common() { + pkgdesc='Common files for Surge XT' + + install -vd "$pkgdir/usr/share/surge-xt" + mv usr-share/* "$pkgdir/usr/share/surge-xt" + + cd "$pkgbase" + + # documentation + install -vDm644 -t "$pkgdir/usr/share/doc/$pkgbase" AUTHORS README.md doc/* +} + +package_surge-xt-standalone() { + pkgdesc+=' - standalone' + depends=( + "surge-xt-common=$pkgver" + 'hicolor-icon-theme' + "${_common_depends[@]}" + ) + optdepends=( + 'jack: audio backend' + 'alsa-lib: audio backend' + ) + + # binaries + install -vd "$pkgdir/usr/bin" + mv usr-bin/* "$pkgdir/usr/bin" + + cd "$pkgbase" + + # application icons & desktop files + install -vd "$pkgdir/usr/share/"{applications,icons} + cd scripts/installer_linux + cp -r assets/icons/hicolor "$pkgdir/usr/share/icons" + cp -r assets/icons/scalable "$pkgdir/usr/share/icons/hicolor" + install -vDm644 -t "$pkgdir/usr/share/applications" assets/applications/*.desktop +} + +package_surge-xt-vst3(){ + pkgdesc+=' - VST3 plugin' + groups+=('vst3-plugins') + depends=( + "surge-xt-common=$pkgver" + "${_common_depends[@]}" + 'vst3-host' + ) + + install -vd "$pkgdir/usr/lib" + mv usr-lib/vst3 "$pkgdir/usr/lib" +} + +package_surge-xt-clap(){ + pkgdesc+=' - CLAP plugin' + groups+=('clap-plugins') + depends=( + "surge-xt-common=$pkgver" + "${_common_depends[@]}" + 'clap-host' + ) + + install -vd "$pkgdir/usr/lib" + mv usr-lib/clap "$pkgdir/usr/lib" +} + +package_surge-xt-lv2(){ + pkgdesc+=' - LV2 plugin' + groups+=('lv2-plugins') + depends=( + "surge-xt-common=$pkgver" + "${_common_depends[@]}" + 'lv2-host' + ) + + install -vd "$pkgdir/usr/lib/lv2" + cp -vr build-lv2/surge_xt_products/*.lv2 "$pkgdir/usr/lib/lv2" +} Deleted: devendor-libs.patch =================================================================== --- devendor-libs.patch 2023-05-18 02:07:43 UTC (rev 1463024) +++ devendor-libs.patch 2023-05-18 02:09:57 UTC (rev 1463025) @@ -1,45 +0,0 @@ ---- a/src/common/CMakeLists.txt -+++ b/src/common/CMakeLists.txt -@@ -1,14 +1,16 @@ - # vi:set sw=2 et: - project(surge-common) - -+find_package(PkgConfig REQUIRED) -+ - surge_add_lib_subdirectory(airwindows) - surge_add_lib_subdirectory(eurorack) --surge_add_lib_subdirectory(fmt) -+pkg_search_module(fmt REQUIRED fmt) - surge_add_lib_subdirectory(oddsound-mts) - if(MINGW) - set(HAVE_VISIBILITY 0 CACHE INTERNAL "Force-disable libsamplerate's visibility check on MinGW") - endif() --surge_add_lib_subdirectory(libsamplerate) -+pkg_search_module(samplerate REQUIRED samplerate) - surge_add_lib_subdirectory(tuning-library) - surge_add_lib_subdirectory(sqlite-3.23.3) - -diff --git a/src/surge-fx/CMakeLists.txt b/src/surge-fx/CMakeLists.txt -index 611194a2..86f044ec 100644 ---- a/src/surge-fx/CMakeLists.txt -+++ b/src/surge-fx/CMakeLists.txt -@@ -60,6 +60,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE - surge-juce - juce::juce_audio_utils - juce::juce_audio_processors -+ fmt - ) - - if(SURGE_BUILD_CLAP) -diff --git a/src/surge-xt/CMakeLists.txt b/src/surge-xt/CMakeLists.txt -index 74115719..d2e0c767 100644 ---- a/src/surge-xt/CMakeLists.txt -+++ b/src/surge-xt/CMakeLists.txt -@@ -202,6 +202,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE - juce::juce_audio_plugin_client - surge-xt-binary - sst-filters-extras -+ fmt - ) - - target_include_directories(${PROJECT_NAME} Copied: surge-xt/repos/community-x86_64/devendor-libs.patch (from rev 1463024, surge-xt/trunk/devendor-libs.patch) =================================================================== --- devendor-libs.patch (rev 0) +++ devendor-libs.patch 2023-05-18 02:09:57 UTC (rev 1463025) @@ -0,0 +1,44 @@ +--- a/src/common/CMakeLists.txt ++++ b/src/common/CMakeLists.txt +@@ -1,9 +1,11 @@ + # vi:set sw=2 et: + project(surge-common) + ++find_package(PkgConfig REQUIRED) ++ + surge_add_lib_subdirectory(airwindows) + surge_add_lib_subdirectory(eurorack) +-surge_add_lib_subdirectory(fmt) ++pkg_search_module(fmt REQUIRED fmt) + + # Make MTS optional + if (NOT SURGE_SKIP_ODDSOUND_MTS) +@@ -17,7 +19,7 @@ endif() + if(MINGW) + set(HAVE_VISIBILITY 0 CACHE INTERNAL "Force-disable libsamplerate's visibility check on MinGW") + endif() +-surge_add_lib_subdirectory(libsamplerate) ++pkg_search_module(samplerate REQUIRED samplerate) + surge_add_lib_subdirectory(pffft) + surge_add_lib_subdirectory(tuning-library) + surge_add_lib_subdirectory(sqlite-3.23.3) +--- a/src/surge-fx/CMakeLists.txt ++++ b/src/surge-fx/CMakeLists.txt +@@ -60,6 +60,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE + surge-juce + juce::juce_audio_utils + juce::juce_audio_processors ++ fmt + ) + + if(SURGE_BUILD_CLAP) +--- a/src/surge-xt/CMakeLists.txt ++++ b/src/surge-xt/CMakeLists.txt +@@ -204,6 +204,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE + juce::juce_audio_plugin_client + surge-xt-binary + sst-filters-extras ++ fmt + ) + + target_include_directories(${PROJECT_NAME} Deleted: fix-lv2-ftbfs.patch =================================================================== --- fix-lv2-ftbfs.patch 2023-05-18 02:07:43 UTC (rev 1463024) +++ fix-lv2-ftbfs.patch 2023-05-18 02:09:57 UTC (rev 1463025) @@ -1,11 +0,0 @@ ---- a/modules/juce_gui_basics/windows/juce_ComponentPeer.h -+++ b/modules/juce_gui_basics/windows/juce_ComponentPeer.h -@@ -23,6 +23,8 @@ - ============================================================================== - */ - -+#include <utility> -+ - namespace juce - { - Copied: surge-xt/repos/community-x86_64/fix-lv2-ftbfs.patch (from rev 1463024, surge-xt/trunk/fix-lv2-ftbfs.patch) =================================================================== --- fix-lv2-ftbfs.patch (rev 0) +++ fix-lv2-ftbfs.patch 2023-05-18 02:09:57 UTC (rev 1463025) @@ -0,0 +1,11 @@ +--- a/modules/juce_gui_basics/windows/juce_ComponentPeer.h ++++ b/modules/juce_gui_basics/windows/juce_ComponentPeer.h +@@ -23,6 +23,8 @@ + ============================================================================== + */ + ++#include <utility> ++ + namespace juce + { + Deleted: improve-reproducibility.patch =================================================================== --- improve-reproducibility.patch 2023-05-18 02:07:43 UTC (rev 1463024) +++ improve-reproducibility.patch 2023-05-18 02:09:57 UTC (rev 1463025) @@ -1,52 +0,0 @@ ---- a/cmake/versiontools.cmake -+++ b/cmake/versiontools.cmake -@@ -32,6 +32,27 @@ elseif (Git_FOUND) - OUTPUT_VARIABLE GIT_COMMIT_HASH - OUTPUT_STRIP_TRAILING_WHITESPACE - ) -+ -+ execute_process( -+ COMMAND ${GIT_EXECUTABLE} show --no-patch --format=%cd --date=format:%Y-%m-%d -+ WORKING_DIRECTORY ${SURGESRC} -+ OUTPUT_VARIABLE GIT_COMMIT_DATE -+ OUTPUT_STRIP_TRAILING_WHITESPACE -+ ) -+ -+ execute_process( -+ COMMAND ${GIT_EXECUTABLE} show --no-patch --format=%cd --date=format:%Y -+ WORKING_DIRECTORY ${SURGESRC} -+ OUTPUT_VARIABLE GIT_COMMIT_YEAR -+ OUTPUT_STRIP_TRAILING_WHITESPACE -+ ) -+ -+ execute_process( -+ COMMAND ${GIT_EXECUTABLE} show --no-patch --format=%cd --date=format:%H:%M:%S -+ WORKING_DIRECTORY ${SURGESRC} -+ OUTPUT_VARIABLE GIT_COMMIT_TIME -+ OUTPUT_STRIP_TRAILING_WHITESPACE -+ ) - endif () - - if ("${GIT_BRANCH}" STREQUAL "") -@@ -74,7 +74,7 @@ else () - ) - endif () - --cmake_host_system_information(RESULT SURGE_BUILD_FQDN QUERY FQDN) -+set(SURGE_BUILD_FQDN "archlinux") - - message(STATUS "Setting up surge version") - message(STATUS " git hash is ${GIT_COMMIT_HASH} and branch is ${GIT_BRANCH}") -@@ -109,9 +130,9 @@ set(SURGE_BUILD_HASH "${GIT_COMMIT_HASH}") - set(SURGE_BUILD_LOCATION "${lpipeline}") - set(SURGE_BUILD_IS_RELEASE "${isrelease}") - --string(TIMESTAMP SURGE_BUILD_DATE "%Y-%m-%d") --string(TIMESTAMP SURGE_BUILD_YEAR "%Y") --string(TIMESTAMP SURGE_BUILD_TIME "%H:%M:%S") -+string(TIMESTAMP SURGE_BUILD_DATE "${GIT_COMMIT_DATE}") -+string(TIMESTAMP SURGE_BUILD_YEAR "${GIT_COMMIT_YEAR}") -+string(TIMESTAMP SURGE_BUILD_TIME "${GIT_COMMIT_TIME}") - - message(STATUS "Using SURGE_VERSION=${SURGE_FULL_VERSION}") - Copied: surge-xt/repos/community-x86_64/improve-reproducibility.patch (from rev 1463024, surge-xt/trunk/improve-reproducibility.patch) =================================================================== --- improve-reproducibility.patch (rev 0) +++ improve-reproducibility.patch 2023-05-18 02:09:57 UTC (rev 1463025) @@ -0,0 +1,52 @@ +--- a/cmake/versiontools.cmake ++++ b/cmake/versiontools.cmake +@@ -32,6 +32,27 @@ elseif (Git_FOUND) + OUTPUT_VARIABLE GIT_COMMIT_HASH + OUTPUT_STRIP_TRAILING_WHITESPACE + ) ++ ++ execute_process( ++ COMMAND ${GIT_EXECUTABLE} show --no-patch --format=%cd --date=format:%Y-%m-%d ++ WORKING_DIRECTORY ${SURGESRC} ++ OUTPUT_VARIABLE GIT_COMMIT_DATE ++ OUTPUT_STRIP_TRAILING_WHITESPACE ++ ) ++ ++ execute_process( ++ COMMAND ${GIT_EXECUTABLE} show --no-patch --format=%cd --date=format:%Y ++ WORKING_DIRECTORY ${SURGESRC} ++ OUTPUT_VARIABLE GIT_COMMIT_YEAR ++ OUTPUT_STRIP_TRAILING_WHITESPACE ++ ) ++ ++ execute_process( ++ COMMAND ${GIT_EXECUTABLE} show --no-patch --format=%cd --date=format:%H:%M:%S ++ WORKING_DIRECTORY ${SURGESRC} ++ OUTPUT_VARIABLE GIT_COMMIT_TIME ++ OUTPUT_STRIP_TRAILING_WHITESPACE ++ ) + endif () + + if ("${GIT_BRANCH}" STREQUAL "") +@@ -74,7 +74,7 @@ else () + ) + endif () + +-cmake_host_system_information(RESULT SURGE_BUILD_FQDN QUERY FQDN) ++set(SURGE_BUILD_FQDN "archlinux") + + message(STATUS "Setting up surge version") + message(STATUS " git hash is ${GIT_COMMIT_HASH} and branch is ${GIT_BRANCH}") +@@ -109,9 +130,9 @@ set(SURGE_BUILD_HASH "${GIT_COMMIT_HASH}") + set(SURGE_BUILD_LOCATION "${lpipeline}") + set(SURGE_BUILD_IS_RELEASE "${isrelease}") + +-string(TIMESTAMP SURGE_BUILD_DATE "%Y-%m-%d") +-string(TIMESTAMP SURGE_BUILD_YEAR "%Y") +-string(TIMESTAMP SURGE_BUILD_TIME "%H:%M:%S") ++string(TIMESTAMP SURGE_BUILD_DATE "${GIT_COMMIT_DATE}") ++string(TIMESTAMP SURGE_BUILD_YEAR "${GIT_COMMIT_YEAR}") ++string(TIMESTAMP SURGE_BUILD_TIME "${GIT_COMMIT_TIME}") + + message(STATUS "Using SURGE_VERSION=${SURGE_FULL_VERSION}") +