6 files changed, 94 insertions, 1 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 901ff214811c..70c02091844c 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 6e6fe0a2992a..d96c4be8e19a 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,8 +1,9 @@
 AUX hydrogen-1.2.1-gnuinstalldirs.patch 1725 BLAKE2B e6b4b0f00b3a155d391ee21ad031b3a12882e652914b9ab40550bade3fc2465c327abe2edb9a4a9ff8e7d15d6700a16ba3e081bba696110ce96f21b91c90ed98 SHA512 d81f04c4f66d860832d767cdb0ef85fbfd05c4846c38ea1b4128ed1bb7e384b54e9844f91236b8fa39af50691334f22efcbea348fc48fc71e844a5b9bd03acab
 AUX hydrogen-1.2.2-cflags.patch 282 BLAKE2B 9535b11fe3d29d5a2ae621aa25084d3cf1540143a3c17979ef9f088b99a7ace4a7e0307f06582f660cb3e7820f27486d130d0f9738670d84e2892a5553043021 SHA512 07d1d0fad5d018507fbf533d71f38ba2325fefb2e51973e3b032fe029b4688695388e7962556d57d9f128178c05235a0aad2281d4b4bd5c293f2f8e10eb51815
+AUX hydrogen-1.2.2-no-pch-include.patch 293 BLAKE2B 11c8990480cbab309736e922d6fd87234865779685a619e9e912359474329d4b0b214f9a37cd29eaad67487418803c9c3e9b261ac72d127c57631dcb3a37869d SHA512 63b9e2bd89d8cacd9f953aff993de9b6aebf4242957e8fd67bfb1715658d192e6864012ededa67a9348616f73f8d12182f2756c39b8751e85095a1b55855c1d1
 AUX hydrogen-1.3.0-cflags.patch 282 BLAKE2B c16bd70b48e231f98787d416d2658c95c329237433f5734a24bd50caa4cf4922964afe80d2a4c4e08e5e169dacfbe415e75db9502169dfae15e6b9ded3d4eb68 SHA512 ff7733a3e1123e6851f5697f2c36c46a457ba22e9543399abe1cd9969d75eddd1c5afc27b4eb97747f86457485acb42c8154fc423b49c8a8a112c519639bae39
 AUX hydrogen-1.3.0-gnuinstalldirs.patch 1677 BLAKE2B 3346a4043f26f7cb9eb65ecb2f42c996b14fc9eab6ba87ace41e928868248e1ed12c00eef55b4d6ea54205d8fb561e42cdb39a6f7e21ca1e3e6497571c17055f SHA512 0e675e6fa839aa0451bdf1caf6fee66b973092ef5ac32ff301f8e9d5f114461d0d95b836012da5cc2fcf756c38eed33ff7233bb44ff83f6275f439eecdd247f5
 DIST hydrogen-1.2.2.tar.gz 12948890 BLAKE2B 30d8624078a29a0514aee01d56865e5923f755de02acfddde45a26d6ffbd68cf3c8c774827fe4538b7d03faefaabb9ddcfd9a28bb404c535ad7f6734eb5b1aff SHA512 bd6b102b14d30a8e2f4ea7e405199bb34f9b7691b57c3f9f3096c9e30c25c158e3bfd40bcfdd2d449bc153b7d3d9717df401f1e7a086e33dc953247870f1dee0
