6.9.72-1

5 files changed, 52 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6bd1f272186b..cf801abbe548 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = radium
 	pkgdesc = A graphical music editor. A next generation tracker.
-	pkgver = 6.7.68
+	pkgver = 6.9.72
 	pkgrel = 1
 	url = https://users.notam02.no/~kjetism/radium
 	arch = x86_64
@@ -39,10 +39,14 @@ pkgbase = radium
 	optdepends = ladspa-plugins: package group for plugins normally included in binary releases
 	optdepends = vst-plugins: more plugins
 	options = !strip
-	source = radium-6.7.68.tar.gz::https://github.com/kmatheussen/radium/archive/6.7.68.tar.gz
+	source = radium-6.9.72.tar.gz::https://github.com/kmatheussen/radium/archive/6.9.72.tar.gz
 	source = add-vstsdk-location-var.patch
-	sha256sums = 3fe78046cdbae38269b8ccd872b7e2900eac59bcdda0f5f1a2ceb8b0202bb552
-	sha256sums = 5094f3e9b5cec48f7f71f7291132269dbe34f2e96622c1ebf5257e9f4f2dcd56
+	source = faust_add_include.patch
+	source = faust-buildfix.patch
+	sha256sums = 8e07f83ef89ea16a5ea131c67f8559293a38353bbd71f26f9510c1c01e2b2b44
+	sha256sums = 8d66045d1a927df67670d2ce0855b246614f2969105bd6c4b78a1fcfd971cc9c
+	sha256sums = 69b762b908d30ce78f0e289b39b77c0d56888d000f440169ab86e63bc0a15430
+	sha256sums = 857c06b9163a42f38364aa54acbdb12a2d3419e5a200eb31e08db84fc6a342b7
 
 pkgname = radium
 
diff --git a/PKGBUILD b/PKGBUILD
index d5ffd4805a5e..809811f04d0b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jakob Gahde <j5lx@fmail.co.uk>
 
 pkgname=radium
-pkgver=6.7.68
+pkgver=6.9.72
 pkgrel=1
 pkgdesc='A graphical music editor. A next generation tracker.'
 arch=(x86_64)
