7.1.87-1

4 files changed, 96 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 07f177f4befd..9b5482aca0c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = radium
 	pkgdesc = A graphical music editor. A next generation tracker.
-	pkgver = 7.1.68
-	pkgrel = 2
+	pkgver = 7.1.87
+	pkgrel = 1
 	url = https://users.notam02.no/~kjetism/radium
 	install = radium.install
 	arch = x86_64
@@ -9,7 +9,6 @@ pkgbase = radium
 	license = GPL2
 	makedepends = boost
 	makedepends = cmake
-	makedepends = ladspa
 	makedepends = libxcursor
 	makedepends = libxinerama
 	makedepends = libxkbfile
@@ -54,22 +53,27 @@ pkgbase = radium
 	depends = binutils
 	depends = xorg-util-macros
 	depends = qt5-base
+	depends = libmicrohttpd
+	depends = ladspa
 	optdepends = new-session-manager: for session management
 	optdepends = calf-ladspa: default chorus plugin used in new file templates
 	optdepends = ladspa-plugins: package group for plugins normally included in binary releases
 	optdepends = vst-plugins: more plugins
 	options = !strip
-	source = radium-7.1.68.tar.gz::https://github.com/kmatheussen/radium/archive/7.1.68.tar.gz
+	options = !lto
+	source = radium-7.1.87.tar.gz::https://github.com/kmatheussen/radium/archive/7.1.87.tar.gz
 	source = add-vstsdk-location-var.patch
 	source = build_libpds.patch
-	source = crashreporter.patch
 	source = radium.install
 	source = grep.patch
-	sha256sums = 7054cd218bee78eea01d3c6798350e531795f1e933000a3f13f95cd4cb4a04b4
+	source = xiinstruments.patch
+	source = build_linux_common.patch
+	sha256sums = 897a6df56aedea417bbe146c85ee45f8b79bf749beac3a7c17568a42b5a9f9d9
 	sha256sums = ed456586a1f28eec9acd081a676e61145e13f07c1a6e967c0af1f7d08be4023e
 	sha256sums = 2f145e84c5940f4f82544ae68e668d5bd02ee7bce559d3354f60d12eaea1a548
-	sha256sums = 16b0c6dc95e835fed5c7d4f350780561cd996ef723b392c415db83edba07af94
 	sha256sums = f627730ff7a819e8cc5ac5c2b5f1fb2f2237327db6ea5442c55a23c1ce82ef14
 	sha256sums = 7ccb4eb8c2924a5b6c610b4f35bc9ff22602cb2e131035d285bef87d813460b3
+	sha256sums = c1937b1d7846c469f477e060a71b6785e7cc24cc5ba6f58374e219fa6504ee5a
+	sha256sums = 0decfc3adcba836004ac34d970a83d4d0b69743334a586f42be53b3de7bdd5a4
 
 pkgname = radium
diff --git a/PKGBUILD b/PKGBUILD
index 6292488ed09e..8ca4b41374ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Jakob Gahde <j5lx@fmail.co.uk>
 
 pkgname=radium
-pkgver=7.1.68
-pkgrel=2
+pkgver=7.1.87
+pkgrel=1
 pkgdesc='A graphical music editor. A next generation tracker.'
 arch=(x86_64)
 url=https://users.notam02.no/~kjetism/radium
