summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2020-08-09 11:06:44 +0200
committerMiroslav Šulc <fordfrog@gentoo.org>2020-08-09 11:07:21 +0200
commitccf0a47dd10f3cb114fb819e515c78f3e49c8fc0 (patch)
tree25cc59d3456d5e93d83be09a6ebae26a1afea271
parentdev-python/docutils: Revbump to drop py2.7 (diff)
downloadgentoo-ccf0a47dd10f3cb114fb819e515c78f3e49c8fc0.tar.gz
gentoo-ccf0a47dd10f3cb114fb819e515c78f3e49c8fc0.tar.bz2
gentoo-ccf0a47dd10f3cb114fb819e515c78f3e49c8fc0.zip
media-libs/ladspa-sdk: fixed linking of filter.so in revbump 1.15-r1
Closes: https://bugs.gentoo.org/732346 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
-rw-r--r--media-libs/ladspa-sdk/files/ladspa-sdk-1.15-properbuild.patch16
-rw-r--r--media-libs/ladspa-sdk/ladspa-sdk-1.15-r1.ebuild (renamed from media-libs/ladspa-sdk/ladspa-sdk-1.15.ebuild)0
2 files changed, 10 insertions, 6 deletions
diff --git a/media-libs/ladspa-sdk/files/ladspa-sdk-1.15-properbuild.patch b/media-libs/ladspa-sdk/files/ladspa-sdk-1.15-properbuild.patch
index bba05d1ef48..709ec7c8456 100644
--- a/media-libs/ladspa-sdk/files/ladspa-sdk-1.15-properbuild.patch
+++ b/media-libs/ladspa-sdk/files/ladspa-sdk-1.15-properbuild.patch
@@ -1,5 +1,5 @@
diff --git a/src/Makefile b/src/Makefile
-index c339524..0b8137e 100644
+index c339524..2166624 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,12 +13,12 @@ INSTALL_BINARY_DIR = /usr/bin/
@@ -20,7 +20,7 @@ index c339524..0b8137e 100644
PLUGINS = ../plugins/amp.so \
../plugins/delay.so \
../plugins/filter.so \
-@@ -28,7 +28,8 @@ PROGRAMS = ../bin/analyseplugin \
+@@ -28,34 +28,25 @@ PROGRAMS = ../bin/analyseplugin \
../bin/applyplugin \
../bin/listplugins
CC = cc
@@ -30,9 +30,13 @@ index c339524..0b8137e 100644
###############################################################################
#
-@@ -36,26 +37,12 @@ CPP = c++
+ # RULES TO BUILD PLUGINS FROM C OR C++ CODE
#
++../plugins/filter.so: plugins/filter.c ladspa.h gcc_exports.map
++ $(CC) $(CFLAGS) $(INCLUDES) -fPIC -o plugins/filter.o -c plugins/filter.c
++ $(CC) $(CFLAGS) $(LDFLAGS) -o ../plugins/filter.so plugins/filter.o -nostartfiles -shared -lm
++
../plugins/%.so: plugins/%.c ladspa.h gcc_exports.map
- $(CC) $(CFLAGS) -o plugins/$*.o -c plugins/$*.c
- $(CC) -o ../plugins/$*.so \
@@ -61,7 +65,7 @@ index c339524..0b8137e 100644
###############################################################################
#
-@@ -66,7 +53,7 @@ test: /tmp/test.wav ../snd/noise.wav always
+@@ -66,7 +57,7 @@ test: /tmp/test.wav ../snd/noise.wav always
@echo ---------------------------------------------
@echo First listen to the white noise input signal:
@echo ---------------------------------------------
@@ -70,7 +74,7 @@ index c339524..0b8137e 100644
@echo -------------------------
@echo Compare to plugin output.
@echo -------------------------
-@@ -75,12 +62,12 @@ test: /tmp/test.wav ../snd/noise.wav always
+@@ -75,12 +66,12 @@ test: /tmp/test.wav ../snd/noise.wav always
@echo Test complete.
install: targets
@@ -89,7 +93,7 @@ index c339524..0b8137e 100644
/tmp/test.wav: targets ../snd/noise.wav
../bin/listplugins
-@@ -106,19 +93,19 @@ targets: $(PLUGINS) $(PROGRAMS)
+@@ -106,19 +97,19 @@ targets: $(PLUGINS) $(PROGRAMS)
#
../bin/applyplugin: applyplugin.o load.o default.o
diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.15.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.15-r1.ebuild
index 2f61df077ec..2f61df077ec 100644
--- a/media-libs/ladspa-sdk/ladspa-sdk-1.15.ebuild
+++ b/media-libs/ladspa-sdk/ladspa-sdk-1.15-r1.ebuild