Fix overlinking

3 files changed, 51 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c568d0a3bc68..e5a444ac0feb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = foo-yc20-git
 	pkgdesc = An emulation of the Yamaha YC-20 combo organ as an LV2 plugin and a standalone program (git version)
 	pkgver = 1.3.0.r330.b99d4a3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/sampov2/foo-yc20
 	arch = x86_64
 	arch = armv7l
@@ -15,8 +15,10 @@ pkgbase = foo-yc20-git
 	conflicts = foo-yc20
 	source = foo-yc20::git+https://github.com/sampov2/foo-yc20.git
 	source = faust-0.9.73-mr2.tar.gz::https://github.com/grame-cncm/faust/archive/40a919756d09c6b2de19b3299b7eef55997551dc.tar.gz
+	source = foo-yc20-makefile-ldflags.patch
 	sha256sums = SKIP
 	sha256sums = 74ad05cd5d508e30d78f31ff230e29793dc1cdb4f156cdb2afe43ac119f82701
+	sha256sums = 5408a958c15bf39d0034c6aeb0a86652a4bb34dd403780e3438bd7bf5e3f45ee
 
 pkgname = foo-yc20-git
 
diff --git a/PKGBUILD b/PKGBUILD
index c4801af42dfa..ac6e2451e340 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _faust_version=0.9.73-mr2
 _faust_commit=40a919756d09c6b2de19b3299b7eef55997551dc
 pkgname="${_name}-git"
 pkgver=1.3.0.r330.b99d4a3
-pkgrel=1
+pkgrel=2
 pkgdesc="An emulation of the Yamaha YC-20 combo organ as an LV2 plugin and a standalone program (git version)"
 arch=('x86_64' 'armv7l')
 url="https://github.com/sampov2/foo-yc20"
@@ -16,9 +16,11 @@ makedepends=('git')
 provides=("${_name}")
 conflicts=("${_name}")
 source=("${_name}::git+https://github.com/sampov2/foo-yc20.git"
-        "faust-${_faust_version}.tar.gz::https://github.com/grame-cncm/faust/archive/${_faust_commit}.tar.gz")
+        "faust-${_faust_version}.tar.gz::https://github.com/grame-cncm/faust/archive/${_faust_commit}.tar.gz"
+        'foo-yc20-makefile-ldflags.patch')
 sha256sums=('SKIP'
-            '74ad05cd5d508e30d78f31ff230e29793dc1cdb4f156cdb2afe43ac119f82701')
+            '74ad05cd5d508e30d78f31ff230e29793dc1cdb4f156cdb2afe43ac119f82701'
+            '5408a958c15bf39d0034c6aeb0a86652a4bb34dd403780e3438bd7bf5e3f45ee')
 
 
 pkgver() {
@@ -29,8 +31,14 @@ pkgver() {
 
 prepare() {
   cd "${srcdir}/${_name}"
+
+  # Fix LDFLAGS position
+  patch -p1 -N -i "${srcdir}/foo-yc20-makefile-ldflags.patch"
+
+  # Insert project version into Makefile
   VERSION="$(git tag --sort=-taggerdate | head -n 1)"
   sed -i -e 's/^VERSION=/VERSION='$VERSION'/' Makefile
+
   # Adapted from: https://github.com/zynthian/zynthian-sys/blob/master/scripts/recipes/install_foo-yc20.sh
   sed -i -e 's|-Iinclude/|-Iinclude -I'${srcdir}'/faust-'${_faust_commit}'/architecture|' Makefile
   sed -i -e 's/= NULL/= 0/' src/faust-dsp-standalone.cpp
diff --git a/foo-yc20-makefile-ldflags.patch b/foo-yc20-makefile-ldflags.patch
new file mode 100644
index 000000000000..f209f797f897
--- /dev/null
+++ b/foo-yc20-makefile-ldflags.patch
@@ -0,0 +1,37 @@
+diff --git a/Makefile b/Makefile
+index 6b92148..16973f5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -60,27 +60,27 @@ lv2: $(LV2_PLUGIN) $(LV2_UI)
+ OBJS_FOO_YC20=src/foo-yc20.o src/configuration.o src/yc20-jack.o src/main-gui.o src/foo-yc20-ui.o src/yc20-base-ui.o src/graphics.o src/yc20-precalc.o $(WIN32_RC)
+ 
+ foo-yc20: $(OBJS_FOO_YC20) $(OBJS_DSP_STANDALONE)
+-	$(CXX11) $(OBJS_FOO_YC20) $(OBJS_DSP_STANDALONE) `$(PKG_CONFIG) --libs gtk+-2.0` `$(PKG_CONFIG) --libs jack` $(LDFLAGS_YC20) -o foo-yc20
++	$(CXX11) $(OBJS_FOO_YC20) $(OBJS_DSP_STANDALONE) $(LDFLAGS) `$(PKG_CONFIG) --libs gtk+-2.0` `$(PKG_CONFIG) --libs jack` -o foo-yc20
+ 
+ ## CLI version
+ OBJS_FOO_YC20_CLI=src/foo-yc20.o src/configuration.o src/main-cli.o src/yc20-jack.o src/yc20-precalc.o
+ 
+ foo-yc20-cli: $(OBJS_FOO_YC20_CLI) $(OBJS_DSP_STANDALONE)
+-	$(CXX11) $(OBJS_FOO_YC20_CLI) $(OBJS_DSP_STANDALONE) $(LDFLAGS_YC20_CLI) `$(PKG_CONFIG) --libs jack` -o foo-yc20-cli
++	$(CXX11) $(OBJS_FOO_YC20_CLI) $(OBJS_DSP_STANDALONE) $(LDFLAGS) `$(PKG_CONFIG) --libs jack` -o foo-yc20-cli
+ 
+ ## LV2 version
+ OBJS_LV2=src/lv2.o src/foo-yc20.o src/yc20-precalc.o
+ 
+ $(LV2_PLUGIN): $(OBJS_LV2) $(OBJS_DSP_PLUGIN)
+-	$(CXX11) $(OBJS_LV2) $(OBJS_DSP_PLUGIN) -fPIC -shared -o $(LV2_PLUGIN) $(LDFLAGS_YC20_LV2)
++	$(CXX11) $(OBJS_LV2) $(OBJS_DSP_PLUGIN) -fPIC -shared $(LDFLAGS) -o $(LV2_PLUGIN)
+ 
+ ## LV2 UI
+ OBJS_LV2_UI=src/lv2-ui.o src/foo-yc20-ui2.o src/yc20-base-ui.o src/graphics.o
+ 
+ $(LV2_UI): $(OBJS_LV2_UI)
+-	$(CXX11) $(OBJS_LV2_UI) -fPIC -shared `$(PKG_CONFIG) --libs gtk+-2.0` -o $(LV2_UI) $(LDFLAGS_YC20_LV2)
++	$(CXX11) $(OBJS_LV2_UI) -fPIC -shared $(LDFLAGS) `$(PKG_CONFIG) --libs gtk+-2.0` -o $(LV2_UI)
+ 
+-## VSTi - only compiles for windows with MinGW32. 
++## VSTi - only compiles for windows with MinGW32.
+ ##        Note: Jack is used in compile flags to provide access to the ringbuffer.h. there
+ ##              is no runtime dependency or even a library as we use the separately compiled ringbuffer.o
+ OBJS_VSTI_LINUX=src/vsti.o src/vstplugmain.o src/foo-yc20.o src/yc20-precalc.o src/yc20-base-ui.o src/graphics.o src/jackringbuffer.o