gentoo resync : 22.05.2021

5 files changed, 105 insertions, 1 deletions

diff --git a/media-sound/amsynth/Manifest b/media-sound/amsynth/Manifest
index 7d1010652127..af24dd16e9a5 100644
--- a/media-sound/amsynth/Manifest
+++ b/media-sound/amsynth/Manifest
@@ -1,3 +1,7 @@
+AUX amsynth-1.12.2-metadata.patch 522 BLAKE2B 8d49d9323dd7739c90aa456d5e123b3f2303764ae2c3959fc3a4b271e109d56151f3ddf08a21904fbd6aa4e397c96eea88c7735a02004e600d0c07b3a58dd9e1 SHA512 ea35b8ae9d11525b314cd4c89385e24b98c22dec34a042b694a707e9a3bdf8741497c6ede792d9837976cf939795f7e645be23174cddcc5df9b3fb228ef56198
+AUX amsynth-1.12.2-x11.patch 1233 BLAKE2B 4df9ab5cfc99ddfbf490a716ae52f13727d4307e4added4ca6916e9fdf31a09b909bdcd437d1076caa3e7c305145e5ab9a2ee1b1747c1c6fb4c506dc37b6fce1 SHA512 03732a90908d9756f9d8517021255860cadc73becec99888fc74d26aa307c2b7e756c265b8e04b356fcf95868d8c125129fcf32820d38131c857e762d2854e10
+DIST amsynth-1.12.2.tar.gz 1607129 BLAKE2B 8308a8a595dfe7b2c9924ff183134fdd5ad20ac2c957b1f52e474a8cb297cd73ee9f8b9938212deb21701e11ccbf776ea22cab763fb71940bf1df5c169e309db SHA512 a1eef3d5a0d0f0ec1edb93d89b3e456ea133a8445a9be73ba338771ae651a2008aea8dd077a9bcf0cd50e6bcc97ad98ab4c44a9baefd9f3381287afdf3325e8f
 DIST amsynth-1.8.0.tar.bz2 1170068 BLAKE2B 0b570efe1db69bba04215055147792a9635bc086749ca7d70b5b3f8bc16613310591802c6cdabfd83009bda2c3b109b17ccc9d4ace7681614bed8c42c5f84f8d SHA512 a47489b103dbdd1cb2233d8629acfda2a1d26ac1f7ea5b8c4e7925676842cac21758ca94b50894e71426517bd826e9a9b6fd26800516054e24d62f7cbce4f0f9
+EBUILD amsynth-1.12.2.ebuild 1118 BLAKE2B 12cd771206dc35c034e6a3921152dd7dfc668827419d454a9ff3be9634276715e371c4221144a636aee1b442c614e47c317f57e720ceef2267eafe85ec6db2f6 SHA512 ed7c8149066a5e9530226e4fc4b6629a3dc0a396aae02e34ab8647b31a3da82b4ff467ab59daf88fad55580270aeedea2b18ecaa14ad899be8e521997a0685be
 EBUILD amsynth-1.8.0.ebuild 1040 BLAKE2B d4927d245ac316c8e82507617d5b911701dcc4e4d083c5d66083155c66d5e756df22de9d71eebbe3045cf7491034b5bf64e80f1de9d7572b1218ac0929159256 SHA512 d181aa4e5642c3f0c03cbdcbb952a7d5468d8a1006a583b6baa236394c5dd66801c6a06c8b934c62139c5b9f3b700cff331141f0776e5509311aee24cf46c91d
