Version bump

Package-Manager: portage-2.1.4.4

4 files changed, 239 insertions, 3 deletions

diff --git a/media-sound/chuck/ChangeLog b/media-sound/chuck/ChangeLog
index 209894eb4721..bee77a37111d 100644
--- a/media-sound/chuck/ChangeLog
+++ b/media-sound/chuck/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/chuck
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/chuck/ChangeLog,v 1.5 2007/08/23 22:01:34 cedk Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/chuck/ChangeLog,v 1.6 2008/03/29 22:35:11 cedk Exp $
+
+*chuck-1.2.1.1 (29 Mar 2008)
+
+  29 Mar 2008; Cédric Krier <cedk@gentoo.org>
+  +files/chuck-1.2.1.1-hid-smc.patch, +chuck-1.2.1.1.ebuild:
+  Version bump
 
 *chuck-1.2.1.0 (23 Aug 2007)
 
diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index 3afbe387a82b..6a6a04a5e950 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1,8 +1,11 @@
+AUX chuck-1.2.1.1-hid-smc.patch 3066 RMD160 d14ed663309cf1d1d959def210f911445232aa16 SHA1 0597db202b8e2696f02ea22c27f01920c13d19bf SHA256 5b07a22881c36bede4d041993cc4b6b26faf13f3e3c549ff9f31cc127fda1554
 DIST chuck-1.2.0.7.tgz 1428298 RMD160 02347cc1ef20a3947eca209ae0f3407329edfa16 SHA1 750b875a4f3dbfe3edf19e661bc364989e7367b5 SHA256 36df181105b5a8cc214a3161c99c7f2f1c26f205181838fa07c0489b252cbfef
 DIST chuck-1.2.0.8.tgz 1488649 RMD160 f497373a5e10adb47b33c618141693ac3f439079 SHA1 5c41dfd982ce606658bab1498e64ac110523db99 SHA256 68e1fcce0cf0ff39c7dc009f4893a0c98c4b5368d2748b2fe3c33f2f6d619358
 DIST chuck-1.2.1.0.tgz 1487034 RMD160 3a90129ec22641d7aea64e0e5d909b2c22809047 SHA1 3f6a393ab0a0e217f1316c4848f8fe338e4a9f60 SHA256 9c96c134e53ec4bdf22b508d52a3e2c43b50ee68211d6c4a5a48d76387fcb93a
+DIST chuck-1.2.1.1.tgz 1490434 RMD160 2b4d5734931b892634b4f2bbce8aafcad077bc5c SHA1 5a1219d8f4b55f6a311fe0c040c28c9230e016dc SHA256 2bd38ad3d55e4cd0f9f789b17eded8d6ad340f3bf169c099f271ff8a883b5e06
 EBUILD chuck-1.2.0.7.ebuild 1949 RMD160 66a8c8e3d3b4370c02c355907f62c7373c105839 SHA1 4e18f1f5a03408039658e0613e4546132ee44967 SHA256 5498ea86f1845da9fc6f539b91bdf9d61235e3218174c0d3856aad9db03f45c0
 EBUILD chuck-1.2.0.8.ebuild 1949 RMD160 f33eaeeb47c55f8098c0b30d7832ac04969697a7 SHA1 cb862a0ee927177442fde590ebc059cd57945708 SHA256 874d39bf7323db4e4392e5c7213141eefdb03e839730101636f7ba1df4bb2793
 EBUILD chuck-1.2.1.0.ebuild 1949 RMD160 b728abd3e85414feb11be5aca3b72e34d22f71ae SHA1 7b1f6d93c266f71dca31cf8633b5e0028b493704 SHA256 e8482c55647e9b197163f70b84c55ba815b18b62a6fb63a9d8f93e3296ff278c
