From 0335447eb73ab34b07aecddcb17ef68ba851824dc4c86cafe4b45f7c34e81307 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sat, 12 Nov 2016 13:33:18 +0000 Subject: [PATCH] Accepting request 440029 from home:plater Update ton 0.4.17 fix boo#1006861 OBS-URL: https://build.opensuse.org/request/show/440029 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ladspa-swh-plugins?expand=0&rev=6 --- ladspa-0.4.17.tar.gz | 3 +++ ladspa-swh-plugins.changes | 16 ++++++++++++++++ ladspa-swh-plugins.spec | 16 ++++++++++------ swh-0.4.13-gcc4-fix.diff | 6 ++++-- swh-libblo.dif | 4 ++-- swh-plugins-0.4.15+git.tar.bz2 | 3 --- swh-readonly.dif | 18 ++++++++++-------- swh-uninit-variable.diff | 28 ++++++++++++++-------------- 8 files changed, 59 insertions(+), 35 deletions(-) create mode 100644 ladspa-0.4.17.tar.gz delete mode 100644 swh-plugins-0.4.15+git.tar.bz2 diff --git a/ladspa-0.4.17.tar.gz b/ladspa-0.4.17.tar.gz new file mode 100644 index 0000000..0fbdfb6 --- /dev/null +++ b/ladspa-0.4.17.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1b090feec4c5e8f9605334b47faaad72db7cc18fe91d792b9161a9e3b821ce7 +size 456472 diff --git a/ladspa-swh-plugins.changes b/ladspa-swh-plugins.changes index 598d7df..adf84a5 100644 --- a/ladspa-swh-plugins.changes +++ b/ladspa-swh-plugins.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sat Nov 12 13:07:16 UTC 2016 - davejplater@gmail.com + +- Update to version 0.4.17, fixes boo#1006861 +- Rebased swh-uninit-variable.diff, swh-readonly.dif, + swh-0.4.13-gcc4-fix.diff and swh-libblo.dif. +- Added sed in spec file to place correct version in configure.ac + see https://github.com/swh/ladspa/issues/41 +- Upstream changes : + Fixed GCC 5.3.1 warnings + avoid global namespace symbol conflicts and possible double free + NaN handling fix from Jaromír Mikeš + Build reproducability fix from Jaromír Mikeš + Spelling fixes from Jaromír Mikeš + Don't use -march patch from Jaromír Mikeš + ------------------------------------------------------------------- Mon Mar 21 08:37:44 UTC 2016 - davejplater@gmail.com diff --git a/ladspa-swh-plugins.spec b/ladspa-swh-plugins.spec index 436ca2e..5cdf3c1 100644 --- a/ladspa-swh-plugins.spec +++ b/ladspa-swh-plugins.spec @@ -16,21 +16,21 @@ # +%define tarname ladspa + Name: ladspa-swh-plugins -Version: 0.4.15+git +Version: 0.4.17 Release: 0 Summary: LADSPA SWH plugins License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Utilities Url: http://plugin.org.uk/ -Source: swh-plugins-%{version}.tar.bz2 +Source: https://github.com/swh/ladspa/archive/v%{version}.tar.gz#/%{tarname}-%{version}.tar.gz Source1: ladspa-swh.tex Source2: ladspa-swh.pdf Patch1: swh-uninit-variable.diff Patch2: swh-readonly.dif Patch3: swh-0.4.13-gcc4-fix.diff -# Upstream fixed -##Patch4: swh-nostatic-lib.diff Patch5: swh-libblo.dif BuildRequires: autoconf BuildRequires: automake @@ -49,19 +49,23 @@ Simple Plug-in API) plugins written by Steve Harris. %prep -%setup -q -n swh-plugins-%{version} +%setup -q -n %{tarname}-%{version} # This creates the .c files from .xml files. for i in `ls -1 *.xml|cut -f 1 -d .` ;do ./makestub.pl "$i.xml" > "$i.c";done %patch1 %patch2 %patch3 -#%%patch4 -p1 %patch5 cp gsm/README README-gsm cp %{SOURCE1} . cp %{SOURCE2} . %build +# This replaces the wrong version with the right one in configure.ac +# see https://github.com/swh/ladspa/issues/41. +sed s/0.4.15/%{version}/ configure.ac>configure.ac1 +mv configure.ac1 configure.ac + autoreconf -i -I m4 # This package failed when testing with -Wl,-as-needed being default. # So we disable it here, if you want to retest, just delete this comment and the line below. diff --git a/swh-0.4.13-gcc4-fix.diff b/swh-0.4.13-gcc4-fix.diff index 2c3b004..7c40eb2 100644 --- a/swh-0.4.13-gcc4-fix.diff +++ b/swh-0.4.13-gcc4-fix.diff @@ -1,5 +1,7 @@ ---- util/pitchscale.c-dist 2005-04-08 16:49:44.787835673 +0200 -+++ util/pitchscale.c 2005-04-08 16:50:53.361873821 +0200 +Index: util/pitchscale.c +=================================================================== +--- util/pitchscale.c.orig 2016-10-17 11:05:54.000000000 +0200 ++++ util/pitchscale.c 2016-11-12 13:34:09.406003378 +0200 @@ -41,7 +41,7 @@ #include "pitchscale.h" diff --git a/swh-libblo.dif b/swh-libblo.dif index 6a5ca41..3e3f563 100644 --- a/swh-libblo.dif +++ b/swh-libblo.dif @@ -1,7 +1,7 @@ Index: configure.ac =================================================================== ---- configure.ac.orig -+++ configure.ac +--- configure.ac.orig 2016-10-17 11:05:54.000000000 +0200 ++++ configure.ac 2016-11-12 13:34:23.338429511 +0200 @@ -55,7 +55,7 @@ AM_PROG_CC_C_O AC_REQUIRE_CPP ALL_LINGUAS="en_GB" diff --git a/swh-plugins-0.4.15+git.tar.bz2 b/swh-plugins-0.4.15+git.tar.bz2 deleted file mode 100644 index 41d24a8..0000000 --- a/swh-plugins-0.4.15+git.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a0b0e3999ce0794a8f98850fb8497340d34c63ad56293bb4dc88f3ef4f0ffbb -size 364941 diff --git a/swh-readonly.dif b/swh-readonly.dif index eb5083b..b8d03a7 100644 --- a/swh-readonly.dif +++ b/swh-readonly.dif @@ -1,6 +1,8 @@ ---- delay_1898.c -+++ delay_1898.c -@@ -218,7 +218,7 @@ +Index: delay_1898.c +=================================================================== +--- delay_1898.c.orig 2016-11-12 13:33:30.592985418 +0200 ++++ delay_1898.c 2016-11-12 13:33:55.093597943 +0200 +@@ -224,7 +224,7 @@ static void runDelay_n(LADSPA_Handle ins Delay_n *plugin_data = (Delay_n *)instance; /* Input (array of floats of length sample_count) */ @@ -9,7 +11,7 @@ /* Output (array of floats of length sample_count) */ LADSPA_Data * const out = plugin_data->out; -@@ -312,7 +312,7 @@ +@@ -321,7 +321,7 @@ static void runAddingDelay_n(LADSPA_Hand LADSPA_Data run_adding_gain = plugin_data->run_adding_gain; /* Input (array of floats of length sample_count) */ @@ -18,7 +20,7 @@ /* Output (array of floats of length sample_count) */ LADSPA_Data * const out = plugin_data->out; -@@ -493,7 +493,7 @@ +@@ -511,7 +511,7 @@ static void runDelay_l(LADSPA_Handle ins Delay_l *plugin_data = (Delay_l *)instance; /* Input (array of floats of length sample_count) */ @@ -27,7 +29,7 @@ /* Output (array of floats of length sample_count) */ LADSPA_Data * const out = plugin_data->out; -@@ -575,7 +575,7 @@ +@@ -596,7 +596,7 @@ static void runAddingDelay_l(LADSPA_Hand LADSPA_Data run_adding_gain = plugin_data->run_adding_gain; /* Input (array of floats of length sample_count) */ @@ -36,7 +38,7 @@ /* Output (array of floats of length sample_count) */ LADSPA_Data * const out = plugin_data->out; -@@ -744,7 +744,7 @@ +@@ -774,7 +774,7 @@ static void runDelay_c(LADSPA_Handle ins Delay_c *plugin_data = (Delay_c *)instance; /* Input (array of floats of length sample_count) */ @@ -45,7 +47,7 @@ /* Output (array of floats of length sample_count) */ LADSPA_Data * const out = plugin_data->out; -@@ -828,7 +828,7 @@ +@@ -861,7 +861,7 @@ static void runAddingDelay_c(LADSPA_Hand LADSPA_Data run_adding_gain = plugin_data->run_adding_gain; /* Input (array of floats of length sample_count) */ diff --git a/swh-uninit-variable.diff b/swh-uninit-variable.diff index 91bf39a..0364ea4 100644 --- a/swh-uninit-variable.diff +++ b/swh-uninit-variable.diff @@ -1,7 +1,7 @@ Index: delay_1898.c =================================================================== ---- delay_1898.c.orig -+++ delay_1898.c +--- delay_1898.c.orig 2016-11-12 13:33:01.088397087 +0200 ++++ delay_1898.c 2016-11-12 13:33:30.592985418 +0200 @@ -187,11 +187,11 @@ static LADSPA_Handle instantiateDelay_n( unsigned long s_rate) { Delay_n *plugin_data = (Delay_n *)calloc(1, sizeof(Delay_n)); @@ -19,7 +19,7 @@ Index: delay_1898.c #line 27 "delay_1898.xml" sample_rate = s_rate; -@@ -462,11 +462,11 @@ static LADSPA_Handle instantiateDelay_l( +@@ -474,11 +474,11 @@ static LADSPA_Handle instantiateDelay_l( unsigned long s_rate) { Delay_l *plugin_data = (Delay_l *)calloc(1, sizeof(Delay_l)); LADSPA_Data *buffer = NULL; @@ -36,7 +36,7 @@ Index: delay_1898.c #line 27 "delay_1898.xml" sample_rate = s_rate; -@@ -713,11 +713,11 @@ static LADSPA_Handle instantiateDelay_c( +@@ -737,11 +737,11 @@ static LADSPA_Handle instantiateDelay_c( unsigned long s_rate) { Delay_c *plugin_data = (Delay_c *)calloc(1, sizeof(Delay_c)); LADSPA_Data *buffer = NULL; @@ -55,8 +55,8 @@ Index: delay_1898.c sample_rate = s_rate; Index: allpass_1895.c =================================================================== ---- allpass_1895.c.orig -+++ allpass_1895.c +--- allpass_1895.c.orig 2016-11-12 13:33:00.552388005 +0200 ++++ allpass_1895.c 2016-11-12 13:33:30.592985418 +0200 @@ -224,13 +224,13 @@ static LADSPA_Handle instantiateAllpass_ unsigned long s_rate) { Allpass_n *plugin_data = (Allpass_n *)calloc(1, sizeof(Allpass_n)); @@ -77,7 +77,7 @@ Index: allpass_1895.c #line 44 "allpass_1895.xml" sample_rate = s_rate; -@@ -606,13 +606,13 @@ static LADSPA_Handle instantiateAllpass_ +@@ -614,13 +614,13 @@ static LADSPA_Handle instantiateAllpass_ unsigned long s_rate) { Allpass_l *plugin_data = (Allpass_l *)calloc(1, sizeof(Allpass_l)); LADSPA_Data *buffer = NULL; @@ -97,7 +97,7 @@ Index: allpass_1895.c #line 44 "allpass_1895.xml" sample_rate = s_rate; -@@ -898,13 +898,13 @@ static LADSPA_Handle instantiateAllpass_ +@@ -918,13 +918,13 @@ static LADSPA_Handle instantiateAllpass_ unsigned long s_rate) { Allpass_c *plugin_data = (Allpass_c *)calloc(1, sizeof(Allpass_c)); LADSPA_Data *buffer = NULL; @@ -119,8 +119,8 @@ Index: allpass_1895.c sample_rate = s_rate; Index: comb_1887.c =================================================================== ---- comb_1887.c.orig -+++ comb_1887.c +--- comb_1887.c.orig 2016-11-12 13:33:00.840392875 +0200 ++++ comb_1887.c 2016-11-12 13:33:30.592985418 +0200 @@ -221,13 +221,13 @@ static LADSPA_Handle instantiateComb_n( unsigned long s_rate) { Comb_n *plugin_data = (Comb_n *)calloc(1, sizeof(Comb_n)); @@ -141,7 +141,7 @@ Index: comb_1887.c #line 41 "comb_1887.xml" sample_rate = s_rate; -@@ -597,13 +597,13 @@ static LADSPA_Handle instantiateComb_l( +@@ -605,13 +605,13 @@ static LADSPA_Handle instantiateComb_l( unsigned long s_rate) { Comb_l *plugin_data = (Comb_l *)calloc(1, sizeof(Comb_l)); LADSPA_Data *buffer = NULL; @@ -161,7 +161,7 @@ Index: comb_1887.c #line 41 "comb_1887.xml" sample_rate = s_rate; -@@ -889,13 +889,13 @@ static LADSPA_Handle instantiateComb_c( +@@ -905,13 +905,13 @@ static LADSPA_Handle instantiateComb_c( unsigned long s_rate) { Comb_c *plugin_data = (Comb_c *)calloc(1, sizeof(Comb_c)); LADSPA_Data *buffer = NULL; @@ -183,8 +183,8 @@ Index: comb_1887.c sample_rate = s_rate; Index: bandpass_iir_1892.c =================================================================== ---- bandpass_iir_1892.c.orig -+++ bandpass_iir_1892.c +--- bandpass_iir_1892.c.orig 2016-11-12 13:33:00.688390305 +0200 ++++ bandpass_iir_1892.c 2016-11-12 13:33:30.596985510 +0200 @@ -144,10 +144,10 @@ static LADSPA_Handle instantiateBandpass iir_stage_t*first = NULL; iir_stage_t*gt = NULL;