Revert "Closes: https://bugs.gentoo.org/975315"

This reverts commit e0b51e7376. Broken commit message due to incorrect title. Not a permanent fix, so please don't close the bug, but use `Bug: <url>` to reference it. Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
2026-10-12 17:51:11 -04:00 · 2026-05-18 12:47:41 +02:00
1 parent e448a26aac
commit 225ed42794
@@ -1,4 +1,6 @@
+DIST bespokesynth-1.2.1.tar.gz 22232039 BLAKE2B c9f866679776fca2d3d12b2cb379861f3a39b1647b3def1c210d96fecfe63ec9509508cca2120122e3563339eea71a209e048e042cf14c1673e05c684e704cdb SHA512 6c623a47a4c8e32cbd4f84c13cf9472cae982d1813871517d92608b338261302ace077449b9235d807e5587377005a021dd987026f6d8bb1a5442cb16db55de5
 DIST bespokesynth-1.3.0.tar.gz 22186347 BLAKE2B 63b85e64a7f735f455b635c7d3f0b3007873d4014dd2fd5544918c4e32f66db04bc6b49efa4f04d6e830beccffce019f4d34d9de59da936ff48fab3037149cf5 SHA512 7ab6e513257e5598510b4552973ec01c32b28991a6c1789a9e23e8b6700a272aef388aabc26148ec8489c308e4cdde8bd11ccb572f61884d30e1ceeaeae7d8bb
+DIST bespokesynth-JUCE-2a27ebcfae7ca7f6eb62b29d5f002ceefdaadbdb.tar.gz 19278493 BLAKE2B 01ca54be9500064c9f526d3e483424b481949eef0140c833498119c0132e0ac7b1b6627ea0dd39e8d8d5b1132cc89b43fdf4aeb228ee5b1b9d7bbf4c86cd51f1 SHA512 26c540f0eadca4ed2ccba89b2b23768f2d4441e9b865f2592f88dd2a2450e64ff38af4c65a68b9e94c49c8ca111f8415711e3000662090b3e3c6835722103fdf
 DIST bespokesynth-JUCE-4f43011b96eb0636104cb3e433894cda98243626.tar.gz 19491491 BLAKE2B d9ce13ee9d0cf983b27b341fae23c141af6970d33d3172b5f4ea2db0bf06ff6ebfc9a00e26a7eaeafa9715e3024a8748c6a58c4a5b999407a378a5b398baba94 SHA512 7047309841032f69efb843a2bca02b9cbee859dd5ecca482dd44f2d1397afb716e5e19c69c7fa46a717770d41883e1c53e6c758763f86d0f9bf326427d8b27f1
 DIST bespokesynth-ableton-link-a4e4c2f3e598e28e5bea90002f954b997b8c8c53.tar.gz 1898358 BLAKE2B ee4deb5a279a98363f0884fdc7796ac50ffc84f55334ff2d33a941624ea17e39b1eda440f2f5cb5e0304df97eee5813ea7d19298fea6630b06d3287647a70852 SHA512 2330cd82a7c8b164d40202e484b6c14fddce3e459ed2d78dc47b1397993b6f5634f95e2333c6c89aee2ad5bb7aa90d45ae8747526a980f4f54ef4a694e7486ac
 DIST bespokesynth-asio-c465349fa5cd91a64bb369f5131ceacab2c0c1c3.tar.gz 2969476 BLAKE2B 83260ab0d11343591d80c9adae8572aecca03cf4c59bcd4b461c5c1241a3a087c3c49d173fae5deb9574807d2462162f42dd4b1a71e51fd36e38967fcd0fe6aa SHA512 0b90175f84ee4fcc89d055ee7f862aebc75c760d1af13a0158bfd52ff3c204a1c2a206f5d4ab2cfb262295e9b6720faeb04fcdbbbcc4451b8d8e4fdd70d28550