-MISC ChangeLog 789 RMD160 068ac6c5072acc4683b37c53b459f3d302ad3430 SHA1 58b1707e9fdece6dac2ab03201166b9a0301b558 SHA256 17b49ca42d58a8bee30f56b803b20df065c0447c638cf47e969771f94b58192f
+EBUILD chuck-1.2.1.1.ebuild 2037 RMD160 be5498338d5641f2d6d7af29250d0c8b0e0fbbfa SHA1 cf154a877f680ba26f2958e3ba17a1e0bf21d8f8 SHA256 c4cc32755be7835e28d0a9341742f89dec1a7992862cf7b19f669fed976ffcd3
+MISC ChangeLog 943 RMD160 da1c6a03f48a6f7de50b0d5ac97e5d74c8b89d20 SHA1 f62afda6b88cf338170b7b0859f89483124e1caa SHA256 04eb4cac8bb043dac928642010a70b8665b14df114feed4c2b33bc971cdb1104
 MISC metadata.xml 368 RMD160 1bdbac2a814e0ac3680a3fbdbbb426c4b42aa1f0 SHA1 e0f26be139138f200081a60985b3a13d75b6c359 SHA256 27805233ee7ce2aaa17abecafbc40d5b5f2664636e1849f314f3e1dc56241030
diff --git a/media-sound/chuck/chuck-1.2.1.1.ebuild b/media-sound/chuck/chuck-1.2.1.1.ebuild
new file mode 100644
index 000000000000..e98759c9e5a4
--- /dev/null
+++ b/media-sound/chuck/chuck-1.2.1.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/chuck/chuck-1.2.1.1.ebuild,v 1.1 2008/03/29 22:35:11 cedk Exp $
+
+inherit toolchain-funcs flag-o-matic eutils
+
+DESCRIPTION="Strongly-timed, Concurrent, and On-the-fly
+Audio Programming Language"
+HOMEPAGE="http://chuck.cs.princeton.edu/release/"
+SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="oss jack alsa examples"
+
+RDEPEND="jack? ( media-sound/jack-audio-connection-kit )
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	media-libs/libsndfile"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+pkg_setup() {
+	local cnt=0
+	use jack && cnt="$((${cnt} + 1))"
+	use alsa && cnt="$((${cnt} + 1))"
+	use oss && cnt="$((${cnt} + 1))"
+	if [[ "${cnt}" -eq 0 ]] ; then
+		eerror "One of the following USE flags is needed: jack, alsa or oss"
+		die "Please set one audio engine type"
+	elif [[ "${cnt}" -ne 1 ]] ; then
+		ewarn "You have set ${P} to use multiple audio engine."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "$FILESDIR/${P}-hid-smc.patch"
+}
+
+src_compile() {
+	local backend
+	if use jack ; then
+		backend="jack"
+	elif use alsa ; then
+		backend="alsa"
+	elif use oss ; then
+		backend="oss"
+	fi
+	einfo "Compiling against ${backend}"
+
+	# when compile with athlon or athlon-xp flags
+	# chuck 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
+
+	cd "${S}/src"
+	emake -f "makefile.${backend}" CC=$(tc-getCC) CXX=$(tc-getCXX) || die "emake failed"
+}
+
+src_install() {
+	dobin src/chuck
+
+	dodoc AUTHORS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
+	docinto doc
+	dodoc doc/*
+	if use examples; then
+		insinto /usr/share/doc/${P}/examples
+		doins `find examples -type f`
+		for dir in `find examples/* -type d`; do
+			insinto /usr/share/doc/${P}/$dir
+			doins $dir/*
+		done
+	fi
+}
diff --git a/media-sound/chuck/files/chuck-1.2.1.1-hid-smc.patch b/media-sound/chuck/files/chuck-1.2.1.1-hid-smc.patch
new file mode 100644
index 000000000000..e5dcef9da811
--- /dev/null
+++ b/media-sound/chuck/files/chuck-1.2.1.1-hid-smc.patch
@@ -0,0 +1,149 @@
+diff -ru chuck-1.2.1.1~/src/util_hid.cpp chuck-1.2.1.1/src/util_hid.cpp
+--- chuck-1.2.1.1~/src/util_hid.cpp	2008-03-29 23:24:21.000000000 +0100
++++ chuck-1.2.1.1/src/util_hid.cpp	2008-03-29 23:24:54.000000000 +0100
+@@ -7175,14 +7175,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 chuck-1.2.1.1/src: util_hid.cpp.orig