6 files changed, 24 insertions, 82 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index d5f888913203..84230c30bdf1 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index bad1a7311735..1c1af4157e13 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -1,9 +1,7 @@
 DIST easyeffects-6.2.3.tar.gz 2621460 BLAKE2B fb73c635b10dec5808d046a4df63cdaaada1c3534f1e9275fdd4f28db52a9111a850367b564b5d008a1bdb7c7e55864e38cc1d50fc363b5614fb138bd0fe0cc1 SHA512 79babe59ef0c86d138b29a4c2dfaa1a937da9de8d7ae7cc40bee6ae5e011b6c43d6ff9554885ce116114943976d50c24c44c4e30775933b5ee8a2bf350d55525
 DIST easyeffects-6.2.4.tar.gz 2648725 BLAKE2B 8d4f10f286ed4b3468ffa2e3b5331b9dfd9c266b0a6a35b373856be14c8465032c79ebad2826ff7ebb1a8db3d81a57fef398880fa7601282da672d5348dae817 SHA512 1c7a9fb95bab3fe039d96420d465d8dfa0d42bf3c04081c5b258f3f227923229f658d6e8152587bf38b26e0a3f3c73b5b89a1a8c9b42807b7e02b776f419e361
-DIST easyeffects-6.2.6.tar.gz 2743298 BLAKE2B 242faa7a819f7986a292bc587a841b130284e9770ff299af741a9f8df56807fd878a5c66a3323af09cd7672c403af725e8f6c3c5109f90a35868e09d37fce742 SHA512 0c93c6afdc337bd5fe60beab00475087eece250ac7014a8b5ac0e6cad9154b3ac22cfa61a44bbbaa99aff79d4706772e903a056c3719a58d9507772684d6f767
 DIST easyeffects-6.2.8.tar.gz 3063821 BLAKE2B d64952ff1e04f0013cb2548cc62d67f4013e9bd51dda2afe50170fc1ddbaabb967da5cb0b2cf6fde44cbdcf196b9656d19172595f6c527099a86b2dfc8ff34be SHA512 8a306308e783ed19fd5380a6b8d1e0ddba1400bca3447ddbf2954355f6d74229d0e750e5ce50b19c9ad1979ee88cda6ad4d1b2549eef7bb88cd29b6dc96dc33b
 EBUILD easyeffects-6.2.3.ebuild 2008 BLAKE2B 9b434e4192e1948618cc9f596461d462e30df5c4cced38fc7ba0d9bc18e3c8d6bf743ec3086eb4c781539a20caf42125145830f686936ee5f9db211478b68cf0 SHA512 f81af4dba50434c0bedc5311e6a4d0445235088463bf430300c3cb869384a085ec3f747e3fda2b551acce8165ef7d365d3fcccd0e0985ead8e631fde72f57e08
 EBUILD easyeffects-6.2.4.ebuild 2008 BLAKE2B 5cf9a3ddf54274a37e560ba7cc69aebe2b76b5ce8138737c02ed40c679babba900e4fa024bd65ed9113282eb2e5c8959b1c552ae95debf26cf3b85778cd379a6 SHA512 7e95820c05679a86f92715b725a33ee61b7b5381fb1e3f2cd73fba0185de18bb2b24e3a25bafdbb0c25380c837ba5ddfa17a98de98b6ade47f3825e68ea27795
-EBUILD easyeffects-6.2.6.ebuild 2051 BLAKE2B a07ee0e8f1de9f8a82039ee3f203a77aeced2da5fc5d5095f7642f996f5662fe50bad4eb5261c86be9eaadbe286b294024da35aae54ad669d08fe3f00c443771 SHA512 bdfd04dc62f7a0125c50f9c7d1a0b1211cf9a341b0d86c076779f66852e5b23fd693ced02adc230e512aae9cd9bd8d2bccfc650b08075e1a026c7102d761c3be
 EBUILD easyeffects-6.2.8.ebuild 1994 BLAKE2B e356cb3645d2e58b08bb7636b5f2a8150377ee86399ece0c1ee3a2895afb39c9df6aa75b95ca7cb42e42503053bd64f4edc38c49a4bef978936ad9f5c5726952 SHA512 dbf4e3c89ea1ab634d932edccc21d78d0dc58c25506c82bdcea047b4fd1a62f41049328334dbfe2813cf87943350ffd39f32b36c5bb490e757a0230f1002f8af
 MISC metadata.xml 839 BLAKE2B d3fde7fe66f301f320a4fc3adb4a5fb5e5f84405b015209b696045eaffe251f7d1531efdb2d9fab6512647dac991290b622bf411dff36ecf304c9b063567c03c SHA512 fc68f37398082f885a2c7c5d117191fc37d1c1a51381439cefe1ae798b7b019598e81f5c5f1832950669cef340d418220024993b95aeb911dfd9fa1df0eb82fc
