diff options
author | Michael Palimaka <kensington@gentoo.org> | 2014-03-22 19:21:19 +0000 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2014-03-22 19:21:19 +0000 |
commit | af9dcc9801d6fd75a34aadcd9f5989115082d84a (patch) | |
tree | 0119e2495f488e1236f8b81d0acc9dc5c85f6af6 /media-sound | |
parent | Fix compilation (diff) | |
download | gentoo-2-af9dcc9801d6fd75a34aadcd9f5989115082d84a.tar.gz gentoo-2-af9dcc9801d6fd75a34aadcd9f5989115082d84a.tar.bz2 gentoo-2-af9dcc9801d6fd75a34aadcd9f5989115082d84a.zip |
Remove old.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
Diffstat (limited to 'media-sound')
-rw-r--r-- | media-sound/audicle/ChangeLog | 8 | ||||
-rw-r--r-- | media-sound/audicle/audicle-1.0.0.7.ebuild | 91 | ||||
-rw-r--r-- | media-sound/audicle/files/audicle-1.0.0.6-gcc43.patch | 95 | ||||
-rw-r--r-- | media-sound/audicle/files/audicle-1.0.0.6-hid-smc.patch | 148 |
4 files changed, 6 insertions, 336 deletions
diff --git a/media-sound/audicle/ChangeLog b/media-sound/audicle/ChangeLog index 3b12179dff10..ce53d2545c9d 100644 --- a/media-sound/audicle/ChangeLog +++ b/media-sound/audicle/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/audicle -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/audicle/ChangeLog,v 1.11 2013/06/27 07:09:40 pinkbyte Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/audicle/ChangeLog,v 1.12 2014/03/22 19:21:19 kensington Exp $ + + 22 Mar 2014; Michael Palimaka <kensington@gentoo.org> -audicle-1.0.0.7.ebuild, + -files/audicle-1.0.0.6-gcc43.patch, -files/audicle-1.0.0.6-hid-smc.patch: + Remove old. *audicle-1.0.0.7-r1 (27 Jun 2013) diff --git a/media-sound/audicle/audicle-1.0.0.7.ebuild b/media-sound/audicle/audicle-1.0.0.7.ebuild deleted file mode 100644 index b08918c9ab9a..000000000000 --- a/media-sound/audicle/audicle-1.0.0.7.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# 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.2 2012/05/05 08:11:27 mgorny 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 - virtual/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.6-gcc43.patch b/media-sound/audicle/files/audicle-1.0.0.6-gcc43.patch deleted file mode 100644 index 71a999fb6e30..000000000000 --- a/media-sound/audicle/files/audicle-1.0.0.6-gcc43.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff -ur audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/chuck_vm.cpp audicle-1.0.0.6/lang/chuck-1.2.1.1/src/chuck_vm.cpp ---- audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/chuck_vm.cpp 2009-06-27 16:41:29.000000000 -0400 -+++ audicle-1.0.0.6/lang/chuck-1.2.1.1/src/chuck_vm.cpp 2009-06-27 16:45:36.000000000 -0400 -@@ -47,6 +47,7 @@ - #else - #include <unistd.h> - #include <pthread.h> -+ #include <algorithm> - #endif - - -diff -ur audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/rtaudio.cpp audicle-1.0.0.6/lang/chuck-1.2.1.1/src/rtaudio.cpp ---- audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/rtaudio.cpp 2009-06-27 16:41:29.000000000 -0400 -+++ audicle-1.0.0.6/lang/chuck-1.2.1.1/src/rtaudio.cpp 2009-06-27 16:47:50.000000000 -0400 -@@ -50,6 +50,7 @@ - #include "chuck_errmsg.h" - #include "digiio_rtaudio.h" - #include <stdio.h> -+#include <climits> - // old - // #include "RtAudio.h" - // #include <iostream> -diff -ur audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/ugen_stk.cpp audicle-1.0.0.6/lang/chuck-1.2.1.1/src/ugen_stk.cpp ---- audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/ugen_stk.cpp 2009-06-27 16:41:29.000000000 -0400 -+++ audicle-1.0.0.6/lang/chuck-1.2.1.1/src/ugen_stk.cpp 2009-06-27 16:48:30.000000000 -0400 -@@ -41,7 +41,7 @@ - #include <string.h> - #include <time.h> - #include <float.h> -- -+#include <climits> - - - -diff -ur audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/ugen_xxx.cpp audicle-1.0.0.6/lang/chuck-1.2.1.1/src/ugen_xxx.cpp ---- audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/ugen_xxx.cpp 2009-06-27 16:41:29.000000000 -0400 -+++ audicle-1.0.0.6/lang/chuck-1.2.1.1/src/ugen_xxx.cpp 2009-06-27 16:51:21.000000000 -0400 -@@ -2587,7 +2587,7 @@ - // open it - SF_INFO info; - info.format = 0; -- char * format = strrchr( filename, '.'); -+ const char * format = strrchr( filename, '.'); - if( format && strcmp( format, ".raw" ) == 0 ) - { - fprintf( stderr, "[chuck](via SndBuf) %s :: type is '.raw'...\n assuming 16 bit signed mono (PCM)\n", filename ); -diff -ur audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/util_hid.cpp audicle-1.0.0.6/lang/chuck-1.2.1.1/src/util_hid.cpp ---- audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/util_hid.cpp 2009-06-27 16:41:29.000000000 -0400 -+++ audicle-1.0.0.6/lang/chuck-1.2.1.1/src/util_hid.cpp 2009-06-27 16:53:26.000000000 -0400 -@@ -37,6 +37,7 @@ - - #include <vector> - #include <map> -+#include <climits> - - using namespace std; - -diff -ur audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/util_opsc.cpp audicle-1.0.0.6/lang/chuck-1.2.1.1/src/util_opsc.cpp ---- audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/util_opsc.cpp 2009-06-27 16:41:29.000000000 -0400 -+++ audicle-1.0.0.6/lang/chuck-1.2.1.1/src/util_opsc.cpp 2009-06-27 16:53:03.000000000 -0400 -@@ -56,6 +56,7 @@ - #include <netinet/tcp.h> - #include <arpa/inet.h> - #include <netdb.h> -+#include <algorithm> - #endif - - #if defined(__MACOSX_CORE__) -diff -ur audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/util_string.h audicle-1.0.0.6/lang/chuck-1.2.1.1/src/util_string.h ---- audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/util_string.h 2009-06-27 16:41:29.000000000 -0400 -+++ audicle-1.0.0.6/lang/chuck-1.2.1.1/src/util_string.h 2009-06-27 16:52:32.000000000 -0400 -@@ -36,6 +36,7 @@ - #include "chuck_def.h" - #include <string> - #include <vector> -+#include <cstdio> - - - // itoa -diff -ur audicle-1.0.0.6-orig/src/audicle_def.h audicle-1.0.0.6/src/audicle_def.h ---- audicle-1.0.0.6-orig/src/audicle_def.h 2009-06-27 16:41:29.000000000 -0400 -+++ audicle-1.0.0.6/src/audicle_def.h 2009-06-27 16:44:42.000000000 -0400 -@@ -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.6-hid-smc.patch b/media-sound/audicle/files/audicle-1.0.0.6-hid-smc.patch deleted file mode 100644 index 358f0801bbe4..000000000000 --- a/media-sound/audicle/files/audicle-1.0.0.6-hid-smc.patch +++ /dev/null @@ -1,148 +0,0 @@ -diff -ru audicle-1.0.0.6~/lang/chuck-1.2.1.1/src/util_hid.cpp audicle-1.0.0.6/lang/chuck-1.2.1.1/src/util_hid.cpp ---- audicle-1.0.0.6~/lang/chuck-1.2.1.1/src/util_hid.cpp 2008-03-30 00:29:37.000000000 +0100 -+++ audicle-1.0.0.6/lang/chuck-1.2.1.1/src/util_hid.cpp 2008-03-30 00:33:08.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 |