-EBUILD hydrogen-1.2.2-r1.ebuild 2114 BLAKE2B 98ce176b3619138ad25da8174305c91ea89115cc5c7a78cbb02fa459dfb5aa2317e93bed5fe660937817b27deba38a6f6110db04ebbde5d693d9b98d141160cc SHA512 d6ced7f064a290fb481052f4aa9525446e1ab63ad97d5a7578f451010d5d4d3b8995da4e7639627a697a606228a801f3de0aacf21730ce7c68878f87e1a3cbbd
+EBUILD hydrogen-1.2.2-r1.ebuild 2155 BLAKE2B 8b5ff3f837d6b08c8c1fbc3ba45ee9ff3c017788685bc08fbf8474322602c150be59da7e134b9c64acae54e190f3105e923ab1c9f76e94997bf84541dce02f94 SHA512 5a94e68f6efd31b6ef051e927c180ad39609b2ee5716c673cd0f16dcb6a144e50e291d4dba2585d86d1e2273d8810f05b91e764ce8b8e9d1a2da2a638ad15410
 EBUILD hydrogen-9999.ebuild 2121 BLAKE2B 96f44f1820a030fbbcaa4b1bc515d0e90074e8942f413060ebd644f520976a85571d68b8594747c7a743fdf37245969d5b92d9439d354a79ae55594fce8efa04 SHA512 1a16e7ddcd262d98ba451ac02fe9fbfb315f16712ccd2ab0190d283f50d1dda3f4a8e0ee71ab516765eba533ae85292a5542391918b10af2bb819f5847963290
 MISC metadata.xml 478 BLAKE2B bd59feef45263e2f2440696d657c0845f70498b64dec764dc4fff3e0c837a725195f55a2a651498f5c38448ae7c45fdc50def9a8068fe58e93332ad66de7e1ab SHA512 757c7766697ad73293ed281df0079de5775068bc6b899a9dc6bd3a41a36ed024646e01d242177948be1756d407e44cacd2bb2ed7ec0e4698fd358ec0031db3c4
