From 3d085b0e0aa5637450f5634de0a7a84ae2673c3e11845ef164454964b0e38b07 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Mon, 21 Mar 2016 09:51:39 +0000 Subject: [PATCH] Accepting request 376371 from home:plater Update to pre 0.4.16 git to fix undefined symbol error in 14 plugins OBS-URL: https://build.opensuse.org/request/show/376371 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ladspa-swh-plugins?expand=0&rev=5 --- ladspa-swh-plugins.changes | 35 ++++++++++++++++++++ ladspa-swh-plugins.spec | 25 +++++++++----- swh-libblo.dif | 17 +++++----- swh-nostatic-lib.diff | 25 -------------- swh-plugins-0.4.15+git.tar.bz2 | 3 ++ swh-plugins-0.4.15.tar.bz2 | 3 -- swh-uninit-variable.diff | 60 ++++++++++++++-------------------- 7 files changed, 89 insertions(+), 79 deletions(-) delete mode 100644 swh-nostatic-lib.diff create mode 100644 swh-plugins-0.4.15+git.tar.bz2 delete mode 100644 swh-plugins-0.4.15.tar.bz2 diff --git a/ladspa-swh-plugins.changes b/ladspa-swh-plugins.changes index 4c2508c..598d7df 100644 --- a/ladspa-swh-plugins.changes +++ b/ladspa-swh-plugins.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Mon Mar 21 08:37:44 UTC 2016 - davejplater@gmail.com + +- Update to pre 0.4.16 git, version 0.4.15+git to fix undefined + symbol errors in 14 plugins. +- Refreshed and rebased patches, removed swh-nostatic-lib.diff +- Upstream changes: + Fix and improve build system + Protect calls to "./makestub.pl *.xml > *.c" + Fix "make distcheck" (i.e. shadow builds) + po/: Remove generated files + intl/: Resolve bundled libintl since AM_GNU_GETTEXT([external]) + is in place. + configure.ac: Modernize call to AM_INIT_AUTOMAKE + configure.ac: Add AC_CONFIG_MACRO_DIRS as proposed by libtoolize + m4/: Remove copied files + Fix compilation on Xcode 4.6 + Ignore "missing" file + Renamed configure.in to configure.ac + Issue https://github.com/swh/ladspa/issues/22 + Applied patch from gentoo swh-plugins-0.4.15-plugindir.patch + Removed incorrecly checked-in "missing" file + gcc5 does not support recursive inline functions + Fix compilation on Xcode 4.6 + Made change to Makefile.am, as per issues/17# + Use calloc instead of malloc when allocating port memory + Fix memory leaks + avoid global namespace symbol conflicts and possible double free + Update bode_shifter_cv_1432.xml per #8 + Update surround_encoder_1401.xml per #8 + Update bode_shifter_1431.xml per #8 + Update surround_encoder_1401.xml per #8 + Update bode_shifter_cv_1432.xml per #8 + Fix off by one error in FIR application + ------------------------------------------------------------------- Mon Mar 3 14:05:53 CET 2014 - tiwai@suse.de diff --git a/ladspa-swh-plugins.spec b/ladspa-swh-plugins.spec index 3821330..436ca2e 100644 --- a/ladspa-swh-plugins.spec +++ b/ladspa-swh-plugins.spec @@ -1,7 +1,7 @@ # # spec file for package ladspa-swh-plugins # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: ladspa-swh-plugins -Version: 0.4.15 +Version: 0.4.15+git Release: 0 Summary: LADSPA SWH plugins License: GPL-2.0+ @@ -29,7 +29,8 @@ Source2: ladspa-swh.pdf Patch1: swh-uninit-variable.diff Patch2: swh-readonly.dif Patch3: swh-0.4.13-gcc4-fix.diff -Patch4: swh-nostatic-lib.diff +# Upstream fixed +##Patch4: swh-nostatic-lib.diff Patch5: swh-libblo.dif BuildRequires: autoconf BuildRequires: automake @@ -37,6 +38,7 @@ BuildRequires: fftw3-devel BuildRequires: gcc BuildRequires: ladspa-devel BuildRequires: libtool +BuildRequires: perl-XML-Parser BuildRequires: pkgconfig Supplements: ladspa BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -45,26 +47,33 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build This package provides a collection of LADSPA (Linux Audio Developer's Simple Plug-in API) plugins written by Steve Harris. + %prep %setup -q -n swh-plugins-%{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 -p1 +#%%patch4 -p1 +%patch5 cp gsm/README README-gsm cp %{SOURCE1} . cp %{SOURCE2} . -autoreconf -fi %build +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. export SUSE_ASNEEDED=0 CFLAGS="%{optflags} -fPIC -ggdb -DPIC -fno-strict-aliasing" \ -./configure --prefix=%{_prefix} +./configure --prefix=%{_prefix} \ + --disable-rpath \ + --enable-shared \ + --enable-dependency-tracking \ + --disable-static make %{?_smp_mflags} CFLAGS="%{optflags} -fPIC -ggdb -DPIC -fno-strict-aliasing" - +# %install make DESTDIR=%{buildroot} plugindir=%{_libdir}/ladspa install %find_lang %{name} --all-name diff --git a/swh-libblo.dif b/swh-libblo.dif index 76d77da..6a5ca41 100644 --- a/swh-libblo.dif +++ b/swh-libblo.dif @@ -1,12 +1,13 @@ -Index: swh-plugins-0.4.15/configure.in +Index: configure.ac =================================================================== ---- swh-plugins-0.4.15.orig/configure.in -+++ swh-plugins-0.4.15/configure.in -@@ -49,6 +50,7 @@ AC_PROG_LIBTOOL - - AC_LANG_C - AC_PROG_CC -+AM_PROG_CC_C_O +--- configure.ac.orig ++++ configure.ac +@@ -55,7 +55,7 @@ AM_PROG_CC_C_O AC_REQUIRE_CPP ALL_LINGUAS="en_GB" AM_GNU_GETTEXT([external]) +-AM_GNU_GETTEXT_VERSION([0.19.3]) ++AM_GNU_GETTEXT_VERSION([0.19.2]) + AC_C_BIGENDIAN + + LIBS="$LIBS -lm" diff --git a/swh-nostatic-lib.diff b/swh-nostatic-lib.diff deleted file mode 100644 index ca1abc8..0000000 --- a/swh-nostatic-lib.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- - Makefile.am | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - ---- a/Makefile.am -+++ b/Makefile.am -@@ -66,12 +66,12 @@ - fm_osc_1415_la_LIBADD = util/libblo.a - analogue_osc_1416_la_DEPENDENCIES = util/libblo.a - analogue_osc_1416_la_LIBADD = util/libblo.a --sc1_1425_la_LIBADD = util/libdb.a util/librms.a --sc2_1426_la_LIBADD = util/libdb.a util/librms.a --sc3_1427_la_LIBADD = util/libdb.a util/librms.a --sc4_1882_la_LIBADD = util/libdb.a util/librms.a --sc4m_1916_la_LIBADD = util/libdb.a util/librms.a --se4_1883_la_LIBADD = util/libdb.a util/librms.a -+sc1_1425_la_SOURCES = sc1_1425.c util/db.c util/rms.c -+sc2_1426_la_SOURCES = sc2_1426.c util/db.c util/rms.c -+sc3_1427_la_SOURCES = sc3_1427.c util/db.c util/rms.c -+sc4_1882_la_SOURCES = sc4_1882.c util/db.c util/rms.c -+sc4m_1916_la_SOURCES = sc4m_1916.c util/db.c util/rms.c -+se4_1883_la_SOURCES = se4_1883.c util/db.c util/rms.c - gsm_1215_la_LIBADD = gsm/libgsm.a - gverb_1216_la_LIBADD = gverb/libgverb.a - lcr_delay_1436_la_DEPENDENCIES = util/biquad.h diff --git a/swh-plugins-0.4.15+git.tar.bz2 b/swh-plugins-0.4.15+git.tar.bz2 new file mode 100644 index 0000000..41d24a8 --- /dev/null +++ b/swh-plugins-0.4.15+git.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a0b0e3999ce0794a8f98850fb8497340d34c63ad56293bb4dc88f3ef4f0ffbb +size 364941 diff --git a/swh-plugins-0.4.15.tar.bz2 b/swh-plugins-0.4.15.tar.bz2 deleted file mode 100644 index b5b686e..0000000 --- a/swh-plugins-0.4.15.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed95c94f802544232aee1cc487d34c6e6a659c358239f8b4bebf6f171d93c5dd -size 802634 diff --git a/swh-uninit-variable.diff b/swh-uninit-variable.diff index a618c45..91bf39a 100644 --- a/swh-uninit-variable.diff +++ b/swh-uninit-variable.diff @@ -1,26 +1,10 @@ ---- decay_1886.c-dist 2006-01-12 16:22:39.000000000 +0100 -+++ decay_1886.c 2006-01-12 16:23:08.000000000 +0100 -@@ -114,11 +114,11 @@ static LADSPA_Handle instantiateDecay( - const LADSPA_Descriptor *descriptor, - unsigned long s_rate) { - Decay *plugin_data = (Decay *)malloc(sizeof(Decay)); -- LADSPA_Data b; -- char first_time; -- LADSPA_Data last_decay_time; -+ LADSPA_Data b = 0; -+ char first_time = 0; -+ LADSPA_Data last_decay_time = 0; - LADSPA_Data sample_rate; -- LADSPA_Data y; -+ LADSPA_Data y = 0; - - #line 24 "decay_1886.xml" - sample_rate = s_rate; ---- delay_1898.c-dist 2006-01-12 16:14:54.000000000 +0100 -+++ delay_1898.c 2006-01-12 16:16:25.000000000 +0100 +Index: delay_1898.c +=================================================================== +--- delay_1898.c.orig ++++ delay_1898.c @@ -187,11 +187,11 @@ static LADSPA_Handle instantiateDelay_n( unsigned long s_rate) { - Delay_n *plugin_data = (Delay_n *)malloc(sizeof(Delay_n)); + Delay_n *plugin_data = (Delay_n *)calloc(1, sizeof(Delay_n)); LADSPA_Data *buffer = NULL; - unsigned int buffer_mask; - LADSPA_Data delay_samples; @@ -37,7 +21,7 @@ sample_rate = s_rate; @@ -462,11 +462,11 @@ static LADSPA_Handle instantiateDelay_l( unsigned long s_rate) { - Delay_l *plugin_data = (Delay_l *)malloc(sizeof(Delay_l)); + Delay_l *plugin_data = (Delay_l *)calloc(1, sizeof(Delay_l)); LADSPA_Data *buffer = NULL; - unsigned int buffer_mask; - LADSPA_Data delay_samples; @@ -54,7 +38,7 @@ sample_rate = s_rate; @@ -713,11 +713,11 @@ static LADSPA_Handle instantiateDelay_c( unsigned long s_rate) { - Delay_c *plugin_data = (Delay_c *)malloc(sizeof(Delay_c)); + Delay_c *plugin_data = (Delay_c *)calloc(1, sizeof(Delay_c)); LADSPA_Data *buffer = NULL; - unsigned int buffer_mask; - LADSPA_Data delay_samples; @@ -69,11 +53,13 @@ #line 27 "delay_1898.xml" sample_rate = s_rate; ---- allpass_1895.c-dist 2006-01-12 16:20:41.000000000 +0100 -+++ allpass_1895.c 2006-01-12 16:21:38.000000000 +0100 +Index: allpass_1895.c +=================================================================== +--- allpass_1895.c.orig ++++ allpass_1895.c @@ -224,13 +224,13 @@ static LADSPA_Handle instantiateAllpass_ unsigned long s_rate) { - Allpass_n *plugin_data = (Allpass_n *)malloc(sizeof(Allpass_n)); + Allpass_n *plugin_data = (Allpass_n *)calloc(1, sizeof(Allpass_n)); LADSPA_Data *buffer = NULL; - unsigned int buffer_mask; - LADSPA_Data delay_samples; @@ -93,7 +79,7 @@ sample_rate = s_rate; @@ -606,13 +606,13 @@ static LADSPA_Handle instantiateAllpass_ unsigned long s_rate) { - Allpass_l *plugin_data = (Allpass_l *)malloc(sizeof(Allpass_l)); + Allpass_l *plugin_data = (Allpass_l *)calloc(1, sizeof(Allpass_l)); LADSPA_Data *buffer = NULL; - unsigned int buffer_mask; - LADSPA_Data delay_samples; @@ -113,7 +99,7 @@ sample_rate = s_rate; @@ -898,13 +898,13 @@ static LADSPA_Handle instantiateAllpass_ unsigned long s_rate) { - Allpass_c *plugin_data = (Allpass_c *)malloc(sizeof(Allpass_c)); + Allpass_c *plugin_data = (Allpass_c *)calloc(1, sizeof(Allpass_c)); LADSPA_Data *buffer = NULL; - unsigned int buffer_mask; - LADSPA_Data delay_samples; @@ -131,11 +117,13 @@ #line 44 "allpass_1895.xml" sample_rate = s_rate; ---- comb_1887.c-dist 2006-01-12 16:21:47.000000000 +0100 -+++ comb_1887.c 2006-01-12 16:22:27.000000000 +0100 +Index: comb_1887.c +=================================================================== +--- comb_1887.c.orig ++++ comb_1887.c @@ -221,13 +221,13 @@ static LADSPA_Handle instantiateComb_n( unsigned long s_rate) { - Comb_n *plugin_data = (Comb_n *)malloc(sizeof(Comb_n)); + Comb_n *plugin_data = (Comb_n *)calloc(1, sizeof(Comb_n)); LADSPA_Data *buffer = NULL; - unsigned int buffer_mask; - LADSPA_Data delay_samples; @@ -155,7 +143,7 @@ sample_rate = s_rate; @@ -597,13 +597,13 @@ static LADSPA_Handle instantiateComb_l( unsigned long s_rate) { - Comb_l *plugin_data = (Comb_l *)malloc(sizeof(Comb_l)); + Comb_l *plugin_data = (Comb_l *)calloc(1, sizeof(Comb_l)); LADSPA_Data *buffer = NULL; - unsigned int buffer_mask; - LADSPA_Data delay_samples; @@ -175,7 +163,7 @@ sample_rate = s_rate; @@ -889,13 +889,13 @@ static LADSPA_Handle instantiateComb_c( unsigned long s_rate) { - Comb_c *plugin_data = (Comb_c *)malloc(sizeof(Comb_c)); + Comb_c *plugin_data = (Comb_c *)calloc(1, sizeof(Comb_c)); LADSPA_Data *buffer = NULL; - unsigned int buffer_mask; - LADSPA_Data delay_samples; @@ -193,8 +181,10 @@ #line 41 "comb_1887.xml" sample_rate = s_rate; ---- bandpass_iir_1892.c-dist 2006-01-12 16:19:57.000000000 +0100 -+++ bandpass_iir_1892.c 2006-01-12 16:20:12.000000000 +0100 +Index: bandpass_iir_1892.c +=================================================================== +--- bandpass_iir_1892.c.orig ++++ bandpass_iir_1892.c @@ -144,10 +144,10 @@ static LADSPA_Handle instantiateBandpass iir_stage_t*first = NULL; iir_stage_t*gt = NULL;