[gentoo-commits] repo/gentoo:master commit in: media-sound/linuxsampler/files/

2019-12-14 Thread Miroslav Šulc 
commit: cd98e174190d0f3f12c0f02682a58228a0167f28
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Dec 14 12:53:31 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Dec 14 13:01:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd98e174

media-sound/linuxsampler: fixed linuxsampler-2.0.0-lv2-automagic.patch

the patch unfortunately changed the logic of lv2 detection
and broke it in such way that it worked with lv2-1.14.0 but
did not work with lv2-1.16.0 so the patch had to be fixed

Closes: https://bugs.gentoo.org/701606
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/linuxsampler-2.0.0-lv2-automagic.patch| 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

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
index a5b9f8d71ef..522882abf5c 100644
--- a/media-sound/linuxsampler/files/linuxsampler-2.0.0-lv2-automagic.patch
+++ b/media-sound/linuxsampler/files/linuxsampler-2.0.0-lv2-automagic.patch
@@ -1,6 +1,8 @@
 linuxsampler-2.0.0/configure.ac
-+++ linuxsampler-2.0.0/configure.ac
-@@ -532,12 +532,12 @@
+diff --git a/configure.ac b/configure.ac
+index c0a37e9..44348ad 100644
+--- a/configure.ac
 b/configure.ac
+@@ -535,12 +535,15 @@ AC_CHECK_HEADERS(dssi.h,
  AM_CONDITIONAL(HAVE_DSSI, test $config_have_dssi = "yes")
  
  # LV2
@@ -14,7 +16,10 @@
 +  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"])
++  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
 +])
  AM_CONDITIONAL(HAVE_LV2, test $config_have_lv2 = "yes")

[gentoo-commits] repo/gentoo:master commit in: media-sound/linuxsampler/files/, media-sound/linuxsampler/

2017-04-01 Thread Alexis Ballier 
commit: cb43aa6dde012ba1c92d755067e0892e53cb61d9
Author: Karl Linden  gmail  com>
AuthorDate: Fri Mar 31 09:17:22 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Apr  1 12:26:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb43aa6d

media-sound/linuxsampler: remove old and depend on virtual/jack

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-sound/linuxsampler/Manifest  |  2 -
 .../files/linuxsampler-0.5.1-gcc43.patch   | 36 ---
 .../files/linuxsampler-0.5.1-libtool22.patch   | 20 
 .../files/linuxsampler-0.5.1-pkgconfiginit.patch   | 12 -
 .../files/linuxsampler-1.0.0-gcc47.patch   | 13 --
 media-sound/linuxsampler/linuxsampler-0.5.1.ebuild | 51 
 .../linuxsampler/linuxsampler-1.0.0-r1.ebuild  | 53 -
 .../linuxsampler/linuxsampler-2.0.0-r2.ebuild  |  4 +-
 media-sound/linuxsampler/linuxsampler-2.0.0.ebuild | 54 --
 9 files changed, 2 insertions(+), 243 deletions(-)

diff --git a/media-sound/linuxsampler/Manifest 
b/media-sound/linuxsampler/Manifest
index bf0bfacbf89..a91b672681b 100644
--- a/media-sound/linuxsampler/Manifest
+++ b/media-sound/linuxsampler/Manifest
@@ -1,3 +1 @@
-DIST linuxsampler-0.5.1.tar.bz2 614500 SHA256 
e0d42f98813abf187b636f52d3fe3d5c1add228a2e783bdda409ebae1c7f901f SHA512 
2125608ac5549068592a305bb9efd73d4100974d27d014ca41360c204d350c4abe04beda6d9f1238897003fdd7268d55f9eaf2b7b54aec26b74120f6c2eba5c3
 WHIRLPOOL 
2615d3e51ef81381931b7088a7638317a99a51cd7bd5bd91a4b00ea9094c79ac08602bc4731c74871eb63205baee92092886c1f21b2841547bdbfa9d5bbfae85
-DIST linuxsampler-1.0.0.tar.bz2 701591 SHA256 
bf4f4f83b9ab706e8e8b017aafb560c363bb7663413aeae46d49f1f56110c9cf SHA512 
50b27ff16ef0f393e0808d992ca58f8a4ec12ce909bf3a461502e7e2a2bcfcbfb1558dd07a5ff5af2cbf26bc5f7b878a736005a8e90e4d5e92ca9b868e9bc204
 WHIRLPOOL 
e7668fb4a1c802411de89fb73bdbca78150a8fc6386c42d9c3b9f8c7c1d4576260ef6c89e283f1fbcbcf397515d565e5e13f1e5286a07b6cb8240bb26e437bf6
 DIST linuxsampler-2.0.0.tar.bz2 1318939 SHA256 
