Sat Nov 25 11:57:28 2017 UTC ()
ladspa: Correct injection of CFLAGS, CXXFLAGS, LDFLAGS

Patch the upstream makefile to rename CFLAGS, CXXFLAGS, LDFLAGS to
LOCAL_*. Retrieve  CFLAGS, CXXFLAGS, LDFLAGS from pkgsrc.

This package uses homegrown hardcoded macros for libraries (-fPIC), this
is not portable and should be adjusted in future.

This unbreaks build on NetBSD/amd64 8.99.7 as of today.


(kamil)
diff -r1.12 -r1.13 pkgsrc/audio/ladspa/distinfo
diff -r1.6 -r1.7 pkgsrc/audio/ladspa/patches/patch-aa
cvs diff -r1.12 -r1.13 pkgsrc/audio/ladspa/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/ladspa/distinfo 2017/11/16 15:05:31 1.12
+++ pkgsrc/audio/ladspa/distinfo 2017/11/25 11:57:28 1.13
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.12 2017/11/16 15:05:31 khorben Exp $ 1$NetBSD: distinfo,v 1.13 2017/11/25 11:57:28 kamil Exp $
2 2
3SHA1 (ladspa_sdk_1.13.tgz) = 2b69e28afb62c0d97943124f48ed82de796f83ed 3SHA1 (ladspa_sdk_1.13.tgz) = 2b69e28afb62c0d97943124f48ed82de796f83ed
4RMD160 (ladspa_sdk_1.13.tgz) = e9eeae8edd24a6890fac3e34c4b55f844f44f8a0 4RMD160 (ladspa_sdk_1.13.tgz) = e9eeae8edd24a6890fac3e34c4b55f844f44f8a0
5SHA512 (ladspa_sdk_1.13.tgz) = a1dab807fda58e08869d3f519be5fa91c394690eb13006fbe7f20b332548e4676b32b01273f5695bf36c8da72190c07618662a76d50f991b3f05068ac2b346ef 5SHA512 (ladspa_sdk_1.13.tgz) = a1dab807fda58e08869d3f519be5fa91c394690eb13006fbe7f20b332548e4676b32b01273f5695bf36c8da72190c07618662a76d50f991b3f05068ac2b346ef
6Size (ladspa_sdk_1.13.tgz) = 70540 bytes 6Size (ladspa_sdk_1.13.tgz) = 70540 bytes
7SHA1 (patch-aa) = 721eddb7269f2c20eecc45b64a293b44395a3fc3 7SHA1 (patch-aa) = 80983955586f314e5e759516ae2c84d0933f1a0b
8SHA1 (patch-ab) = 1ad33baf6dcc4633e1459b6585cc8ccada57831f 8SHA1 (patch-ab) = 1ad33baf6dcc4633e1459b6585cc8ccada57831f
9SHA1 (patch-ac) = 40108e5e4fdba9b2be322d0de532a97322d22325 9SHA1 (patch-ac) = 40108e5e4fdba9b2be322d0de532a97322d22325
10SHA1 (patch-plugins_amp.c) = e0336ff7fe078aa6b4e6b3d25b21b70ac6dc127d 10SHA1 (patch-plugins_amp.c) = e0336ff7fe078aa6b4e6b3d25b21b70ac6dc127d
11SHA1 (patch-plugins_delay.c) = ee551be35938b69d7b535640858d67ceeb261ee0 11SHA1 (patch-plugins_delay.c) = ee551be35938b69d7b535640858d67ceeb261ee0
12SHA1 (patch-plugins_filter.c) = 79b050f99a68ebd87e76f552054592331c31828e 12SHA1 (patch-plugins_filter.c) = 79b050f99a68ebd87e76f552054592331c31828e
13SHA1 (patch-plugins_noise.c) = 9e996f5f9ad4e39974cafea52af143e9db4603f7 13SHA1 (patch-plugins_noise.c) = 9e996f5f9ad4e39974cafea52af143e9db4603f7
cvs diff -r1.6 -r1.7 pkgsrc/audio/ladspa/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/audio/ladspa/patches/Attic/patch-aa 2017/11/16 15:05:31 1.6
+++ pkgsrc/audio/ladspa/patches/Attic/patch-aa 2017/11/25 11:57:28 1.7
@@ -1,114 +1,119 @@ @@ -1,114 +1,119 @@
1$NetBSD: patch-aa,v 1.6 2017/11/16 15:05:31 khorben Exp $ 1$NetBSD: patch-aa,v 1.7 2017/11/25 11:57:28 kamil Exp $
2 2
3* Fix the destination directories 3* Fix the destination directories
4* Use cc(1) to link the plug-ins 4* Use cc(1) to link the plug-ins
5* Add support for CFLAGS and LDFLAGS 5* Add support for CFLAGS and LDFLAGS
6 6
7--- makefile.orig 2007-11-06 10:42:45.000000000 +0000 7--- makefile.orig 2007-11-06 10:42:45.000000000 +0000
8+++ makefile 8+++ makefile
9@@ -4,9 +4,9 @@ 9@@ -4,9 +4,9 @@
10 # 10 #
11 # Change these if you want to install somewhere else. 11 # Change these if you want to install somewhere else.
12  12
13-INSTALL_PLUGINS_DIR = /usr/lib/ladspa/ 13-INSTALL_PLUGINS_DIR = /usr/lib/ladspa/
14-INSTALL_INCLUDE_DIR = /usr/include/ 14-INSTALL_INCLUDE_DIR = /usr/include/
15-INSTALL_BINARY_DIR = /usr/bin/ 15-INSTALL_BINARY_DIR = /usr/bin/
16+INSTALL_PLUGINS_DIR = ${PREFIX}/lib/ladspa/ 16+INSTALL_PLUGINS_DIR = ${PREFIX}/lib/ladspa/
17+INSTALL_INCLUDE_DIR = ${PREFIX}/include/ 17+INSTALL_INCLUDE_DIR = ${PREFIX}/include/
18+INSTALL_BINARY_DIR = ${PREFIX}/bin/ 18+INSTALL_BINARY_DIR = ${PREFIX}/bin/
19  19
20 ############################################################################### 20 ###############################################################################
21 # 21 #
22@@ -14,9 +14,11 @@ INSTALL_BINARY_DIR = /usr/bin/ 22@@ -14,9 +14,10 @@ INSTALL_BINARY_DIR = /usr/bin/
23 # 23 #
24  24
25 INCLUDES = -I. 25 INCLUDES = -I.
26-LIBRARIES = -ldl -lm 26-LIBRARIES = -ldl -lm
27-CFLAGS = $(INCLUDES) -Wall -Werror -O3 -fPIC 27-CFLAGS = $(INCLUDES) -Wall -Werror -O3 -fPIC
28+CPPFLAGS = $(INCLUDES) 28-CXXFLAGS = $(CFLAGS)
29+CFLAGS = -Wall -Werror -fPIC 29+LOCAL_CPPFLAGS = $(INCLUDES) -fPIC $(CPPFLAGS)
30 CXXFLAGS = $(CFLAGS) 30+LOCAL_CFLAGS = $(INCLUDES) -fPIC $(CFLAGS)
31+LIBRARIES = $(DL_LIBS) -lm 31+LIBRARIES = $(DL_LIBS) -lm
32+LDFLAGS = 32+LOCAL_LDFLAGS = $(LDFLAGS)
33 PLUGINS = ../plugins/amp.so \ 33 PLUGINS = ../plugins/amp.so \
34 ../plugins/delay.so \ 34 ../plugins/delay.so \
35 ../plugins/filter.so \ 35 ../plugins/filter.so \
36@@ -25,8 +27,8 @@ PLUGINS = ../plugins/amp.so \ 36@@ -25,8 +26,8 @@ PLUGINS = ../plugins/amp.so \
37 PROGRAMS = ../bin/analyseplugin \ 37 PROGRAMS = ../bin/analyseplugin \
38 ../bin/applyplugin \ 38 ../bin/applyplugin \
39 ../bin/listplugins 39 ../bin/listplugins
40-CC = cc 40-CC = cc
41-CPP = c++ 41-CPP = c++
42+#CC = cc 42+#CC = cc
43+#CPP = c++ 43+#CPP = c++
44  44
45 ############################################################################### 45 ###############################################################################
46 # 46 #
47@@ -34,12 +36,12 @@ CPP = c++ 47@@ -34,12 +35,12 @@ CPP = c++
48 # 48 #
49  49
50 ../plugins/%.so: plugins/%.c ladspa.h 50 ../plugins/%.so: plugins/%.c ladspa.h
51- $(CC) $(CFLAGS) -o plugins/$*.o -c plugins/$*.c 51- $(CC) $(CFLAGS) -o plugins/$*.o -c plugins/$*.c
52- $(LD) -o ../plugins/$*.so plugins/$*.o -shared 52- $(LD) -o ../plugins/$*.so plugins/$*.o -shared
53+ $(CC) $(CPPFLAGS) $(CFLAGS) -o plugins/$*.o -c plugins/$*.c 53+ $(CC) $(LOCAL_CPPFLAGS) $(LOCAL_CFLAGS) -o plugins/$*.o -c plugins/$*.c
54+ $(CC) -shared $(LDFLAGS) -o ../plugins/$*.so plugins/$*.o 54+ $(CC) -shared $(LOCAL_LDFLAGS) -o ../plugins/$*.so plugins/$*.o
55  55
56 ../plugins/%.so: plugins/%.cpp ladspa.h 56 ../plugins/%.so: plugins/%.cpp ladspa.h
57- $(CPP) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp 57- $(CPP) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp
58- $(CPP) -o ../plugins/$*.so plugins/$*.o -shared 58- $(CPP) -o ../plugins/$*.so plugins/$*.o -shared
59+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp 59+ $(CXX) $(LOCAL_CPPFLAGS) $(LOCAL_CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp
60+ $(CXX) -shared $(LDFLAGS) -o ../plugins/$*.so plugins/$*.o 60+ $(CXX) -shared $(LOCAL_LDFLAGS) -o ../plugins/$*.so plugins/$*.o
61  61
62 ############################################################################### 62 ###############################################################################
63 # 63 #
64@@ -58,13 +60,13 @@ test: /tmp/test.wav ../snd/noise.wav alw 64@@ -58,13 +59,13 @@ test: /tmp/test.wav ../snd/noise.wav alw
65 -sndfile-play /tmp/test.wav 65 -sndfile-play /tmp/test.wav
66 @echo Test complete. 66 @echo Test complete.
67  67
68-install: targets 68-install: targets
69- -mkdirhier $(INSTALL_PLUGINS_DIR) 69- -mkdirhier $(INSTALL_PLUGINS_DIR)
70- -mkdirhier $(INSTALL_INCLUDE_DIR) 70- -mkdirhier $(INSTALL_INCLUDE_DIR)
71- -mkdirhier $(INSTALL_BINARY_DIR) 71- -mkdirhier $(INSTALL_BINARY_DIR)
72- cp ../plugins/* $(INSTALL_PLUGINS_DIR) 72- cp ../plugins/* $(INSTALL_PLUGINS_DIR)
73- cp ladspa.h $(INSTALL_INCLUDE_DIR) 73- cp ladspa.h $(INSTALL_INCLUDE_DIR)
74- cp ../bin/* $(INSTALL_BINARY_DIR) 74- cp ../bin/* $(INSTALL_BINARY_DIR)
75+install: 75+install:
76+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INSTALL_PLUGINS_DIR) 76+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INSTALL_PLUGINS_DIR)
77+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INSTALL_INCLUDE_DIR) 77+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INSTALL_INCLUDE_DIR)
78+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INSTALL_BINARY_DIR) 78+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INSTALL_BINARY_DIR)
79+ $(BSD_INSTALL_DATA) ../plugins/* ${DESTDIR}$(INSTALL_PLUGINS_DIR) 79+ $(BSD_INSTALL_DATA) ../plugins/* ${DESTDIR}$(INSTALL_PLUGINS_DIR)
80+ $(BSD_INSTALL_DATA) ladspa.h ${DESTDIR}$(INSTALL_INCLUDE_DIR) 80+ $(BSD_INSTALL_DATA) ladspa.h ${DESTDIR}$(INSTALL_INCLUDE_DIR)
81+ $(BSD_INSTALL_PROGRAM) ../bin/* ${DESTDIR}$(INSTALL_BINARY_DIR) 81+ $(BSD_INSTALL_PROGRAM) ../bin/* ${DESTDIR}$(INSTALL_BINARY_DIR)
82  82
83 /tmp/test.wav: targets ../snd/noise.wav 83 /tmp/test.wav: targets ../snd/noise.wav
84 ../bin/listplugins 84 ../bin/listplugins
85@@ -82,7 +84,7 @@ install: targets 85@@ -82,7 +83,7 @@ install: targets
86 ../plugins/delay.so delay_5s 1 0.1 \ 86 ../plugins/delay.so delay_5s 1 0.1 \
87 ../plugins/amp.so amp_mono 4 \ 87 ../plugins/amp.so amp_mono 4 \
88  88
89-targets: $(PLUGINS) $(PROGRAMS) 89-targets: $(PLUGINS) $(PROGRAMS)
90+all: $(PLUGINS) $(PROGRAMS) 90+all: $(PLUGINS) $(PROGRAMS)
91  91
92 ############################################################################### 92 ###############################################################################
93 # 93 #
94@@ -90,17 +92,17 @@ targets: $(PLUGINS) $(PROGRAMS) 94@@ -90,17 +91,17 @@ targets: $(PLUGINS) $(PROGRAMS)
95 # 95 #
96  96
97 ../bin/applyplugin: applyplugin.o load.o default.o 97 ../bin/applyplugin: applyplugin.o load.o default.o
98- $(CC) $(CFLAGS) $(LIBRARIES) \ 98- $(CC) $(CFLAGS) $(LIBRARIES) \
99+ $(CC) $(LDFLAGS) $(LIBRARIES) \ 99+ $(CC) $(LOCAL_LDFLAGS) $(LIBRARIES) \
100 -o ../bin/applyplugin \ 100 -o ../bin/applyplugin \
101 applyplugin.o load.o default.o 101 applyplugin.o load.o default.o
102  102
103 ../bin/analyseplugin: analyseplugin.o load.o default.o 103 ../bin/analyseplugin: analyseplugin.o load.o default.o
104- $(CC) $(CFLAGS) $(LIBRARIES) \ 104- $(CC) $(CFLAGS) $(LIBRARIES) \
105+ $(CC) $(LDFLAGS) $(LIBRARIES) \ 105+ $(CC) $(LOCAL_LDFLAGS) $(LIBRARIES) \
106 -o ../bin/analyseplugin \ 106 -o ../bin/analyseplugin \
107 analyseplugin.o load.o default.o 107 analyseplugin.o load.o default.o
108  108
109 ../bin/listplugins: listplugins.o search.o 109 ../bin/listplugins: listplugins.o search.o
110- $(CC) $(CFLAGS) $(LIBRARIES) \ 110- $(CC) $(CFLAGS) $(LIBRARIES) \
111+ $(CC) $(LDFLAGS) $(LIBRARIES) \ 111+ $(CC) $(LOCAL_LDFLAGS) $(LIBRARIES) \
112 -o ../bin/listplugins \ 112 -o ../bin/listplugins \
113 listplugins.o search.o 113 listplugins.o search.o
114  114
 115@@ -123,4 +124,3 @@ backup: clean
 116 tar czf `date '+../backup/ladspa_sdk.%Y%m%d%H%M.tgz'` ladspa_sdk/)
 117
 118 ###############################################################################
 119-