Received: by mail.netbsd.org (Postfix, from userid 605) id 9642484D69; Sat, 25 Nov 2017 11:57:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2016E84D47 for ; Sat, 25 Nov 2017 11:57:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id OMa3Y2HJhe6V for ; Sat, 25 Nov 2017 11:57:28 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 561BC84C6C for ; Sat, 25 Nov 2017 11:57:28 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4BE5CFB40; Sat, 25 Nov 2017 11:57:28 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1511611048121420" MIME-Version: 1.0 Date: Sat, 25 Nov 2017 11:57:28 +0000 From: "Kamil Rytarowski" Subject: CVS commit: pkgsrc/audio/ladspa To: pkgsrc-changes@NetBSD.org Reply-To: kamil@netbsd.org X-Mailer: log_accum Message-Id: <20171125115728.4BE5CFB40@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1511611048121420 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: kamil Date: Sat Nov 25 11:57:28 UTC 2017 Modified Files: pkgsrc/audio/ladspa: distinfo pkgsrc/audio/ladspa/patches: patch-aa Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 pkgsrc/audio/ladspa/distinfo cvs rdiff -u -r1.6 -r1.7 pkgsrc/audio/ladspa/patches/patch-aa Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1511611048121420 Content-Disposition: inline Content-Length: 5228 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/audio/ladspa/distinfo diff -u pkgsrc/audio/ladspa/distinfo:1.12 pkgsrc/audio/ladspa/distinfo:1.13 --- pkgsrc/audio/ladspa/distinfo:1.12 Thu Nov 16 15:05:31 2017 +++ pkgsrc/audio/ladspa/distinfo Sat Nov 25 11:57:28 2017 @@ -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 Index: pkgsrc/audio/ladspa/patches/patch-aa diff -u pkgsrc/audio/ladspa/patches/patch-aa:1.6 pkgsrc/audio/ladspa/patches/patch-aa:1.7 --- pkgsrc/audio/ladspa/patches/patch-aa:1.6 Thu Nov 16 15:05:31 2017 +++ pkgsrc/audio/ladspa/patches/patch-aa Sat Nov 25 11:57:28 2017 @@ -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 @@ $NetBSD: patch-aa,v 1.6 2017/11/16 15:05 ############################################################################### # -@@ -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 @@ $NetBSD: patch-aa,v 1.6 2017/11/16 15:05 ############################################################################### # -@@ -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 @@ $NetBSD: patch-aa,v 1.6 2017/11/16 15:05 /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 @@ $NetBSD: patch-aa,v 1.6 2017/11/16 15:05 ############################################################################### # -@@ -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/) + + ############################################################################### +- --_----------=_1511611048121420--