1 |
commit: 6264a78f9b7c0e5074e9357bba5f9b25cd383b8d |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 5 21:27:28 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 7 20:33:51 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6264a78f |
7 |
|
8 |
media-sound/chuck: Drop 1.3.5.2 |
9 |
|
10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
11 |
|
12 |
media-sound/chuck/Manifest | 1 - |
13 |
media-sound/chuck/chuck-1.3.5.2.ebuild | 72 ---------- |
14 |
.../chuck/files/chuck-1.2.1.1-hid-smc.patch | 149 --------------------- |
15 |
.../chuck/files/chuck-1.3.5.1-makefile.patch | 27 ---- |
16 |
4 files changed, 249 deletions(-) |
17 |
|
18 |
diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest |
19 |
index db8b7944008..9fb583bc5d7 100644 |
20 |
--- a/media-sound/chuck/Manifest |
21 |
+++ b/media-sound/chuck/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST chuck-1.3.5.2.tgz 14687476 BLAKE2B 35c3803ba1291bbfedd31d7c2845d20e32af4e91ea77e0790f429465b98d6d3ff91e321f036e3c2294d900d746741d987ac3a231bd6db01e3edaab006d507c97 SHA512 00407b0f20fa9adcd9d0c31078ef7593f8a5b026f19086942c3fa56128fd07e202848651e5e8f41f1d70566de766e84f4a049ca4013e65a61b6f6fb10d69ffbc |
24 |
DIST chuck-1.4.0.0.tgz 14664130 BLAKE2B 2009cc3f6905c7e4361aefdbcc89cab08d21328c6fe8ea366aad32a862428a5ffb16d45b1717e849d174f52e104ff0394a0aa2f93cfceed066e7b393edaabb1e SHA512 198b3c08a79bbbd2c0cdd5d9a7a11b8b58f09e949a3f5dd3f330af7d80fdb2861ca53dce807df555aed6ba917e72001ef7147b62a3ada57c34154102388dece1 |
25 |
|
26 |
diff --git a/media-sound/chuck/chuck-1.3.5.2.ebuild b/media-sound/chuck/chuck-1.3.5.2.ebuild |
27 |
deleted file mode 100644 |
28 |
index fd5abfa7224..00000000000 |
29 |
--- a/media-sound/chuck/chuck-1.3.5.2.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,72 +0,0 @@ |
32 |
-# Copyright 1999-2016 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=6 |
36 |
-inherit toolchain-funcs flag-o-matic |
37 |
- |
38 |
-DESCRIPTION="Strongly-timed, concurrent, and on-the-fly audio programming language" |
39 |
-HOMEPAGE="http://chuck.cs.princeton.edu/" |
40 |
-SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz" |
41 |
- |
42 |
-LICENSE="GPL-2" |
43 |
-SLOT="0" |
44 |
-KEYWORDS="~amd64 ~x86" |
45 |
-IUSE="+alsa jack examples" |
46 |
-REQUIRED_USE="|| ( alsa jack )" |
47 |
- |
48 |
-RDEPEND="app-eselect/eselect-chuck |
49 |
- media-libs/libsndfile |
50 |
- alsa? ( media-libs/alsa-lib ) |
51 |
- jack? ( media-sound/jack-audio-connection-kit )" |
52 |
-DEPEND="${RDEPEND} |
53 |
- sys-devel/bison |
54 |
- sys-devel/flex" |
55 |
- |
56 |
-PATCHES=( |
57 |
- "${FILESDIR}"/${PN}-1.2.1.1-hid-smc.patch |
58 |
- "${FILESDIR}"/${PN}-1.3.5.1-makefile.patch |
59 |
-) |
60 |
- |
61 |
-compile_backend() { |
62 |
- backend=$1 |
63 |
- pushd "${S}/src" &>/dev/null || die |
64 |
- einfo "Compiling against ${backend}" |
65 |
- emake CC=$(tc-getCC) CXX=$(tc-getCXX) linux-${backend} |
66 |
- mv chuck{,-${backend}} || die |
67 |
- emake clean |
68 |
- popd &>/dev/null || die |
69 |
-} |
70 |
- |
71 |
-src_compile() { |
72 |
- # when compile with athlon or athlon-xp flags |
73 |
- # chuck crashes on removing a shred with a double free or corruption |
74 |
- # it happens in Chuck_VM_Stack::shutdown() on the line |
75 |
- # SAFE_DELETE_ARRAY( stack ); |
76 |
- replace-cpu-flags athlon athlon-xp i686 |
77 |
- |
78 |
- use jack && compile_backend jack |
79 |
- use alsa && compile_backend alsa |
80 |
-} |
81 |
- |
82 |
-src_install() { |
83 |
- use jack && dobin src/chuck-jack |
84 |
- use alsa && dobin src/chuck-alsa |
85 |
- |
86 |
- dodoc AUTHORS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS |
87 |
- docinto doc |
88 |
- dodoc doc/* |
89 |
- if use examples; then |
90 |
- insinto /usr/share/doc/${PF}/ |
91 |
- doins -r examples |
92 |
- docompress -x /usr/share/doc/${PF}/examples |
93 |
- fi |
94 |
-} |
95 |
- |
96 |
-pkg_postinst() { |
97 |
- if [[ -z ${REPLACING_VERSIONS} ]]; then |
98 |
- elog "Chuck now can use multiple audio engines, so you can specify" |
99 |
- elog "the preferred audio engine with chuck-{jack,alsa}" |
100 |
- elog "Or you can use 'eselect chuck' to set the audio engine" |
101 |
- fi |
102 |
- eselect chuck update --if-unset |
103 |
-} |
104 |
|
105 |
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 |
106 |
deleted file mode 100644 |
107 |
index e5dcef9da81..00000000000 |
108 |
--- a/media-sound/chuck/files/chuck-1.2.1.1-hid-smc.patch |
109 |
+++ /dev/null |
110 |
@@ -1,149 +0,0 @@ |
111 |
-diff -ru chuck-1.2.1.1~/src/util_hid.cpp chuck-1.2.1.1/src/util_hid.cpp |
112 |
---- chuck-1.2.1.1~/src/util_hid.cpp 2008-03-29 23:24:21.000000000 +0100 |
113 |
-+++ chuck-1.2.1.1/src/util_hid.cpp 2008-03-29 23:24:54.000000000 +0100 |
114 |
-@@ -7175,14 +7175,139 @@ |
115 |
- int WiiRemote_send( const HidMsg * msg ){ return -1; } |
116 |
- const char * WiiRemote_name( int wr ){ return NULL; } |
117 |
- |
118 |
-+#define SYSFS_TILTSENSOR_FILE "/sys/devices/platform/applesmc/position" |
119 |
-+#define TILTSENSOR_BUF_LEN 32 |
120 |
-+ |
121 |
-+static struct t_TiltSensor_data |
122 |
-+{ |
123 |
-+ union |
124 |
-+ { |
125 |
-+ struct t_macbook |
126 |
-+ { |
127 |
-+ int x; |
128 |
-+ int y; |
129 |
-+ int z; |
130 |
-+ } macbook; |
131 |
-+ } data; |
132 |
-+ int dataType; |
133 |
-+ int detected; |
134 |
-+ int refcount; |
135 |
-+ |
136 |
-+ t_TiltSensor_data() |
137 |
-+ { |
138 |
-+ refcount = 0; |
139 |
-+ dataType = -1; |
140 |
-+ detected = 0; |
141 |
-+ } |
142 |
-+ |
143 |
-+} TiltSensor_data; |
144 |
-+enum |
145 |
-+{ |
146 |
-+ linuxAppleSMCMacBookDataType |
147 |
-+}; |
148 |
-+static int TiltSensor_detect() |
149 |
-+{ |
150 |
-+ int fd; |
151 |
-+ |
152 |
-+ fd = open(SYSFS_TILTSENSOR_FILE, O_RDONLY); |
153 |
-+ |
154 |
-+ if (fd > 0) |
155 |
-+ { |
156 |
-+ TiltSensor_data.dataType = linuxAppleSMCMacBookDataType; |
157 |
-+ TiltSensor_data.detected = 1; |
158 |
-+ close(fd); |
159 |
-+ return 1; |
160 |
-+ } |
161 |
-+ |
162 |
-+ TiltSensor_data.detected = -1; |
163 |
-+ |
164 |
-+ return 0; |
165 |
-+} |
166 |
-+ |
167 |
-+static int TiltSensor_do_read() |
168 |
-+{ |
169 |
-+ |
170 |
-+ switch(TiltSensor_data.dataType) |
171 |
-+ { |
172 |
-+ case linuxAppleSMCMacBookDataType: |
173 |
-+ char buf[TILTSENSOR_BUF_LEN]; |
174 |
-+ int ret, fd; |
175 |
-+ fd = open(SYSFS_TILTSENSOR_FILE, O_RDONLY); |
176 |
-+ |
177 |
-+ if (fd < 0) { |
178 |
-+ return -1; |
179 |
-+ } |
180 |
-+ ret = read(fd, buf, TILTSENSOR_BUF_LEN); |
181 |
-+ if (ret < 0) { |
182 |
-+ close(fd); |
183 |
-+ return -1; |
184 |
-+ } |
185 |
-+ if (sscanf(buf, "(%d,%d,%d)\n", &TiltSensor_data.data.macbook.x, &TiltSensor_data.data.macbook.y, &TiltSensor_data.data.macbook.z) != 3) { |
186 |
-+ close(fd); |
187 |
-+ return -1; |
188 |
-+ } |
189 |
-+ close(fd); |
190 |
-+ break; |
191 |
-+ default: |
192 |
-+ return 0; |
193 |
-+ } |
194 |
-+ return 1; |
195 |
-+} |
196 |
- void TiltSensor_init(){} |
197 |
- void TiltSensor_quit(){} |
198 |
- void TiltSensor_probe(){} |
199 |
--int TiltSensor_count(){ return 0; } |
200 |
--int TiltSensor_open( int ts ){ return -1; } |
201 |
--int TiltSensor_close( int ts ){ return -1; } |
202 |
--int TiltSensor_read( int ts, int type, int num, HidMsg * msg ){ return -1; } |
203 |
--const char * TiltSensor_name( int ts ){ return NULL; } |
204 |
-+int TiltSensor_count() |
205 |
-+{ |
206 |
-+ if(TiltSensor_data.detected == 0) |
207 |
-+ TiltSensor_detect(); |
208 |
-+ |
209 |
-+ if(TiltSensor_data.detected == -1) |
210 |
-+ return 0; |
211 |
-+ else if(TiltSensor_data.detected == 1) |
212 |
-+ return 1; |
213 |
-+ |
214 |
-+ return 0; |
215 |
-+} |
216 |
-+int TiltSensor_open( int ts ) |
217 |
-+{ |
218 |
-+ if(TiltSensor_data.detected == 0) |
219 |
-+ TiltSensor_detect(); |
220 |
-+ |
221 |
-+ if(TiltSensor_data.detected == -1) |
222 |
-+ return -1; |
223 |
-+ |
224 |
-+ TiltSensor_data.refcount++; |
225 |
-+ |
226 |
-+ return 0; |
227 |
-+} |
228 |
-+int TiltSensor_close( int ts ) |
229 |
-+{ |
230 |
-+ TiltSensor_data.refcount--; |
231 |
-+ |
232 |
-+ return 0; |
233 |
-+} |
234 |
-+int TiltSensor_read( int ts, int type, int num, HidMsg * msg ) |
235 |
-+{ |
236 |
-+ |
237 |
-+ if(TiltSensor_data.detected == -1) |
238 |
-+ return -1; |
239 |
-+ |
240 |
-+ if(!TiltSensor_do_read()) |
241 |
-+ return -1; |
242 |
-+ |
243 |
-+ if(TiltSensor_data.dataType == linuxAppleSMCMacBookDataType) |
244 |
-+ { |
245 |
-+ msg->idata[0] = TiltSensor_data.data.macbook.x; |
246 |
-+ msg->idata[1] = TiltSensor_data.data.macbook.y; |
247 |
-+ msg->idata[2] = TiltSensor_data.data.macbook.z; |
248 |
-+ } |
249 |
-+ |
250 |
-+ return 0; |
251 |
-+} |
252 |
-+const char * TiltSensor_name( int ts ) |
253 |
-+{ |
254 |
-+ return "Apple Sudden Motion Sensor"; |
255 |
-+} |
256 |
- |
257 |
- |
258 |
- #endif |
259 |
-Only in chuck-1.2.1.1/src: util_hid.cpp.orig |
260 |
|
261 |
diff --git a/media-sound/chuck/files/chuck-1.3.5.1-makefile.patch b/media-sound/chuck/files/chuck-1.3.5.1-makefile.patch |
262 |
deleted file mode 100644 |
263 |
index e714d20e6b9..00000000000 |
264 |
--- a/media-sound/chuck/files/chuck-1.3.5.1-makefile.patch |
265 |
+++ /dev/null |
266 |
@@ -1,27 +0,0 @@ |
267 |
---- chuck-1.3.5.1/src/makefile |
268 |
-+++ chuck-1.3.5.1/src/makefile |
269 |
-@@ -40,8 +40,6 @@ |
270 |
- |
271 |
- ifneq ($(CHUCK_DEBUG),) |
272 |
- CFLAGS+= -g |
273 |
--else |
274 |
--CFLAGS+= -O3 |
275 |
- endif |
276 |
- |
277 |
- ifneq ($(USE_64_BIT_SAMPLE),) |
278 |
---- chuck-1.3.5.1/src/makefile.alsa |
279 |
-+++ chuck-1.3.5.1/src/makefile.alsa |
280 |
-@@ -1,4 +1,4 @@ |
281 |
- |
282 |
--CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ |
283 |
-+CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ |
284 |
- LDFLAGS+= -lasound -lstdc++ -ldl -lm -lsndfile -lpthread |
285 |
- |
286 |
---- chuck-1.3.5.1/src/makefile.jack |
287 |
-+++ chuck-1.3.5.1/src/makefile.jack |
288 |
-@@ -1,4 +1,4 @@ |
289 |
- |
290 |
--CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ |
291 |
-+CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ |
292 |
- LDFLAGS+= -lasound -ljack -lstdc++ -ldl -lm -lsndfile -lpthread |
293 |
- |