media-sound/linuxsampler: Fixed automagic dependency on media-libs/lv2

Gentoo-Bug: 557010
* Added USE=lv2 flag, which pulls in media-libs/lv2 as dependency
* Fix configure.ac automagically enabling lv2 support
* Amend metadata.xml to reflect new USE flag

Package-Manager: portage-2.2.27

diff --git a/media-sound/linuxsampler/files/linuxsampler-2.0.0-lv2-automagic.patch b/media-sound/linuxsampler/files/linuxsampler-2.0.0-lv2-automagic.patch
new file mode 100644 (file)
index 0000000..a5b9f8d
--- /dev/null
+++ b/media-sound/linuxsampler/files/linuxsampler-2.0.0-lv2-automagic.patch
@@ -0,0 +1,21 @@
+--- linuxsampler-2.0.0/configure.ac
++++ linuxsampler-2.0.0/configure.ac
+@@ -532,12 +532,12 @@
+ AM_CONDITIONAL(HAVE_DSSI, test $config_have_dssi = "yes")
+ 
+ # LV2
+-PKG_CHECK_MODULES(LV2, lv2 >= 1.0.0, config_have_lv2="yes", config_have_lv2="no")
+-if test "$config_have_lv2" != "yes"; then
+-    PKG_CHECK_MODULES(LV2, lv2core >= 1.0.0, config_have_lv2="yes", config_have_lv2="no")
+-fi
+-AC_SUBST(LV2_CFLAGS)
+-AC_SUBST(LV2_LIBS)
++AC_ARG_ENABLE([lv2],
++      AS_HELP_STRING([--enable-lv2], [Enable building with lv2]))
++config_have_lv2="no"
++AS_IF([test "x$enable_lv2" = "xyes"], [
++      PKG_CHECK_MODULES([LV2], [lv2 >= 1.0.0 lv2core >= 1.0.0], [config_have_lv2="yes"])
++])
+ AM_CONDITIONAL(HAVE_LV2, test $config_have_lv2 = "yes")
+ 
+ # VST

diff --git a/media-sound/linuxsampler/linuxsampler-2.0.0-r1.ebuild b/media-sound/linuxsampler/linuxsampler-2.0.0-r2.ebuild
similarity index 85%
rename from media-sound/linuxsampler/linuxsampler-2.0.0-r1.ebuild
rename to media-sound/linuxsampler/linuxsampler-2.0.0-r2.ebuild
index 4806c00cf796d5a82fdbee2ce03ad26e0830f878..2cdae23e9972c06c95ef7b2dfeb8e3f6643154d3 100644 (file)
--- a/media-sound/linuxsampler/linuxsampler-2.0.0-r1.ebuild
+++ b/media-sound/linuxsampler/linuxsampler-2.0.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc jack sqlite static-libs"
+IUSE="doc jack lv2 sqlite static-libs"
 
 RDEPEND="sqlite? ( >=dev-db/sqlite-3.3 )
        >=media-libs/libgig-4.0.0
@@ -21,9 +21,11 @@ RDEPEND="sqlite? ( >=dev-db/sqlite-3.3 )
        jack? ( media-sound/jack-audio-connection-kit )"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       doc? ( app-doc/doxygen )"
+       doc? ( app-doc/doxygen )
+       lv2? ( media-libs/lv2 )"
 PATCHES=(
        "${FILESDIR}/${P}-nptl-hardened.patch"
+       "${FILESDIR}/${P}-lv2-automagic.patch"
 )
 
 src_prepare() {
@@ -39,6 +41,7 @@ src_configure() {
                --enable-alsa-driver \
                --disable-arts-driver \
                $(use_enable jack jack-driver) \
+               $(use_enable lv2) \
                $(use_enable sqlite instruments-db) \
                $(use_enable static-libs static)
 }
@@ -50,9 +53,6 @@ src_compile() {
 
 src_install() {
        default
-
-       docinto html
-       use doc && dodoc -r doc/html/*
-
+       use doc && dodoc -r doc/html
        prune_libtool_files
 }

diff --git a/media-sound/linuxsampler/metadata.xml b/media-sound/linuxsampler/metadata.xml
index c870d0eef0ab11b13425198447bd3a5ff0ad5069..188b388f69c67e7acd047cfb0e5d82c0f8f5dbea 100644 (file)
--- a/media-sound/linuxsampler/metadata.xml
+++ b/media-sound/linuxsampler/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-       <email>sound@gentoo.org</email>
-       <name>Gentoo Sound project</name>
-</maintainer>
+  <maintainer type="project">
+      <email>sound@gentoo.org</email>
+      <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="lv2">Add support for Ladspa V2</flag>
+  </use>
 </pkgmetadata>