@@ -31,29 +31,30 @@ depends=(
   ttf-croscore
   ttf-lato
   libatomic_ops
-	libsamplerate
-	tk
-	guile
-	libxkbfile
-	openssl
-	ncurses
-	gmp
-	xcb-util-keysyms
-	mpfr
-	libmpc
-	libogg
-	libvorbis
-	openssl
-	alsa-lib
-	glib2
-	binutils
-	xorg-util-macros
-	qt5-base
-)
+  libsamplerate
+  tk
+  guile
+  libxkbfile
+  openssl
+  ncurses
+  gmp
+  xcb-util-keysyms
+  mpfr
+  libmpc
+  libogg
+  libvorbis
+  openssl
+  alsa-lib
+  glib2
+  binutils
+  xorg-util-macros
+  qt5-base
+  libmicrohttpd
+  ladspa
+  )
 makedepends=(
   boost
   cmake
-  ladspa
   libxcursor
   libxinerama
   libxkbfile
@@ -68,35 +69,40 @@ optdepends=(
   'ladspa-plugins: package group for plugins normally included in binary releases'
   'vst-plugins: more plugins'
 )
-options=(!strip)
+options=(!strip
+				 !lto )
 source=("$pkgname-$pkgver.tar.gz::https://github.com/kmatheussen/radium/archive/$pkgver.tar.gz"
 				add-vstsdk-location-var.patch
 				build_libpds.patch
-				crashreporter.patch
 				radium.install
 				grep.patch
+				xiinstruments.patch
+				build_linux_common.patch
 )
-sha256sums=('7054cd218bee78eea01d3c6798350e531795f1e933000a3f13f95cd4cb4a04b4'
+sha256sums=('897a6df56aedea417bbe146c85ee45f8b79bf749beac3a7c17568a42b5a9f9d9'
             'ed456586a1f28eec9acd081a676e61145e13f07c1a6e967c0af1f7d08be4023e' 
             '2f145e84c5940f4f82544ae68e668d5bd02ee7bce559d3354f60d12eaea1a548' 
-            '16b0c6dc95e835fed5c7d4f350780561cd996ef723b392c415db83edba07af94'
-						'f627730ff7a819e8cc5ac5c2b5f1fb2f2237327db6ea5442c55a23c1ce82ef14'
-						'7ccb4eb8c2924a5b6c610b4f35bc9ff22602cb2e131035d285bef87d813460b3'
+            'f627730ff7a819e8cc5ac5c2b5f1fb2f2237327db6ea5442c55a23c1ce82ef14'
+            '7ccb4eb8c2924a5b6c610b4f35bc9ff22602cb2e131035d285bef87d813460b3'
+            'c1937b1d7846c469f477e060a71b6785e7cc24cc5ba6f58374e219fa6504ee5a'
+            '0decfc3adcba836004ac34d970a83d4d0b69743334a586f42be53b3de7bdd5a4'
 					)
 install=radium.install
 
 prepare() {
   cd radium-$pkgver
+	#makes all xiinstruments available in local browser
+  patch -p1 < "$srcdir/xiinstruments.patch"
 
-	#sed "/grep [^\-]*\\\ /s/grep \([^\]*\)\\\ \([^ ]*\)/grep \"\1 \2\"/p" -i check_dependencies.sh
-	patch -p0 < "$srcdir/grep.patch"
+  #sed "/grep [^\-]*\\\ /s/grep \([^\]*\)\\\ \([^ ]*\)/grep \"\1 \2\"/p" -i check_dependencies.sh
+  patch -p0 < "$srcdir/grep.patch"
 
   # Add VST2SDK env var so we can use VST2 headers from steinberg-vst36 in AUR
   patch -p1 < "$srcdir/add-vstsdk-location-var.patch"
   
-  # fix crashreporter PTR-error
-  patch -p2 < "$srcdir/crashreporter.patch"
-
+	# fix for binutils 2.40
+	patch -p0 < "$srcdir/build_linux_common.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 !!
@@ -105,13 +111,11 @@ prepare() {
 
   cd bin/packages
   patch -p0 < "$srcdir/build_libpds.patch"
-  cp faust3.patch faust2.patch
 }
 
 build() {
   cd radium-$pkgver
 
-  #RADIUM_USE_CLANG=1 RADIUM_QT_VERSION=5 RADIUM_VST2SDK_PATH=/usr/include/vst36 RADIUM_BUILD_LIBXCB=0 make packages
   RADIUM_QT_VERSION=5 RADIUM_VST2SDK_PATH=/usr/include/vst36 RADIUM_BUILD_LIBXCB=0 make packages
   RADIUM_QT_VERSION=5 RADIUM_VST2SDK_PATH=/usr/include/vst36 BUILDTYPE=RELEASE ./build_linux.sh
 }
diff --git a/build_linux_common.patch b/build_linux_common.patch
new file mode 100644
index 000000000000..cec22c044347
--- /dev/null
+++ b/build_linux_common.patch
@@ -0,0 +1,11 @@
+--- build_linux_common.sh.orig	2023-03-10 14:18:55.074248103 +0100
++++ build_linux_common.sh	2023-03-10 14:20:54.617578515 +0100
+@@ -216,7 +216,7 @@
+     if [[ $RADIUM_USE_CLANG == 1 ]] && [ -f "$CLANG_PREFIX/lib/libbfd.a" ]; then
+         export RADIUM_BFD_LDFLAGS="$CLANG_PREFIX/lib/libbfd.a"
+     else
+-        export RADIUM_BFD_LDFLAGS="-Wl,-Bstatic -lbfd -Wl,-Bdynamic"
++        export RADIUM_BFD_LDFLAGS="-Wl,-Bstatic -lbfd -Wl,-Bdynamic -lzstd -lsframe"
+     fi
+ fi
+ 
diff --git a/xiinstruments.patch b/xiinstruments.patch
new file mode 100644
index 000000000000..d1f049ab73f4
--- /dev/null
+++ b/xiinstruments.patch
@@ -0,0 +1,35 @@
+diff --git a/Qt/Qt_sample_requester_widget_callbacks.h b/Qt/Qt_sample_requester_widget_callbacks.h
+index 9ee2158be..67d58e40d 100644
+--- a/Qt/Qt_sample_requester_widget_callbacks.h
++++ b/Qt/Qt_sample_requester_widget_callbacks.h
+@@ -126,20 +126,22 @@ static QString get_sample_filename_display_string(QFileInfo file_info, int width
+     //printf("Trying to open %s\n",file_info.absoluteFilePath().toUtf8().constData());
+     SNDFILE *sndfile = radium_sf_open(full_filename, SFM_READ, &sf_info);
+     
+-    if(sndfile==NULL)
+-      return QString();
+-
+-    num_channels = sf_info.channels;
++    if(sndfile==NULL){
++      num_channels = -1;
++    }else{
++      num_channels = sf_info.channels;
+ 
+-    sf_close(sndfile);
++      sf_close(sndfile);
++    }
+   }
+ 
+   int64_t num_bytes = file_info.size();
+ 
+   //const QFontMetrics fn = QFontMetrics(font);
+-  QString ret =
+-    file_info.fileName().leftJustified(k_filename_len-2,'.') +
+-    ".." + QString::number(num_channels)+"ch,";
++  QString ret = file_info.fileName().leftJustified(k_filename_len-2,'.');
++
++  if (num_channels >= 0)
++    ret += ".." + QString::number(num_channels)+"ch,";
+ 
+   {
+     QString size_string;