diff --git a/media-sound/hydrogen/files/hydrogen-1.2.2-no-pch-include.patch b/media-sound/hydrogen/files/hydrogen-1.2.2-no-pch-include.patch
new file mode 100644
index 000000000000..fd0ee64b76a0
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.2.2-no-pch-include.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/922034
+--- a/src/gui/src/Widgets/FileDialog.h
++++ b/src/gui/src/Widgets/FileDialog.h
+@@ -23,6 +23,7 @@
+ #define FILEDIALOG_H
+ 
+ #include <QDialog>
++#include <QFileDialog>
+ #include <core/Object.h>
+ 
+ /** Custom file dialog checking whether the user has write access to
diff --git a/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild b/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
index 08ca329f3266..71df9f243599 100644
--- a/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
@@ -61,6 +61,7 @@ DOCS=( AUTHORS ChangeLog DEVELOPERS README.md )
 PATCHES=(
 	"${FILESDIR}/${PN}-1.2.1-gnuinstalldirs.patch"
 	"${FILESDIR}/${PN}-1.2.2-cflags.patch"
+	"${FILESDIR}/${P}-no-pch-include.patch"
 )
 
 src_prepare() {
diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest
index ba5ad421f7fa..47cc73215e29 100644
--- a/media-sound/linuxsampler/Manifest
+++ b/media-sound/linuxsampler/Manifest
@@ -2,6 +2,8 @@ AUX linuxsampler-2.0.0-lv2-automagic.patch 929 BLAKE2B 11e2dac74d6e4bc76385544f9
 AUX linuxsampler-2.0.0-nptl-hardened.patch 654 BLAKE2B 1e3f06d78cce3a67847bf3bedbb40b4ee7d28d410997444506d21d4ed0e646106ddcc78c770c3e214d73e474e6138f436841d3ce1703c9da2f06df3df921e9ce SHA512 cc75f55d80264d939650ea87c967e206110ae07245ae8e00dd83bed63a4e0aa75aa2a18b3b384ca3557896e44b2a13bd34deb3cc6f5487d7516b09b2c05e1594
 AUX linuxsampler-2.1.1-fix-yyterror-not-declared.patch 427 BLAKE2B 017c8fd7e7343eb582a5fcbf083be3fa9fcb02fff69caace767534ee509215a835caf548cce73955295c39a6a42409e0caf3ec3e5752018235ccf2defe327b0f SHA512 6a89d17600eab3aac9b9a90899c441af1359b7798fe79ceed4e3acb624024e6285e56210b484f50fc03dfd7da4def2cfdb708adfd0526d84d9b041256fd6f4e6
 DIST linuxsampler-2.3.0.tar.bz2 1267738 BLAKE2B 5f9e7bf2f6c0bfe8131cc04d79b3df5c08c16c7332315e5ff39c16aa3565f88bc3a58b63db4162c8e2f4430ae1a091c928cecba2385fc181f6c7b46a72c4ae88 SHA512 5a59e3443ee6d3056fc274386ae222e7db72a8c6e316a1c39c5d631bae86ec6a61745b20e594cf569c10f5a6bd6eb0d09b3956cce67072175ff60a770a4b7e5b
+DIST linuxsampler-2.3.1.tar.bz2 1267554 BLAKE2B e07866d1ccaadf4bb95e4bb17f4b643b8dec5ff8c3b363b0e55b7fcb1383be59d2a22c84536db3e31f7c67467ef293a01147120294884005bd1d4c1f5b6c326b SHA512 160820d1a1c44169bb84fd5b6380256af31e42701ff2d2e4394df8c680fa0b6f9b8a21047ff2ec757009f53d1694bafdf254067d8aae9994c244aaf247a5890d
 EBUILD linuxsampler-2.3.0.ebuild 1750 BLAKE2B 6747892f94b9e9cbc5b043dd3460fc3e611381957a4cd57e4edd27982ee6575fe9e358fd6b8e137177dfc248a184487bcff8986d24b59c052d580b329fef251d SHA512 0003ef928550d063af2b9e0ab96e2606e1ae3160cf4f2a50bafb6505562336763213cd91721dd9d0341f720edff31adc56da3282cd24433a40bef0d215fba95c
+EBUILD linuxsampler-2.3.1.ebuild 1751 BLAKE2B 644796f6d2173dbf1bc6f289e3960f8a52294fcbc75263d08ddfaf79e6977bcb839171cae39e9c0173381a2447aab855028987cacc9a3576b930d930bbebf6fa SHA512 944033254c2407bfe076553dc5c00e9dd824b3272e9916a8f751337c0e7b44d9174613dfe76d24663bdc58da2f09529c8aa0cfa520b9151591bbf30b9933168a
 EBUILD linuxsampler-9999.ebuild 1571 BLAKE2B 2282aa2f4a4496826a8e300070bebcb11f332ec6c9c7212cd4c59b5b2ff730e936efc50f131bf53828d827c37ec77d2bb734d649e6a56ed39d0b5ae8c27cf087 SHA512 bbb722c6629f2476737630c30401b7f14391643627619b73554576862e7d33d3836cb3747178a66a64bc7978473c3b9795c07d2e8cc3434d7b639c4fe645aeea
 MISC metadata.xml 392 BLAKE2B 4dad0ff3f6c461c9672da1cee3f37f78720a0d5dda462c385d96759e9adcf39367c6fba4a010793881aeb75efb4f0a78fae0e4acad2d82b2512deadc324307a5 SHA512 f3f5a5a0ed00efffbe1287e8014a1291d436c35fb03bff17c70ba23836b2a858fee9a9749ebeda9bf48b759c2f57553a8eb639751f99f60704e15e7cc5ca208c
diff --git a/media-sound/linuxsampler/linuxsampler-2.3.1.ebuild b/media-sound/linuxsampler/linuxsampler-2.3.1.ebuild
new file mode 100644
index 000000000000..b0b55deafa6a
--- /dev/null
+++ b/media-sound/linuxsampler/linuxsampler-2.3.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Software audio sampler engine with professional grade features"
+HOMEPAGE="https://www.linuxsampler.org/"
+SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa doc jack lv2 sf2 sqlite"
+REQUIRED_USE="|| ( alsa jack )"
+
+RDEPEND="
+	>=media-libs/libgig-4.4.0
+	media-libs/libsndfile[-minimal]
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	lv2? ( media-libs/lv2 )
+	sqlite? ( dev-db/sqlite )
+"
+DEPEND="${RDEPEND}
+	media-libs/dssi
+	media-libs/ladspa-sdk
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.0-nptl-hardened.patch"
+	"${FILESDIR}/${PN}-2.0.0-lv2-automagic.patch"
+	"${FILESDIR}/${PN}-2.1.1-fix-yyterror-not-declared.patch"
+)
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	default
+	# Force regeneration of the file to let it build with all bison
+	# versions, bug #556204
+	rm src/network/lscpparser.cpp || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-arts-driver
+		--disable-static
+		$(use_enable alsa alsa-driver)
+		$(use_enable jack jack-driver)
+		$(use_enable lv2)
+		$(use_enable sqlite instruments-db)
+		$(use_enable sf2 sf2-engine)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# bug #666738
+	emake -j1
+	use doc && emake docs
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	# lscp files conflict with nilfs-utils, bug #556330
+	mv "${D}/usr/bin/lscp" "${D}/usr/bin/lscp-${PN}" || die
+	mv "${D}/usr/share/man/man1/lscp.1" "${D}/usr/share/man/man1/lscp-${PN}.1" || die
+}