From 25344bbc259185c2b6b6606cdb563bb974f1ecc7 Mon Sep 17 00:00:00 2001
From: la-ninpre <leobrekalini@gmail.com>
Date: Thu, 15 Sep 2022 23:36:59 +0300
Subject: media-libs/lsp-plugins: add 1.2.3, drop 1.2.2

---
 media-libs/lsp-plugins/Manifest                    |  2 +-
 .../files/lsp-plugins-1.2.1-r3d-glx-libdir.patch   | 41 ---------------
 .../files/lsp-plugins-1.2.3-r3d-glx-libdir.patch   | 41 +++++++++++++++
 media-libs/lsp-plugins/lsp-plugins-1.2.2.ebuild    | 58 ----------------------
 media-libs/lsp-plugins/lsp-plugins-1.2.3.ebuild    | 55 ++++++++++++++++++++
 5 files changed, 97 insertions(+), 100 deletions(-)
 delete mode 100644 media-libs/lsp-plugins/files/lsp-plugins-1.2.1-r3d-glx-libdir.patch
 create mode 100644 media-libs/lsp-plugins/files/lsp-plugins-1.2.3-r3d-glx-libdir.patch
 delete mode 100644 media-libs/lsp-plugins/lsp-plugins-1.2.2.ebuild
 create mode 100644 media-libs/lsp-plugins/lsp-plugins-1.2.3.ebuild

