[arch-commits] Commit in zynaddsubfx/trunk (2 files)

[David Runge]

    Date: Monday, January 24, 2022 @ 01:07:15
  Author: dvzrv
Revision: 1114193

upgpkg: zynaddsubfx 3.0.6-2: Rebuild to add support for CFLAGS and LDFLAGS for zest.

Rebuild to add patch for adding CFLAGS and LDFLAGS to Makefile for mruby-zest
based frontend, which achieves full RELRO for zyn-fusion and libzest.so.

Added:
  zynaddsubfx/trunk/zynaddsubfx-mruby-zest-build-3.0.6-cflags_ldflags.patch
Modified:
  zynaddsubfx/trunk/PKGBUILD

---------------------------------------------------------+
 PKGBUILD                                                |   14 ++++++---
 zynaddsubfx-mruby-zest-build-3.0.6-cflags_ldflags.patch |   21 ++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-24 01:07:00 UTC (rev 1114192)
+++ PKGBUILD	2022-01-24 01:07:15 UTC (rev 1114193)
@@ -6,7 +6,7 @@
 
 pkgname=zynaddsubfx
 pkgver=3.0.6
-pkgrel=1
+pkgrel=2
 _mruby_zest_commit='dd3d45ba333011f2359e86f9a758d9836e53fe5f'  # refs/tags/3.0.6
 pkgdesc="Opensource software synthesizer capable of making a countless number of instruments."
 arch=(x86_64)
@@ -14,7 +14,7 @@
 license=(GPL2)
 groups=(lv2-plugins pro-audio vst-plugins)
 # NOTE: fftw is dlopen()'ed
-depends=(fftw gcc-libs glibc hicolor-icon-theme libglvnd zlib)
+depends=(fftw gcc-libs glibc hicolor-icon-theme libglvnd libuv zlib)
 makedepends=(alsa-lib asciidoc asciidoctor cmake cxxtest doxygen git jack liblo
 libxpm mxml portaudio rtosc ruby-rake ttf-roboto)
 optdepends=(
@@ -46,6 +46,7 @@
   "${pkgname}-mruby-zest-build-3.0.6-devendor_rtosc.patch"
   "${pkgname}-mruby-zest-build-3.0.6-libzest_location.patch"
   "${pkgname}-mruby-zest-build-3.0.6-system_wide_location.patch"
+  "${pkgname}-mruby-zest-build-3.0.6-cflags_ldflags.patch"
 )
 sha512sums=('86311f00d97e20c7eb22a46c99736c56765ed9737e728ef380a324e4a92c731086ed74f5d7bfeae104b690ab1ee1b40bfb8f240bc4c46f8afd47308ec48cbcea'
             'c84d185e7bcc3d7b0bd44941999b9b14638e230c5c5d86b487a39d6b793b56649b6aacde8d27b0aef567eaa3d381d3906d7bd31fd5fd74d5a662e21d188fcdc9'
@@ -70,7 +71,8 @@
             'SKIP'
             '0677bf66e5996b09298a3f7e3aabf0d5d8a5bbdca6ed869038e1a35cbef94c2bafcfeb92cd163f43476aadf5c915cde92c75876c5ff3964d5b2049509075a765'
             'd7ef0b4e8068d1d09d34c913d7b70342eaaa2eb8dae619d223e3e03ac667cf76c6e5615b60efabaf7eae594e3a5d6f40bc0cf10b8e939da1aa349bc27dff4ea8'
-            '2a6b57df3a9ffac669341d37739b281ce32696f82d82ee17220fdc9e426729d40f91cf50e1b58b7be1cc9bc5651d99794ae5e1bbd32f25c14aaf489989e10aab')
+            '2a6b57df3a9ffac669341d37739b281ce32696f82d82ee17220fdc9e426729d40f91cf50e1b58b7be1cc9bc5651d99794ae5e1bbd32f25c14aaf489989e10aab'
+            'a3912a879cb78565934a5cdea97ac1623f65a02d26ded548d851cd271da62390eb3fa9f26dfff153eb2d18c5bf30ba47e19fcbf1985e4b03772d2df936998511')
 b2sums=('4adbeffb9bc0bd77bf81a6734f5c26fc676426e644e27cebb8e54e8d74d869c0e1b468782cd1a64aacef8f9b788d434a8d30a194944650eea03c4fd146ee7bf7'
         'd9586ef1dd7866963d342f9be8def639ab4428a173f8abc2e503643d87e2c9087ff8d6af538df7c8f8df8f8facd409e8665735ef905deae8dfe3a840de340ea1'
         '68a24898a4646c6d84e782c4e31a962de456fa315d5c398c16b013efa684683f80cc411bf51628bb9cff799fc77f669d56e5d44af5938e05d0ec64322ad30ec7'
@@ -94,7 +96,8 @@
         'SKIP'
         '70ea96032e5f3f20f4270339f03b508c5a5e5d62859d6771adce452fbcde48f89edb4ef8908255cbf915f1088ce5d3fc5baa1b1e74794db3bc975e48c3425d14'
         '2f1782fd907fb0e284c16ee0f09e1d93d05984676707da2d9d47038880e723379535f8d3934f97753cc9a6865aed957a1c230840dda3a2cb49a26cb4ff2cd034'
-        '69ccb494e863caf8e47eaa70609940d532cfae6265eeffc626f24ed6a2290511d828d63405a7560fd567b0ab01bdabedd85aa3fe28bec5a638477654f9440f40')
+        '69ccb494e863caf8e47eaa70609940d532cfae6265eeffc626f24ed6a2290511d828d63405a7560fd567b0ab01bdabedd85aa3fe28bec5a638477654f9440f40'
+        'cab9048aede5bd346493ede996752b902f78de95de97310622caa0f7e473eba46159f1ee5fc925cf9ffc3cf1bd3f98c6dac521f354ac1be074346015bf9ded14')
 
 prepare() {
   (
@@ -139,6 +142,8 @@
     # load JSON schema from custom system location in /usr/share/zynaddsubfx/schema/
     # load fonts from custom system location in /usr/share/fonts/TTF/
     patch -Np1 -i ../"${pkgname}-mruby-zest-build-3.0.6-system_wide_location.patch"
+    # incorporate LDFLAGS to achieve full RELRO
+    patch -Np1 -i ../"${pkgname}-mruby-zest-build-3.0.6-cflags_ldflags.patch"
   )
 }
 
