Update to 1.1.0.r12.g7d802f2

PKGBUILD:
Use upstreamed (at the time of writing not yet merged) patches to
devendor JUCE and tuning-library generically.
Use cmake options to use system provided dependencies where possible.
Simplify quoting in file.

bespokesynth-1.0.0.r246.gfd389e6-devendoring.patch:
Remove patch, as upstream merged changes to devendor pybind11 and
jsoncpp.

3 files changed, 31 insertions, 102 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d78d63d902b4..546a583832a7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bespokesynth-git
 	pkgdesc = A software modular synth
-	pkgver = 1.0.0.r246.gfd389e6
+	pkgver = 1.1.0.r12.g7d802f2
 	pkgrel = 1
 	url = https://www.bespokesynth.com/
 	arch = x86_64
@@ -33,13 +33,16 @@ pkgbase = bespokesynth-git
 	conflicts = bespokesynth
 	source = bespokesynth-git::git+https://github.com/bespokesynth/bespokesynth
 	source = MTS-ESP::git+https://github.com/ODDSound/MTS-ESP
-	source = bespokesynth-1.0.0.r246.gfd389e6-devendoring.patch
+	source = bespokesynth-1.1.0.r12.g7d802f2-devendor_tuning_library.patch::https://github.com/dvzrv/BespokeSynth/commit/4a42c0945ff7f4cebac58482be5217a16122eca4.patch
+	source = bespokesynth-1.1.0.r12.g7d802f2-devendor_juce.patch::https://github.com/dvzrv/BespokeSynth/commit/04efc00b1f97b9ea3e1ec1bc3666baf23c1c693c.patch
 	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = 21bae6e78694f742d0e8aa07a2e570f558675bf0fc7358956a9ddd604be0e94c73e6d4a3405e91a2f97cc4bbafdb2f7d1e70297fafabc6622b7690893dce8e33
+	sha512sums = 1a2f8c2397f52572b9ae3680e6b7fb092d568cdba5d6ba13a54e7e7bdd160491bca5bc53b43d461ae1fc3bdd11f5ecebd336a20285a7cd4e869c150f752900ca
+	sha512sums = be7fa56c1b46b1d3d157e88ea84fdea70be8e5287a19b2c75b20f0d580a4e3078ad7e02939734cf11be8ff75a69c3f8a29aaa88df91e5c45530eac9e360f6712
 	b2sums = SKIP
 	b2sums = SKIP
-	b2sums = a24bf808e4855038ab29ef854d2e40c6d310dd52e825d54f42f4f59431d8fc38ba856b25a7c92fb34728b09d23f85421b1a29695c40711ae5b7d7d2297859d13
+	b2sums = f40b598e2dd3bc12cc6117748147608da3cae7895cda8e7822c3d3e9d1b805ffd702dce3848ffe3ce55660e1789515c7cb903e226e9592c45bed2442e51b185c
+	b2sums = 9d6b2f09822f542c8873b73942f1a1decb21b7e3fe81687c058795dd8e76ac4d55b99e2a4bdbb314eca2b788958fb5a9908e8482b4555f52037a4e31fa000562
 
 pkgname = bespokesynth-git
 	depends = gcc-libs
diff --git a/PKGBUILD b/PKGBUILD
index bd2fa4c10449..271550e1954c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,30 +2,31 @@
 
 _name=bespokesynth
 pkgname=bespokesynth-git
-pkgver=1.0.0.r250.ge424a8e
+pkgver=1.1.0.r12.g7d802f2
 pkgrel=1
 pkgdesc="A software modular synth"
-arch=('x86_64')
+arch=(x86_64)
 url="https://www.bespokesynth.com/"
