From 8f76bce6a20fdecc8079de60f2df0fcd0bf62fedad032a808be66d27c20ce7f3 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 18 Nov 2009 10:35:36 +0000 Subject: [PATCH] checked in OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ladspa?expand=0&rev=7 --- blop-automake-fix.dif | 14 +++----- blop-shlib.diff | 75 ++++++++++++++----------------------------- ladspa.changes | 6 ---- ladspa.spec | 6 ++-- 4 files changed, 33 insertions(+), 68 deletions(-) diff --git a/blop-automake-fix.dif b/blop-automake-fix.dif index 5eedac2..865bc1b 100644 --- a/blop-automake-fix.dif +++ b/blop-automake-fix.dif @@ -1,12 +1,8 @@ ---- - src/Makefile.am | 3 +++ - 1 file changed, 3 insertions(+) - ---- src/Makefile.am.orig -+++ src/Makefile.am -@@ -69,6 +69,9 @@ - tracker_2025_so_DEPENDENCIES = include/common.h - triangle_1649_so_DEPENDENCIES = include/wavedata.h +--- src/Makefile.am-dist 2004-01-22 12:50:08.279992874 +0100 ++++ src/Makefile.am 2004-01-22 12:50:30.475950498 +0100 +@@ -33,6 +33,9 @@ + + random_1661_so_DEPENDENCIES = include/common.h +%.c: %.so.c + ln -s $*.so.c $*.c diff --git a/blop-shlib.diff b/blop-shlib.diff index 46608c5..f2bced6 100644 --- a/blop-shlib.diff +++ b/blop-shlib.diff @@ -1,31 +1,4 @@ ---- - src/Makefile.am | 5 +++-- - src/adsr_1653.so.c | 5 +++-- - src/adsr_1680.so.c | 6 ++++-- - src/amp_1654.so.c | 4 ++-- - src/branch_1673.so.c | 5 +++-- - src/dahdsr_2021.so.c | 4 ++-- - src/difference_2030.so.c | 4 ++-- - src/fmod_1656.so.c | 4 ++-- - src/interpolator_1660.so.c | 4 ++-- - src/lp4pole_1671.so.c | 4 ++-- - src/product_1668.so.c | 4 ++-- - src/pulse_1645.so.c | 4 ++-- - src/quantiser.so.c | 4 ++-- - src/random_1661.so.c | 4 ++-- - src/ratio_2034.so.c | 4 ++-- - src/sawtooth_1641.so.c | 4 ++-- - src/sequencer.so.c | 4 ++-- - src/square_1643.so.c | 4 ++-- - src/sum_1665.so.c | 4 ++-- - src/sync_pulse_2023.so.c | 4 ++-- - src/sync_square_1678.so.c | 4 ++-- - src/tracker_2025.so.c | 4 ++-- - src/triangle_1649.so.c | 4 ++-- - src/wdatutil.c | 2 +- - 24 files changed, 52 insertions(+), 47 deletions(-) - ---- src/Makefile.am.orig +--- src/Makefile.am +++ src/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = include @@ -46,7 +19,7 @@ ## Need to specify sources so that make dist will include them lp4pole_1671_so_SOURCES = lp4pole_1671.so.c lp4pole_filter.c ---- src/adsr_1653.so.c.orig +--- src/adsr_1653.so.c +++ src/adsr_1653.so.c @@ -278,7 +278,8 @@ plugin->samples = samples; @@ -67,7 +40,7 @@ _fini () { LADSPA_Descriptor * descriptor; ---- src/adsr_1680.so.c.orig +--- src/adsr_1680.so.c +++ src/adsr_1680.so.c @@ -281,7 +281,8 @@ plugin->samples = samples; @@ -89,7 +62,7 @@ { LADSPA_Descriptor * descriptor; int i; ---- src/amp_1654.so.c.orig +--- src/amp_1654.so.c +++ src/amp_1654.so.c @@ -150,7 +150,7 @@ } @@ -109,7 +82,7 @@ _fini () { LADSPA_Descriptor * descriptor; ---- src/branch_1673.so.c.orig +--- src/branch_1673.so.c +++ src/branch_1673.so.c @@ -137,7 +137,8 @@ output2[0] = input; @@ -130,7 +103,7 @@ _fini () { LADSPA_Descriptor * descriptor; ---- src/dahdsr_2021.so.c.orig +--- src/dahdsr_2021.so.c +++ src/dahdsr_2021.so.c @@ -746,7 +746,7 @@ plugin->samples = samples; @@ -150,7 +123,7 @@ _fini (void) { LADSPA_Descriptor * descriptor; ---- src/difference_2030.so.c.orig +--- src/difference_2030.so.c +++ src/difference_2030.so.c @@ -190,7 +190,7 @@ output[0] = input - minus; @@ -170,7 +143,7 @@ _fini (void) { LADSPA_Descriptor * descriptor; ---- src/fmod_1656.so.c.orig +--- src/fmod_1656.so.c +++ src/fmod_1656.so.c @@ -201,7 +201,7 @@ output[0] = scale * frequency; @@ -190,7 +163,7 @@ _fini (void) { LADSPA_Descriptor * descriptor; ---- src/interpolator_1660.so.c.orig +--- src/interpolator_1660.so.c +++ src/interpolator_1660.so.c @@ -154,7 +154,7 @@ plugin->p0 = input; @@ -210,7 +183,7 @@ _fini (void) { LADSPA_Descriptor *descriptor; ---- src/lp4pole_1671.so.c.orig +--- src/lp4pole_1671.so.c +++ src/lp4pole_1671.so.c @@ -197,7 +197,7 @@ } @@ -230,7 +203,7 @@ _fini (void) { LADSPA_Descriptor *descriptor; ---- src/product_1668.so.c.orig +--- src/product_1668.so.c +++ src/product_1668.so.c @@ -163,7 +163,7 @@ output[0] = input1 * input2; @@ -250,7 +223,7 @@ _fini (void) { LADSPA_Descriptor * descriptor; ---- src/pulse_1645.so.c.orig +--- src/pulse_1645.so.c +++ src/pulse_1645.so.c @@ -303,7 +303,7 @@ plugin->phase = phase; @@ -270,7 +243,7 @@ _fini (void) { LADSPA_Descriptor * descriptor; ---- src/quantiser.so.c.orig +--- src/quantiser.so.c +++ src/quantiser.so.c @@ -544,7 +544,7 @@ plugin->last_found = last_found; @@ -290,7 +263,7 @@ _fini (void) { LADSPA_Descriptor * descriptor; ---- src/random_1661.so.c.orig +--- src/random_1661.so.c +++ src/random_1661.so.c @@ -359,7 +359,7 @@ plugin->value2 = value2; @@ -310,7 +283,7 @@ _fini (void) { LADSPA_Descriptor * descriptor; ---- src/ratio_2034.so.c.orig +--- src/ratio_2034.so.c +++ src/ratio_2034.so.c @@ -199,7 +199,7 @@ output[0] = numerator / denominator; @@ -330,7 +303,7 @@ _fini (void) { LADSPA_Descriptor * descriptor; ---- src/sawtooth_1641.so.c.orig +--- src/sawtooth_1641.so.c +++ src/sawtooth_1641.so.c @@ -183,7 +183,7 @@ plugin->phase = phase; @@ -350,7 +323,7 @@ _fini (void) { LADSPA_Descriptor * descriptor; ---- src/sequencer.so.c.orig +--- src/sequencer.so.c +++ src/sequencer.so.c @@ -226,7 +226,7 @@ plugin->step_index = step_index; @@ -370,7 +343,7 @@ _fini (void) { LADSPA_Descriptor * descriptor; ---- src/square_1643.so.c.orig +--- src/square_1643.so.c +++ src/square_1643.so.c @@ -185,7 +185,7 @@ plugin->phase = phase; @@ -390,7 +363,7 @@ _fini (void) { LADSPA_Descriptor * descriptor; ---- src/sum_1665.so.c.orig +--- src/sum_1665.so.c +++ src/sum_1665.so.c @@ -163,7 +163,7 @@ output[0] = input1 + input2; @@ -410,7 +383,7 @@ _fini (void) { LADSPA_Descriptor * descriptor; ---- src/sync_pulse_2023.so.c.orig +--- src/sync_pulse_2023.so.c +++ src/sync_pulse_2023.so.c @@ -223,7 +223,7 @@ plugin->phase = phase; @@ -430,7 +403,7 @@ _fini (void) { LADSPA_Descriptor * descriptor; ---- src/sync_square_1678.so.c.orig +--- src/sync_square_1678.so.c +++ src/sync_square_1678.so.c @@ -208,7 +208,7 @@ plugin->phase = phase; @@ -450,7 +423,7 @@ _fini (void) { LADSPA_Descriptor * descriptor; ---- src/tracker_2025.so.c.orig +--- src/tracker_2025.so.c +++ src/tracker_2025.so.c @@ -234,7 +234,7 @@ plugin->last_value = last_value; @@ -470,7 +443,7 @@ _fini (void) { LADSPA_Descriptor * descriptor; ---- src/triangle_1649.so.c.orig +--- src/triangle_1649.so.c +++ src/triangle_1649.so.c @@ -322,7 +322,7 @@ plugin->phase = phase; @@ -490,7 +463,7 @@ _fini (void) { LADSPA_Descriptor * descriptor; ---- src/wdatutil.c.orig +--- src/wdatutil.c +++ src/wdatutil.c @@ -411,7 +411,7 @@ * _init() diff --git a/ladspa.changes b/ladspa.changes index 839bd24..dc60c73 100644 --- a/ladspa.changes +++ b/ladspa.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Tue Nov 17 08:58:59 CET 2009 - tiwai@suse.de - -- refresh patches with fuzz=0 -- add -fno-strict-aliasing for swh plugins - ------------------------------------------------------------------- Tue Nov 10 20:22:43 CET 2009 - tiwai@suse.de diff --git a/ladspa.spec b/ladspa.spec index ac26707..9d84781 100644 --- a/ladspa.spec +++ b/ladspa.spec @@ -198,10 +198,11 @@ make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC" targets cd ../.. # SWH plugins cd swh-plugins-%{swh_version} +%{?suse_update_config:%{suse_update_config -f}} autoreconf --install --force -CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC -fno-strict-aliasing" \ +CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" \ ./configure --prefix=%{_prefix} -make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC -fno-strict-aliasing" +make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" cd .. # Vocoder cd vocoder-%{vocoder_version} @@ -217,6 +218,7 @@ make CFLAGS="$RPM_OPT_FLAGS -fPIC" cd .. # Blop cd blop-%{blop_version} +%{?suse_update_config:%{suse_update_config -f}} autoreconf --install --force ./configure --prefix=%{_prefix} \ --with-ladspa-plugin-dir=%{_libdir}/ladspa