1943d05006d96a9fb49f74a6f38129a4585cb78cc0648885fca9f056529c5c28 SHA512 
f4a57117dbec3eeb9d6d670fec76e928ef9d9e49a1a8c6bd654d6114efdc203861e7865005f06265c172e29b5e0a948eac160377dcdabc5244caed5e5ca7e441
 WHIRLPOOL 
d8af13229d8dafd8ed68950038968d19e01a010465a91ddd54866fb626c47081931dba7dda9a073c17274c26dec9a1ec51cf30a00fe4831716354c9e9fcf4cf4

diff --git a/media-sound/linuxsampler/files/linuxsampler-0.5.1-gcc43.patch 
b/media-sound/linuxsampler/files/linuxsampler-0.5.1-gcc43.patch
deleted file mode 100644
index e65c6cbb106..000
--- a/media-sound/linuxsampler/files/linuxsampler-0.5.1-gcc43.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: linuxsampler-0.5.1/src/db/InstrumentsDbUtilities.h
-===
 linuxsampler-0.5.1.orig/src/db/InstrumentsDbUtilities.h
-+++ linuxsampler-0.5.1/src/db/InstrumentsDbUtilities.h
-@@ -24,6 +24,7 @@
- #define __LS_INSTRUMENTSDBUTILITIES_H__
- 
- #include 
-+#include 
- #include 
- #include 
- #include 
-Index: linuxsampler-0.5.1/src/drivers/midi/midi.h
-===
 linuxsampler-0.5.1.orig/src/drivers/midi/midi.h
-+++ linuxsampler-0.5.1/src/drivers/midi/midi.h
-@@ -21,6 +21,7 @@
- #ifndef __LS_MIDI_H__
- #define __LS_MIDI_H__
- 
-+#include 
- #include 
- 
- namespace LinuxSampler {
-Index: linuxsampler-0.5.1/src/network/lscpserver.cpp
-===
 linuxsampler-0.5.1.orig/src/network/lscpserver.cpp
-+++ linuxsampler-0.5.1/src/network/lscpserver.cpp
-@@ -21,6 +21,7 @@
-  *   MA  02111-1307  USA   *
-  ***/
- 
-+#include 
- #include "lscpserver.h"
- #include "lscpresultset.h"
- #include "lscpevent.h"

diff --git a/media-sound/linuxsampler/files/linuxsampler-0.5.1-libtool22.patch 
b/media-sound/linuxsampler/files/linuxsampler-0.5.1-libtool22.patch
deleted file mode 100644
index 3c4add20637..000
--- a/media-sound/linuxsampler/files/linuxsampler-0.5.1-libtool22.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: linuxsampler-0.5.1/configure.in
-===
 linuxsampler-0.5.1.orig/configure.in
-+++ linuxsampler-0.5.1/configure.in
-@@ -38,6 +38,7 @@ LSCP_RELEASE_MINOR=3
- AC_DEFINE_UNQUOTED(LSCP_RELEASE_MAJOR, ${LSCP_RELEASE_MAJOR}, [LSCP spec 
major version this release complies with.])
- AC_DEFINE_UNQUOTED(LSCP_RELEASE_MINOR, ${LSCP_RELEASE_MINOR}, [LSCP spec 
minor version this release complies with.])
- 
-+AC_PROG_CXX
- AM_PROG_LIBTOOL
- 
- AC_SUBST(SHLIB_VERSION_ARG)
-@@ -1082,7 +1083,6 @@ AM_CONFIG_HEADER(config.h)
- AM_INIT_AUTOMAKE(linuxsampler, 
"$LINUXSAMPLER_RELEASE_MAJOR.$LINUXSAMPLER_RELEASE_MINOR.$LINUXSAMPLER_RELEASE_BUILD")
-

[gentoo-commits] repo/gentoo:master commit in: media-sound/linuxsampler/files/, media-sound/linuxsampler/

2016-02-13 Thread David Seifert 
commit: f7b26ec1e274a1985e25929b839221ed8f70e5e5
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 13 12:42:08 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 13 12:42:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7b26ec1

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

 .../files/linuxsampler-2.0.0-lv2-automagic.patch| 21 +
 ...2.0.0-r1.ebuild => linuxsampler-2.0.0-r2.ebuild} | 12 ++--
 media-sound/linuxsampler/metadata.xml   | 11 +++
 3 files changed, 34 insertions(+), 10 deletions(-)

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
index 000..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 4806c00..2cdae23 100644
--- 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 c870d0e..188b388 100644
--- a/media-sound/linuxsampler/metadata.xml
+++ b/media-sound/linuxsampler/metadata.xml
@@ -1,8 +1,11 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-
-   so...@gentoo.org
-   Gentoo Sound project
-
+  
+  so...@gentoo.org
+  Gentoo Sound project
+  
+  
+Add support for Ladspa V2
+