diff --git a/media-sound/easyeffects/easyeffects-6.2.6.ebuild b/media-sound/easyeffects/easyeffects-6.2.6.ebuild
deleted file mode 100644
index 9250f1d82ccd..000000000000
--- a/media-sound/easyeffects/easyeffects-6.2.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome2-utils flag-o-matic meson toolchain-funcs
-
-DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
-HOMEPAGE="https://github.com/wwmm/easyeffects"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
-else
-	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="calf +doc mda-lv2 zamaudio"
-
-DEPEND="dev-cpp/nlohmann_json
-	dev-cpp/tbb
-	>=dev-libs/glib-2.56:2
-	dev-libs/libfmt
-	>=dev-libs/libsigc++-3.0.6:3
-	>=gui-libs/gtk-4.2.1:4
-	gui-libs/libadwaita:1
-	media-libs/libbs2b
-	>=media-libs/libebur128-1.2.0
-	media-libs/libsndfile
-	>=media-libs/lilv-0.22
-	>=media-libs/lv2-1.18.2
-	media-libs/rnnoise
-	media-libs/rubberband[ladspa]
-	media-libs/speexdsp
-	>=media-libs/zita-convolver-3.0.0
-	>=media-video/pipewire-0.3.41
-	sci-libs/fftw:3.0"
-RDEPEND="${DEPEND}
-	>=media-libs/lsp-plugins-1.1.24[lv2]
-	sys-apps/dbus
-	calf? ( >=media-plugins/calf-0.90.1[lv2] )
-	doc? ( gnome-extra/yelp )
-	mda-lv2? ( media-plugins/mda-lv2 )
-	zamaudio? ( media-plugins/zam-plugins )"
-# Only header files are used from libsamplerate so put it here rather than DEPEND
-# to avoid unnecessary cross-compilation.
-BDEPEND="dev-libs/appstream-glib
-	dev-util/desktop-file-utils
-	dev-util/itstool
-	media-libs/libsamplerate
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if ! test-flag-CXX -std=c++20 ; then
-			die "${PN} requires degree of C++20 support only available since GCC 10 or Clang 10"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 11 ]] ; then
-			die "Since version 6.2.5 ${PN} requires GCC 11 or newer to build (Bug #848072)"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index f34bd125727e..2e1960d8a749 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,4 +1,5 @@
+AUX serd.patch 492 BLAKE2B e71252663b5df4a8ebbe0fb55d7dd96e66925db96dcd0b1baa629e3387a0f2d17e8dd2a4958207e63500b52a0bccd24984a1f617a7c248fd27ad6e4166d781a5 SHA512 ed8847eb8c5594e994e8b62505fa022f6fb419898563b244ca3d0d2120ebfc6904f80a080b085ebdc0c47842c11ef347e0f426c29c46d3c36730dc02ba5b650b
 AUX sonic-visualiser-4.3-meson.build.patch 4428 BLAKE2B 30f2fb4f69f633de44e7f50f901a14a997cc785cbd23b33668e7587ff1cdc270eea94f7caa6fb54605009ebcadcb8d0b69d26980aa592a89696fcf4ede919b89 SHA512 1bf40499f8a15572ec1aad67685508aaac5fb7f41fd8ba4c5e129bed04b1fc0052f87618036b9ef3fd3c6205c7a8a27dfcf5349d6b9c99eb3de7a6348a775238
 DIST sonic-visualiser-4.5.tar.gz 6652200 BLAKE2B a5e39a755e991663390370c06ce5d54b2ff9422081f8b9046097645f1f747972d270233a0d4fe05d4e6adde5239ca6d2d0210a8a67d9ef6ede60089471ce6452 SHA512 eca7f7b2a56a4c70f38c8fafdd20d5c0e773dc1a99a75189998dd1f50ae777df4999e1a4b3431f9202edfb8ce2686d05cf6448493c263c52ab5f068169a7385d
-EBUILD sonic-visualiser-4.5.ebuild 1656 BLAKE2B a1b13d216e5625ca2b0647d3b47a82220853d7500b94178c826f9878e35539a03ed32e11891275e6d38784e72d8709606b4010576b8f7b939c380260e3c2f147 SHA512 392de40b7f125acb4e592ab2cac7d1580cb81415df42e950b89b6eccbd0d709d339a0c6a256d56f9918d9fa981ed9323aded499e9911a35fdfdc94434dbeb943
+EBUILD sonic-visualiser-4.5.ebuild 1682 BLAKE2B 5b7b6c61571fbcab561d7bc43900fbd241d7ee3d128c85df3c9a0a95b9b5aba87aa61b0819d77b8e51a80eb6e3f22fd8a8d8c6b11b8e0289dc5327480376f84f SHA512 ef6f2a581bda1142361de337ac8f52a4987fb8b1f33edad8611dfbcf8771d62139c48e6f60a0d4d689aea260d37068de57abfc82fc0081a7857d981d9406a2bc
 MISC metadata.xml 457 BLAKE2B fee1474516a395ba251de868c533ab4f88ac346a169a71e1513593f0ffa99f3365f0a7d87c24c31e73cf4f06d500b8bafe83f02230e6f24ebf8c0a23b43cd662 SHA512 58c25ca412527ef47411204f5ce579c3731c5b19922c43c13f069dae0c498e63879cc209e1f93e3487a2c32972df8ac45af690b4d470bfea9e497a3b9699c3a7
diff --git a/media-sound/sonic-visualiser/files/serd.patch b/media-sound/sonic-visualiser/files/serd.patch
new file mode 100644
index 000000000000..c7b6f179a686
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/serd.patch
@@ -0,0 +1,21 @@
+From 865fbe253cde8e966709bb11dc8c441ceb3891ed Mon Sep 17 00:00:00 2001
+From: Chris Cannam <cannam@all-day-breakfast.com>
+Date: Fri, 29 Jul 2022 13:31:37 +0100
+Subject: [PATCH] Fix build failure
+
+---
+ meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/meson.build b/meson.build
+index 59a635f..35fc470 100644
+--- a/meson.build
++++ b/meson.build
+@@ -138,6 +138,7 @@ if system == 'linux'
+   server_dependencies = [
+     capnp_dep,
+     sord_dep,
++    serd_dep,
+     dl_dep,
+   ]
+   
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.5.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.5.ebuild
index a1616c31a0aa..a8d5a288ec4f 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.5.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-4.5.ebuild
@@ -62,6 +62,7 @@ REQUIRED_USE="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.3-meson.build.patch"
+	"${FILESDIR}/serd.patch"
 )
 
 src_configure() {