Bug#900705: x42-plugins FTCBFS: many reasons
Helmut Grohne
helmut at subdivi.de
Sun Jun 3 19:00:22 BST 2018
Source: x42-plugins
Version: 20170428-1.1
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap
x42-plugins fails to cross build from source for a pile of reasons.
First and foremost, the Makefiles hard code the build architecture
pkg-config. Allowing substitution produces quite a big cross.patch, but
that part should be upstreamable. Then the packaging needs to pass cross
compilers and a cross pkg-config to make. Furthermore, stripping (with
the build architecture strip) fails. Stripping not just breaks cross
compilation, but also generation of -dbgsym packages, so disable it
entirely. The attached patch makes x32-plugins cross buildable. Please
consider applying it.
Helmut
-------------- next part --------------
diff --minimal -Nru x42-plugins-20170428/debian/changelog x42-plugins-20170428/debian/changelog
--- x42-plugins-20170428/debian/changelog 2018-03-20 19:30:37.000000000 +0100
+++ x42-plugins-20170428/debian/changelog 2018-06-03 17:13:31.000000000 +0200
@@ -1,3 +1,15 @@
+x42-plugins (20170428-1.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + cross.patch: Allow substituting pkg-config.
+ + Let dh_auto_build pass cross CC and CXX to make.
+ + Let buildtools.mk set up PKG_CONFIG for dh_auto_install.
+ + Disable stripping during build, let dh_strip perform stripping.
+ * Remove useless override_dh_auto_configure.
+
+ -- Helmut Grohne <helmut at subdivi.de> Sun, 03 Jun 2018 17:13:31 +0200
+
x42-plugins (20170428-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff --minimal -Nru x42-plugins-20170428/debian/patches/cross.patch x42-plugins-20170428/debian/patches/cross.patch
--- x42-plugins-20170428/debian/patches/cross.patch 1970-01-01 01:00:00.000000000 +0100
+++ x42-plugins-20170428/debian/patches/cross.patch 2018-06-03 17:13:31.000000000 +0200
@@ -0,0 +1,1098 @@
+--- x42-plugins-20170428.orig/balance.lv2/Makefile
++++ x42-plugins-20170428/balance.lv2/Makefile
+@@ -9,6 +9,7 @@
+ CXXFLAGS ?= $(OPTIMIZATIONS) -Wall
+ LIBDIR ?= lib
+
++PKG_CONFIG?=pkg-config
+ STRIP?=strip
+ STRIPFLAGS=-s
+ UISTRIPFLAGS=-s
+@@ -62,10 +63,10 @@
+ include git2lv2.mk
+
+ # check for build-dependencies
+-ifeq ($(shell pkg-config --exists lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists lv2 || echo no), no)
+ $(error "LV2 SDK was not found")
+ else
+- override CXXFLAGS+=`pkg-config --cflags lv2`
++ override CXXFLAGS+=`$(PKG_CONFIG) --cflags lv2`
+ endif
+
+ # optional UI
+@@ -95,18 +96,18 @@
+ endif
+ endif
+
+-HAVE_UI=$(shell pkg-config --exists $(PKG_GL_LIBS) ftgl && echo $(FONT_FOUND))
++HAVE_UI=$(shell $(PKG_CONFIG) --exists $(PKG_GL_LIBS) ftgl && echo $(FONT_FOUND))
+
+ LV2UIREQ=
+ # check for LV2 idle thread -- requires 'lv2', atleast_version='1.4.6
+-ifeq ($(shell pkg-config --atleast-version=1.4.6 lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --atleast-version=1.4.6 lv2 || echo no), no)
+ UICFLAGS+=-DOLD_SUIL
+ else
+ LV2UIREQ=lv2:requiredFeature ui:idleInterface; lv2:extensionData ui:idleInterface;
+ endif
+
+ # check for lv2_atom_forge_object new in 1.8.1 deprecates lv2_atom_forge_blank
+-ifeq ($(shell pkg-config --atleast-version=1.8.1 lv2 && echo yes), yes)
++ifeq ($(shell $(PKG_CONFIG) --atleast-version=1.8.1 lv2 && echo yes), yes)
+ override CXXFLAGS += -DHAVE_LV2_1_8
+ endif
+
+@@ -120,34 +121,34 @@
+ UIDEPS+=pugl/pugl_osx.m
+ UILIBS=pugl/pugl_osx.m -framework Cocoa -framework OpenGL
+ UI_TYPE=CocoaUI
+- UILIBS+=`pkg-config --variable=libdir ftgl`/libftgl.a `pkg-config --variable=libdir ftgl`/libfreetype.a -lm -mmacosx-version-min=10.5
+- UILIBS+=`pkg-config --libs zlib`
++ UILIBS+=`$(PKG_CONFIG) --variable=libdir ftgl`/libftgl.a `$(PKG_CONFIG) --variable=libdir ftgl`/libfreetype.a -lm -mmacosx-version-min=10.5
++ UILIBS+=`$(PKG_CONFIG) --libs zlib`
+ else
+ ifneq ($(XWIN),)
+ UIDEPS+=pugl/pugl_win.cpp
+ UICFLAGS+=-DPTW32_STATIC_LIB
+ UILIBS=pugl/pugl_win.cpp
+- UILIBS+=`pkg-config --variable=libdir ftgl`/libftgl.a `pkg-config --variable=libdir ftgl`/libfreetype.a
+- UILIBS+=`pkg-config --libs zlib`
++ UILIBS+=`$(PKG_CONFIG) --variable=libdir ftgl`/libftgl.a `$(PKG_CONFIG) --variable=libdir ftgl`/libfreetype.a
++ UILIBS+=`$(PKG_CONFIG) --libs zlib`
+ UILIBS+=-lws2_32 -lwinmm -lopengl32 -lglu32 -lgdi32 -lcomdlg32 -lpthread
+ UI_TYPE=WindowsUI
+ else
+ UIDEPS+=pugl/pugl_x11.c
+- UICFLAGS+=`pkg-config --cflags glu gl`
++ UICFLAGS+=`$(PKG_CONFIG) --cflags glu gl`
+ UILIBS=pugl/pugl_x11.c -lX11
+ UI_TYPE=X11UI
+ ifeq ($(STATICBUILD), yes)
+- UILIBS+=`pkg-config --libs glu`
+- UILIBS+=`pkg-config --variable=libdir ftgl`/libftgl.a `pkg-config --variable=libdir ftgl`/libfreetype.a
+- UILIBS+=`pkg-config --libs zlib`
++ UILIBS+=`$(PKG_CONFIG) --libs glu`
++ UILIBS+=`$(PKG_CONFIG) --variable=libdir ftgl`/libftgl.a `$(PKG_CONFIG) --variable=libdir ftgl`/libfreetype.a
++ UILIBS+=`$(PKG_CONFIG) --libs zlib`
+ else
+- UILIBS+=`pkg-config --libs glu ftgl`
++ UILIBS+=`$(PKG_CONFIG) --libs glu ftgl`
+ endif
+ UICFLAGS+=-DFONTFILE=\"$(FONTFILE)\"
+ endif
+ endif
+- UILIBS+=`pkg-config --libs ftgl`
+- UICFLAGS+=`pkg-config --cflags freetype2` `pkg-config --cflags ftgl` -DHAVE_FTGL -DUINQHACK=Blc
++ UILIBS+=`$(PKG_CONFIG) --libs ftgl`
++ UICFLAGS+=`$(PKG_CONFIG) --cflags freetype2` `$(PKG_CONFIG) --cflags ftgl` -DHAVE_FTGL -DUINQHACK=Blc
+ UICFLAGS+=-DFONTSIZE=$(FONTSIZE)
+
+ targets+=$(BUILDDIR)$(LV2GUI)$(LIB_EXT)
+--- x42-plugins-20170428.orig/controlfilter.lv2/Makefile
++++ x42-plugins-20170428/controlfilter.lv2/Makefile
+@@ -4,6 +4,7 @@
+ PREFIX ?= /usr/local
+ CFLAGS ?= $(OPTIMIZATIONS) -Wall
+
++PKG_CONFIG?=pkg-config
+ STRIP?=strip
+ STRIPFLAGS?=-s
+
+@@ -47,12 +48,12 @@
+
+ ###############################################################################
+ # check for build-dependencies
+-ifeq ($(shell pkg-config --exists lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists lv2 || echo no), no)
+ $(error "LV2 SDK was not found")
+ endif
+
+ override CFLAGS += -fPIC -std=c99
+-override CFLAGS += `pkg-config --cflags lv2`
++override CFLAGS += `$(PKG_CONFIG) --cflags lv2`
+
+ ###############################################################################
+ # build target definitions
+--- x42-plugins-20170428.orig/convoLV2/Makefile
++++ x42-plugins-20170428/convoLV2/Makefile
+@@ -10,6 +10,8 @@
+ LIBDIR ?= lib
+ BUILDGTK ?= no
+
++PKG_CONFIG?=pkg-config
++
+ ###############################################################################
+ BUILDDIR=build/
+
+@@ -38,22 +40,22 @@
+
+ # check for build-dependencies
+
+-ifeq ($(shell pkg-config --exists lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists lv2 || echo no), no)
+ $(error "LV2 SDK was not found")
+ endif
+
+-ifeq ($(shell pkg-config --atleast-version=1.4 lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --atleast-version=1.4 lv2 || echo no), no)
+ $(error "LV2 SDK needs to be version 1.4 or later")
+ endif
+
+-ifneq ($(shell pkg-config --exists sndfile samplerate\
++ifneq ($(shell $(PKG_CONFIG) --exists sndfile samplerate\
+ && echo yes), yes)
+ $(error "libsndfile and libsamplerate are required")
+ endif
+
+ CLV2UI=
+ ifneq ($(BUILDGTK), no)
+- ifeq ($(shell pkg-config --exists glib-2.0 gtk+-2.0 || echo no), no)
++ ifeq ($(shell $(PKG_CONFIG) --exists glib-2.0 gtk+-2.0 || echo no), no)
+ $(warning "The optional plugin GUI requires glib-2.0 and gtk+-2.0")
+ $(warning "call make BUILDGTK=no to disable the GUI.")
+ $(error "Aborting build.")
+@@ -71,16 +73,16 @@
+ # add library dependent flags and libs
+
+ override CXXFLAGS +=-fPIC
+-override CXXFLAGS +=`pkg-config --cflags glib-2.0 lv2 sndfile samplerate`
+-override LOADLIBES +=`pkg-config --libs sndfile samplerate` -lm
++override CXXFLAGS +=`$(PKG_CONFIG) --cflags glib-2.0 lv2 sndfile samplerate`
++override LOADLIBES +=`$(PKG_CONFIG) --libs sndfile samplerate` -lm
+
+-ifeq ($(shell pkg-config --atleast-version=1.8.1 lv2 && echo yes), yes)
++ifeq ($(shell $(PKG_CONFIG) --atleast-version=1.8.1 lv2 && echo yes), yes)
+ override CXXFLAGS += -DHAVE_LV2_1_8
+ endif
+
+
+-GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
+-GTKLIBS = `pkg-config --libs gtk+-2.0`
++GTKCFLAGS = `$(PKG_CONFIG) --cflags gtk+-2.0`
++GTKLIBS = `$(PKG_CONFIG) --libs gtk+-2.0`
+
+ targets= $(BUILDDIR)$(LV2NAME)$(LIB_EXT)
+
+--- x42-plugins-20170428.orig/fat1.lv2/Makefile
++++ x42-plugins-20170428/fat1.lv2/Makefile
+@@ -12,6 +12,7 @@
+
+ OPTIMIZATIONS ?= -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG
+ CXXFLAGS ?= -Wall -g -Wno-unused-function
++PKG_CONFIG ?= pkg-config
+ STRIP ?= strip
+
+ BUILDOPENGL?=yes
+@@ -65,7 +66,7 @@
+ PUGL_SRC=$(RW)pugl/pugl_x11.c
+ PKG_GL_LIBS=glu gl
+ GLUILIBS=-lX11
+- GLUICFLAGS+=`pkg-config --cflags glu`
++ GLUICFLAGS+=`$(PKG_CONFIG) --cflags glu`
+ STRIPFLAGS= -s
+ EXTENDED_RE=-r
+ endif
+@@ -113,26 +114,26 @@
+
+ ###############################################################################
+ # check for build-dependencies
+-ifeq ($(shell pkg-config --exists lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists lv2 || echo no), no)
+ $(error "LV2 SDK was not found")
+ endif
+
+-ifeq ($(shell pkg-config --exists fftw3f || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists fftw3f || echo no), no)
+ $(error "fftw3f library was not found")
+ endif
+
+-ifeq ($(shell pkg-config --atleast-version=1.6.0 lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --atleast-version=1.6.0 lv2 || echo no), no)
+ $(error "LV2 SDK needs to be version 1.6.0 or later")
+ endif
+
+ ifneq ($(BUILDOPENGL)$(BUILDJACKAPP), nono)
+- ifeq ($(shell pkg-config --exists pango cairo $(PKG_GL_LIBS) || echo no), no)
++ ifeq ($(shell $(PKG_CONFIG) --exists pango cairo $(PKG_GL_LIBS) || echo no), no)
+ $(error "This plugin requires cairo pango $(PKG_GL_LIBS)")
+ endif
+ endif
+
+ ifneq ($(BUILDJACKAPP), no)
+- ifeq ($(shell pkg-config --exists jack || echo no), no)
++ ifeq ($(shell $(PKG_CONFIG) --exists jack || echo no), no)
+ $(warning *** libjack from http://jackaudio.org is required)
+ $(error Please install libjack-dev or libjack-jackd2-dev)
+ endif
+@@ -140,7 +141,7 @@
+ endif
+
+ # check for lv2_atom_forge_object new in 1.8.1 deprecates lv2_atom_forge_blank
+-ifeq ($(shell pkg-config --atleast-version=1.8.1 lv2 && echo yes), yes)
++ifeq ($(shell $(PKG_CONFIG) --atleast-version=1.8.1 lv2 && echo yes), yes)
+ override CXXFLAGS += -DHAVE_LV2_1_8
+ endif
+
+@@ -168,17 +169,17 @@
+
+ # add library dependent flags and libs
+ override CXXFLAGS += $(OPTIMIZATIONS) -DVERSION="\"$(fat1_VERSION)\""
+-override CXXFLAGS += `pkg-config --cflags lv2 fftw3f`
++override CXXFLAGS += `$(PKG_CONFIG) --cflags lv2 fftw3f`
+ ifeq ($(XWIN),)
+ override CXXFLAGS += -fPIC -fvisibility=hidden
+ else
+ override CXXFLAGS += -DPTW32_STATIC_LIB
+ endif
+-override LOADLIBES += `pkg-config --libs lv2 fftw3f`
++override LOADLIBES += `$(PKG_CONFIG) --libs lv2 fftw3f`
+
+
+-GLUICFLAGS+=`pkg-config --cflags cairo pango` $(CXXFLAGS)
+-GLUILIBS+=`pkg-config $(PKG_UI_FLAGS) --libs cairo pango pangocairo $(PKG_GL_LIBS)`
++GLUICFLAGS+=`$(PKG_CONFIG) --cflags cairo pango` $(CXXFLAGS)
++GLUILIBS+=`$(PKG_CONFIG) $(PKG_UI_FLAGS) --libs cairo pango pangocairo $(PKG_GL_LIBS)`
+
+ ifneq ($(XWIN),)
+ GLUILIBS+=-lpthread -lusp10
+@@ -196,7 +197,7 @@
+ ROBGL+= Makefile
+
+ JACKCFLAGS=-I. $(CXXFLAGS) $(LIC_CFLAGS)
+-JACKCFLAGS+=`pkg-config --cflags jack lv2 pango pangocairo $(PKG_GL_LIBS)`
++JACKCFLAGS+=`$(PKG_CONFIG) --cflags jack lv2 pango pangocairo $(PKG_GL_LIBS)`
+ JACKLIBS=-lm $(GLUILIBS) $(LIC_LOADLIBES) $(LOADLIBES)
+
+
+--- x42-plugins-20170428.orig/fil4.lv2/Makefile
++++ x42-plugins-20170428/fil4.lv2/Makefile
+@@ -12,6 +12,7 @@
+
+ OPTIMIZATIONS ?= -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG
+ CXXFLAGS ?= -Wall -g -Wno-unused-function
++PKG_CONFIG ?= pkg-config
+ STRIP ?= strip
+
+ BUILDOPENGL?=yes
+@@ -68,7 +69,7 @@
+ PUGL_SRC=$(RW)pugl/pugl_x11.c
+ PKG_GL_LIBS=glu gl
+ GLUILIBS=-lX11
+- GLUICFLAGS+=`pkg-config --cflags glu`
++ GLUICFLAGS+=`$(PKG_CONFIG) --cflags glu`
+ STRIPFLAGS= -s
+ EXTENDED_RE=-r
+ endif
+@@ -116,26 +117,26 @@
+
+ ###############################################################################
+ # check for build-dependencies
+-ifeq ($(shell pkg-config --exists lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists lv2 || echo no), no)
+ $(error "LV2 SDK was not found")
+ endif
+
+-ifeq ($(shell pkg-config --exists fftw3f || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists fftw3f || echo no), no)
+ $(error "fftw3f library was not found")
+ endif
+
+-ifeq ($(shell pkg-config --atleast-version=1.6.0 lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --atleast-version=1.6.0 lv2 || echo no), no)
+ $(error "LV2 SDK needs to be version 1.6.0 or later")
+ endif
+
+ ifneq ($(BUILDOPENGL)$(BUILDJACKAPP), nono)
+- ifeq ($(shell pkg-config --exists pango cairo $(PKG_GL_LIBS) || echo no), no)
++ ifeq ($(shell $(PKG_CONFIG) --exists pango cairo $(PKG_GL_LIBS) || echo no), no)
+ $(error "This plugin requires cairo pango $(PKG_GL_LIBS)")
+ endif
+ endif
+
+ ifneq ($(BUILDJACKAPP), no)
+- ifeq ($(shell pkg-config --exists jack || echo no), no)
++ ifeq ($(shell $(PKG_CONFIG) --exists jack || echo no), no)
+ $(warning *** libjack from http://jackaudio.org is required)
+ $(error Please install libjack-dev or libjack-jackd2-dev)
+ endif
+@@ -143,7 +144,7 @@
+ endif
+
+ # check for lv2_atom_forge_object new in 1.8.1 deprecates lv2_atom_forge_blank
+-ifeq ($(shell pkg-config --atleast-version=1.8.1 lv2 && echo yes), yes)
++ifeq ($(shell $(PKG_CONFIG) --atleast-version=1.8.1 lv2 && echo yes), yes)
+ override CXXFLAGS += -DHAVE_LV2_1_8
+ endif
+
+@@ -171,7 +172,7 @@
+
+ # add library dependent flags and libs
+ override CXXFLAGS += $(OPTIMIZATIONS) -DVERSION="\"$(fil4_VERSION)\""
+-override CXXFLAGS += `pkg-config --cflags lv2`
++override CXXFLAGS += `$(PKG_CONFIG) --cflags lv2`
+ ifeq ($(XWIN),)
+ override CXXFLAGS += -fPIC -fvisibility=hidden
+ else
+@@ -179,15 +180,15 @@
+ endif
+
+ ifneq ($(INLINEDISPLAY),no)
+-override CXXFLAGS += `pkg-config --cflags cairo pangocairo pango` -I$(RW) -DDISPLAY_INTERFACE
+-override LOADLIBES += `pkg-config $(PKG_UI_FLAGS) --libs cairo pangocairo pango`
++override CXXFLAGS += `$(PKG_CONFIG) --cflags cairo pangocairo pango` -I$(RW) -DDISPLAY_INTERFACE
++override LOADLIBES += `$(PKG_CONFIG) $(PKG_UI_FLAGS) --libs cairo pangocairo pango`
+ ifneq ($(XWIN),)
+ override LOADLIBES += -lpthread -lusp10
+ endif
+ endif
+
+-GLUICFLAGS+=`pkg-config --cflags cairo pango fftw3f` $(CXXFLAGS)
+-GLUILIBS+=`pkg-config $(PKG_UI_FLAGS) --libs cairo pango pangocairo fftw3f $(PKG_GL_LIBS)`
++GLUICFLAGS+=`$(PKG_CONFIG) --cflags cairo pango fftw3f` $(CXXFLAGS)
++GLUILIBS+=`$(PKG_CONFIG) $(PKG_UI_FLAGS) --libs cairo pango pangocairo fftw3f $(PKG_GL_LIBS)`
+
+ ifneq ($(XWIN),)
+ GLUILIBS+=-lpthread -lusp10
+@@ -209,7 +210,7 @@
+ ROBGL+= Makefile
+
+ JACKCFLAGS=-I. $(CXXFLAGS) $(LIC_CFLAGS)
+-JACKCFLAGS+=`pkg-config --cflags jack lv2 pango pangocairo $(PKG_GL_LIBS)`
++JACKCFLAGS+=`$(PKG_CONFIG) --cflags jack lv2 pango pangocairo $(PKG_GL_LIBS)`
+ JACKLIBS=-lm $(GLUILIBS) $(LIC_LOADLIBES) $(LOADLIBES)
+
+
+--- x42-plugins-20170428.orig/meters.lv2/Makefile
++++ x42-plugins-20170428/meters.lv2/Makefile
+@@ -12,6 +12,7 @@
+
+ OPTIMIZATIONS ?= -msse -msse2 -mfpmath=sse -fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG
+ CFLAGS ?= -Wall -Wno-unused-function
++PKG_CONFIG ?= pkg-config
+ STRIP ?= strip
+
+ EXTERNALUI?=yes
+@@ -83,7 +84,7 @@
+ PUGL_SRC=$(RW)pugl/pugl_x11.c
+ PKG_LIBS=glu gl
+ GLUILIBS=-lX11
+- GLUICFLAGS+=`pkg-config --cflags glu` -pthread
++ GLUICFLAGS+=`$(PKG_CONFIG) --cflags glu` -pthread
+ STRIPFLAGS=-s
+ EXTENDED_RE=-r
+ endif
+@@ -129,28 +130,28 @@
+ ###############################################################################
+ # check for build-dependencies
+
+-ifeq ($(shell pkg-config --exists lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists lv2 || echo no), no)
+ $(error "LV2 SDK was not found")
+ endif
+
+-ifeq ($(shell pkg-config --atleast-version=1.6.0 lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --atleast-version=1.6.0 lv2 || echo no), no)
+ $(error "LV2 SDK needs to be at least version 1.6.0 (idle interface)")
+ endif
+
+-ifeq ($(shell pkg-config --exists glib-2.0 pango cairo $(PKG_LIBS) || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists glib-2.0 pango cairo $(PKG_LIBS) || echo no), no)
+ $(error "These plugins requires $(PKG_LIBS) cairo pango glib-2.0")
+ endif
+
+-ifeq ($(shell pkg-config --exists jack || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists jack || echo no), no)
+ $(warning *** libjack from http://jackaudio.org is required)
+ $(error Please install libjack-dev or libjack-jackd2-dev)
+ endif
+
+-ifeq ($(shell pkg-config --exists fftw3f || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists fftw3f || echo no), no)
+ $(error "fftw3f library was not found")
+ endif
+
+-FFTW=`pkg-config --cflags --libs fftw3f` -lm
++FFTW=$(shell $(PKG_CONFIG) --cflags --libs fftw3f) -lm
+ export FFTW
+
+ # lv2 >= 1.6.0
+@@ -158,7 +159,7 @@
+ LV2UIREQ+=lv2:requiredFeature ui:idleInterface; lv2:extensionData ui:idleInterface;
+
+ # check for lv2_atom_forge_object new in 1.8.1 deprecates lv2_atom_forge_blank
+-ifeq ($(shell pkg-config --atleast-version=1.8.1 lv2 && echo yes), yes)
++ifeq ($(shell $(PKG_CONFIG) --atleast-version=1.8.1 lv2 && echo yes), yes)
+ override CFLAGS += -DHAVE_LV2_1_8
+ endif
+
+@@ -179,12 +180,12 @@
+ override CFLAGS += -DPTW32_STATIC_LIB
+ override CXXFLAGS += -DPTW32_STATIC_LIB
+ endif
+-override CFLAGS += `pkg-config --cflags lv2` -DVERSION="\"$(meters_VERSION)\""
++override CFLAGS += `$(PKG_CONFIG) --cflags lv2` -DVERSION="\"$(meters_VERSION)\""
+ override CXXFLAGS += -DVERSION="\"$(meters_VERSION)\""
+
+ ifneq ($(INLINEDISPLAY),no)
+-override CXXFLAGS += `pkg-config --cflags cairo pangocairo pango` -I$(RW) -DDISPLAY_INTERFACE -I.
+-override LOADLIBES += `pkg-config $(PKG_UI_FLAGS) --libs cairo pangocairo pango`
++override CXXFLAGS += `$(PKG_CONFIG) --cflags cairo pangocairo pango` -I$(RW) -DDISPLAY_INTERFACE -I.
++override LOADLIBES += `$(PKG_CONFIG) $(PKG_UI_FLAGS) --libs cairo pangocairo pango`
+ ifneq ($(XWIN),)
+ override LOADLIBES += -lusp10
+ endif
+@@ -196,8 +197,8 @@
+
+ UIIMGS=$(IM)meter-bright.c $(IM)meter-dark.c $(IM)screw.c
+
+-GLUICFLAGS+=`pkg-config --cflags cairo pango`
+-GLUILIBS+=`pkg-config --libs $(PKG_UI_FLAGS) cairo pangocairo pango $(PKG_LIBS)`
++GLUICFLAGS+=`$(PKG_CONFIG) --cflags cairo pango`
++GLUILIBS+=`$(PKG_CONFIG) --libs $(PKG_UI_FLAGS) cairo pangocairo pango $(PKG_LIBS)`
+ ifneq ($(XWIN),)
+ GLUILIBS+=-lpthread -lusp10
+ endif
+@@ -230,10 +231,10 @@
+ goniometer_UIDEP=zita-resampler/resampler.cc zita-resampler/resampler-table.cc
+ goniometer_UISRC=zita-resampler/resampler.cc zita-resampler/resampler-table.cc
+
+-$(eval phasewheel_UISRC=$(value FFTW))
+-$(eval stereoscope_UISRC=$(value FFTW))
++$(eval phasewheel_UISRC=$(FFTW))
++$(eval stereoscope_UISRC=$(FFTW))
+
+-$(eval meters_UISRC=$(value FFTW))
++$(eval meters_UISRC=$(FFTW))
+ meters_UISRC+=zita-resampler/resampler.cc zita-resampler/resampler-table.cc
+
+ ###############################################################################
+@@ -297,7 +298,7 @@
+
+
+ JACKCFLAGS=-I. $(CFLAGS) $(CXXFLAGS) $(LIC_CFLAGS)
+-JACKCFLAGS+=`pkg-config --cflags jack lv2 pango pangocairo $(PKG_GL_LIBS)`
++JACKCFLAGS+=`$(PKG_CONFIG) --cflags jack lv2 pango pangocairo $(PKG_GL_LIBS)`
+ JACKLIBS=-lm $(GLUILIBS) $(LIC_LOADLIBES)
+
+ ## JACK applications
+@@ -337,7 +338,7 @@
+ $(APPBLD)x42-goniometer$(EXE_EXT): src/meters.cc $(DSPSRC) $(DSPDEPS) \
+ $(x42_goniometer_JACKGUI) $(x42_goniometer_LV2HTTL)
+
+-$(eval x42_phasewheel_JACKSRC = src/meters.cc $(DSPSRC) $(value FFTW))
++$(eval x42_phasewheel_JACKSRC = src/meters.cc $(DSPSRC) $(FFTW))
+ x42_phasewheel_JACKGUI = gui/phasewheel.c
+ x42_phasewheel_LV2HTTL = lv2ttl/phasewheel.h
+ x42_phasewheel_JACKDESC = lv2ui_phasewheel
+@@ -358,7 +359,7 @@
+ $(APPBLD)x42-spectrum30$(EXE_EXT): src/meters.cc $(DSPSRC) $(DSPDEPS) \
+ $(x42_spectrum30_JACKGUI) $(x42_spectrum30_LV2HTTL)
+
+-$(eval x42_stereoscope_JACKSRC = src/meters.cc $(DSPSRC) $(value FFTW))
++$(eval x42_stereoscope_JACKSRC = src/meters.cc $(DSPSRC) $(FFTW))
+ x42_stereoscope_JACKGUI = gui/stereoscope.c
+ x42_stereoscope_LV2HTTL = lv2ttl/stereoscope.h
+ x42_stereoscope_JACKDESC = lv2ui_stereoscope
+@@ -413,7 +414,7 @@
+ $(APPBLD)x42-stereoscope.o \
+ $(APPBLD)x42-truepeakrms.o
+
+-$(eval x42_meter_collection_JACKSRC = -DX42_MULTIPLUGIN src/meters.cc $(DSPSRC) $(COLLECTION_OBJS) $(value FFTW))
++$(eval x42_meter_collection_JACKSRC = -DX42_MULTIPLUGIN src/meters.cc $(DSPSRC) $(COLLECTION_OBJS) $(FFTW))
+ x42_meter_collection_LV2HTTL = lv2ttl/plugins.h
+ $(APPBLD)x42-meter-collection$(EXE_EXT): src/meters.cc $(DSPSRC) $(DSPDEPS) $(COLLECTION_OBJS) \
+ lv2ttl/cor.h lv2ttl/dr14stereo.h lv2ttl/ebur128.h lv2ttl/goniometer.h \
+--- x42-plugins-20170428.orig/midifilter.lv2/Makefile
++++ x42-plugins-20170428/midifilter.lv2/Makefile
+@@ -4,6 +4,7 @@
+ PREFIX ?= /usr/local
+ CFLAGS ?= $(OPTIMIZATIONS) -Wall
+
++PKG_CONFIG?=pkg-config
+ STRIP?=strip
+ STRIPFLAGS?=-s
+
+@@ -58,12 +59,12 @@
+ include git2lv2.mk
+
+ # check for build-dependencies
+-ifeq ($(shell pkg-config --exists lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists lv2 || echo no), no)
+ $(error "LV2 SDK was not found")
+ endif
+
+ override CFLAGS += -fPIC -std=c99
+-override CFLAGS += `pkg-config --cflags lv2`
++override CFLAGS += `$(PKG_CONFIG) --cflags lv2`
+
+ # build target definitions
+ default: all
+--- x42-plugins-20170428.orig/midigen.lv2/Makefile
++++ x42-plugins-20170428/midigen.lv2/Makefile
+@@ -9,6 +9,7 @@
+ CFLAGS ?= $(OPTIMIZATIONS) -Wall
+ LIBDIR ?= lib
+
++PKG_CONFIG?=pkg-config
+ STRIP?=strip
+ STRIPFLAGS?=-s
+
+@@ -61,17 +62,17 @@
+ include git2lv2.mk
+
+ # check for build-dependencies
+-ifeq ($(shell pkg-config --exists lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists lv2 || echo no), no)
+ $(error "LV2 SDK was not found")
+ endif
+
+ # check for lv2_atom_forge_object new in 1.8.1 deprecates lv2_atom_forge_blank
+-ifeq ($(shell pkg-config --atleast-version=1.8.1 lv2 && echo yes), yes)
++ifeq ($(shell $(PKG_CONFIG) --atleast-version=1.8.1 lv2 && echo yes), yes)
+ override CFLAGS += -DHAVE_LV2_1_8
+ endif
+
+ override CFLAGS += -fPIC -std=c99
+-override CFLAGS += `pkg-config --cflags lv2`
++override CFLAGS += `$(PKG_CONFIG) --cflags lv2`
+
+ # build target definitions
+ default: all
+--- x42-plugins-20170428.orig/midimap.lv2/Makefile
++++ x42-plugins-20170428/midimap.lv2/Makefile
+@@ -9,6 +9,7 @@
+ CFLAGS ?= $(OPTIMIZATIONS) -Wall
+ LIBDIR ?= lib
+
++PKG_CONFIG?=pkg-config
+ STRIP?=strip
+ STRIPFLAGS?=-s
+
+@@ -52,17 +53,17 @@
+ include git2lv2.mk
+
+ # check for build-dependencies
+-ifeq ($(shell pkg-config --exists lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists lv2 || echo no), no)
+ $(error "LV2 SDK was not found")
+ endif
+
+ # check for lv2_atom_forge_object new in 1.8.1 deprecates lv2_atom_forge_blank
+-ifeq ($(shell pkg-config --atleast-version=1.8.1 lv2 && echo yes), yes)
++ifeq ($(shell $(PKG_CONFIG) --atleast-version=1.8.1 lv2 && echo yes), yes)
+ override CFLAGS += -DHAVE_LV2_1_8
+ endif
+
+ override CFLAGS += -fPIC -std=c99
+-override CFLAGS += `pkg-config --cflags lv2`
++override CFLAGS += `$(PKG_CONFIG) --cflags lv2`
+
+ # build target definitions
+ default: all
+--- x42-plugins-20170428.orig/mixtri.lv2/Makefile
++++ x42-plugins-20170428/mixtri.lv2/Makefile
+@@ -12,6 +12,7 @@
+
+ OPTIMIZATIONS ?= -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG
+ CFLAGS ?= -Wall -Wno-unused-function
++PKG_CONFIG ?= pkg-config
+ STRIP ?= strip
+
+ EXTERNALUI?=yes
+@@ -59,7 +60,7 @@
+ PUGL_SRC=$(RW)pugl/pugl_x11.c
+ PKG_GL_LIBS=glu gl
+ GLUILIBS=-lX11
+- GLUICFLAGS+=`pkg-config --cflags glu` -pthread
++ GLUICFLAGS+=`$(PKG_CONFIG) --cflags glu` -pthread
+ STRIPFLAGS=-s
+ EXTENDED_RE=-r
+ endif
+@@ -116,28 +117,28 @@
+ ###############################################################################
+ # check for build-dependencies
+
+-ifeq ($(shell pkg-config --exists lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists lv2 || echo no), no)
+ $(error "LV2 SDK was not found")
+ endif
+
+-ifeq ($(shell pkg-config --exists ltc || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists ltc || echo no), no)
+ $(error "libltc was not found - https://x42.github.io/libltc/")
+ endif
+
+-ifeq ($(shell pkg-config --atleast-version=1.6.0 lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --atleast-version=1.6.0 lv2 || echo no), no)
+ $(error "LV2 SDK needs to be version 1.6.0 or later")
+ endif
+
+-ifeq ($(shell pkg-config --exists pango cairo $(PKG_GTK_LIBS) $(PKG_GL_LIBS) || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists pango cairo $(PKG_GTK_LIBS) $(PKG_GL_LIBS) || echo no), no)
+ $(error "This plugin requires cairo pango $(PKG_GTK_LIBS) $(PKG_GL_LIBS)")
+ endif
+
+ # check for lv2_atom_forge_object new in 1.8.1 deprecates lv2_atom_forge_blank
+-ifeq ($(shell pkg-config --atleast-version=1.8.1 lv2 && echo yes), yes)
++ifeq ($(shell $(PKG_CONFIG) --atleast-version=1.8.1 lv2 && echo yes), yes)
+ override CFLAGS += -DHAVE_LV2_1_8
+ endif
+
+-ifeq ($(shell pkg-config --exists jack || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists jack || echo no), no)
+ $(warning *** libjack from http://jackaudio.org is required)
+ $(error Please install libjack-dev or libjack-jackd2-dev)
+ endif
+@@ -159,7 +160,7 @@
+ LV2UIREQ+=lv2:requiredFeature ui:idleInterface; lv2:extensionData ui:idleInterface;
+
+ # add library dependent flags and libs
+-LV2CFLAGS += `pkg-config --cflags lv2 ltc`
++LV2CFLAGS += `$(PKG_CONFIG) --cflags lv2 ltc`
+ LV2CFLAGS += $(OPTIMIZATIONS) -DVERSION="\"$(mixtri_VERSION)\""
+ ifeq ($(XWIN),)
+ LV2CFLAGS += -fPIC -fvisibility=hidden
+@@ -167,13 +168,13 @@
+ LV2CFLAGS += -DPTW32_STATIC_LIB
+ endif
+
+-LOADLIBES=`pkg-config $(PKG_UI_FLAGS) --libs ltc` -lm
++LOADLIBES=`$(PKG_CONFIG) $(PKG_UI_FLAGS) --libs ltc` -lm
+
+-GTKUICFLAGS+= $(LV2CFLAGS) `pkg-config --cflags gtk+-2.0 cairo pango`
+-GTKUILIBS+=`pkg-config --libs gtk+-2.0 cairo pango`
++GTKUICFLAGS+= $(LV2CFLAGS) `$(PKG_CONFIG) --cflags gtk+-2.0 cairo pango`
++GTKUILIBS+=`$(PKG_CONFIG) --libs gtk+-2.0 cairo pango`
+
+-GLUICFLAGS+= $(LV2CFLAGS) `pkg-config --cflags cairo pango`
+-GLUILIBS+=`pkg-config $(PKG_UI_FLAGS) --libs cairo pangocairo pango $(PKG_GL_LIBS)`
++GLUICFLAGS+= $(LV2CFLAGS) `$(PKG_CONFIG) --cflags cairo pango`
++GLUILIBS+=`$(PKG_CONFIG) $(PKG_UI_FLAGS) --libs cairo pangocairo pango $(PKG_GL_LIBS)`
+ ifneq ($(XWIN),)
+ GLUILIBS+=-lpthread -lusp10
+ endif
+@@ -265,8 +266,8 @@
+ $(STRIP) $(STRIPFLAGS) $(BUILDDIR)$(LV2NAME)$(LIB_EXT)
+
+ JACKCFLAGS=-I. $(LV2CFLAGS) $(CFLAGS) $(LIC_CFLAGS)
+-JACKCFLAGS+=`pkg-config --cflags jack lv2 pango pangocairo ltc $(PKG_GL_LIBS)`
+-JACKLIBS=-lm $(GLUILIBS) $(LIC_LOADLIBES) `pkg-config $(PKG_UI_FLAGS) --libs ltc`
++JACKCFLAGS+=`$(PKG_CONFIG) --cflags jack lv2 pango pangocairo ltc $(PKG_GL_LIBS)`
++JACKLIBS=-lm $(GLUILIBS) $(LIC_LOADLIBES) `$(PKG_CONFIG) $(PKG_UI_FLAGS) --libs ltc`
+
+ $(eval x42_mixtri_JACKSRC = src/mixtri.c)
+ x42_mixtri_JACKGUI = gui/mixtri.c
+--- x42-plugins-20170428.orig/nodelay.lv2/Makefile
++++ x42-plugins-20170428/nodelay.lv2/Makefile
+@@ -9,6 +9,7 @@
+ CFLAGS ?= $(OPTIMIZATIONS) -Wall
+ LIBDIR ?= lib
+
++PKG_CONFIG?=pkg-config
+ STRIP?=strip
+ STRIPFLAGS?=-s
+
+@@ -52,12 +53,12 @@
+ include git2lv2.mk
+
+ # check for build-dependencies
+-ifeq ($(shell pkg-config --exists lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists lv2 || echo no), no)
+ $(error "LV2 SDK was not found")
+ endif
+
+ override CFLAGS += -fPIC -std=c99
+-override CFLAGS += `pkg-config --cflags lv2`
++override CFLAGS += `$(PKG_CONFIG) --cflags lv2`
+
+ # build target definitions
+ default: all
+--- x42-plugins-20170428.orig/onsettrigger.lv2/Makefile
++++ x42-plugins-20170428/onsettrigger.lv2/Makefile
+@@ -5,6 +5,7 @@
+ CFLAGS ?= -Wall -Wno-unused-function
+ LIBDIR ?= lib
+
++PKG_CONFIG?=pkg-config
+ STRIP?=strip
+ STRIPFLAGS?=-s
+
+@@ -57,12 +58,12 @@
+ include git2lv2.mk
+
+ # check for build-dependencies
+-ifeq ($(shell pkg-config --exists lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists lv2 || echo no), no)
+ $(error "LV2 SDK was not found")
+ endif
+
+ override CFLAGS +=-fPIC
+-override CFLAGS += `pkg-config --cflags lv2`
++override CFLAGS += `$(PKG_CONFIG) --cflags lv2`
+
+ # build target definitions
+ default: all
+--- x42-plugins-20170428.orig/sisco.lv2/Makefile
++++ x42-plugins-20170428/sisco.lv2/Makefile
+@@ -4,6 +4,7 @@
+ PREFIX ?= /usr/local
+ CFLAGS ?= -g -Wall -Wno-unused-function
+ LIBDIR ?= lib
++PKG_CONFIG ?= pkg-config
+ STRIP ?= strip
+
+ EXTERNALUI?=no
+@@ -52,7 +53,7 @@
+ PUGL_SRC=$(RW)pugl/pugl_x11.c
+ PKG_GL_LIBS=glu gl
+ GLUILIBS=-lX11
+- GLUICFLAGS+=`pkg-config --cflags glu` -pthread
++ GLUICFLAGS+=`$(PKG_CONFIG) --cflags glu` -pthread
+ STRIPFLAGS=-s
+ EXTENDED_RE=-r
+ endif
+@@ -113,19 +114,19 @@
+ ###############################################################################
+ # check for build-dependencies
+
+-ifeq ($(shell pkg-config --exists lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists lv2 || echo no), no)
+ $(error "LV2 SDK was not found")
+ endif
+
+-ifeq ($(shell pkg-config --atleast-version=1.6.0 lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --atleast-version=1.6.0 lv2 || echo no), no)
+ $(error "LV2 SDK needs to be version 1.6.0 or later")
+ endif
+
+-ifeq ($(shell pkg-config --exists pango cairo $(PKG_GTK_LIBS) $(PKG_GL_LIBS) || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists pango cairo $(PKG_GTK_LIBS) $(PKG_GL_LIBS) || echo no), no)
+ $(error "This plugin requires cairo pango $(PKG_GTK_LIBS) $(PKG_GL_LIBS)")
+ endif
+
+-ifeq ($(shell pkg-config --exists jack || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists jack || echo no), no)
+ $(warning *** libjack from http://jackaudio.org is required)
+ $(error Please install libjack-dev or libjack-jackd2-dev)
+ endif
+@@ -147,19 +148,19 @@
+ LV2UIREQ+=lv2:requiredFeature ui:idleInterface; lv2:extensionData ui:idleInterface;
+
+ # check for lv2_atom_forge_object new in 1.8.1 deprecates lv2_atom_forge_blank
+-ifeq ($(shell pkg-config --atleast-version=1.8.1 lv2 && echo yes), yes)
++ifeq ($(shell $(PKG_CONFIG) --atleast-version=1.8.1 lv2 && echo yes), yes)
+ override CFLAGS += -DHAVE_LV2_1_8
+ endif
+
+ # add library dependent flags and libs
+-LV2CFLAGS += `pkg-config --cflags lv2`
++LV2CFLAGS += `$(PKG_CONFIG) --cflags lv2`
+ LV2CFLAGS += -fPIC $(OPTIMIZATIONS) -DVERSION="\"$(sisco_VERSION)\""
+
+-GTKUICFLAGS+= $(LV2CFLAGS) `pkg-config --cflags gtk+-2.0 cairo pango`
+-GTKUILIBS+=`pkg-config --libs gtk+-2.0 cairo pango`
++GTKUICFLAGS+= $(LV2CFLAGS) `$(PKG_CONFIG) --cflags gtk+-2.0 cairo pango`
++GTKUILIBS+=`$(PKG_CONFIG) --libs gtk+-2.0 cairo pango`
+
+-GLUICFLAGS+= $(LV2CFLAGS) `pkg-config --cflags cairo pango`
+-GLUILIBS+=`pkg-config $(PKG_UI_FLAGS) --libs cairo pangocairo pango $(PKG_GL_LIBS)`
++GLUICFLAGS+= $(LV2CFLAGS) `$(PKG_CONFIG) --cflags cairo pango`
++GLUILIBS+=`$(PKG_CONFIG) $(PKG_UI_FLAGS) --libs cairo pangocairo pango $(PKG_GL_LIBS)`
+ ifneq ($(XWIN),)
+ GLUILIBS+=-lpthread -lusp10
+ endif
+@@ -168,8 +169,8 @@
+ GLUILIBS+=$(LIC_LOADLIBES)
+
+ JACKCFLAGS+= $(OPTIMIZATIONS) -DVERSION="\"$(sisco_VERSION)\"" $(LIC_CFLAGS)
+-JACKCFLAGS+=`pkg-config --cflags jack lv2 pango pangocairo $(PKG_GL_LIBS)`
+-JACKLIBS=-lm `pkg-config $(PKG_UI_FLAGS) --libs pangocairo $(PKG_GL_LIBS)` $(GLUILIBS) $(LIC_LOADLIBES)
++JACKCFLAGS+=`$(PKG_CONFIG) --cflags jack lv2 pango pangocairo $(PKG_GL_LIBS)`
++JACKLIBS=-lm `$(PKG_CONFIG) $(PKG_UI_FLAGS) --libs pangocairo $(PKG_GL_LIBS)` $(GLUILIBS) $(LIC_LOADLIBES)
+
+ GLUICFLAGS+=-DUSE_GUI_THREAD
+ ifeq ($(GLTHREADSYNC), yes)
+--- x42-plugins-20170428.orig/stepseq.lv2/Makefile
++++ x42-plugins-20170428/stepseq.lv2/Makefile
+@@ -11,6 +11,7 @@
+
+ OPTIMIZATIONS ?= -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
+ CFLAGS ?= -Wall -g -Wno-unused-function
++PKG_CONFIG ?= pkg-config
+ STRIP ?= strip
+
+ # grid-size (should be at least 4x4 for the MOD-GUI)
+@@ -62,7 +63,7 @@
+ PUGL_SRC=$(RW)pugl/pugl_x11.c
+ PKG_GL_LIBS=glu gl
+ GLUILIBS=-lX11
+- GLUICFLAGS+=`pkg-config --cflags glu` -pthread
++ GLUICFLAGS+=`$(PKG_CONFIG) --cflags glu` -pthread
+ STRIPFLAGS= -s
+ EXTENDED_RE=-r
+ endif
+@@ -125,18 +126,18 @@
+ endif
+
+ # check for build-dependencies
+-ifeq ($(shell pkg-config --exists lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists lv2 || echo no), no)
+ $(error "LV2 SDK was not found")
+ endif
+
+ ifneq ($(BUILDOPENGL)$(BUILDJACKAPP), nono)
+- ifeq ($(shell pkg-config --exists pango cairo $(PKG_GL_LIBS) || echo no), no)
++ ifeq ($(shell $(PKG_CONFIG) --exists pango cairo $(PKG_GL_LIBS) || echo no), no)
+ $(error "This plugin requires cairo pango $(PKG_GL_LIBS)")
+ endif
+ endif
+
+ ifneq ($(BUILDJACKAPP), no)
+- ifeq ($(shell pkg-config --exists jack || echo no), no)
++ ifeq ($(shell $(PKG_CONFIG) --exists jack || echo no), no)
+ $(warning *** libjack from http://jackaudio.org is required)
+ $(error Please install libjack-dev or libjack-jackd2-dev)
+ endif
+@@ -144,7 +145,7 @@
+ endif
+
+ # check for lv2_atom_forge_object new in 1.8.1 deprecates lv2_atom_forge_blank
+-ifeq ($(shell pkg-config --atleast-version=1.8.1 lv2 && echo yes), yes)
++ifeq ($(shell $(PKG_CONFIG) --atleast-version=1.8.1 lv2 && echo yes), yes)
+ override CFLAGS += -DHAVE_LV2_1_8
+ endif
+
+@@ -172,18 +173,18 @@
+
+ # add library dependent flags and libs
+ override CFLAGS += $(OPTIMIZATIONS) -DVERSION="\"$(stepseq_VERSION)\""
+-override CFLAGS += `pkg-config --cflags lv2`
++override CFLAGS += `$(PKG_CONFIG) --cflags lv2`
+
+ ifeq ($(XWIN),)
+ override CFLAGS += -fPIC -fvisibility=hidden
+ else
+ override CFLAGS += -DPTW32_STATIC_LIB
+ endif
+-override LOADLIBES += `pkg-config --libs lv2`
++override LOADLIBES += `$(PKG_CONFIG) --libs lv2`
+
+
+-GLUICFLAGS+=`pkg-config --cflags cairo pango` $(CFLAGS)
+-GLUILIBS+=`pkg-config $(PKG_UI_FLAGS) --libs cairo pango pangocairo $(PKG_GL_LIBS)`
++GLUICFLAGS+=`$(PKG_CONFIG) --cflags cairo pango` $(CFLAGS)
++GLUILIBS+=`$(PKG_CONFIG) $(PKG_UI_FLAGS) --libs cairo pango pangocairo $(PKG_GL_LIBS)`
+
+ ifneq ($(XWIN),)
+ GLUILIBS+=-lpthread -lusp10
+@@ -201,7 +202,7 @@
+ ROBGL+= Makefile
+
+ JACKCFLAGS=-I. $(CFLAGS) $(LIC_CFLAGS)
+-JACKCFLAGS+=`pkg-config --cflags jack lv2 pango pangocairo $(PKG_GL_LIBS)`
++JACKCFLAGS+=`$(PKG_CONFIG) --cflags jack lv2 pango pangocairo $(PKG_GL_LIBS)`
+ JACKLIBS=-lm $(GLUILIBS) $(LIC_LOADLIBES) $(LOADLIBES)
+
+
+--- x42-plugins-20170428.orig/stereoroute.lv2/Makefile
++++ x42-plugins-20170428/stereoroute.lv2/Makefile
+@@ -7,6 +7,7 @@
+ PREFIX ?= /usr/local
+ CFLAGS ?= $(OPTIMIZATIONS) -Wall
+ LIBDIR ?= lib
++PKG_CONFIG ?= pkg-config
+ STRIP ?= strip
+
+ STRIPFLAGS=-s
+@@ -50,12 +51,12 @@
+ include git2lv2.mk
+
+ # check for build-dependencies
+-ifeq ($(shell pkg-config --exists lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists lv2 || echo no), no)
+ $(error "LV2 SDK was not found")
+ endif
+
+ override CFLAGS += -fPIC -std=c99
+-override CFLAGS += `pkg-config --cflags lv2`
++override CFLAGS += `$(PKG_CONFIG) --cflags lv2`
+
+ # build target definitions
+ default: all
+--- x42-plugins-20170428.orig/testsignal.lv2/Makefile
++++ x42-plugins-20170428/testsignal.lv2/Makefile
+@@ -3,6 +3,7 @@
+ PREFIX ?= /usr/local
+ CFLAGS ?= $(OPTIMIZATIONS) -Wall
+
++PKG_CONFIG?=pkg-config
+ STRIP?=strip
+ STRIPFLAGS?=-s
+
+@@ -46,12 +47,12 @@
+ include git2lv2.mk
+
+ # check for build-dependencies
+-ifeq ($(shell pkg-config --exists lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists lv2 || echo no), no)
+ $(error "LV2 SDK was not found")
+ endif
+
+ override CFLAGS += -fPIC -std=c99
+-override CFLAGS += `pkg-config --cflags lv2`
++override CFLAGS += `$(PKG_CONFIG) --cflags lv2`
+
+ # build target definitions
+ default: all
+--- x42-plugins-20170428.orig/tuna.lv2/Makefile
++++ x42-plugins-20170428/tuna.lv2/Makefile
+@@ -12,6 +12,7 @@
+
+ OPTIMIZATIONS ?= -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG
+ CFLAGS ?= -Wall -g -Wno-unused-function
++PKG_CONFIG ?= pkg-config
+ STRIP ?= strip
+
+ BUILDOPENGL?=yes
+@@ -68,7 +69,7 @@
+ PUGL_SRC=$(RW)pugl/pugl_x11.c
+ PKG_GL_LIBS=glu gl
+ GLUILIBS=-lX11
+- GLUICFLAGS+=`pkg-config --cflags glu`
++ GLUICFLAGS+=`$(PKG_CONFIG) --cflags glu`
+ STRIPFLAGS= -s
+ EXTENDED_RE=-r
+ endif
+@@ -116,26 +117,26 @@
+
+ ###############################################################################
+ # check for build-dependencies
+-ifeq ($(shell pkg-config --exists lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists lv2 || echo no), no)
+ $(error "LV2 SDK was not found")
+ endif
+
+-ifeq ($(shell pkg-config --exists fftw3f || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists fftw3f || echo no), no)
+ $(error "fftw3f library was not found")
+ endif
+
+-ifeq ($(shell pkg-config --atleast-version=1.6.0 lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --atleast-version=1.6.0 lv2 || echo no), no)
+ $(error "LV2 SDK needs to be version 1.6.0 or later")
+ endif
+
+ ifneq ($(BUILDOPENGL)$(BUILDJACKAPP), nono)
+- ifeq ($(shell pkg-config --exists pango cairo $(PKG_GL_LIBS) || echo no), no)
++ ifeq ($(shell $(PKG_CONFIG) --exists pango cairo $(PKG_GL_LIBS) || echo no), no)
+ $(error "This plugin requires cairo pango $(PKG_GL_LIBS)")
+ endif
+ endif
+
+ ifneq ($(BUILDJACKAPP), no)
+- ifeq ($(shell pkg-config --exists jack || echo no), no)
++ ifeq ($(shell $(PKG_CONFIG) --exists jack || echo no), no)
+ $(warning *** libjack from http://jackaudio.org is required)
+ $(error Please install libjack-dev or libjack-jackd2-dev)
+ endif
+@@ -143,7 +144,7 @@
+ endif
+
+ # check for lv2_atom_forge_object new in 1.8.1 deprecates lv2_atom_forge_blank
+-ifeq ($(shell pkg-config --atleast-version=1.8.1 lv2 && echo yes), yes)
++ifeq ($(shell $(PKG_CONFIG) --atleast-version=1.8.1 lv2 && echo yes), yes)
+ override CFLAGS += -DHAVE_LV2_1_8
+ endif
+
+@@ -171,17 +172,17 @@
+
+ # add library dependent flags and libs
+ override CFLAGS +=-g $(OPTIMIZATIONS) -DVERSION="\"$(tuna_VERSION)\""
+-override CFLAGS += `pkg-config --cflags lv2 fftw3f`
++override CFLAGS += `$(PKG_CONFIG) --cflags lv2 fftw3f`
+ ifeq ($(XWIN),)
+ override CFLAGS += -fPIC -fvisibility=hidden
+ else
+ override CFLAGS += -DPTW32_STATIC_LIB
+ endif
+-override LOADLIBES += `pkg-config --libs lv2 fftw3f`
++override LOADLIBES += `$(PKG_CONFIG) --libs lv2 fftw3f`
+
+
+-GLUICFLAGS+=`pkg-config --cflags cairo pango`
+-GLUILIBS+=`pkg-config $(PKG_UI_FLAGS) --libs cairo pango pangocairo $(PKG_GL_LIBS)`
++GLUICFLAGS+=`$(PKG_CONFIG) --cflags cairo pango`
++GLUILIBS+=`$(PKG_CONFIG) $(PKG_UI_FLAGS) --libs cairo pango pangocairo $(PKG_GL_LIBS)`
+
+ ifneq ($(XWIN),)
+ GLUILIBS+=-lpthread -lusp10
+@@ -202,7 +203,7 @@
+ ROBGL+= Makefile
+
+ JACKCFLAGS=-I. $(CXXFLAGS) $(LIC_CFLAGS)
+-JACKCFLAGS+=`pkg-config --cflags jack lv2 pango pangocairo fftw3f $(PKG_GL_LIBS)`
++JACKCFLAGS+=`$(PKG_CONFIG) --cflags jack lv2 pango pangocairo fftw3f $(PKG_GL_LIBS)`
+ JACKLIBS=-lm $(GLUILIBS) $(LIC_LOADLIBES) $(LOADLIBES)
+
+ ###############################################################################
+@@ -272,7 +273,7 @@
+ $(APPBLD)x42-tuna-fft$(EXE_EXT)
+
+ JACKCFLAGS=-I. $(CFLAGS) $(CXXFLAGS) $(LIC_CFLAGS)
+-JACKCFLAGS+=`pkg-config --cflags jack lv2 pango pangocairo $(PKG_GL_LIBS)`
++JACKCFLAGS+=`$(PKG_CONFIG) --cflags jack lv2 pango pangocairo $(PKG_GL_LIBS)`
+ JACKLIBS=-lm $(LOADLIBES) $(GLUILIBS) $(LIC_LOADLIBES)
+
+ $(eval x42_tuna_JACKSRC = src/tuna.c)
+--- x42-plugins-20170428.orig/xfade.lv2/Makefile
++++ x42-plugins-20170428/xfade.lv2/Makefile
+@@ -8,6 +8,7 @@
+ CFLAGS ?= $(OPTIMIZATIONS) -Wall
+ LIBDIR ?= lib
+
++PKG_CONFIG?=pkg-config
+ STRIP?=strip
+ STRIPFLAGS?=-s
+
+@@ -50,12 +51,12 @@
+ include git2lv2.mk
+
+ # check for build-dependencies
+-ifeq ($(shell pkg-config --exists lv2 || echo no), no)
++ifeq ($(shell $(PKG_CONFIG) --exists lv2 || echo no), no)
+ $(error "LV2 SDK was not found")
+ endif
+
+ override CFLAGS += -fPIC -std=c99
+-override CFLAGS += `pkg-config --cflags lv2`
++override CFLAGS += `$(PKG_CONFIG) --cflags lv2`
+
+ # build target definitions
+ default: all
+--- x42-plugins-20170428.orig/robtk/robtk.mk
++++ x42-plugins-20170428/robtk/robtk.mk
+@@ -1,5 +1,6 @@
+ RT=$(RW)rtk/
+ WD=$(RW)widgets/robtk_
++PKG_CONFIG?=pkg-config
+ STRIP?=strip
+ LIBSTRIPFLAGS?=-s
+ APPSTRIPFLAGS?=-s
+@@ -33,12 +34,12 @@
+ JACKLIBS+=-ldl
+ endif
+ else
+- JACKLIBS+=`pkg-config $(PKG_UI_FLAGS) --libs jack`
++ JACKLIBS+=`$(PKG_CONFIG) $(PKG_UI_FLAGS) --libs jack`
+ endif
+
+-ifeq ($(shell pkg-config --exists liblo && echo yes), yes)
+- JACKCFLAGS+=`pkg-config $(PKG_UI_FLAGS) --cflags liblo` -DHAVE_LIBLO
+- JACKLIBS+=`pkg-config $(PKG_UI_FLAGS) --libs liblo`
++ifeq ($(shell $(PKG_CONFIG) --exists liblo && echo yes), yes)
++ JACKCFLAGS+=`$(PKG_CONFIG) $(PKG_UI_FLAGS) --cflags liblo` -DHAVE_LIBLO
++ JACKLIBS+=`$(PKG_CONFIG) $(PKG_UI_FLAGS) --libs liblo`
+ endif
+
+
diff --minimal -Nru x42-plugins-20170428/debian/patches/series x42-plugins-20170428/debian/patches/series
--- x42-plugins-20170428/debian/patches/series 2018-03-20 19:30:34.000000000 +0100
+++ x42-plugins-20170428/debian/patches/series 2018-06-03 17:05:53.000000000 +0200
@@ -1 +1,2 @@
pow10f.patch
+cross.patch
diff --minimal -Nru x42-plugins-20170428/debian/rules x42-plugins-20170428/debian/rules
--- x42-plugins-20170428/debian/rules 2017-06-25 23:31:12.000000000 +0200
+++ x42-plugins-20170428/debian/rules 2018-06-03 17:13:31.000000000 +0200
@@ -6,18 +6,17 @@
export OPTIMIZATIONS= -fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG
+-include /usr/share/dpkg/buildtools.mk
+export PKG_CONFIG ?= pkg-config
+export STRIP=true
+
%:
dh $@
override_dh_auto_clean:
-
-override_dh_auto_configure:
- dh_auto_configure -- \
- --prefix=/usr
-
override_dh_auto_build:
- $(MAKE) \
+ dh_auto_build -- \
PREFIX=/usr
override_dh_auto_install:
More information about the pkg-multimedia-maintainers
mailing list