| [proaudio] [2051] media-sound/swami update thx to Ede Wolf |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2051
Author: gavlee
Date: 2011-12-31 17:50:58 +0100 (Sat, 31 Dec 2011)
Log Message:
-----------
media-sound/swami update thx to Ede Wolf
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/swami/ChangeLog
trunk/overlays/proaudio/media-sound/swami/Manifest
trunk/overlays/proaudio/media-sound/swami/metadata.xml
trunk/overlays/proaudio/media-sound/swami/swami-9999.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/swami/files/swami-2.0.0-qsort-args.patch
trunk/overlays/proaudio/media-sound/swami/swami-2.0.0-r1.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/swami/swami-0.9.4.ebuild
trunk/overlays/proaudio/media-sound/swami/swami-1.0.0_pre1-r1.ebuild
Modified: trunk/overlays/proaudio/media-sound/swami/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/swami/ChangeLog 2011-12-31 16:50:56 UTC (rev 2050)
+++ trunk/overlays/proaudio/media-sound/swami/ChangeLog 2011-12-31 16:50:58 UTC (rev 2051)
@@ -1,7 +1,17 @@
# ChangeLog for media-sound/swami
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/media-sound/swami/ChangeLog,v 1.2 2005/10/05 16:27:34 matsuu Exp $
+*swami-2.0.0-r1 (31 Dec 2011)
+
+ 31 Dec 2011; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx> -swami-0.9.4.ebuild,
+ -swami-1.0.0_pre1-r1.ebuild, +swami-2.0.0-r1.ebuild,
+ +files/swami-2.0.0-qsort-args.patch, swami-9999.ebuild, metadata.xml:
+ Fix deps and crash on execution wrt msg #4249 thx to Ede Wolf.
+ Workaround intermittent failures on install with parallel jobs forcing -j1.
+ Upstream recommended python be disabled for now.
+ Updated svn ebuild for newer cmake scripts.
+
*swami-2.0.0 (02 Nov 2010)
02 Nov 2010; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx> +swami-2.0.0.ebuild:
Modified: trunk/overlays/proaudio/media-sound/swami/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/swami/Manifest 2011-12-31 16:50:56 UTC (rev 2050)
+++ trunk/overlays/proaudio/media-sound/swami/Manifest 2011-12-31 16:50:58 UTC (rev 2051)
@@ -1,9 +1,7 @@
-DIST swami-0.9.4.tar.bz2 697143 RMD160 322762d21106bd9ba6639bab07c239f4d735c2e9 SHA1 301bc4cd77606bb4cf71462d1cd4779e2db1d6a7 SHA256 e9f98e045db6dd98a8061c2409851a9faa2835c009dbfa78fad892d857b769a8
-DIST swami-1.0.0pre1.tar.gz 1094755 RMD160 a0611dea95d3743b5c93cf7593854edee1bb151a SHA1 82f015ab33533ae3d4e2f778e30a430fe6dc43fd SHA256 9205c2f534bdad5550856c00f64a01f5edd15615eceabeceeea7fa76c588226c
+AUX swami-2.0.0-qsort-args.patch 431 RMD160 46763c16b33b43579f684075e06de7c9fa83b750 SHA1 c1a178719e46ec2c71beef865ff845229327656a SHA256 b782ea422e1157380aa71b40fece9b600b533b5b8420bc73ce654544774bfd98
DIST swami-2.0.0.tar.gz 1263997 RMD160 8ec80ecdfbba8dc117208b5dba436312c5625956 SHA1 5c0ace1d55f0b0cf2436f897d1fcf85d7eb61909 SHA256 ef7db4f249055cf30395615b62e0a91989ee717c03afc69e50ae1d0ebb93100e
-EBUILD swami-0.9.4.ebuild 973 RMD160 c1be032543fc0b7574019ed176ec974a6db2c822 SHA1 19d010f16858d7fb04f12474b96d09effcf4590e SHA256 27225bb71a0c16309bcc30504f9e805cd1b72fc41adfbeac5bebf2662efbc30e
-EBUILD swami-1.0.0_pre1-r1.ebuild 1008 RMD160 679da583ac33a8b568f6891043b9704b2e994c48 SHA1 f37a02453bb75ff0700b15f718c63fc6d95d09c5 SHA256 8028ca7116d8d7cc1ce2de92a6ce732d3f8e7ae8195548a2cabafba7398b5e06
+EBUILD swami-2.0.0-r1.ebuild 1327 RMD160 84f7e558b861c9d91522445c9bbd012547ea455d SHA1 8690663e5d3c88aded3b3cb895e57dd23c3469d1 SHA256 b7e79ac2a121ba5cd1e73edc32351dc563ebd671a036381a5a9a9a273518401d
EBUILD swami-2.0.0.ebuild 1089 RMD160 e5d9bb11a1f6834b7bef3caa3095842a0e191bb5 SHA1 78646be6b1906989ca9336ad6c6de414cc53bdbe SHA256 3b9fa06bd758d7bf45b14457fe6a607cf062d3d223bcbb6453a1ce569696c484
-EBUILD swami-9999.ebuild 1316 RMD160 a4eb7d4689faa5973768ff6a0f4f02a1c613cc40 SHA1 61677fd000bd82285679af5a816c333713a02bfd SHA256 ed20ad91383a280a1d220ce7548d62a6b6d2ab52f329ba2d79ea6ecf342ce3ac
-MISC ChangeLog 945 RMD160 cae8e303e538aff3dc59884d7c1fd3f598e4be69 SHA1 8659225cf9dfe349057bac7217c572dfc354d0e6 SHA256 9f67c796e21d86c62205d1d32961a32ac2f85f17e5b5d7b5f3b27cfc6f34de4f
-MISC metadata.xml 221 RMD160 600a2278f8a89283311c5bb10b02d54cebef8ca3 SHA1 aff61004cffd7341912643e1ab44a8df84e14c23 SHA256 3341e7789c5ba08aade2440d5ce6d2937e8432775731033190f11df5f64d085e
+EBUILD swami-9999.ebuild 1026 RMD160 7aeb1382cd74b7ed44f547aeb2bbfd9987a059f0 SHA1 e24604423647da1f30e6d7e094af9095eb864a79 SHA256 e61e2dfbbf51f2f70d31050f5a0fe883358117678a9ff2570e1a002d2c4f149b
+MISC ChangeLog 1421 RMD160 81b2f09a6b52a1510d9a16543da8539a3089eb4e SHA1 96539bbaac8fc8a77b72b7f0153d1a7da513c6bf SHA256 e61b59092e12aa74aa3c207768e53ac17c4536eaf9f472d64d5ee9e6a4d64609
+MISC metadata.xml 335 RMD160 18f4176a607e85afd04768270d2b26b49e195f06 SHA1 247fd0cf29aacd4b14ea028d41eec531ffcc03f9 SHA256 5b3199cf4f5b1e04e75c0385ba2fe4473f230e95bab3066d5cc53e81ce41e969
Added: trunk/overlays/proaudio/media-sound/swami/files/swami-2.0.0-qsort-args.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/swami/files/swami-2.0.0-qsort-args.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/swami/files/swami-2.0.0-qsort-args.patch 2011-12-31 16:50:58 UTC (rev 2051)
@@ -0,0 +1,11 @@
+--- src/swamigui/SwamiguiMenu.c.orig 2011-12-21 19:06:46.932934708 +0000
++++ src/swamigui/SwamiguiMenu.c 2011-12-21 19:07:29.884583604 +0000
+@@ -373,7 +373,7 @@
+ menu = gtk_menu_new ();
+
+ types = swami_util_get_child_types (IPATCH_TYPE_BASE, &n_types);
+- qsort (types, sizeof (GType), n_types, sort_by_type_name);
++ qsort (types, n_types, sizeof (GType), sort_by_type_name);
+
+ for (ptype = types; *ptype; ptype++)
+ {
Modified: trunk/overlays/proaudio/media-sound/swami/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/swami/metadata.xml 2011-12-31 16:50:56 UTC (rev 2050)
+++ trunk/overlays/proaudio/media-sound/swami/metadata.xml 2011-12-31 16:50:58 UTC (rev 2051)
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
-<herd>sound</herd>
-<maintainer>
- <email>sound@xxxxxxxxxx</email>
- </maintainer>
+ <maintainer>
+ <email>proaudio@xxxxxxxxxxxxx</email>
+ <name>pro-audio overlay team</name>
+ </maintainer>
+ <use>
+ <flag name="fluidsynth">build support for media-sound/fluidsynth</flag>
+ </use>
</pkgmetadata>
Deleted: trunk/overlays/proaudio/media-sound/swami/swami-0.9.4.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/swami/swami-0.9.4.ebuild 2011-12-31 16:50:56 UTC (rev 2050)
+++ trunk/overlays/proaudio/media-sound/swami/swami-0.9.4.ebuild 2011-12-31 16:50:58 UTC (rev 2051)
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/swami/swami-0.9.4.ebuild,v 1.3 2007/08/23 17:43:44 drac Exp $
-
-DESCRIPTION="an instrument editor for MIDI music composition and a sampler frontend"
-HOMEPAGE="http://swami.sourceforge.net";
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="audiofile debug nls"
-
-RDEPEND="=x11-libs/gtk+-1.2*
- >=media-sound/fluidsynth-1.0.4
- audiofile? ( >=media-libs/audiofile-0.2.0 )
- >=media-libs/libsndfile-1.0.0
- >=dev-libs/popt-1.5"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-src_compile() {
- econf \
- --disable-gtktest --disable-audiofiletest \
- $(use_enable nls) \
- $(use_enable debug) \
- $(use_enable audiofile) || die
- emake || die "emake failed."
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
- dodoc AUTHORS ChangeLog NEWS README
-}
Deleted: trunk/overlays/proaudio/media-sound/swami/swami-1.0.0_pre1-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/swami/swami-1.0.0_pre1-r1.ebuild 2011-12-31 16:50:56 UTC (rev 2050)
+++ trunk/overlays/proaudio/media-sound/swami/swami-1.0.0_pre1-r1.ebuild 2011-12-31 16:50:58 UTC (rev 2051)
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-RESTRICT="mirror"
-DESCRIPTION="an instrument editor for MIDI music composition and a sampler frontend"
-HOMEPAGE="http://swami.sourceforge.net";
-SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="audiofile debug nls"
-
-RDEPEND="=x11-libs/gtk+-1.2*
- >=media-sound/fluidsynth-1.0.4
- audiofile? ( >=media-libs/audiofile-0.2.0 )
- >=media-libs/libsndfile-1.0.0
- >=dev-libs/popt-1.5
- >=dev-libs/libinstpatch-1.0.0_pre1"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-S="${WORKDIR}/${P/_pre1/}"
-src_compile() {
- use amd64 && myconf='--with-pic'
- econf \
- --disable-gtktest --disable-audiofiletest \
- ${myconf} \
- $(use_enable nls) \
- $(use_enable debug) \
- $(use_enable audiofile) || die
- emake || die "emake failed."
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
- dodoc AUTHORS ChangeLog NEWS README
-}
Added: trunk/overlays/proaudio/media-sound/swami/swami-2.0.0-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/swami/swami-2.0.0-r1.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/swami/swami-2.0.0-r1.ebuild 2011-12-31 16:50:58 UTC (rev 2051)
@@ -0,0 +1,55 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+inherit autotools-utils
+
+DESCRIPTION="A SoundFont instrument editor for MIDI music composition and a sampler frontend"
+HOMEPAGE="http://swami.sourceforge.net";
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug fftw fluidsynth nls"
+
+RESTRICT="mirror"
+
+RDEPEND=">=dev-libs/libinstpatch-1.0.0
+ >=gnome-base/libgnomecanvas-2.30.3
+ >=gnome-base/libglade-2.6.4:2.0
+ >=gnome-base/librsvg-2.8:2
+ >=media-libs/libsndfile-1.0.0
+ >=x11-libs/gtk+-2.20:2
+ fftw? ( >=sci-libs/fftw-3.0:3.0 )
+ fluidsynth? ( >=media-sound/fluidsynth-1.0.4 )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
+
+# bug?
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+DOCS=(AUTHORS ChangeLog NEWS README)
+
+PATCHES=(
+ # fix crash on execution wrt msg #4249. upstream svn commit rev 387
+ "${FILESDIR}/${P}-qsort-args.patch"
+)
+
+src_configure() {
+ local myeconfargs=(
+ --disable-dependency-tracking
+ --disable-rpath
+ --disable-python # upstream recommended until it's fixed
+ $(use amd64 && echo --with-pic)
+ $(use_enable debug)
+ $(use_enable nls)
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ # intermittent failures with parallel install jobs, force -j1
+ autotools-utils_src_install -j1
+}
Modified: trunk/overlays/proaudio/media-sound/swami/swami-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/swami/swami-9999.ebuild 2011-12-31 16:50:56 UTC (rev 2050)
+++ trunk/overlays/proaudio/media-sound/swami/swami-9999.ebuild 2011-12-31 16:50:58 UTC (rev 2051)
@@ -1,52 +1,37 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-inherit eutils flag-o-matic subversion
+EAPI=2
+inherit cmake-utils multilib subversion
-DESCRIPTION="an instrument editor for MIDI music composition and a sampler frontend"
+DESCRIPTION="A SoundFont instrument editor for MIDI music composition and a sampler frontend"
HOMEPAGE="http://swami.sourceforge.net";
-#SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
-
ESVN_REPO_URI="https://swami.svn.sourceforge.net/svnroot/swami/trunk/swami";
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="debug nls python"
+IUSE="debug fftw fluidsynth"
-RDEPEND="media-libs/alsa-lib
- =x11-libs/gtk+-2*
- >=dev-libs/glib-2.0
+RDEPEND=">=dev-libs/libinstpatch-1.0.0
>=gnome-base/libglade-2.6.0
- x11-libs/gtksourceview
- >=dev-python/pygtk-2.12.0-r1
- media-libs/libpng
- >=sci-libs/fftw-3.1
- >=media-sound/fluidsynth-1.0.4
+ >=gnome-base/libgnomecanvas-2.30.3
+ >=gnome-base/librsvg-2.8:2
>=media-libs/libsndfile-1.0.0
- =dev-libs/libinstpatch-9999
- python? ( >=dev-lang/python-2.4 )"
+ >=x11-libs/gtk+-2.20:2
+ fftw? ( >=sci-libs/fftw-3.1:3.0 )
+ fluidsynth? ( >=media-sound/fluidsynth-1.0.4 )"
DEPEND="${RDEPEND}
dev-util/pkgconfig"
-src_compile() {
- # fails with --as-needed
- filter-ldflags -Wl,--as-needed --as-needed
+DOCS=(AUTHORS ChangeLog NEWS README)
- ./autogen.sh
- use amd64 && myconf='--with-pic'
- econf ${myconf} \
- --disable-gtktest --disable-audiofiletest \
- $(use_enable nls) \
- $(use_enable debug) \
- $(use_enable python) \
- || die
- emake || die
+src_configure() {
+ local mycmakeargs=(
+ -DPLUGINS_DIR="${PREFIX}/usr/$(get_libdir)/swami" # multilib-strict
+ $(cmake-utils_use fftw enable-fftw)
+ $(cmake-utils_use fluidsynth enable-fluidsynth)
+ )
+ cmake-utils_src_configure
}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
- dodoc AUTHORS ChangeLog NEWS README
- doicon "${D}"/usr/share/icons/hicolor/48x48/apps/swami-2.png
-}