Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/freeverb3/files/
Date: Thu, 22 Dec 2016 16:04:59
Message-Id: 1482422683.9535a4a8bab1f0fdd3ddfc5a5478b6dda6f7f57b.kensington@gentoo
1 commit: 9535a4a8bab1f0fdd3ddfc5a5478b6dda6f7f57b
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Tue Dec 20 19:15:11 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 22 16:04:43 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9535a4a8
7
8 media-libs/freeverb3: remove unused patches
9
10 .../files/freeverb3-2.3.0-fix-implicit.patch | 90 ---------------
11 .../files/freeverb3-2.3.1-plugin-api-v8-v10.patch | 125 ---------------------
12 .../files/freeverb3-2.5.0-pow-ambiguity.patch | 12 --
13 .../freeverb3-2.5.13-fix-sse1v2-assembly.patch | 13 ---
14 .../freeverb3-2.5.13-respect-disable-sse.patch | 24 ----
15 .../files/freeverb3-3.0.0-audacious-3.3.x.patch | 40 -------
16 6 files changed, 304 deletions(-)
17
18 diff --git a/media-libs/freeverb3/files/freeverb3-2.3.0-fix-implicit.patch b/media-libs/freeverb3/files/freeverb3-2.3.0-fix-implicit.patch
19 deleted file mode 100644
20 index 1db4dc8..00000000
21 --- a/media-libs/freeverb3/files/freeverb3-2.3.0-fix-implicit.patch
22 +++ /dev/null
23 @@ -1,90 +0,0 @@
24 -diff -cr freeverb3-2.3.0/libsamplerate2/samplerate.c freeverb3/libsamplerate2/samplerate.c
25 -*** freeverb3-2.3.0/libsamplerate2/samplerate.c 2008-09-18 22:52:39.000000000 +0900
26 ---- freeverb3/libsamplerate2/samplerate.c 2009-03-03 20:23:52.000000000 +0900
27 -***************
28 -*** 20,30 ****
29 - #include <stdlib.h>
30 - #include <string.h>
31 -
32 -! #include "config.h"
33 -!
34 - #include "samplerate2.h"
35 - #include "common.h"
36 -- #include "float_cast.h"
37 -
38 - static long SR2_(psrc_set_converter) (SR2_(SRC_PRIVATE) *psrc, long converter_type);
39 -
40 ---- 20,28 ----
41 - #include <stdlib.h>
42 - #include <string.h>
43 -
44 -! #include "float_cast.h"
45 - #include "samplerate2.h"
46 - #include "common.h"
47 -
48 - static long SR2_(psrc_set_converter) (SR2_(SRC_PRIVATE) *psrc, long converter_type);
49 -
50 -diff -cr freeverb3-2.3.0/libsamplerate2/samplerate_common.c freeverb3/libsamplerate2/samplerate_common.c
51 -*** freeverb3-2.3.0/libsamplerate2/samplerate_common.c 2008-09-18 22:50:26.000000000 +0900
52 ---- freeverb3/libsamplerate2/samplerate_common.c 2009-03-03 20:23:39.000000000 +0900
53 -***************
54 -*** 19,28 ****
55 - #include <stdio.h>
56 - #include <stdlib.h>
57 - #include <string.h>
58 -! #include "config.h"
59 - #include "common_c.h"
60 - #include "samplerate2_common.h"
61 -- #include "float_cast.h"
62 -
63 - const char * src_get_name (long converter_type)
64 - {
65 ---- 19,27 ----
66 - #include <stdio.h>
67 - #include <stdlib.h>
68 - #include <string.h>
69 -! #include "float_cast.h"
70 - #include "common_c.h"
71 - #include "samplerate2_common.h"
72 -
73 - const char * src_get_name (long converter_type)
74 - {
75 -diff -cr freeverb3-2.3.0/libsamplerate2/src_linear.c freeverb3/libsamplerate2/src_linear.c
76 -*** freeverb3-2.3.0/libsamplerate2/src_linear.c 2008-09-18 21:11:55.000000000 +0900
77 ---- freeverb3/libsamplerate2/src_linear.c 2009-03-03 20:24:07.000000000 +0900
78 -***************
79 -*** 20,26 ****
80 - #include <stdlib.h>
81 - #include <string.h>
82 -
83 -- #include "config.h"
84 - #include "float_cast.h"
85 - #include "samplerate2.h"
86 - #include "common.h"
87 ---- 20,25 ----
88 -diff -cr freeverb3-2.3.0/libsamplerate2/src_sinc.c freeverb3/libsamplerate2/src_sinc.c
89 -*** freeverb3-2.3.0/libsamplerate2/src_sinc.c 2008-09-18 23:31:00.000000000 +0900
90 ---- freeverb3/libsamplerate2/src_sinc.c 2009-03-03 20:24:11.000000000 +0900
91 -***************
92 -*** 20,26 ****
93 - #include <stdlib.h>
94 - #include <string.h>
95 -
96 -- #include "config.h"
97 - #include "float_cast.h"
98 - #include "samplerate2.h"
99 - #include "common.h"
100 ---- 20,25 ----
101 -diff -cr freeverb3-2.3.0/libsamplerate2/src_zoh.c freeverb3/libsamplerate2/src_zoh.c
102 -*** freeverb3-2.3.0/libsamplerate2/src_zoh.c 2008-09-18 23:21:46.000000000 +0900
103 ---- freeverb3/libsamplerate2/src_zoh.c 2009-03-03 20:24:15.000000000 +0900
104 -***************
105 -*** 20,26 ****
106 - #include <stdlib.h>
107 - #include <string.h>
108 -
109 -- #include "config.h"
110 - #include "float_cast.h"
111 - #include "samplerate2.h"
112 - #include "common.h"
113 ---- 20,25 ----
114
115 diff --git a/media-libs/freeverb3/files/freeverb3-2.3.1-plugin-api-v8-v10.patch b/media-libs/freeverb3/files/freeverb3-2.3.1-plugin-api-v8-v10.patch
116 deleted file mode 100644
117 index 5bc6c8f..00000000
118 --- a/media-libs/freeverb3/files/freeverb3-2.3.1-plugin-api-v8-v10.patch
119 +++ /dev/null
120 @@ -1,125 +0,0 @@
121 -From a5dbe75a4b2c26ff969ef0b8eb2acc0b39f477a7 Mon Sep 17 00:00:00 2001
122 -From: Sebastian Pipping <sebastian@×××××××.org>
123 -Date: Sat, 3 Oct 2009 04:57:55 +0200
124 -Subject: [PATCH] Support Plugin API v8, v10 and later
125 -
126 ----
127 - work/freeverb3-2.3.1/xmms/compressor.cpp | 12 ++++++++++++
128 - work/freeverb3-2.3.1/xmms/filter.cpp | 3 +++
129 - work/freeverb3-2.3.1/xmms/freeverb3.cpp | 3 +++
130 - work/freeverb3-2.3.1/xmms/impulser.cpp | 3 +++
131 - work/freeverb3-2.3.1/xmms/impulser2.cpp | 3 +++
132 - work/freeverb3-2.3.1/xmms/revmodel.cpp | 3 +++
133 - work/freeverb3-2.3.1/xmms/stenh.cpp | 3 +++
134 - 7 files changed, 30 insertions(+), 0 deletions(-)
135 -
136 -diff --git a/work/freeverb3-2.3.1/xmms/compressor.cpp b/work/freeverb3-2.3.1/xmms/compressor.cpp
137 -index a02570f..a18eca3 100644
138 ---- a/work/freeverb3-2.3.1/xmms/compressor.cpp
139 -+++ b/work/freeverb3-2.3.1/xmms/compressor.cpp
140 -@@ -1095,6 +1095,18 @@ static EffectPlugin epe = {
141 - cleanup,
142 - about,
143 - configure,
144 -+/*
145 -+ * Compile fix for Audacious 2.2_alpha1
146 -+ *
147 -+ * Increase PAPI version.
148 -+ * http://hg.atheme.org/audacious/annotate/74969c017b3e/src/audacious/plugin.h#64
149 -+ *
150 -+ * Shuffle some functors and fields around in plugin structures; Start of cleanup.
151 -+ * http://hg.atheme.org/audacious/annotate/8554b25b0087/src/audacious/plugin.h#1025
152 -+ */
153 -+#if __AUDACIOUS_PLUGIN_API__ >= 10
154 -+ NULL,
155 -+#endif
156 - FALSE,
157 - mod_samples,
158 - NULL,
159 -diff --git a/work/freeverb3-2.3.1/xmms/filter.cpp b/work/freeverb3-2.3.1/xmms/filter.cpp
160 -index 3b01e4d..b403124 100644
161 ---- a/work/freeverb3-2.3.1/xmms/filter.cpp
162 -+++ b/work/freeverb3-2.3.1/xmms/filter.cpp
163 -@@ -462,6 +462,9 @@ static EffectPlugin epe = {
164 - cleanup,
165 - about,
166 - configure,
167 -+#if __AUDACIOUS_PLUGIN_API__ >= 10
168 -+ NULL,
169 -+#endif
170 - FALSE,
171 - mod_samples,
172 - NULL,
173 -diff --git a/work/freeverb3-2.3.1/xmms/freeverb3.cpp b/work/freeverb3-2.3.1/xmms/freeverb3.cpp
174 -index f00bc8e..8bda2be 100644
175 ---- a/work/freeverb3-2.3.1/xmms/freeverb3.cpp
176 -+++ b/work/freeverb3-2.3.1/xmms/freeverb3.cpp
177 -@@ -700,6 +700,9 @@ static EffectPlugin epe = {
178 - cleanup,
179 - about,
180 - configure,
181 -+#if __AUDACIOUS_PLUGIN_API__ >= 10
182 -+ NULL,
183 -+#endif
184 - FALSE,
185 - mod_samples,
186 - NULL,
187 -diff --git a/work/freeverb3-2.3.1/xmms/impulser.cpp b/work/freeverb3-2.3.1/xmms/impulser.cpp
188 -index c1b6856..6341219 100644
189 ---- a/work/freeverb3-2.3.1/xmms/impulser.cpp
190 -+++ b/work/freeverb3-2.3.1/xmms/impulser.cpp
191 -@@ -617,6 +617,9 @@ static EffectPlugin epe = {
192 - cleanup,
193 - about,
194 - configure,
195 -+#if __AUDACIOUS_PLUGIN_API__ >= 10
196 -+ NULL,
197 -+#endif
198 - FALSE,
199 - mod_samples,
200 - NULL,
201 -diff --git a/work/freeverb3-2.3.1/xmms/impulser2.cpp b/work/freeverb3-2.3.1/xmms/impulser2.cpp
202 -index cf8e453..1385484 100644
203 ---- a/work/freeverb3-2.3.1/xmms/impulser2.cpp
204 -+++ b/work/freeverb3-2.3.1/xmms/impulser2.cpp
205 -@@ -1538,6 +1538,9 @@ static EffectPlugin epe = {
206 - cleanup,
207 - about,
208 - configure,
209 -+#if __AUDACIOUS_PLUGIN_API__ >= 10
210 -+ NULL,
211 -+#endif
212 - FALSE,
213 - mod_samples,
214 - NULL,
215 -diff --git a/work/freeverb3-2.3.1/xmms/revmodel.cpp b/work/freeverb3-2.3.1/xmms/revmodel.cpp
216 -index d596df4..bc808ae 100644
217 ---- a/work/freeverb3-2.3.1/xmms/revmodel.cpp
218 -+++ b/work/freeverb3-2.3.1/xmms/revmodel.cpp
219 -@@ -592,6 +592,9 @@ static EffectPlugin epe = {
220 - cleanup,
221 - about,
222 - configure,
223 -+#if __AUDACIOUS_PLUGIN_API__ >= 10
224 -+ NULL,
225 -+#endif
226 - FALSE,
227 - mod_samples,
228 - NULL,
229 -diff --git a/work/freeverb3-2.3.1/xmms/stenh.cpp b/work/freeverb3-2.3.1/xmms/stenh.cpp
230 -index 3eca478..d376896 100644
231 ---- a/work/freeverb3-2.3.1/xmms/stenh.cpp
232 -+++ b/work/freeverb3-2.3.1/xmms/stenh.cpp
233 -@@ -905,6 +905,9 @@ static EffectPlugin epe = {
234 - cleanup,
235 - about,
236 - configure,
237 -+#if __AUDACIOUS_PLUGIN_API__ >= 10
238 -+ NULL,
239 -+#endif
240 - FALSE,
241 - mod_samples,
242 - NULL,
243 ---
244 -1.6.4.4
245 -
246
247 diff --git a/media-libs/freeverb3/files/freeverb3-2.5.0-pow-ambiguity.patch b/media-libs/freeverb3/files/freeverb3-2.5.0-pow-ambiguity.patch
248 deleted file mode 100644
249 index 2c79e79..00000000
250 --- a/media-libs/freeverb3/files/freeverb3-2.5.0-pow-ambiguity.patch
251 +++ /dev/null
252 @@ -1,12 +0,0 @@
253 ---- xmms/impulser2.cpp
254 -+++ xmms/impulser2.cpp
255 -@@ -1221,7 +1221,8 @@
256 - presetLatencyValue2[latencyIndex]);
257 - }
258 - CFILELOADER fileLoader;
259 -- double l_stretch = std::pow(std::sqrt(2), (*slotVector)[i].stretch);
260 -+ // NOTE: Casting to double to help compile select from pow(double,double) and pow(float,float)
261 -+ double l_stretch = std::pow(static_cast<double>(std::sqrt(2)), static_cast<double>((*slotVector)[i].stretch));
262 - int ret = fileLoader.load((*slotVector)[i].filename.c_str(), srate,
263 - l_stretch, (*slotVector)[i].limit, SRC_SINC_BEST_QUALITY);
264 -
265
266 diff --git a/media-libs/freeverb3/files/freeverb3-2.5.13-fix-sse1v2-assembly.patch b/media-libs/freeverb3/files/freeverb3-2.5.13-fix-sse1v2-assembly.patch
267 deleted file mode 100644
268 index e18f504..00000000
269 --- a/media-libs/freeverb3/files/freeverb3-2.5.13-fix-sse1v2-assembly.patch
270 +++ /dev/null
271 @@ -1,13 +0,0 @@
272 ---- freeverb/frag.cpp 2010-12-10 18:44:37.006729672 +0100
273 -+++ freeverb/frag.cpp 2010-12-10 18:45:10.220476080 +0100
274 -@@ -434,8 +434,8 @@
275 - "mulps (%2), %%xmm1 \n\t"
276 - "addps (%0), %%xmm1 \n\t" // saved in xmm1
277 - "xor %0, %0 \n\t"
278 -- "movl $0x80000000, %0 \n\t" // 32bit float -1 mask
279 -- "movl %0, (%4) \n\t"
280 -+ "mov $0x80000000, %0 \n\t" // 32bit float -1 mask
281 -+ "mov %0, (%4) \n\t"
282 - "xorps %%xmm2, %%xmm2 \n\t" // pxor xmm,xmm (mmx,sse2)
283 - "movss (%4), %%xmm2 \n\t" // movd eax,xmm (sse2)
284 - "movlhps %%xmm2, %%xmm2 \n\t" // bitmask = xmm2 ([0]=-1,[1]=0,[2]=-1,[3]=0)
285
286 diff --git a/media-libs/freeverb3/files/freeverb3-2.5.13-respect-disable-sse.patch b/media-libs/freeverb3/files/freeverb3-2.5.13-respect-disable-sse.patch
287 deleted file mode 100644
288 index 3e8b9f0..00000000
289 --- a/media-libs/freeverb3/files/freeverb3-2.5.13-respect-disable-sse.patch
290 +++ /dev/null
291 @@ -1,24 +0,0 @@
292 ---- configure.in_BACKUP 2010-12-10 09:49:30.204907020 +0100
293 -+++ configure.in 2010-12-10 09:50:59.063128511 +0100
294 -@@ -137,9 +137,18 @@
295 - [cv_avx="$enable_avx"], [cv_avx="no"])
296 -
297 - case "${target_cpu}" in
298 -- x86_64*) cv_sse=yes cv_sse2=yes;;
299 -- amd64*) cv_sse=yes cv_sse2=yes;;
300 -- *) ;;
301 -+ amd64*|x86_64*)
302 -+ if test "x$cv_sse" = "x"; then
303 -+ AC_MSG_NOTICE([Auto-enabling SSE codes])
304 -+ cv_sse=yes
305 -+ fi
306 -+ if test "x$cv_sse2" = "x"; then
307 -+ AC_MSG_NOTICE([Auto-enabling SSE2 codes])
308 -+ cv_sse2=yes
309 -+ fi
310 -+ ;;
311 -+ *)
312 -+ ;;
313 - esac
314 -
315 - dnl option checks
316
317 diff --git a/media-libs/freeverb3/files/freeverb3-3.0.0-audacious-3.3.x.patch b/media-libs/freeverb3/files/freeverb3-3.0.0-audacious-3.3.x.patch
318 deleted file mode 100644
319 index 9e343c0..00000000
320 --- a/media-libs/freeverb3/files/freeverb3-3.0.0-audacious-3.3.x.patch
321 +++ /dev/null
322 @@ -1,40 +0,0 @@
323 -From 43416e5d5ce5d13f81e1cd0f69da7ff0351f6d65 Mon Sep 17 00:00:00 2001
324 -From: Sebastian Pipping <sebastian@×××××××.org>
325 -Date: Sat, 8 Jun 2013 14:00:33 +0200
326 -Subject: [PATCH] Make Audacious plugin work with Audacious 3.3.x, too
327 -
328 ----
329 - audacious/so.c | 8 ++++++++
330 - 1 file changed, 8 insertions(+)
331 -
332 -diff --git a/audacious/so.c b/audacious/so.c
333 -index 8c679df..37aa056 100644
334 ---- a/audacious/so.c
335 -+++ b/audacious/so.c
336 -@@ -44,8 +44,12 @@ static void dsp_start(gint * channels, gint * rate){ if(ptable != NULL) ptable->
337 - static void dsp_process(gfloat ** data, gint * samples){ if(ptable != NULL) ptable->process(data,samples); }
338 - static void dsp_flush(){ if(ptable != NULL) ptable->flush(); }
339 - static void dsp_finish(gfloat ** data, gint * samples){ if(ptable != NULL) ptable->finish(data,samples); }
340 -+#if defined(_AUD_PLUGIN_VERSION_MIN) && (_AUD_PLUGIN_VERSION_MIN < 40)
341 - static gint decoder_to_output_time(gint time){ return time; }
342 - static gint output_to_decoder_time(gint time){ return time; }
343 -+#else
344 -+static int adjust_delay(int delay){ return delay; }
345 -+#endif
346 -
347 - AUD_EFFECT_PLUGIN
348 - (
349 -@@ -57,6 +61,10 @@ AUD_EFFECT_PLUGIN
350 - .start = dsp_start,
351 - .process = dsp_process,
352 - .finish = dsp_finish,
353 -+#if defined(_AUD_PLUGIN_VERSION_MIN) && (_AUD_PLUGIN_VERSION_MIN < 40)
354 - .decoder_to_output_time = decoder_to_output_time,
355 - .output_to_decoder_time = output_to_decoder_time,
356 -+#else
357 -+ .adjust_delay = adjust_delay,
358 -+#endif
359 - )
360 ---
361 -1.8.2.1
362 -