[pkgsrc/trunk]: pkgsrc/audio/ladspa ladspa: Correct injection of CFLAGS, CXXF...

[kamil <kamil%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/72506f2bc25d
branches:  trunk
changeset: 371969:72506f2bc25d
user:      kamil <kamil%pkgsrc.org@localhost>
date:      Sat Nov 25 11:57:28 2017 +0000

description:
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.

diffstat:

 audio/ladspa/distinfo         |   4 ++--
 audio/ladspa/patches/patch-aa |  41 +++++++++++++++++++++++------------------
 2 files changed, 25 insertions(+), 20 deletions(-)

diffs (127 lines):

diff -r 071191843a7a -r 72506f2bc25d audio/ladspa/distinfo
--- a/audio/ladspa/distinfo     Sat Nov 25 09:16:23 2017 +0000
+++ b/audio/ladspa/distinfo     Sat Nov 25 11:57:28 2017 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2017/11/16 15:05:31 khorben Exp $
+$NetBSD: distinfo,v 1.13 2017/11/25 11:57:28 kamil Exp $
 
 SHA1 (ladspa_sdk_1.13.tgz) = 2b69e28afb62c0d97943124f48ed82de796f83ed
 RMD160 (ladspa_sdk_1.13.tgz) = e9eeae8edd24a6890fac3e34c4b55f844f44f8a0
 SHA512 (ladspa_sdk_1.13.tgz) = a1dab807fda58e08869d3f519be5fa91c394690eb13006fbe7f20b332548e4676b32b01273f5695bf36c8da72190c07618662a76d50f991b3f05068ac2b346ef
 Size (ladspa_sdk_1.13.tgz) = 70540 bytes
-SHA1 (patch-aa) = 721eddb7269f2c20eecc45b64a293b44395a3fc3
+SHA1 (patch-aa) = 80983955586f314e5e759516ae2c84d0933f1a0b
 SHA1 (patch-ab) = 1ad33baf6dcc4633e1459b6585cc8ccada57831f
 SHA1 (patch-ac) = 40108e5e4fdba9b2be322d0de532a97322d22325
 SHA1 (patch-plugins_amp.c) = e0336ff7fe078aa6b4e6b3d25b21b70ac6dc127d
diff -r 071191843a7a -r 72506f2bc25d audio/ladspa/patches/patch-aa
--- a/audio/ladspa/patches/patch-aa     Sat Nov 25 09:16:23 2017 +0000
+++ b/audio/ladspa/patches/patch-aa     Sat Nov 25 11:57:28 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2017/11/16 15:05:31 khorben Exp $
+$NetBSD: patch-aa,v 1.7 2017/11/25 11:57:28 kamil Exp $
 
 * Fix the destination directories
 * Use cc(1) to link the plug-ins
@@ -19,21 +19,21 @@
  
  ###############################################################################
  #
-@@ -14,9 +14,11 @@ INSTALL_BINARY_DIR  =       /usr/bin/
+@@ -14,9 +14,10 @@ INSTALL_BINARY_DIR  =       /usr/bin/
  #
  
  INCLUDES      =       -I.
 -LIBRARIES     =       -ldl -lm
 -CFLAGS                =       $(INCLUDES) -Wall -Werror -O3 -fPIC
-+CPPFLAGS      =       $(INCLUDES)
-+CFLAGS                =       -Wall -Werror -fPIC
- CXXFLAGS      =       $(CFLAGS)
+-CXXFLAGS      =       $(CFLAGS)
++LOCAL_CPPFLAGS        =       $(INCLUDES) -fPIC $(CPPFLAGS)
++LOCAL_CFLAGS  =       $(INCLUDES) -fPIC $(CFLAGS)
 +LIBRARIES     =       $(DL_LIBS) -lm
-+LDFLAGS               =
++LOCAL_LDFLAGS =       $(LDFLAGS)
  PLUGINS               =       ../plugins/amp.so                               \
                        ../plugins/delay.so                             \
                        ../plugins/filter.so                            \
-@@ -25,8 +27,8 @@ PLUGINS              =       ../plugins/amp.so                               \
+@@ -25,8 +26,8 @@ PLUGINS              =       ../plugins/amp.so                               \
  PROGRAMS      =       ../bin/analyseplugin                            \
                        ../bin/applyplugin                              \
                        ../bin/listplugins
@@ -44,24 +44,24 @@
  
  ###############################################################################
  #
-@@ -34,12 +36,12 @@ CPP                =       c++
+@@ -34,12 +35,12 @@ CPP                =       c++
  #
  
  ../plugins/%.so:      plugins/%.c ladspa.h
 -      $(CC) $(CFLAGS) -o plugins/$*.o -c plugins/$*.c
 -      $(LD) -o ../plugins/$*.so plugins/$*.o -shared
-+      $(CC) $(CPPFLAGS) $(CFLAGS) -o plugins/$*.o -c plugins/$*.c
-+      $(CC) -shared $(LDFLAGS) -o ../plugins/$*.so plugins/$*.o
++      $(CC) $(LOCAL_CPPFLAGS) $(LOCAL_CFLAGS) -o plugins/$*.o -c plugins/$*.c
++      $(CC) -shared $(LOCAL_LDFLAGS) -o ../plugins/$*.so plugins/$*.o
  
  ../plugins/%.so:      plugins/%.cpp ladspa.h
 -      $(CPP) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp
 -      $(CPP) -o ../plugins/$*.so plugins/$*.o -shared
-+      $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp
-+      $(CXX) -shared $(LDFLAGS) -o ../plugins/$*.so plugins/$*.o
++      $(CXX) $(LOCAL_CPPFLAGS) $(LOCAL_CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp
++      $(CXX) -shared $(LOCAL_LDFLAGS) -o ../plugins/$*.so plugins/$*.o
  
  ###############################################################################
  #
-@@ -58,13 +60,13 @@ test:      /tmp/test.wav ../snd/noise.wav alw
+@@ -58,13 +59,13 @@ test:      /tmp/test.wav ../snd/noise.wav alw
        -sndfile-play /tmp/test.wav
        @echo Test complete.
  
@@ -82,7 +82,7 @@
  
  /tmp/test.wav:        targets ../snd/noise.wav
        ../bin/listplugins
-@@ -82,7 +84,7 @@ install:     targets
+@@ -82,7 +83,7 @@ install:     targets
                                ../plugins/delay.so delay_5s 1 0.1      \
                                ../plugins/amp.so amp_mono 4            \
  
@@ -91,24 +91,29 @@
  
  ###############################################################################
  #
-@@ -90,17 +92,17 @@ targets:   $(PLUGINS) $(PROGRAMS)
+@@ -90,17 +91,17 @@ targets:   $(PLUGINS) $(PROGRAMS)
  #
  
  ../bin/applyplugin:   applyplugin.o load.o default.o
 -      $(CC) $(CFLAGS) $(LIBRARIES)                                    \
-+      $(CC) $(LDFLAGS) $(LIBRARIES)                                   \
++      $(CC) $(LOCAL_LDFLAGS) $(LIBRARIES)                                     \
                -o ../bin/applyplugin                                   \
                applyplugin.o load.o default.o
  
  ../bin/analyseplugin: analyseplugin.o load.o default.o
 -      $(CC) $(CFLAGS) $(LIBRARIES)                                    \
-+      $(CC) $(LDFLAGS) $(LIBRARIES)                                   \
++      $(CC) $(LOCAL_LDFLAGS) $(LIBRARIES)                                     \
                -o ../bin/analyseplugin                                 \
                analyseplugin.o load.o default.o
  
  ../bin/listplugins:   listplugins.o search.o
 -      $(CC) $(CFLAGS) $(LIBRARIES)                                    \
-+      $(CC) $(LDFLAGS) $(LIBRARIES)                                   \
++      $(CC) $(LOCAL_LDFLAGS) $(LIBRARIES)                                     \
                -o ../bin/listplugins                                   \
                listplugins.o search.o
  
+@@ -123,4 +124,3 @@ backup:            clean
+       tar czf `date '+../backup/ladspa_sdk.%Y%m%d%H%M.tgz'` ladspa_sdk/)
+ 
+ ###############################################################################
+-