@@ -155,6 +160,7 @@
   make VERBOSE=1 -C build
   make man -C "${pkgname}-${pkgver}/doc"
 
+  # TODO: fix full RELRO
   make -C "${pkgname}-mruby-zest-build"
 }
 

Added: zynaddsubfx-mruby-zest-build-3.0.6-cflags_ldflags.patch
===================================================================
--- zynaddsubfx-mruby-zest-build-3.0.6-cflags_ldflags.patch	                        (rev 0)
+++ zynaddsubfx-mruby-zest-build-3.0.6-cflags_ldflags.patch	2022-01-24 01:07:15 UTC (rev 1114193)
@@ -0,0 +1,21 @@
+diff --git i/Makefile w/Makefile
+index 7bc3788..3af1cce 100644
+--- i/Makefile
++++ w/Makefile
+@@ -16,10 +16,14 @@ linux:
+ 	$(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -v mrbc | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \
+ 		./deps/libnanovg.a \
+ 		src/osc-bridge/libosc-bridge.a \
+-		`pkg-config --libs libuv` -lm -lX11 -lGL -lpthread
++		$(CFLAGS) \
++		`pkg-config --libs libuv` -lm -lX11 -lGL -lpthread \
++		$(LDFLAGS)
+ 	$(CC) test-libversion.c deps/pugl/pugl/pugl_x11.c \
++		$(CFLAGS) \
+ 		  -DPUGL_HAVE_GL \
+-		  -ldl -o zest -lX11 -lGL -lpthread -I deps/pugl -std=gnu99 -Wno-trigraphs
++		  -ldl -o zest -lX11 -lGL -lpthread -I deps/pugl -std=gnu99 -Wno-trigraphs \
++			$(LDFLAGS)
+ 
+ osx: deps/libuv.a
+ 	ruby ./rebuild-fcache.rb