@@ -0,0 +1,114 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=8
+
+inherit cmake desktop xdg
+
+DESCRIPTION="Software modular synth"
+HOMEPAGE="https://www.bespokesynth.com/"
+SRC_URI="https://github.com/BespokeSynth/BespokeSynth/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+JUCE_COMMIT="2a27ebcfae7ca7f6eb62b29d5f002ceefdaadbdb"
+SRC_URI+=" https://github.com/juce-framework/JUCE/archive/${JUCE_COMMIT}.tar.gz -> ${PN}-JUCE-${JUCE_COMMIT}.tar.gz"
+READERWRITER_COMMIT="8e7627d18c2108aca178888d88514179899a044f"
+SRC_URI+=" https://github.com/cameron314/readerwriterqueue/archive/${READERWRITER_COMMIT}.tar.gz -> ${PN}-readerwriterqueue-${READERWRITER_COMMIT}.tar.gz"
+TUNINGLIBRARY_COMMIT="eb8617be49ac3c2436cf54de6bff94a1b1c94acf"
+SRC_URI+=" https://github.com/surge-synthesizer/tuning-library/archive/${TUNINGLIBRARY_COMMIT}.tar.gz -> ${PN}-tuning-library-${TUNINGLIBRARY_COMMIT}.tar.gz"
+ABLETON_COMMIT="a4e4c2f3e598e28e5bea90002f954b997b8c8c53"
+SRC_URI+=" https://github.com/Ableton/link/archive/${ABLETON_COMMIT}.tar.gz -> ${PN}-ableton-link-${ABLETON_COMMIT}.tar.gz"
+ODDSOUND_COMMIT="fcfaa59a043d515d288c9d587bf61a0a7d7571a8"
+SRC_URI+=" https://github.com/ODDSound/MTS-ESP/archive/${ODDSOUND_COMMIT}.tar.gz -> ${PN}-oddsound-mts-${ODDSOUND_COMMIT}.tar.gz"
+ASIO_COMMIT="c465349fa5cd91a64bb369f5131ceacab2c0c1c3"
+SRC_URI+=" https://github.com/chriskohlhoff/asio/archive/${ASIO_COMMIT}.tar.gz -> ${PN}-asio-${ASIO_COMMIT}.tar.gz"
+
+S="${WORKDIR}/BespokeSynth-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-python/pybind11
+	dev-libs/jsoncpp
+	dev-cpp/asio
+	>=virtual/jack-2
+	x11-libs/libX11
+	x11-libs/libXrandr
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-find-jsoncpp.patch"
+)
+
+src_prepare() {
+	rmdir "${S}/libs/JUCE" || die
+	mv "${WORKDIR}/JUCE-${JUCE_COMMIT}" "${S}/libs/JUCE" || die
+	rmdir "${S}/libs/readerwriterqueue" || die
+	mv "${WORKDIR}/readerwriterqueue-${READERWRITER_COMMIT}" "${S}/libs/readerwriterqueue" || die
+	rmdir "${S}/libs/pybind11" || die
+	#mv "${WORKDIR}/JUCE-${JUCE_COMMIT}" "${S}/libs/JUCE" || die
+	rmdir "${S}/libs/tuning-library" || die
+	mv "${WORKDIR}/tuning-library-${TUNINGLIBRARY_COMMIT}" "${S}/libs/tuning-library" || die
+	rmdir "${S}/libs/ableton-link" || die
+	mv "${WORKDIR}/link-${ABLETON_COMMIT}" "${S}/libs/ableton-link" || die
+
+	# patching out build dependency for dev-cpp/asio
+	#TODO: couldn't figure out how to have ableton-link build without asio-standalone.
+	# It doesn't want to use 'dev-cpp/asio' it seems.
+	# eapply "${FILESDIR}/ableton-link-dependencies.patch"
+	rmdir "${S}/libs/ableton-link/modules/asio-standalone" || die
+	mv "${WORKDIR}/asio-${ASIO_COMMIT}" "${S}/libs/ableton-link/modules/asio-standalone" || die
+
+	rmdir "${S}/libs/oddsound-mts/MTS-ESP" || die
+	mv "${WORKDIR}/MTS-ESP-${ODDSOUND_COMMIT}" "${S}/libs/oddsound-mts/MTS-ESP" || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DBESPOKE_SYSTEM_PYBIND11=TRUE"
+		"-DBESPOKE_SYSTEM_JSONCPP=TRUE"
+		"-DCMAKE_BUILD_TYPE=Release"
+		"-DCMAKE_INSTALL_PREFIX=/usr"
+		"-DCMAKE_SKIP_RPATH=ON"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	DESTDIR="/usr/share/BespokeSynth"
+
+	# Install libraries
+	dolib.so "${WORKDIR}/BespokeSynth-${PV}_build/libs/freeverb/libfreeverb.so"
+	dolib.so "${WORKDIR}/BespokeSynth-${PV}_build/libs/oddsound-mts/liboddsound-mts.so"
+	dolib.so "${WORKDIR}/BespokeSynth-${PV}_build/libs/psmove/libpsmove.so"
+	dolib.so "${WORKDIR}/BespokeSynth-${PV}_build/libs/push2/libpush2.so"
+	dolib.so "${WORKDIR}/BespokeSynth-${PV}_build/libs/xwax/libxwax.so"
+	dolib.so "${WORKDIR}/BespokeSynth-${PV}_build/libs/nanovg/libnanovg.so"
+
+	# Create a new directory for bespoke to live in
+	dodir ${DESTDIR}
+	into ${DESTDIR}
+
+	# It seems the executable really wants to be where the resource directory is.
+	dobin "${WORKDIR}/BespokeSynth-${PV}_build/Source/BespokeSynth_artefacts/RelWithDebInfo/BespokeSynth"
+
+	# Install auxilary files
+	insinto /usr/share/BespokeSynth
+	doins -r "${WORKDIR}/BespokeSynth-${PV}_build/Source/BespokeSynth_artefacts/RelWithDebInfo/resource"
+
+	dosym -r ${DESTDIR}/bin/BespokeSynth /usr/bin/BespokeSynth
+
+	# Adding icon and desktop settings
+	doicon -s 512 "${WORKDIR}/BespokeSynth-${PV}/bespoke_icon.png"
+	domenu "${WORKDIR}/BespokeSynth-${PV}/scripts/installer_linux/BespokeSynth.desktop"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
@@ -71,7 +71,6 @@ src_prepare() {
 	cmake_src_prepare
 }

-# NOTE: -DCMAKE_POLICY_VERSION_MINIMUM=3.5 is needed to fix bug 975315.
 src_configure() {
 	local mycmakeargs=(
 		"-DBESPOKE_SYSTEM_PYBIND11=TRUE"
@@ -79,7 +78,6 @@ src_configure() {
 		"-DCMAKE_BUILD_TYPE=Release"
 		"-DCMAKE_INSTALL_PREFIX=/usr"
 		"-DCMAKE_SKIP_RPATH=ON"
-		"-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
 	)
 	cmake_src_configure
 }