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

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

3 files changed, 99 insertions, 12 deletions

diff --git a/media-sound/audicle/ChangeLog b/media-sound/audicle/ChangeLog
index dfeb255fb079..f68a33ba9dd5 100644
--- a/media-sound/audicle/ChangeLog
+++ b/media-sound/audicle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/audicle
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audicle/ChangeLog,v 1.3 2009/06/28 21:28:03 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audicle/ChangeLog,v 1.4 2009/08/13 21:57:52 cedk Exp $
+
+*audicle-1.0.0.6-r1 (13 Aug 2009)
+
+  13 Aug 2009; Cédric Krier <cedk@gentoo.org> +audicle-1.0.0.6-r1.ebuild:
+  Add multi-backend support, add default USE flag for bug #254738 and fix
+  CFLAGS and cross-compile
 
   27 Jun 2009; Mark Loeser <halcy0n@gentoo.org> audicle-1.0.0.6.ebuild,
   +files/audicle-1.0.0.6-gcc43.patch:
diff --git a/media-sound/audicle/Manifest b/media-sound/audicle/Manifest
index ee218f555364..994e9e88a7aa 100644
--- a/media-sound/audicle/Manifest
+++ b/media-sound/audicle/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX audicle-1.0.0.6-font.patch 2862 RMD160 12edc5098b4ae21adbdcc0eaef7b6c386329dd44 SHA1 2d0845bad78570b084087f4489c86bb24f6eabd2 SHA256 ca958277aaead8c7cfe4f02a4ee78a0ba3d527bfb61857f4e349ad8f1389c152
 AUX audicle-1.0.0.6-gcc43.patch 3747 RMD160 90ec72eeb2038965d660511c712043a42184ee7d SHA1 73caf64faf837c31ed71fb2d091b42d890156ed9 SHA256 f4384983659a18d1eeff51f5de8434d874284b427aa5c8d0129465d904a17b35
 AUX audicle-1.0.0.6-hid-smc.patch 3105 RMD160 759c6d34beb8fb00be475f7c82f2f313d4f22e6c SHA1 21e2b0875483598ed5fdeabd07911b59d98d00c4 SHA256 051cffc2db8207f5e78cec4fa059580fc734c57d00b0055eb9de7a67b10c462d
 DIST audicle-1.0.0.6.tgz 5531625 RMD160 66a4a69b2a7dbe0d8aa705358f71c0d8df312a3e SHA1 c8967cfb3238064fb12cb91d0fcf19dc90628bb4 SHA256 685b86a263e92be279ccbae001202b159175363ecc87d8a7bc521f8a42a92f90
+EBUILD audicle-1.0.0.6-r1.ebuild 2571 RMD160 162ff6591354e6d1494c3422e7a096d2edaeb54a SHA1 743f683f25ab0020748122543ac7c6ddf7d88d50 SHA256 ff1f06fb49c45c4206f70d3bd215de2a003949b0394d5cc4aef0152016a9bc57
 EBUILD audicle-1.0.0.6.ebuild 2262 RMD160 c73071968a744ae475e9deb2eff9bee40075f81a SHA1 22f589c9b16d6b02e8a54b5f3639aeebcd3516b6 SHA256 5a0a2f4ed4f3e71a52d3ddd803574615d201e8fe2108862ec25fcf710bfcd457
-MISC ChangeLog 795 RMD160 2bed2ce13fbe4a12559829aa3796bd8dccc5b4cc SHA1 5c7cc9b58bc61c06f853d1d093f29203e68b8232 SHA256 e62465a1cdfa2d1616a8b0f9bd2017c9a3be8835224a469af12818f48f651518
+MISC ChangeLog 1004 RMD160 299e12bb3d27765f7532483f827d07ce2fb04dd6 SHA1 452b87bc604bef74fc04b211ac5713a9fa86800c SHA256 5ba667534c99218c8f0de3052ce9ab5181ac5c0f003b1a2bc80894565a75b264
 MISC metadata.xml 472 RMD160 4062e70f23fec1b713ec4661229c94fe3b5977e5 SHA1 37e6ab7cdce21b32d6c434bfaf2a23d03ea70499 SHA256 5bafa4cb9fb7a68864b326ac3b15881be3e2f9e52f0b23f47d50581e4998d895
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpGj1EACgkQCRZPokWLroTXMwCgzVl8csIrgNGnNB6gUS+SbxVo
-fH0An2Ckjc0fWRRpojKIay00ZyMAhhrm
-=BnYo
------END PGP SIGNATURE-----
diff --git a/media-sound/audicle/audicle-1.0.0.6-r1.ebuild b/media-sound/audicle/audicle-1.0.0.6-r1.ebuild
new file mode 100644
index 000000000000..fe762df35358
--- /dev/null
+++ b/media-sound/audicle/audicle-1.0.0.6-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audicle/audicle-1.0.0.6-r1.ebuild,v 1.1 2009/08/13 21:57:52 cedk Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="A Context-sensitive, On-the-fly Audio Programming Environ/mentality"
+HOMEPAGE="http://audicle.cs.princeton.edu/"
+SRC_URI="http://audicle.cs.princeton.edu/release/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="+alsa jack oss truetype"
+
+RDEPEND="jack? ( media-sound/jack-audio-connection-kit )
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	media-libs/libsndfile
+	virtual/glut
+	virtual/opengl
+	virtual/glu
+	>=x11-libs/gtk+-2
+	truetype? ( media-libs/ftgl
+		media-fonts/corefonts )
+	app-admin/eselect-audicle"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-font.patch"
+	epatch "${FILESDIR}/${P}-hid-smc.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+
+	sed -i \
+		-e "s@../ftgl_lib/FTGL/include@/usr/include/FTGL@" \
+		-e "s@../ftgl_lib/FTGL/mac/build@/usr/lib@" \
+		-e "s/gcc -o/\$(CC) -o/" \
+		-e "s/-O3 -c/-c \$(CFLAGS)/" \
+		src/makefile.{alsa,jack,oss} || die "sed failed"
+}
+
+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
+}
+
+compile_backend() {
+	backend=$1
+	local config
+	use truetype && config="USE_FREETYPE_LIBS=1"
+	einfo "Compiling against ${backend}"
+	cd "${S}/src"
+	emake -f "makefile.${backend}" CC=$(tc-getCC) CXX=$(tc-getCXX) LEX=flex \
+		YACC=bison ${config} || die "emake failed"
+	mv audicle{,-${backend}}
+	emake -f makefile clean
+}
+
+src_compile() {
+	# when compile with athlon or athlon-xp flags
+	# audicle 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 src/audicle-jack
+	use alsa && dobin src/audicle-alsa
+	use oss && dobin src/audicle-oss
+	dodoc AUTHORS PROGRAMMER README THANKS TODO VERSIONS
+}
+
+pkg_postinst() {
+	elog "Audicle now can use many audio engines, so you can specify audio engine"
+	elog "with audicle-{jack,alsa,oss}"
+	elog "Or you can use 'eselect audicle' to set the audio engine"
+
+	einfo "Calling eselect audicle update..."
+	eselect audicle update --if-unset
+}