Version bump

(Portage version: 2.1.10.41/cvs/Linux i686)

5 files changed, 329 insertions, 2 deletions

diff --git a/media-sound/audicle/ChangeLog b/media-sound/audicle/ChangeLog
index bc4e20e7ffad..5595825eb945 100644
--- a/media-sound/audicle/ChangeLog
+++ b/media-sound/audicle/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/audicle
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audicle/ChangeLog,v 1.7 2011/03/29 12:38:01 angelos Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audicle/ChangeLog,v 1.8 2012/03/17 09:59:59 cedk Exp $
+
+*audicle-1.0.0.7 (17 Mar 2012)
+
+  17 Mar 2012; Cédric Krier <cedk@gentoo.org> +audicle-1.0.0.7.ebuild,
+  +files/audicle-1.0.0.7-const.patch, +files/audicle-1.0.0.7-gcc43.patch,
+  +files/audicle-1.0.0.7-hid-smc.patch:
+  Version bump
 
   29 Mar 2011; Christoph Mende <angelos@gentoo.org> audicle-1.0.0.6-r1.ebuild:
   Fix gtk+ slot deps
diff --git a/media-sound/audicle/audicle-1.0.0.7.ebuild b/media-sound/audicle/audicle-1.0.0.7.ebuild
new file mode 100644
index 000000000000..3467aba1dbf4
--- /dev/null
+++ b/media-sound/audicle/audicle-1.0.0.7.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2012 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.7.ebuild,v 1.1 2012/03/17 09:59:59 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
+	media-libs/freeglut
+	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}/${PN}-1.0.0.6-font.patch"
+	epatch "${FILESDIR}/${P}-hid-smc.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+	epatch "${FILESDIR}/${P}-const.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
+}
diff --git a/media-sound/audicle/files/audicle-1.0.0.7-const.patch b/media-sound/audicle/files/audicle-1.0.0.7-const.patch
new file mode 100644
index 000000000000..38acbf2f2ede
--- /dev/null
+++ b/media-sound/audicle/files/audicle-1.0.0.7-const.patch
@@ -0,0 +1,12 @@
+diff -ru audicle-1.0.0.7.orig//src/audicle_font.cpp audicle-1.0.0.7/src/audicle_font.cpp
+--- audicle-1.0.0.7.orig//src/audicle_font.cpp	2012-03-17 10:23:39.000000000 +0100
++++ audicle-1.0.0.7/src/audicle_font.cpp	2012-03-17 10:49:24.000000000 +0100
+@@ -215,7 +215,7 @@
+ protected :
+     FTFont * m_font;
+ public: 
+-    AudicleFTGLFont( char * name ) { 
++    AudicleFTGLFont( const char * name ) { 
+         
+         glEnable ( GL_TEXTURE_2D );
+         
diff --git a/media-sound/audicle/files/audicle-1.0.0.7-gcc43.patch b/media-sound/audicle/files/audicle-1.0.0.7-gcc43.patch
new file mode 100644
index 000000000000..f6fc08e7da47
--- /dev/null
+++ b/media-sound/audicle/files/audicle-1.0.0.7-gcc43.patch
@@ -0,0 +1,68 @@
+diff -ru audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/chuck_vm.cpp audicle-1.0.0.7/lang/chuck-1.2.1.3/src/chuck_vm.cpp
+--- audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/chuck_vm.cpp	2012-03-17 10:23:39.000000000 +0100
++++ audicle-1.0.0.7/lang/chuck-1.2.1.3/src/chuck_vm.cpp	2012-03-17 10:27:23.000000000 +0100
+@@ -48,6 +48,7 @@
+ #else
+   #include <unistd.h>
+   #include <pthread.h>
++  #include <algorithm>
+ #endif
+ 
+ 
+Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: chuck_vm.cpp.orig
+Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: rtaudio.cpp.orig
+Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: rtaudio.cpp.rej
+Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: ugen_stk.cpp.orig
+Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: ugen_stk.cpp.rej
+Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: ugen_xxx.cpp.orig
+Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: ugen_xxx.cpp.rej
+diff -ru audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_hid.cpp audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_hid.cpp
+--- audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_hid.cpp	2012-03-17 10:23:39.000000000 +0100
++++ audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_hid.cpp	2012-03-17 10:27:23.000000000 +0100
+@@ -38,6 +38,7 @@
+ #include <limits.h>
+ #include <vector>
+ #include <map>
++#include <climits>
+ 
+ using namespace std;
+ 
+Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: util_hid.cpp.orig
+diff -ru audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_opsc.cpp audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_opsc.cpp
+--- audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_opsc.cpp	2012-03-17 10:23:39.000000000 +0100
++++ audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_opsc.cpp	2012-03-17 10:27:23.000000000 +0100
+@@ -57,6 +57,7 @@
+ #include <netinet/tcp.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
++#include <algorithm>
+ #endif
+ 
+ #if defined(__MACOSX_CORE__)
+Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: util_opsc.cpp.orig
+diff -ru audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_string.h audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_string.h
+--- audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_string.h	2012-03-17 10:23:39.000000000 +0100
++++ audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_string.h	2012-03-17 10:27:23.000000000 +0100
+@@ -36,6 +36,7 @@
+ #include "chuck_def.h"
+ #include <string>
+ #include <vector>
++#include <cstdio>
+ 
+ 
+ // itoa
+diff -ru audicle-1.0.0.7.orig//src/audicle_def.h audicle-1.0.0.7/src/audicle_def.h
+--- audicle-1.0.0.7.orig//src/audicle_def.h	2012-03-17 10:23:39.000000000 +0100
++++ audicle-1.0.0.7/src/audicle_def.h	2012-03-17 10:28:40.000000000 +0100
+@@ -39,8 +39,9 @@
+ 
+ #include "chuck_def.h"
+ 
+-#include <stdio.h>
+-#include <math.h>
++#include <cstdio>
++#include <cmath>
++#include <algorithm>
+ #include <assert.h>
+ #ifndef __PLATFORM_WIN32__
+   #include <unistd.h>
diff --git a/media-sound/audicle/files/audicle-1.0.0.7-hid-smc.patch b/media-sound/audicle/files/audicle-1.0.0.7-hid-smc.patch
new file mode 100644
index 000000000000..d362ed06423a
--- /dev/null
+++ b/media-sound/audicle/files/audicle-1.0.0.7-hid-smc.patch
@@ -0,0 +1,149 @@
+diff -ru audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_hid.cpp audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_hid.cpp
+--- audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_hid.cpp	2012-03-17 10:23:39.000000000 +0100
++++ audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_hid.cpp	2012-03-17 10:25:03.000000000 +0100
+@@ -7392,14 +7392,139 @@
+ int WiiRemote_send( const HidMsg * msg ){ return -1; }
+ const char * WiiRemote_name( int wr ){ return NULL; }
+ 
++#define SYSFS_TILTSENSOR_FILE "/sys/devices/platform/applesmc/position"
++#define TILTSENSOR_BUF_LEN 32
++
++static struct t_TiltSensor_data
++{
++	union
++	{
++		struct t_macbook
++		{
++			int x;
++			int y;
++			int z;
++		} macbook;
++	} data;
++	int dataType;
++	int detected;
++	int refcount;
++
++	t_TiltSensor_data()
++	{
++		refcount = 0;
++		dataType = -1;
++		detected = 0;
++	}
++
++} TiltSensor_data;
++enum
++{
++	linuxAppleSMCMacBookDataType
++};
++static int TiltSensor_detect()
++{
++	int fd;
++
++	fd = open(SYSFS_TILTSENSOR_FILE, O_RDONLY);
++
++	if (fd > 0)
++	{
++		TiltSensor_data.dataType = linuxAppleSMCMacBookDataType;
++		TiltSensor_data.detected = 1;
++		close(fd);
++		return 1;
++	}
++
++	TiltSensor_data.detected = -1;
++
++	return 0;
++}
++
++static int TiltSensor_do_read()
++{
++
++	switch(TiltSensor_data.dataType)
++	{
++		case linuxAppleSMCMacBookDataType:
++			char buf[TILTSENSOR_BUF_LEN];
++			int ret, fd;
++			fd = open(SYSFS_TILTSENSOR_FILE, O_RDONLY);
++
++			if (fd < 0) {
++				return -1;
++			}
++			ret = read(fd, buf, TILTSENSOR_BUF_LEN);
++			if (ret < 0) {
++				close(fd);
++				return -1;
++			}
++			if (sscanf(buf, "(%d,%d,%d)\n", &TiltSensor_data.data.macbook.x, &TiltSensor_data.data.macbook.y, &TiltSensor_data.data.macbook.z) != 3) {
++				close(fd);
++				return -1;
++			}
++			close(fd);
++			break;
++		default:
++			return 0;
++	}
++	return 1;
++}
+ void TiltSensor_init(){}
+ void TiltSensor_quit(){}
+ void TiltSensor_probe(){}
+-int TiltSensor_count(){ return 0; }
+-int TiltSensor_open( int ts ){ return -1; }
+-int TiltSensor_close( int ts ){ return -1; }
+-int TiltSensor_read( int ts, int type, int num, HidMsg * msg ){ return -1; }
+-const char * TiltSensor_name( int ts ){ return NULL; }
++int TiltSensor_count()
++{
++	if(TiltSensor_data.detected == 0)
++		TiltSensor_detect();
++
++	if(TiltSensor_data.detected == -1)
++		return 0;
++	else if(TiltSensor_data.detected == 1)
++		return 1;
++
++	return 0;
++}
++int TiltSensor_open( int ts )
++{
++	if(TiltSensor_data.detected == 0)
++		TiltSensor_detect();
++
++	if(TiltSensor_data.detected == -1)
++		return -1;
++
++	TiltSensor_data.refcount++;
++
++	return 0;
++}
++int TiltSensor_close( int ts )
++{
++	TiltSensor_data.refcount--;
++
++	return 0;
++}
++int TiltSensor_read( int ts, int type, int num, HidMsg * msg )
++{
++
++	if(TiltSensor_data.detected == -1)
++		return -1;
++
++	if(!TiltSensor_do_read())
++		return -1;
++
++	if(TiltSensor_data.dataType == linuxAppleSMCMacBookDataType)
++	{
++		msg->idata[0] = TiltSensor_data.data.macbook.x;
++		msg->idata[1] = TiltSensor_data.data.macbook.y;
++		msg->idata[2] = TiltSensor_data.data.macbook.z;
++	}
++
++	return 0;
++}
++const char * TiltSensor_name( int ts )
++{
++	return "Apple Sudden Motion Sensor";
++}
+ 
+ 
+ #endif
+Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: util_hid.cpp.orig