@@ -51,9 +51,12 @@ optdepends=(
 options=(!strip)
 source=("$pkgname-$pkgver.tar.gz::https://github.com/kmatheussen/radium/archive/$pkgver.tar.gz"
         add-vstsdk-location-var.patch
+        faust_add_include.patch faust-buildfix.patch
 )
-sha256sums=('3fe78046cdbae38269b8ccd872b7e2900eac59bcdda0f5f1a2ceb8b0202bb552'
-            '5094f3e9b5cec48f7f71f7291132269dbe34f2e96622c1ebf5257e9f4f2dcd56')
+sha256sums=('8e07f83ef89ea16a5ea131c67f8559293a38353bbd71f26f9510c1c01e2b2b44'
+            '8d66045d1a927df67670d2ce0855b246614f2969105bd6c4b78a1fcfd971cc9c'
+            '69b762b908d30ce78f0e289b39b77c0d56888d000f440169ab86e63bc0a15430'
+            '857c06b9163a42f38364aa54acbdb12a2d3419e5a200eb31e08db84fc6a342b7')
 
 prepare() {
   cd radium-$pkgver
@@ -61,6 +64,10 @@ prepare() {
   # Add VST2SDK env var so we can use VST2 headers from steinberg-vst36 in AUR
   patch -p1 < "$srcdir/add-vstsdk-location-var.patch"
 
+  # https://github.com/kmatheussen/radium/pull/1343
+  cp "$srcdir/faust_add_include.patch" bin/packages
+  patch -p1 < "$srcdir/faust-buildfix.patch"
+
   # This tweak edits new file template and demo songs to be compatible with chorus plugin from calf-ladspa package
   # !! NOTE TO LMMS USERS !!
   # !! Comment next line out if you have LMMS installed as it already comes with their own version of Calf plugins !!
diff --git a/add-vstsdk-location-var.patch b/add-vstsdk-location-var.patch
index 67e909634f25..fcaba67c7f26 100644
--- a/add-vstsdk-location-var.patch
+++ b/add-vstsdk-location-var.patch
@@ -1,7 +1,7 @@
-diff -aur --no-dereference '--exclude=.git' radium-6.6.77.old/check_dependencies.sh radium-6.6.77.new/check_dependencies.sh
---- radium-6.6.77.old/check_dependencies.sh	2020-12-20 19:57:05.000000000 +0000
-+++ radium-6.6.77.new/check_dependencies.sh	2020-12-24 13:20:32.615606788 +0000
-@@ -226,13 +226,6 @@
+diff -aur --no-dereference '--exclude=.git' radium-6.9.72.old/check_dependencies.sh radium-6.9.72.new/check_dependencies.sh
+--- radium-6.9.72.old/check_dependencies.sh	2021-05-12 12:22:43.000000000 +0100
++++ radium-6.9.72.new/check_dependencies.sh	2021-05-17 19:33:06.675841674 +0100
+@@ -246,13 +246,6 @@
      exit 5
  fi
  
@@ -15,21 +15,21 @@ diff -aur --no-dereference '--exclude=.git' radium-6.6.77.old/check_dependencies
  if [[ $4 == "test_build" ]] ; then
      if [ `uname` == "Linux" ] ; then
          if [ ! -f bin/packages/deletemetorebuild ] ; then
-diff -aur --no-dereference '--exclude=.git' radium-6.6.77.old/Makefile.Qt radium-6.6.77.new/Makefile.Qt
---- radium-6.6.77.old/Makefile.Qt	2020-12-20 19:57:05.000000000 +0000
-+++ radium-6.6.77.new/Makefile.Qt	2020-12-24 13:23:13.945876161 +0000
-@@ -308,7 +308,7 @@
+diff -aur --no-dereference '--exclude=.git' radium-6.9.72.old/Makefile.Qt radium-6.9.72.new/Makefile.Qt
+--- radium-6.9.72.old/Makefile.Qt	2021-05-12 12:22:43.000000000 +0100
++++ radium-6.9.72.new/Makefile.Qt	2021-05-17 19:33:41.772606557 +0100
+@@ -344,7 +344,7 @@
  
  FLAGOPTS = $(DEFINES) -DGUIISQT -DFULL_VERSION=$(FULL_VERSION) -DIS_LITTLE_ENDIAN=1 -DUSE_OPENGL=1 $(VISUAL) $(REQTYPE_TYPE) $(MENU_TYPE)
  
--COMMONOPT = -D__STDC_FORMAT_MACROS=1 -c `cat buildtype.opt` -I$(GCDIR)/include -I$(P) -I$(PYPATH) `cat flagopts.opt` $(MIDIINC) $(OS_OPTS) $(VST_OPTS) -I${HOME}/boost_1_70_0 -I${HOME}/boost_1_67_0 -I${HOME}/boost_1_63_0 -I ~/SDKs/VST_SDK/VST2_SDK/ -I ~/SDKs/vstsdk2.4/ -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unknown-pragmas -fno-strict-aliasing -Wmissing-field-initializers -Wnull-dereference 
-+COMMONOPT = -D__STDC_FORMAT_MACROS=1 -c `cat buildtype.opt` -I$(GCDIR)/include -I$(P) -I$(PYPATH) `cat flagopts.opt` $(MIDIINC) $(OS_OPTS) $(VST_OPTS) -I${HOME}/boost_1_70_0 -I${HOME}/boost_1_67_0 -I${HOME}/boost_1_63_0 -I${RADIUM_VST2SDK_PATH} -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unknown-pragmas -fno-strict-aliasing -Wmissing-field-initializers -Wnull-dereference 
+-COMMONOPT = -D__STDC_FORMAT_MACROS=1 -c `cat buildtype.opt` -I$(GCDIR)/include -I$(P) $(PYOPTS) `cat flagopts.opt` $(MIDIINC) $(OS_OPTS) $(VST_OPTS) -I ~/SDKs/VST_SDK/VST2_SDK/ -I ~/SDKs/vstsdk2.4/ -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unknown-pragmas -fno-strict-aliasing -Wmissing-field-initializers -Wnull-dereference -Wwrite-strings -DTHREADED_OPENGL=1
++COMMONOPT = -D__STDC_FORMAT_MACROS=1 -c `cat buildtype.opt` -I$(GCDIR)/include -I$(P) $(PYOPTS) `cat flagopts.opt` $(MIDIINC) $(OS_OPTS) $(VST_OPTS) -I ~/SDKs/VST_SDK/VST2_SDK/ -I ~/SDKs/vstsdk2.4/ -I${RADIUM_VST2SDK_PATH} -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unknown-pragmas -fno-strict-aliasing -Wmissing-field-initializers -Wnull-dereference -Wwrite-strings -DTHREADED_OPENGL=1
  #-fdelete-null-pointer-checks 
  # -Werror
  
-diff -aur --no-dereference '--exclude=.git' radium-6.6.77.old/pluginhost/Builds/Linux/Makefile radium-6.6.77.new/pluginhost/Builds/Linux/Makefile
---- radium-6.6.77.old/pluginhost/Builds/Linux/Makefile	2020-12-20 19:57:05.000000000 +0000
-+++ radium-6.6.77.new/pluginhost/Builds/Linux/Makefile	2020-12-24 13:20:32.615606788 +0000
+diff -aur --no-dereference '--exclude=.git' radium-6.9.72.old/pluginhost/Builds/Linux/Makefile radium-6.9.72.new/pluginhost/Builds/Linux/Makefile
+--- radium-6.9.72.old/pluginhost/Builds/Linux/Makefile	2021-05-12 12:22:43.000000000 +0100
++++ radium-6.9.72.new/pluginhost/Builds/Linux/Makefile	2021-05-17 19:33:06.675841674 +0100
 @@ -8,7 +8,7 @@
    CONFIG=Debug

  endif

diff --git a/faust-buildfix.patch b/faust-buildfix.patch
new file mode 100644
index 000000000000..f94c724351c1
--- /dev/null
+++ b/faust-buildfix.patch
@@ -0,0 +1,11 @@
+diff -aur --no-dereference '--exclude=.git' radium-6.9.72.old/bin/packages/build.sh radium-6.9.72.new/bin/packages/build.sh
+--- radium-6.9.72.old/bin/packages/build.sh	2021-05-12 12:22:43.000000000 +0100
++++ radium-6.9.72.new/bin/packages/build.sh	2021-05-17 21:09:20.161588109 +0100
+@@ -103,6 +103,7 @@
+         patch -p0 <../faust_nollvm.patch
+     fi
+     patch -p1 <../faust_llvm_fix.patch
++    patch -p0 <../faust_add_include.patch
+     VERBOSE=1 CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" CMAKEOPT="-DCMAKE_BUILD_TYPE=Release -DSELF_CONTAINED_LIBRARY=on -DCMAKE_CXX_COMPILER=`which $DASCXX` -DCMAKE_C_COMPILER=`which $DASCC`" make most
+     cd ..
+ }
diff --git a/faust_add_include.patch b/faust_add_include.patch
new file mode 100644
index 000000000000..d23989c2243d
--- /dev/null
+++ b/faust_add_include.patch
@@ -0,0 +1,10 @@
+--- architecture/faust/gui/JSONUI.h~	2020-12-23 21:09:06.000000000 +0000
++++ architecture/faust/gui/JSONUI.h	2021-05-17 21:03:09.597254660 +0100
+@@ -32,6 +32,7 @@
+ #include <iomanip>
+ #include <sstream>
+ #include <algorithm>
++#include <limits>
+ 
+ #include "faust/gui/UI.h"
+ #include "faust/gui/PathBuilder.h"