snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

chuck: update to 1.4.0.0.

This commit is contained in:
Andrea Brancaleoni 2018-02-11 19:56:33 +01:00
parent ce2e1500c4
commit fb5a2d63dd
6 changed files with 9 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
srcpkgs/chuck/patches/hid-smc.patch
View File

@ -1,149 +0,0 @@
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

27
srcpkgs/chuck/patches/makefile.patch
View File

@ -1,27 +0,0 @@
--- chuck-1.3.5.1/src/makefile
+++ chuck-1.3.5.1/src/makefile
@@ -40,8 +40,6 @@
ifneq ($(CHUCK_DEBUG),)
CFLAGS+= -g
-else
-CFLAGS+= -O3
endif
ifneq ($(USE_64_BIT_SAMPLE),)
--- chuck-1.3.5.1/src/makefile.alsa
+++ chuck-1.3.5.1/src/makefile.alsa
@@ -1,4 +1,4 @@
-CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
+CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
LDFLAGS+= -lasound -lstdc++ -ldl -lm -lsndfile -lpthread
--- chuck-1.3.5.1/src/makefile.jack
+++ chuck-1.3.5.1/src/makefile.jack
@@ -1,4 +1,4 @@
-CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
+CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
LDFLAGS+= -lasound -ljack -lstdc++ -ldl -lm -lsndfile -lpthread

4
srcpkgs/chuck/patches/musl-glob.patch
View File

@ -1,7 +1,7 @@
In musl libc there is no GLOB_TILDE defined.
--- chuck-1.3.5.2/src/util_string.cpp 2015-10-21 11:04:45.000000000 +0200
+++ chuck-1.3.5.2/src/util_string.cpp 2015-10-25 15:54:10.284686182 +0100
--- chuck-1.3.5.2/src/core/util_string.cpp 2015-10-21 11:04:45.000000000 +0200
+++ chuck-1.3.5.2/src/core/util_string.cpp 2015-10-25 15:54:10.284686182 +0100
@@ -41,6 +41,11 @@
#endif // __PLATFORM_LINUX__

4
srcpkgs/chuck/patches/musl-limits_h.patch
View File

@ -1,7 +1,7 @@
PATH_MAX is defined in <limits.h>
--- chuck-1.3.5.2/src/util_serial.cpp 2015-10-21 11:04:45.000000000 +0200
+++ chuck-1.3.5.2/src/util_serial.cpp 2015-10-25 15:57:34.953700938 +0100
--- chuck-1.3.5.2/src/core/util_serial.cpp 2015-10-21 11:04:45.000000000 +0200
+++ chuck-1.3.5.2/src/core/util_serial.cpp 2015-10-25 15:57:34.953700938 +0100
@@ -118,6 +118,7 @@
#elif defined(__PLATFORM_LINUX__)

4
srcpkgs/chuck/patches/musl-termios_h.patch
View File

@ -1,8 +1,8 @@
The header file <termio.h> is obsolete. Instead use the
header <termios.h> and the struct termios for musl libc.
--- chuck-1.3.5.2/src/util_console.cpp 2015-10-21 11:04:45.000000000 +0200
+++ chuck-1.3.5.2/src/util_console.cpp 2015-10-25 15:50:25.091669947 +0100
--- chuck-1.3.5.2/src/core/util_console.cpp 2015-10-21 11:04:45.000000000 +0200
+++ chuck-1.3.5.2/src/core/util_console.cpp 2015-10-25 15:50:25.091669947 +0100
@@ -95,9 +95,12 @@
#ifdef __PLATFORM_MACOSX__
#include <termios.h>

6
srcpkgs/chuck/template
View File

@ -1,7 +1,7 @@
# Template file for 'chuck'
pkgname=chuck
version=1.3.5.2
revision=2
version=1.4.0.0
revision=1
build_wrksrc=src
hostmakedepends="bison flex"
makedepends="jack-devel libsndfile-devel liblo-devel"
@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3"
homepage="http://chuck.cs.princeton.edu"
distfiles="http://chuck.cs.princeton.edu/release/files/$pkgname-$version.tgz"
checksum=e900b8545ffcb69c6d49354b18c43a9f9b8f789d3ae822f34b408eaee8d3e70b
checksum=2caee332b8d48e2fddad0f8a0a1811b6cf4c5afab73ae8a17b85ec759cce27ac
patch_args="-Np1"