From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 36962139694 for ; Sat, 1 Apr 2017 12:26:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8EA9A21C1A6; Sat, 1 Apr 2017 12:26:53 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5CCF621C1A6 for ; Sat, 1 Apr 2017 12:26:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E44C34167D for ; Sat, 1 Apr 2017 12:26:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CF8084C79 for ; Sat, 1 Apr 2017 12:26:50 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1491049606.cb43aa6dde012ba1c92d755067e0892e53cb61d9.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/linuxsampler/files/, media-sound/linuxsampler/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/linuxsampler/Manifest media-sound/linuxsampler/files/linuxsampler-0.5.1-gcc43.patch media-sound/linuxsampler/files/linuxsampler-0.5.1-libtool22.patch media-sound/linuxsampler/files/linuxsampler-0.5.1-pkgconfiginit.patch media-sound/linuxsampler/files/linuxsampler-1.0.0-gcc47.patch media-sound/linuxsampler/linuxsampler-0.5.1.ebuild media-sound/linuxsampler/linuxsampler-1.0.0-r1.ebuild media-sound/linuxsampler/linuxsampler-2.0.0-r2.ebuild media-sound/linuxsampler/linuxsampler-2.0.0.ebuild X-VCS-Directories: media-sound/linuxsampler/files/ media-sound/linuxsampler/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: cb43aa6dde012ba1c92d755067e0892e53cb61d9 X-VCS-Branch: master Date: Sat, 1 Apr 2017 12:26:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 89a74ef9-4a4f-4cb4-997a-548d5f7deff8 X-Archives-Hash: 26c7c361444e702645cc517282d3ac54 commit: cb43aa6dde012ba1c92d755067e0892e53cb61d9 Author: Karl Linden gmail com> AuthorDate: Fri Mar 31 09:17:22 2017 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Sat Apr 1 12:26:46 2017 +0000 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..00000000000 --- 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..00000000000 --- 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") - - AC_LANG_CPLUSPLUS --AC_PROG_CXX - - # some gcc 4.0 versions need -msse for SSE register allocations - if test "$config_asm" = "yes"; then diff --git a/media-sound/linuxsampler/files/linuxsampler-0.5.1-pkgconfiginit.patch b/media-sound/linuxsampler/files/linuxsampler-0.5.1-pkgconfiginit.patch deleted file mode 100644 index 551f1512e12..00000000000 --- a/media-sound/linuxsampler/files/linuxsampler-0.5.1-pkgconfiginit.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: linuxsampler-0.5.1/configure.in -=================================================================== ---- linuxsampler-0.5.1.orig/configure.in -+++ linuxsampler-0.5.1/configure.in -@@ -52,6 +52,7 @@ AC_SUBST(target_cpu) - AC_SUBST(target_os) - AC_SUBST(target_vendor) - -+PKG_PROG_PKG_CONFIG - - ########################################################################### - # General Checks diff --git a/media-sound/linuxsampler/files/linuxsampler-1.0.0-gcc47.patch b/media-sound/linuxsampler/files/linuxsampler-1.0.0-gcc47.patch deleted file mode 100644 index e46fb243b6c..00000000000 --- a/media-sound/linuxsampler/files/linuxsampler-1.0.0-gcc47.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://bugs.gentoo.org/414033 - ---- a/src/common/Pool.h -+++ b/src/common/Pool.h -@@ -393,7 +393,7 @@ class RTList : public RTListBase { - inline Iterator allocAppend() { - if (pPool->poolIsEmpty()) return RTListBase::begin(); - Iterator element = pPool->alloc(); -- append(element); -+ this->append(element); - #if CONFIG_DEVMODE - element.list = this; - #endif // CONFIG_DEVMODE diff --git a/media-sound/linuxsampler/linuxsampler-0.5.1.ebuild b/media-sound/linuxsampler/linuxsampler-0.5.1.ebuild deleted file mode 100644 index 834a47f99df..00000000000 --- a/media-sound/linuxsampler/linuxsampler-0.5.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit autotools eutils - -DESCRIPTION="LinuxSampler is a software audio sampler engine with professional grade features" -HOMEPAGE="http://www.linuxsampler.org/" -SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc jack sqlite" - -RDEPEND="sqlite? ( >=dev-db/sqlite-3.3 ) - >=media-libs/libgig-3.2.1 - media-libs/alsa-lib - jack? ( media-sound/jack-audio-connection-kit )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen )" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${P}-pkgconfiginit.patch" - epatch "${FILESDIR}/${P}-libtool22.patch" - epatch "${FILESDIR}/${P}-gcc43.patch" - AT_M4DIR="m4" eautoreconf -} - -src_compile() { - econf --enable-alsa-driver \ - $(use_enable jack jack-driver) \ - $(use_enable sqlite instruments-db) - emake -j1 || die "emake failed." - - if use doc; then - emake -j1 docs || die "emake docs failed." - fi -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed." - dodoc AUTHORS ChangeLog NEWS README - - if use doc; then - dohtml -r doc/html/* - fi -} diff --git a/media-sound/linuxsampler/linuxsampler-1.0.0-r1.ebuild b/media-sound/linuxsampler/linuxsampler-1.0.0-r1.ebuild deleted file mode 100644 index f7008b85fe8..00000000000 --- a/media-sound/linuxsampler/linuxsampler-1.0.0-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit eutils - -DESCRIPTION="LinuxSampler is a software audio sampler engine with professional grade features" -HOMEPAGE="http://www.linuxsampler.org/" -SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc jack sqlite static-libs" - -RDEPEND="sqlite? ( >=dev-db/sqlite-3.3 ) - >=media-libs/libgig-3.3.0 - media-libs/alsa-lib - jack? ( media-sound/jack-audio-connection-kit )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-gcc47.patch -} - -src_configure() { - econf --enable-alsa-driver \ - --disable-arts-driver \ - $(use_enable jack jack-driver) \ - $(use_enable sqlite instruments-db) \ - $(use_enable static-libs static) -} - -src_compile() { - emake - if use doc; then - emake docs - fi -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog NEWS README - - if use doc; then - dohtml -r doc/html/* - fi - - prune_libtool_files -} diff --git a/media-sound/linuxsampler/linuxsampler-2.0.0-r2.ebuild b/media-sound/linuxsampler/linuxsampler-2.0.0-r2.ebuild index 446de49b49e..5caedabd561 100644 --- a/media-sound/linuxsampler/linuxsampler-2.0.0-r2.ebuild +++ b/media-sound/linuxsampler/linuxsampler-2.0.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,7 +17,7 @@ IUSE="doc jack lv2 sqlite static-libs" RDEPEND="sqlite? ( >=dev-db/sqlite-3.3 ) >=media-libs/libgig-4.0.0 media-libs/alsa-lib - jack? ( media-sound/jack-audio-connection-kit )" + jack? ( virtual/jack )" DEPEND="${RDEPEND} virtual/pkgconfig doc? ( app-doc/doxygen ) diff --git a/media-sound/linuxsampler/linuxsampler-2.0.0.ebuild b/media-sound/linuxsampler/linuxsampler-2.0.0.ebuild deleted file mode 100644 index 7378a3545c0..00000000000 --- a/media-sound/linuxsampler/linuxsampler-2.0.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -DESCRIPTION="LinuxSampler is a software audio sampler engine with professional grade features" -HOMEPAGE="http://www.linuxsampler.org/" -SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc jack sqlite static-libs" - -RDEPEND="sqlite? ( >=dev-db/sqlite-3.3 ) - >=media-libs/libgig-4.0.0 - media-libs/alsa-lib - jack? ( media-sound/jack-audio-connection-kit )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen )" - -src_prepare() { - # Force regeneration of the file to let it build with all bison - # versions, bug #556204 - rm -f src/network/lscpparser.cpp || die -} - -src_configure() { - econf --enable-alsa-driver \ - --disable-arts-driver \ - $(use_enable jack jack-driver) \ - $(use_enable sqlite instruments-db) \ - $(use_enable static-libs static) -} - -src_compile() { - emake - if use doc; then - emake docs - fi -} - -src_install() { - default - - if use doc; then - dohtml -r doc/html/* - fi - - prune_libtool_files -}