Add multi-backend support, add default USE flag for bug #254733 and fix CFLAGS and cross-compile

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 98 insertions, 12 deletions

diff --git a/media-sound/miniaudicle/ChangeLog b/media-sound/miniaudicle/ChangeLog
index 1c22afd7ad51..7481ffc31fc9 100644
--- a/media-sound/miniaudicle/ChangeLog
+++ b/media-sound/miniaudicle/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/miniaudicle
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/miniaudicle/ChangeLog,v 1.2 2009/06/29 01:32:26 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/miniaudicle/ChangeLog,v 1.3 2009/08/09 14:33:34 cedk Exp $
+
+*miniaudicle-0.1.3.8-r1 (09 Aug 2009)
+
+  09 Aug 2009; Cédric Krier <cedk@gentoo.org>
+  +miniaudicle-0.1.3.8-r1.ebuild:
+  Add multi-backend support, add default USE flag for bug #254733 and fix
+  CFLAGS and cross-compile
 
   28 Jun 2009; Mark Loeser <halcy0n@gentoo.org> miniaudicle-0.1.3.8.ebuild,
   +files/miniaudicle-0.1.3.8-gcc44.patch:
diff --git a/media-sound/miniaudicle/Manifest b/media-sound/miniaudicle/Manifest
index 8bcb5603667e..89e662adaa3c 100644
--- a/media-sound/miniaudicle/Manifest
+++ b/media-sound/miniaudicle/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX miniaudicle-0.1.3.8-gcc44.patch 6358 RMD160 229de4851c3e86e8d0fbca13ea415c71634f2b8f SHA1 26b3a58ab814a80eede9a8f0509175e7e4ee7108 SHA256 dacaf5680b766e115efd187dac773231d209d23f149d85c541be8724815c37c2
 AUX miniaudicle-0.1.3.8-hid-smc.patch 3101 RMD160 f8b325dd7da234c3bb85d13f3acc69e1a1f274c9 SHA1 7f4aa83ed7e437e90774f408f0c6392b53094121 SHA256 20c137254828b1638c5ef1aecb25d5eaa674fb3c723d98a45c41843e38bb3d73
 DIST miniAudicle-0.1.3.8.tgz 2253821 RMD160 d332fffb4cddadf3f144ffc84f7fd62ec6bc82be SHA1 fbebccaf90fe11951fb104848444bcda292df5a1 SHA256 adfbd244a7963e646c466f70111fee4ecf32eee500c4c9a33ca9b52387631cd6
+EBUILD miniaudicle-0.1.3.8-r1.ebuild 2483 RMD160 61d40bc93e1077d0ea82006c34623e0897043fa4 SHA1 e352e8ca95b97a68cd9af106d82a4f4a17554860 SHA256 3ff55c5d0261268eacfa69071151a87d854d798d8b3ebd31a078aa23ba3382db
 EBUILD miniaudicle-0.1.3.8.ebuild 1980 RMD160 a0d6be61edccce572cefcdf23f5c3039d4eb545d SHA1 c5ffef003e7d3e2d4d01bfcf81a4d66cccbbe995 SHA256 e23cc2781e59a014696569fc5364e2f56cea19a788c5794f1023bd2c426663b1
-MISC ChangeLog 639 RMD160 e8c29b6bbbd950432ada10d5998683d591ad25dd SHA1 fa4cf08d345091ab0489c86e475a284b2d5c8140 SHA256 90e4f5531471a47173eac79fb05cc42077d120e4c0bb0a82a2158e8dc223c636
+MISC ChangeLog 858 RMD160 c14fd359f59231bd5a92c8adc620f9dbe7a47f80 SHA1 3150fc66ea96b43980f9e280c88dd234d3a4f554 SHA256 202c9b3c291a67d8322f9ba656de282c5e6ff8c91993d09b9f2563e1ed4292b3
 MISC metadata.xml 405 RMD160 33bef0e9877b6e20dcf8d558327eb775cace4084 SHA1 54acba4e626df4d51aed5cd2d855770cf45dff95 SHA256 bc3639b5d9f5b72f07a88b90aad07da64da85bb37bc3f7d9ab5d5a15a8d82fd4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpGyJIACgkQCRZPokWLroSrEwCfb9dVQ48uIJrACXM8dtRLypO/
-bWQAoKAm/vdw89dyCUbJna6pC+PPtyPb
-=40ZX
------END PGP SIGNATURE-----
diff --git a/media-sound/miniaudicle/miniaudicle-0.1.3.8-r1.ebuild b/media-sound/miniaudicle/miniaudicle-0.1.3.8-r1.ebuild
new file mode 100644
index 000000000000..a0542b2d3b0c
--- /dev/null
+++ b/media-sound/miniaudicle/miniaudicle-0.1.3.8-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/miniaudicle/miniaudicle-0.1.3.8-r1.ebuild,v 1.1 2009/08/09 14:33:34 cedk Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs flag-o-matic
+
+MY_P=${P/a/A}
+
+DESCRIPTION="integrated development + performance environment for chuck"
+HOMEPAGE="http://audicle.cs.princeton.edu/mini/"
+SRC_URI="http://audicle.cs.princeton.edu/mini/release/files/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="+alsa jack oss"
+
+RDEPEND="jack? ( media-sound/jack-audio-connection-kit )
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	media-libs/libsndfile
+	>=x11-libs/wxGTK-2.6
+	app-admin/eselect-miniaudicle"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if ! use alsa && ! use jack && ! use oss; then
+		eerror "One of the following USE flags is needed: jack, alsa or oss"
+		die "Please set one audio engine type"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-hid-smc.patch"
+	epatch "${FILESDIR}/${P}-gcc44.patch"
+
+	sed -i -e "s/make -C/#make -C/" \
+		-e "s/g++/\$(CXX)/" \
+		-e "s/-O3 -c/-c \$(CFLAGS)/" \
+		makefile.* || die "sed failed"
+}
+
+compile_backend() {
+	backend=$1
+	einfo "Compiling against ${backend}"
+	cd "${S}/chuck/src"
+	emake -f "makefile.${backend}" CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) || die "emake failed"
+	cd "${S}"
+	emake -f "makefile.${backend}" CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) || die "emake failed"
+	mv wxw/miniAudicle{,-${backend}}
+	emake -f "makefile.${backend}" clean
+	cd "${S}/chuck/src"
+	emake -f "makefile.${backend}" clean
+}
+
+src_compile() {
+	# when compiled with -march=athlon or -march=athlon-xp
+	# miniaudicle crashes on removing a shred with a double free or corruption
+	# it happens in Chuck_VM_Stack::shutdown() on the line
+	#   SAFE_DELETE_ARRAY( stack );
+	replace-cpu-flags athlon athlon-xp i686
+
+	use jack && compile_backend jack
+	use alsa && compile_backend alsa
+	use oss && compile_backend oss
+}
+
+src_install() {
+	use jack && dobin wxw/miniAudicle-jack
+	use alsa && dobin wxw/miniAudicle-alsa
+	use oss && dobin wxw/miniAudicle-oss
+	dodoc BUGS README.linux VERSIONS
+}
+
+pkg_postinst() {
+	elog "miniAudicle now can use many audio engines, so you can specify audio engine"
+	elog "with miniAudicle-{jack,alsa,oss}"
+	elog "Or you can use 'eselect miniaudicle' to set the audio engine"
+
+	einfo "Calling eselect miniaudicle update..."
+	eselect miniaudicle update --if-unset
+}