-MISC metadata.xml 472 BLAKE2B 0af28a6f759474d8b879c6830e03fe043c623192b36a39acc90c431f93a82eccd392bedd172414610a58f3d74fcea6d41e081dc3cb06eec32b3352be7c2d7bfc SHA512 41a2736e7376b37ab7770ded3ee6653891ab56d4c52c5c96601d2ee3b5269de1fb2fda0de464569cae005b6b08bc5813ec9a4c20bbdf9ba7cec8d5eecae190cd
+MISC metadata.xml 580 BLAKE2B 529ab272ffd8198a78102fe385ba94a10b7fb94942b4d464f920768b716ecf04affe79aba38c5566c10803738c957942e840dc9842f4ab775bee851a15c0e7d8 SHA512 6d492efb5dffee7429d85256f263c9f34ef799ec7cde5745e8246e72d9d32d6df7423a67f121a7c7870fd8672eef1261f794b52a585e23f2df4bb14d6f3d67d8
diff --git a/media-sound/amsynth/amsynth-1.12.2.ebuild b/media-sound/amsynth/amsynth-1.12.2.ebuild
new file mode 100644
index 000000000000..872703207acb
--- /dev/null
+++ b/media-sound/amsynth/amsynth-1.12.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+DESCRIPTION="Virtual analogue synthesizer"
+HOMEPAGE="https://github.com/amsynth/amsynth"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa dssi gtk jack lash lv2 nsm oss vst"
+
+REQUIRED_USE="dssi? ( gtk ) lv2? ( gtk )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	alsa? (
+		media-libs/alsa-lib:=
+		media-sound/alsa-utils
+	)
+	dssi? (
+		media-libs/dssi:=
+		media-libs/liblo:=
+	)
+	gtk? (
+		x11-libs/gtk+:2
+		x11-libs/libX11
+	)
+	jack? ( virtual/jack )
+	lash? ( media-sound/lash )
+	lv2? ( media-libs/lv2 )
+"
+DEPEND="${RDEPEND}
+	oss? ( virtual/os-headers )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-metadata.patch"
+)
+
+src_prepare() {
+	default
+	! use gtk && eapply "${FILESDIR}/${P}-x11.patch"
+}
+
+src_configure() {
+	econf \
+		$(use_with alsa) \
+		$(use_with dssi) \
+		$(use_with gtk gui) \
+		$(use_with jack) \
+		$(use_with lash) \
+		$(use_with lv2) \
+		$(use_with nsm) \
+		$(use_with oss) \
+		$(use_with vst)
+}
diff --git a/media-sound/amsynth/files/amsynth-1.12.2-metadata.patch b/media-sound/amsynth/files/amsynth-1.12.2-metadata.patch
new file mode 100644
index 000000000000..24b73ea31190
--- /dev/null
+++ b/media-sound/amsynth/files/amsynth-1.12.2-metadata.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index e0dd2a6..9bca63f 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1416,7 +1416,7 @@ appiconsvg_DATA = data/icons/scalable/amsynth.svg
+ desktopdir = $(datadir)/applications
+ desktop_in_files = data/amsynth.desktop.in
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+-appdatadir = $(datadir)/appdata
++appdatadir = $(datadir)/metadata
+ appdata_in_files = data/amsynth.appdata.xml.in \
+ 	data/dssi-amsynth-plugin.metainfo.xml.in \
+ 	data/lv2-amsynth-plugin.metainfo.xml.in \
diff --git a/media-sound/amsynth/files/amsynth-1.12.2-x11.patch b/media-sound/amsynth/files/amsynth-1.12.2-x11.patch
new file mode 100644
index 000000000000..2222fc1eb355
--- /dev/null
+++ b/media-sound/amsynth/files/amsynth-1.12.2-x11.patch
@@ -0,0 +1,22 @@
+diff --git a/Makefile.in b/Makefile.in
+index e0dd2a6..4449599 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1297,7 +1297,7 @@ amsynth_SOURCES = $(libcore_sources) $(libdsp_sources) \
+ 	$(am__append_1) $(am__append_3) $(am__append_4)
+ amsynth_CPPFLAGS = $(AM_CPPFLAGS) @ALSA_CFLAGS@ @JACK_CFLAGS@ @LASH_CFLAGS@ @LIBLO_CFLAGS@ @GTK_CFLAGS@
+ amsynth_LDADD = @ALSA_LIBS@ @JACK_LIBS@ @LASH_LIBS@ @LIBLO_LIBS@ \
+-	@LIBS@ -lX11 $(am__append_2)
++	@LIBS@ $(am__append_2)
+ @DARWIN_TRUE@amsynth_LDFLAGS = $(AM_LDFLAGS) -framework CoreFoundation -framework CoreAudio -framework CoreMIDI
+ 
+ #
+@@ -1317,7 +1317,7 @@ noinst_LTLIBRARIES = $(am__append_5) $(am__append_6) $(am__append_7)
+ @BUILD_DSSI_TRUE@amsynth_dssi_la_LDFLAGS = -rpath $(dssidir) -avoid-version -module -export-symbols-regex "dssi_descriptor" -disable-static
+ @BUILD_DSSI_GUI_TRUE@amsynth_dssi_gtk_SOURCES = src/amsynth_dssi_gtk.cpp $(libcore_sources) $(libgui_sources)
+ @BUILD_DSSI_GUI_TRUE@amsynth_dssi_gtk_CPPFLAGS = $(AM_CPPFLAGS) @DSSI_CFLAGS@ @GTK_CFLAGS@ @LIBLO_CFLAGS@
+-@BUILD_DSSI_GUI_TRUE@amsynth_dssi_gtk_LDADD = @DSSI_LIBS@ @GTK_LIBS@ @LIBLO_LIBS@ -lstdc++ -lX11
++@BUILD_DSSI_GUI_TRUE@amsynth_dssi_gtk_LDADD = @DSSI_LIBS@ @GTK_LIBS@ @LIBLO_LIBS@ -lstdc++
+ 
+ #
+ # LV2
diff --git a/media-sound/amsynth/metadata.xml b/media-sound/amsynth/metadata.xml
index 6ac5d966f1b7..a0865e068760 100644
--- a/media-sound/amsynth/metadata.xml
+++ b/media-sound/amsynth/metadata.xml
@@ -8,6 +8,8 @@
 	<use>
 		<flag name="dssi">Enable support for DSSI Soft Synth Interface</flag>
 		<flag name="lv2">Add support for Ladspa V2</flag>
+		<flag name="nsm">Build support for Non Session Manager</flag>
+		<flag name="vst">Build VST plug-in</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">amsynth/amsynth</remote-id>