From 9535a4a8bab1f0fdd3ddfc5a5478b6dda6f7f57b Mon Sep 17 00:00:00 2001 From: "Michael Mair-Keimberger (asterix)" Date: Tue, 20 Dec 2016 20:15:11 +0100 Subject: media-libs/freeverb3: remove unused patches --- .../files/freeverb3-2.3.0-fix-implicit.patch | 90 --------------- .../files/freeverb3-2.3.1-plugin-api-v8-v10.patch | 125 --------------------- .../files/freeverb3-2.5.0-pow-ambiguity.patch | 12 -- .../freeverb3-2.5.13-fix-sse1v2-assembly.patch | 13 --- .../freeverb3-2.5.13-respect-disable-sse.patch | 24 ---- .../files/freeverb3-3.0.0-audacious-3.3.x.patch | 40 ------- 6 files changed, 304 deletions(-) delete mode 100644 media-libs/freeverb3/files/freeverb3-2.3.0-fix-implicit.patch delete mode 100644 media-libs/freeverb3/files/freeverb3-2.3.1-plugin-api-v8-v10.patch delete mode 100644 media-libs/freeverb3/files/freeverb3-2.5.0-pow-ambiguity.patch delete mode 100644 media-libs/freeverb3/files/freeverb3-2.5.13-fix-sse1v2-assembly.patch delete mode 100644 media-libs/freeverb3/files/freeverb3-2.5.13-respect-disable-sse.patch delete mode 100644 media-libs/freeverb3/files/freeverb3-3.0.0-audacious-3.3.x.patch (limited to 'media-libs/freeverb3') 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 deleted file mode 100644 index 1db4dc8a1733..000000000000 --- a/media-libs/freeverb3/files/freeverb3-2.3.0-fix-implicit.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -cr freeverb3-2.3.0/libsamplerate2/samplerate.c freeverb3/libsamplerate2/samplerate.c -*** freeverb3-2.3.0/libsamplerate2/samplerate.c 2008-09-18 22:52:39.000000000 +0900 ---- freeverb3/libsamplerate2/samplerate.c 2009-03-03 20:23:52.000000000 +0900 -*************** -*** 20,30 **** - #include - #include - -! #include "config.h" -! - #include "samplerate2.h" - #include "common.h" -- #include "float_cast.h" - - static long SR2_(psrc_set_converter) (SR2_(SRC_PRIVATE) *psrc, long converter_type); - ---- 20,28 ---- - #include - #include - -! #include "float_cast.h" - #include "samplerate2.h" - #include "common.h" - - static long SR2_(psrc_set_converter) (SR2_(SRC_PRIVATE) *psrc, long converter_type); - -diff -cr freeverb3-2.3.0/libsamplerate2/samplerate_common.c freeverb3/libsamplerate2/samplerate_common.c -*** freeverb3-2.3.0/libsamplerate2/samplerate_common.c 2008-09-18 22:50:26.000000000 +0900 ---- freeverb3/libsamplerate2/samplerate_common.c 2009-03-03 20:23:39.000000000 +0900 -*************** -*** 19,28 **** - #include - #include - #include -! #include "config.h" - #include "common_c.h" - #include "samplerate2_common.h" -- #include "float_cast.h" - - const char * src_get_name (long converter_type) - { ---- 19,27 ---- - #include - #include - #include -! #include "float_cast.h" - #include "common_c.h" - #include "samplerate2_common.h" - - const char * src_get_name (long converter_type) - { -diff -cr freeverb3-2.3.0/libsamplerate2/src_linear.c freeverb3/libsamplerate2/src_linear.c -*** freeverb3-2.3.0/libsamplerate2/src_linear.c 2008-09-18 21:11:55.000000000 +0900 ---- freeverb3/libsamplerate2/src_linear.c 2009-03-03 20:24:07.000000000 +0900 -*************** -*** 20,26 **** - #include - #include - -- #include "config.h" - #include "float_cast.h" - #include "samplerate2.h" - #include "common.h" ---- 20,25 ---- -diff -cr freeverb3-2.3.0/libsamplerate2/src_sinc.c freeverb3/libsamplerate2/src_sinc.c -*** freeverb3-2.3.0/libsamplerate2/src_sinc.c 2008-09-18 23:31:00.000000000 +0900 ---- freeverb3/libsamplerate2/src_sinc.c 2009-03-03 20:24:11.000000000 +0900 -*************** -*** 20,26 **** - #include - #include - -- #include "config.h" - #include "float_cast.h" - #include "samplerate2.h" - #include "common.h" ---- 20,25 ---- -diff -cr freeverb3-2.3.0/libsamplerate2/src_zoh.c freeverb3/libsamplerate2/src_zoh.c -*** freeverb3-2.3.0/libsamplerate2/src_zoh.c 2008-09-18 23:21:46.000000000 +0900 ---- freeverb3/libsamplerate2/src_zoh.c 2009-03-03 20:24:15.000000000 +0900 -*************** -*** 20,26 **** - #include - #include - -- #include "config.h" - #include "float_cast.h" - #include "samplerate2.h" - #include "common.h" ---- 20,25 ---- 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 deleted file mode 100644 index 5bc6c8f328b9..000000000000 --- a/media-libs/freeverb3/files/freeverb3-2.3.1-plugin-api-v8-v10.patch +++ /dev/null @@ -1,125 +0,0 @@ -From a5dbe75a4b2c26ff969ef0b8eb2acc0b39f477a7 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Sat, 3 Oct 2009 04:57:55 +0200 -Subject: [PATCH] Support Plugin API v8, v10 and later - ---- - work/freeverb3-2.3.1/xmms/compressor.cpp | 12 ++++++++++++ - work/freeverb3-2.3.1/xmms/filter.cpp | 3 +++ - work/freeverb3-2.3.1/xmms/freeverb3.cpp | 3 +++ - work/freeverb3-2.3.1/xmms/impulser.cpp | 3 +++ - work/freeverb3-2.3.1/xmms/impulser2.cpp | 3 +++ - work/freeverb3-2.3.1/xmms/revmodel.cpp | 3 +++ - work/freeverb3-2.3.1/xmms/stenh.cpp | 3 +++ - 7 files changed, 30 insertions(+), 0 deletions(-) - -diff --git a/work/freeverb3-2.3.1/xmms/compressor.cpp b/work/freeverb3-2.3.1/xmms/compressor.cpp -index a02570f..a18eca3 100644 ---- a/work/freeverb3-2.3.1/xmms/compressor.cpp -+++ b/work/freeverb3-2.3.1/xmms/compressor.cpp -@@ -1095,6 +1095,18 @@ static EffectPlugin epe = { - cleanup, - about, - configure, -+/* -+ * Compile fix for Audacious 2.2_alpha1 -+ * -+ * Increase PAPI version. -+ * http://hg.atheme.org/audacious/annotate/74969c017b3e/src/audacious/plugin.h#64 -+ * -+ * Shuffle some functors and fields around in plugin structures; Start of cleanup. -+ * http://hg.atheme.org/audacious/annotate/8554b25b0087/src/audacious/plugin.h#1025 -+ */ -+#if __AUDACIOUS_PLUGIN_API__ >= 10 -+ NULL, -+#endif - FALSE, - mod_samples, - NULL, -diff --git a/work/freeverb3-2.3.1/xmms/filter.cpp b/work/freeverb3-2.3.1/xmms/filter.cpp -index 3b01e4d..b403124 100644 ---- a/work/freeverb3-2.3.1/xmms/filter.cpp -+++ b/work/freeverb3-2.3.1/xmms/filter.cpp -@@ -462,6 +462,9 @@ static EffectPlugin epe = { - cleanup, - about, - configure, -+#if __AUDACIOUS_PLUGIN_API__ >= 10 -+ NULL, -+#endif - FALSE, - mod_samples, - NULL, -diff --git a/work/freeverb3-2.3.1/xmms/freeverb3.cpp b/work/freeverb3-2.3.1/xmms/freeverb3.cpp -index f00bc8e..8bda2be 100644 ---- a/work/freeverb3-2.3.1/xmms/freeverb3.cpp -+++ b/work/freeverb3-2.3.1/xmms/freeverb3.cpp -@@ -700,6 +700,9 @@ static EffectPlugin epe = { - cleanup, - about, - configure, -+#if __AUDACIOUS_PLUGIN_API__ >= 10 -+ NULL, -+#endif - FALSE, - mod_samples, - NULL, -diff --git a/work/freeverb3-2.3.1/xmms/impulser.cpp b/work/freeverb3-2.3.1/xmms/impulser.cpp -index c1b6856..6341219 100644 ---- a/work/freeverb3-2.3.1/xmms/impulser.cpp -+++ b/work/freeverb3-2.3.1/xmms/impulser.cpp -@@ -617,6 +617,9 @@ static EffectPlugin epe = { - cleanup, - about, - configure, -+#if __AUDACIOUS_PLUGIN_API__ >= 10 -+ NULL, -+#endif - FALSE, - mod_samples, - NULL, -diff --git a/work/freeverb3-2.3.1/xmms/impulser2.cpp b/work/freeverb3-2.3.1/xmms/impulser2.cpp -index cf8e453..1385484 100644 ---- a/work/freeverb3-2.3.1/xmms/impulser2.cpp -+++ b/work/freeverb3-2.3.1/xmms/impulser2.cpp -@@ -1538,6 +1538,9 @@ static EffectPlugin epe = { - cleanup, - about, - configure, -+#if __AUDACIOUS_PLUGIN_API__ >= 10 -+ NULL, -+#endif - FALSE, - mod_samples, - NULL, -diff --git a/work/freeverb3-2.3.1/xmms/revmodel.cpp b/work/freeverb3-2.3.1/xmms/revmodel.cpp -index d596df4..bc808ae 100644 ---- a/work/freeverb3-2.3.1/xmms/revmodel.cpp -+++ b/work/freeverb3-2.3.1/xmms/revmodel.cpp -@@ -592,6 +592,9 @@ static EffectPlugin epe = { - cleanup, - about, - configure, -+#if __AUDACIOUS_PLUGIN_API__ >= 10 -+ NULL, -+#endif - FALSE, - mod_samples, - NULL, -diff --git a/work/freeverb3-2.3.1/xmms/stenh.cpp b/work/freeverb3-2.3.1/xmms/stenh.cpp -index 3eca478..d376896 100644 ---- a/work/freeverb3-2.3.1/xmms/stenh.cpp -+++ b/work/freeverb3-2.3.1/xmms/stenh.cpp -@@ -905,6 +905,9 @@ static EffectPlugin epe = { - cleanup, - about, - configure, -+#if __AUDACIOUS_PLUGIN_API__ >= 10 -+ NULL, -+#endif - FALSE, - mod_samples, - NULL, --- -1.6.4.4 - 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 deleted file mode 100644 index 2c79e793e27c..000000000000 --- a/media-libs/freeverb3/files/freeverb3-2.5.0-pow-ambiguity.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- xmms/impulser2.cpp -+++ xmms/impulser2.cpp -@@ -1221,7 +1221,8 @@ - presetLatencyValue2[latencyIndex]); - } - CFILELOADER fileLoader; -- double l_stretch = std::pow(std::sqrt(2), (*slotVector)[i].stretch); -+ // NOTE: Casting to double to help compile select from pow(double,double) and pow(float,float) -+ double l_stretch = std::pow(static_cast(std::sqrt(2)), static_cast((*slotVector)[i].stretch)); - int ret = fileLoader.load((*slotVector)[i].filename.c_str(), srate, - l_stretch, (*slotVector)[i].limit, SRC_SINC_BEST_QUALITY); - 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 deleted file mode 100644 index e18f504fbe29..000000000000 --- a/media-libs/freeverb3/files/freeverb3-2.5.13-fix-sse1v2-assembly.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- freeverb/frag.cpp 2010-12-10 18:44:37.006729672 +0100 -+++ freeverb/frag.cpp 2010-12-10 18:45:10.220476080 +0100 -@@ -434,8 +434,8 @@ - "mulps (%2), %%xmm1 \n\t" - "addps (%0), %%xmm1 \n\t" // saved in xmm1 - "xor %0, %0 \n\t" -- "movl $0x80000000, %0 \n\t" // 32bit float -1 mask -- "movl %0, (%4) \n\t" -+ "mov $0x80000000, %0 \n\t" // 32bit float -1 mask -+ "mov %0, (%4) \n\t" - "xorps %%xmm2, %%xmm2 \n\t" // pxor xmm,xmm (mmx,sse2) - "movss (%4), %%xmm2 \n\t" // movd eax,xmm (sse2) - "movlhps %%xmm2, %%xmm2 \n\t" // bitmask = xmm2 ([0]=-1,[1]=0,[2]=-1,[3]=0) 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 deleted file mode 100644 index 3e8b9f05db0e..000000000000 --- a/media-libs/freeverb3/files/freeverb3-2.5.13-respect-disable-sse.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- configure.in_BACKUP 2010-12-10 09:49:30.204907020 +0100 -+++ configure.in 2010-12-10 09:50:59.063128511 +0100 -@@ -137,9 +137,18 @@ - [cv_avx="$enable_avx"], [cv_avx="no"]) - - case "${target_cpu}" in -- x86_64*) cv_sse=yes cv_sse2=yes;; -- amd64*) cv_sse=yes cv_sse2=yes;; -- *) ;; -+ amd64*|x86_64*) -+ if test "x$cv_sse" = "x"; then -+ AC_MSG_NOTICE([Auto-enabling SSE codes]) -+ cv_sse=yes -+ fi -+ if test "x$cv_sse2" = "x"; then -+ AC_MSG_NOTICE([Auto-enabling SSE2 codes]) -+ cv_sse2=yes -+ fi -+ ;; -+ *) -+ ;; - esac - - dnl option checks 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 deleted file mode 100644 index 9e343c0b0838..000000000000 --- a/media-libs/freeverb3/files/freeverb3-3.0.0-audacious-3.3.x.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 43416e5d5ce5d13f81e1cd0f69da7ff0351f6d65 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Sat, 8 Jun 2013 14:00:33 +0200 -Subject: [PATCH] Make Audacious plugin work with Audacious 3.3.x, too - ---- - audacious/so.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/audacious/so.c b/audacious/so.c -index 8c679df..37aa056 100644 ---- a/audacious/so.c -+++ b/audacious/so.c -@@ -44,8 +44,12 @@ static void dsp_start(gint * channels, gint * rate){ if(ptable != NULL) ptable-> - static void dsp_process(gfloat ** data, gint * samples){ if(ptable != NULL) ptable->process(data,samples); } - static void dsp_flush(){ if(ptable != NULL) ptable->flush(); } - static void dsp_finish(gfloat ** data, gint * samples){ if(ptable != NULL) ptable->finish(data,samples); } -+#if defined(_AUD_PLUGIN_VERSION_MIN) && (_AUD_PLUGIN_VERSION_MIN < 40) - static gint decoder_to_output_time(gint time){ return time; } - static gint output_to_decoder_time(gint time){ return time; } -+#else -+static int adjust_delay(int delay){ return delay; } -+#endif - - AUD_EFFECT_PLUGIN - ( -@@ -57,6 +61,10 @@ AUD_EFFECT_PLUGIN - .start = dsp_start, - .process = dsp_process, - .finish = dsp_finish, -+#if defined(_AUD_PLUGIN_VERSION_MIN) && (_AUD_PLUGIN_VERSION_MIN < 40) - .decoder_to_output_time = decoder_to_output_time, - .output_to_decoder_time = output_to_decoder_time, -+#else -+ .adjust_delay = adjust_delay, -+#endif - ) --- -1.8.2.1 - -- cgit v1.2.3-65-gdbad