-license=('GPL3')
-depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'libglvnd' 'libpng'
-'python' 'zenity' 'zlib')
-makedepends=('alsa-lib' 'cmake' 'flac' 'freetype2' 'git' 'jack' 'jsoncpp'
-'juce' 'libusb' 'libvorbis' 'libx11' 'libxcursor' 'libxinerama' 'pybind11'
-'tuning-library' 'xorg-xrandr')
-conflicts=('bespokesynth')
-provides=('bespokesynth')
+license=(GPL3)
+depends=(gcc-libs glibc hicolor-icon-theme libglvnd libpng python zenity zlib)
+makedepends=(alsa-lib cmake flac freetype2 git jack jsoncpp juce libusb
+libvorbis libx11 libxcursor libxinerama pybind11 tuning-library xorg-xrandr)
+conflicts=(bespokesynth)
+provides=(bespokesynth)
 source=(
   "$pkgname::git+https://github.com/${_name}/${_name}"
   "MTS-ESP::git+https://github.com/ODDSound/MTS-ESP"
-  "${_name}-1.0.0.r246.gfd389e6-devendoring.patch"
+  "${_name}-1.1.0.r12.g7d802f2-devendor_tuning_library.patch::https://github.com/dvzrv/BespokeSynth/commit/4a42c0945ff7f4cebac58482be5217a16122eca4.patch"
+  "${_name}-1.1.0.r12.g7d802f2-devendor_juce.patch::https://github.com/dvzrv/BespokeSynth/commit/04efc00b1f97b9ea3e1ec1bc3666baf23c1c693c.patch"
 )
 sha512sums=('SKIP'
             'SKIP'
-            '21bae6e78694f742d0e8aa07a2e570f558675bf0fc7358956a9ddd604be0e94c73e6d4a3405e91a2f97cc4bbafdb2f7d1e70297fafabc6622b7690893dce8e33')
+            '1a2f8c2397f52572b9ae3680e6b7fb092d568cdba5d6ba13a54e7e7bdd160491bca5bc53b43d461ae1fc3bdd11f5ecebd336a20285a7cd4e869c150f752900ca'
+            'be7fa56c1b46b1d3d157e88ea84fdea70be8e5287a19b2c75b20f0d580a4e3078ad7e02939734cf11be8ff75a69c3f8a29aaa88df91e5c45530eac9e360f6712')
 b2sums=('SKIP'
         'SKIP'
-        'a24bf808e4855038ab29ef854d2e40c6d310dd52e825d54f42f4f59431d8fc38ba856b25a7c92fb34728b09d23f85421b1a29695c40711ae5b7d7d2297859d13')
+        'f40b598e2dd3bc12cc6117748147608da3cae7895cda8e7822c3d3e9d1b805ffd702dce3848ffe3ce55660e1789515c7cb903e226e9592c45bed2442e51b185c'
+        '9d6b2f09822f542c8873b73942f1a1decb21b7e3fe81687c058795dd8e76ac4d55b99e2a4bdbb314eca2b788958fb5a9908e8482b4555f52037a4e31fa000562')
 validpgpkeys=()
 
 prepare() {
@@ -38,7 +39,8 @@ prepare() {
   git submodule deinit libs/json/jsoncpp
   git submodule update
 
-  patch -Np1 -i ../"${_name}-1.0.0.r246.gfd389e6-devendoring.patch"
+  patch -Np1 -i ../${_name}-1.1.0.r12.g7d802f2-devendor_tuning_library.patch
+  patch -Np1 -f -i ../${_name}-1.1.0.r12.g7d802f2-devendor_juce.patch
 }
 
 pkgver() {
@@ -49,8 +51,12 @@ pkgver() {
 build() {
   cd "$pkgname"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE='None' \
-        -DBESPOKE_JUCE_LOCATION=/usr/share/juce/ \
+        -DCMAKE_BUILD_TYPE=None \
+        -DBESPOKE_SYSTEM_PYBIND11=ON \
+        -DBESPOKE_SYSTEM_JSONCPP=ON \
+        -DBESPOKE_SYSTEM_TUNING_LIBRARY=ON \
+        -DBESPOKE_SYSTEM_JUCE=ON \
+        -DBESPOKE_DEVENDORED_SYSTEM_JUCE=ON \
         -Wno-dev \
         -B build \
         -S .
@@ -58,9 +64,8 @@ build() {
 }
 
 package() {
-  depends+=('libasound.so' 'libFLAC.so' 'libfreetype.so' 'libjpeg.so'
-  'libjsoncpp.so' 'libogg.so' 'libusb-1.0.so' 'libvorbis.so' 'libvorbisenc.so'
-  'libvorbisfile.so')
+  depends+=(libasound.so libFLAC.so libfreetype.so libjpeg.so libjsoncpp.so
+  libogg.so libusb-1.0.so libvorbis.so libvorbisenc.so libvorbisfile.so)
 
   cd "$pkgname"
   make DESTDIR="$pkgdir/" install -C build
diff --git a/bespokesynth-1.0.0.r246.gfd389e6-devendoring.patch b/bespokesynth-1.0.0.r246.gfd389e6-devendoring.patch
deleted file mode 100644
index 6852eb2cc02a..000000000000
--- a/bespokesynth-1.0.0.r246.gfd389e6-devendoring.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git i/CMakeLists.txt w/CMakeLists.txt
-index 7a3cc9a..901846e 100644
---- i/CMakeLists.txt
-+++ w/CMakeLists.txt
-@@ -61,7 +61,8 @@ message(STATUS "Python executable: ${Python_EXECUTABLE}")
- message(STATUS "Python library: ${Python_LIBRARIES}")
- 
- message(STATUS "Using JUCE from ${BESPOKE_JUCE_LOCATION}")
--add_subdirectory(${BESPOKE_JUCE_LOCATION} ${CMAKE_BINARY_DIR}/JUCE EXCLUDE_FROM_ALL)
-+# add_subdirectory(${BESPOKE_JUCE_LOCATION} ${CMAKE_BINARY_DIR}/JUCE EXCLUDE_FROM_ALL)
-+find_package(JUCE COMPONENTS REQUIRED)
- 
- if (BESPOKE_VST2_SDK_LOCATION)
-     juce_set_vst2_sdk_path(${BESPOKE_VST2_SDK_LOCATION})
-diff --git i/Source/CMakeLists.txt w/Source/CMakeLists.txt
-index 532bcde..9dbcd5d 100644
---- i/Source/CMakeLists.txt
-+++ w/Source/CMakeLists.txt
-@@ -420,7 +420,6 @@ target_link_libraries(BespokeSynth PRIVATE
-     bespoke::3dxware
-     bespoke::exprtk
-     bespoke::freeverb
--    bespoke::json
-     bespoke::leathers
-     bespoke::nanovg
-     bespoke::psmove
-@@ -428,7 +427,7 @@ target_link_libraries(BespokeSynth PRIVATE
-     bespoke::pybind11
-     bespoke::xwax
- 
--    tuning-library
-+    jsoncpp
-     oddsound-mts
- 
-     juce::juce_audio_basics
-@@ -439,6 +438,12 @@ target_link_libraries(BespokeSynth PRIVATE
-     juce::juce_opengl
-     juce::juce_osc
- 
-+    ogg
-+    FLAC
-+    vorbis
-+    vorbisenc
-+    vorbisfile
-+
-     ${Python_LIBRARIES}
-     $<$<BOOL:${MINGW}>:dbghelp>
-     )
-diff --git i/libs/CMakeLists.txt w/libs/CMakeLists.txt
-index 2b174b1..9681a59 100644
---- i/libs/CMakeLists.txt
-+++ w/libs/CMakeLists.txt
-@@ -1,7 +1,10 @@
- add_subdirectory(3dxware EXCLUDE_FROM_ALL)
- add_subdirectory(exprtk EXCLUDE_FROM_ALL)
- add_subdirectory(freeverb EXCLUDE_FROM_ALL)
--add_subdirectory(json EXCLUDE_FROM_ALL)
-+# add_subdirectory(json EXCLUDE_FROM_ALL)
-+include(FindPkgConfig)
-+pkg_search_module(json REQUIRED jsoncpp)
-+
- add_subdirectory(leathers EXCLUDE_FROM_ALL)
- add_subdirectory(nanovg EXCLUDE_FROM_ALL)
- add_subdirectory(oddsound-mts EXCLUDE_FROM_ALL)
-@@ -9,11 +12,12 @@ add_subdirectory(psmove EXCLUDE_FROM_ALL)
- add_subdirectory(push2 EXCLUDE_FROM_ALL)
- 
- set(PYBIND11_NOPYTHON TRUE)
--add_subdirectory(pybind11 EXCLUDE_FROM_ALL)
-+# add_subdirectory(pybind11 EXCLUDE_FROM_ALL)
-+find_package(pybind11 COMPONENTS REQUIRED)
- add_library(bespoke_pybind11_wrapper INTERFACE)
- target_compile_definitions(bespoke_pybind11_wrapper INTERFACE PYBIND11_EXPORT=)
- target_link_libraries(bespoke_pybind11_wrapper INTERFACE pybind11::pybind11)
- add_library(bespoke::pybind11 ALIAS bespoke_pybind11_wrapper)
- 
--add_subdirectory(tuning-library EXCLUDE_FROM_ALL)
-+# add_subdirectory(tuning-library EXCLUDE_FROM_ALL)
- add_subdirectory(xwax EXCLUDE_FROM_ALL)