diff --git a/media-libs/lsp-plugins/Manifest b/media-libs/lsp-plugins/Manifest
index a5887fd..7482ccc 100644
--- a/media-libs/lsp-plugins/Manifest
+++ b/media-libs/lsp-plugins/Manifest
@@ -1 +1 @@
-DIST lsp-plugins-1.2.2.tar.gz 38377573 BLAKE2B 4c72745d3aeb81cfddc5aef6214062a26016ea8ee092f9167abf56f602eaf1f9e1e5e113adc679089109180ebfedc9a70ac58df3178027bc2f1054a464337899 SHA512 63a1da2007a91db0e9bed97c26de5c5621b429d801b8d0eaf0e8d26aba2a57631824566e2c0ad48ea5943a5050cc40d4328c30427e4986b85d2878773a51dae1
+DIST lsp-plugins-1.2.3.tar.gz 38760829 BLAKE2B c28a4b5cfdbbe5fe42c3f4821ce323cb097b84eddc850f43adcc14e8a9edb2e313236ce44e4eca17dd226c578113a5749d06754deb45a6c2e7c2ff37bfed4fc2 SHA512 1db849ebceffb24540879fcd0971ddd8bffe9a0ecaaebf4b69bf8633a267562bb3eb5cd55dce8b804868d880efdec95b19a312ee017c2a9334b5e764eebbbb30
diff --git a/media-libs/lsp-plugins/files/lsp-plugins-1.2.1-r3d-glx-libdir.patch b/media-libs/lsp-plugins/files/lsp-plugins-1.2.1-r3d-glx-libdir.patch
deleted file mode 100644
index c386f55..0000000
--- a/media-libs/lsp-plugins/files/lsp-plugins-1.2.1-r3d-glx-libdir.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/modules/lsp-r3d-glx-lib/src/Makefile
-+++ b/modules/lsp-r3d-glx-lib/src/Makefile
-@@ -64,6 +64,8 @@ ARTIFACT_OBJFILES       = $(call query, OBJ, $(ARTIFACT_DEPENDENCIES) $(HOST)$(A
- 
- ARTIFACT_TARGETS        = $(ARTIFACT_LIB) $(ARTIFACT_SLIB) $(ARTIFACT_PC)
- 
-+R3D_GLX_LIBDIR		= $(LIBDIR)/$(PN)
-+
- # Source code
- CXX_SRC_MAIN            = $(call rwildcard, main, *.cpp)
- CXX_SRC_EXPORT          = $(call rwildcard, export, *.cpp)
-@@ -164,7 +166,7 @@ $(ARTIFACT_PC):
- 	echo "prefix=$(PREFIX)" > "$(ARTIFACT_PC)"
- 	echo "exec_prefix=$(BINDIR)" >> "$(ARTIFACT_PC)"
- 	echo "includedir=$(INCDIR)" >> "$(ARTIFACT_PC)"
--	echo "libdir=$(LIBDIR)" >> "$(ARTIFACT_PC)"
-+	echo "libdir=$(R3D_GLX_LIBDIR)" >> "$(ARTIFACT_PC)"
- 	echo "" >> $(ARTIFACT_PC) >> "$(ARTIFACT_PC)"
- 	echo "Name: $($(ARTIFACT_ID)_NAME)" >> "$(ARTIFACT_PC)"
- 	echo "Description: $($(ARTIFACT_ID)_DESC)" >> "$(ARTIFACT_PC)"
-@@ -175,14 +177,14 @@ $(ARTIFACT_PC):
- # Installation/deinstallation
- install: all
- 	echo "Installing $($(ARTIFACT_ID)_NAME)"
--	mkdir -p "$(DESTDIR)$(LIBDIR)/pkgconfig"
-+	mkdir -p "$(DESTDIR)$(R3D_GLX_LIBDIR)/pkgconfig"
- 	$(if $(CXX_INSTALL_HEADERS), mkdir -p "$(DESTDIR)$(INCDIR)")
- 	$(if $(CXX_INSTALL_HEADERS), cp -r "$(CXX_HDR_PATHS)" "$(DESTDIR)$(INCDIR)/")
--	cp $(ARTIFACT_PC) "$(DESTDIR)$(LIBDIR)/pkgconfig/"
--	$(INSTALL) $(ARTIFACT_LIB) "$(DESTDIR)$(LIBDIR)/"
--	cp $(ARTIFACT_SLIB) "$(DESTDIR)$(LIBDIR)/"
--	ln -sf $(notdir $(ARTIFACT_LIB)) "$(DESTDIR)$(LIBDIR)/$(ARTIFACT_LIBLINK)"
--	ln -sf $(notdir $(ARTIFACT_SLIB)) "$(DESTDIR)$(LIBDIR)/$(ARTIFACT_SLIBLINK)"
-+	cp $(ARTIFACT_PC) "$(DESTDIR)$(R3D_GLX_LIBDIR)/pkgconfig/"
-+	$(INSTALL) $(ARTIFACT_LIB) "$(DESTDIR)$(R3D_GLX_LIBDIR)/"
-+	cp $(ARTIFACT_SLIB) "$(DESTDIR)$(R3D_GLX_LIBDIR)/"
-+	ln -sf $(notdir $(ARTIFACT_LIB)) "$(DESTDIR)$(R3D_GLX_LIBDIR)/$(ARTIFACT_LIBLINK)"
-+	ln -sf $(notdir $(ARTIFACT_SLIB)) "$(DESTDIR)$(R3D_GLX_LIBDIR)/$(ARTIFACT_SLIBLINK)"
- 	echo "Install OK"
- 
- uninstall:
diff --git a/media-libs/lsp-plugins/files/lsp-plugins-1.2.3-r3d-glx-libdir.patch b/media-libs/lsp-plugins/files/lsp-plugins-1.2.3-r3d-glx-libdir.patch
new file mode 100644
index 0000000..b424ca7
--- /dev/null
+++ b/media-libs/lsp-plugins/files/lsp-plugins-1.2.3-r3d-glx-libdir.patch
@@ -0,0 +1,41 @@
+--- a/modules/lsp-r3d-glx-lib/src/Makefile
++++ b/modules/lsp-r3d-glx-lib/src/Makefile
+@@ -66,6 +66,8 @@ ARTIFACT_OBJFILES       = $(call query, OBJ, $(ARTIFACT_DEPENDENCIES) $(HOST)$(A
+ 
+ ARTIFACT_TARGETS        = $(ARTIFACT_LIB) $(ARTIFACT_SLIB) $(ARTIFACT_PC)
+ 
++R3D_GLX_LIBDIR			= $(LIBDIR)/$(PN)
++
+ # Source code
+ CXX_SRC_MAIN            = $(call rwildcard, main, *.cpp)
+ CXX_SRC_EXPORT          = $(call rwildcard, export, *.cpp)
+@@ -163,7 +165,7 @@ $(ARTIFACT_PC):
+ 	echo "prefix=$(PREFIX)" > "$(ARTIFACT_PC)"
+ 	echo "exec_prefix=$(BINDIR)" >> "$(ARTIFACT_PC)"
+ 	echo "includedir=$(INCDIR)" >> "$(ARTIFACT_PC)"
+-	echo "libdir=$(LIBDIR)" >> "$(ARTIFACT_PC)"
++	echo "libdir=$(R3D_GLX_LIBDIR)" >> "$(ARTIFACT_PC)"
+ 	echo "" >> $(ARTIFACT_PC) >> "$(ARTIFACT_PC)"
+ 	echo "Name: $($(ARTIFACT_ID)_NAME)" >> "$(ARTIFACT_PC)"
+ 	echo "Description: $($(ARTIFACT_ID)_DESC)" >> "$(ARTIFACT_PC)"
+@@ -174,14 +176,14 @@ $(ARTIFACT_PC):
+ # Installation/deinstallation
+ install: all
+ 	echo "Installing $($(ARTIFACT_ID)_NAME)"
+-	mkdir -p "$(DESTDIR)$(LIBDIR)/pkgconfig"
++	mkdir -p "$(DESTDIR)$(R3D_GLX_LIBDIR)/pkgconfig"
+ 	$(if $(filter $(INSTALL_HEADERS),1), mkdir -p "$(DESTDIR)$(INCDIR)")
+ 	$(if $(filter $(INSTALL_HEADERS),1), cp -r "$(CXX_HDR_PATHS)" "$(DESTDIR)$(INCDIR)/")
+-	cp $(ARTIFACT_PC) "$(DESTDIR)$(LIBDIR)/pkgconfig/"
+-	$(INSTALL) $(ARTIFACT_LIB) "$(DESTDIR)$(LIBDIR)/"
+-	cp $(ARTIFACT_SLIB) "$(DESTDIR)$(LIBDIR)/"
+-	ln -sf $(notdir $(ARTIFACT_LIB)) "$(DESTDIR)$(LIBDIR)/$(ARTIFACT_LIBLINK)"
+-	ln -sf $(notdir $(ARTIFACT_SLIB)) "$(DESTDIR)$(LIBDIR)/$(ARTIFACT_SLIBLINK)"
++	cp $(ARTIFACT_PC) "$(DESTDIR)$(R3D_GLX_LIBDIR)/pkgconfig/"
++	$(INSTALL) $(ARTIFACT_LIB) "$(DESTDIR)$(R3D_GLX_LIBDIR)/"
++	cp $(ARTIFACT_SLIB) "$(DESTDIR)$(R3D_GLX_LIBDIR)/"
++	ln -sf $(notdir $(ARTIFACT_LIB)) "$(DESTDIR)$(R3D_GLX_LIBDIR)/$(ARTIFACT_LIBLINK)"
++	ln -sf $(notdir $(ARTIFACT_SLIB)) "$(DESTDIR)$(R3D_GLX_LIBDIR)/$(ARTIFACT_SLIBLINK)"
+ 	echo "Install OK"
+ 
+ uninstall:
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.2.2.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.2.2.ebuild
deleted file mode 100644
index 8f4ae2a..0000000
--- a/media-libs/lsp-plugins/lsp-plugins-1.2.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="Linux Studio Plugins"
-HOMEPAGE="https://lsp-plug.in"
-
-SRC_URI="https://github.com/sadko4u/lsp-plugins/releases/download/${PV}/${PN}-src-${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-S=${WORKDIR}/${PN}
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="doc jack ladspa +lv2 test"
-REQUIRED_USE="|| ( jack ladspa lv2 )
-	test? ( jack )"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/expat
-	media-libs/libsndfile
-	media-libs/libglvnd[X]
-	doc? ( dev-lang/php:* )
-	jack? (
-		virtual/jack
-		x11-libs/cairo[X]
-	)
-	ladspa? ( media-libs/ladspa-sdk )
-	lv2? (
-		media-libs/lv2
-		x11-libs/cairo[X]
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-PATCHES=(
-	# see https://github.com/sadko4u/lsp-plugins/issues/257
-	"${FILESDIR}/${P}-constexpr-cflags.patch"
-
-	"${FILESDIR}/${PN}-1.2.1-r3d-glx-libdir.patch"
-)
-
-src_configure() {
-	use doc && MODULES+="doc"
-	use jack && MODULES+=" jack"
-	use ladspa && MODULES+=" ladspa"
-	use lv2 && MODULES+=" lv2"
-	emake FEATURES="${MODULES}" PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" config
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-}
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.2.3.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.2.3.ebuild
new file mode 100644
index 0000000..9378c4c
--- /dev/null
+++ b/media-libs/lsp-plugins/lsp-plugins-1.2.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+DESCRIPTION="Linux Studio Plugins"
+HOMEPAGE="https://lsp-plug.in"
+
+SRC_URI="https://github.com/sadko4u/lsp-plugins/releases/download/${PV}/${PN}-src-${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+S=${WORKDIR}/${PN}
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="doc jack ladspa +lv2 test"
+REQUIRED_USE="|| ( jack ladspa lv2 )
+	test? ( jack )"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/expat
+	media-libs/libsndfile
+	media-libs/libglvnd[X]
+	doc? ( dev-lang/php:* )
+	jack? (
+		virtual/jack
+		x11-libs/cairo[X]
+	)
+	ladspa? ( media-libs/ladspa-sdk )
+	lv2? (
+		media-libs/lv2
+		x11-libs/cairo[X]
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-r3d-glx-libdir.patch"
+)
+
+src_configure() {
+	use doc && MODULES+="doc"
+	use jack && MODULES+=" jack"
+	use ladspa && MODULES+=" ladspa"
+	use lv2 && MODULES+=" lv2"
+	emake FEATURES="${MODULES}" PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" config
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+}
-- 
cgit v1.2.3