7.1.68-1

6 files changed, 97 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8f61c6611be0..ad65bc340388 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = radium
 	pkgdesc = A graphical music editor. A next generation tracker.
-	pkgver = 6.9.96
+	pkgver = 7.1.68
 	pkgrel = 1
 	url = https://users.notam02.no/~kjetism/radium
+	install = radium.install
 	arch = x86_64
 	groups = pro-audio
 	license = GPL2
@@ -13,7 +14,7 @@ pkgbase = radium
 	makedepends = libxinerama
 	makedepends = libxkbfile
 	makedepends = libxrandr
-	makedepends = llvm
+	makedepends = llvm11
 	makedepends = qt5-tools
 	makedepends = steinberg-vst36
 	depends = desktop-file-utils
@@ -34,14 +35,21 @@ pkgbase = radium
 	depends = ttf-bitstream-vera
 	depends = ttf-croscore
 	depends = ttf-lato
+	depends = libatomic_ops
 	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-6.9.96.tar.gz::https://github.com/kmatheussen/radium/archive/6.9.96.tar.gz
+	source = radium-7.1.68.tar.gz::https://github.com/kmatheussen/radium/archive/7.1.68.tar.gz
 	source = add-vstsdk-location-var.patch
-	sha256sums = 0060734362c824fe70dfb9d4e0e12f048cbedb0fa7d2abb6043a5970f0c0aeca
-	sha256sums = 74fd7a84a6aea46778e97a0559c9ffa7d2dc69de534a331d882a0b95d88e30ea
+	source = build_libpds.patch
+	source = crashreporter.patch
+	source = radium.install
+	sha256sums = 7054cd218bee78eea01d3c6798350e531795f1e933000a3f13f95cd4cb4a04b4
+	sha256sums = ed456586a1f28eec9acd081a676e61145e13f07c1a6e967c0af1f7d08be4023e
+	sha256sums = 2f145e84c5940f4f82544ae68e668d5bd02ee7bce559d3354f60d12eaea1a548
+	sha256sums = 16b0c6dc95e835fed5c7d4f350780561cd996ef723b392c415db83edba07af94
+	sha256sums = f627730ff7a819e8cc5ac5c2b5f1fb2f2237327db6ea5442c55a23c1ce82ef14
 
 pkgname = radium
diff --git a/PKGBUILD b/PKGBUILD
index 965ef602a592..cfb94e644c70 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
-# Maintainer: Teteros <teteros at teknik dot io>
-# Maintainer: Karol "Kenji Takahashi" Woźniak <kenji.sx>
+# Maintainer: yustin <#archlinux-proaudio@libera.chat>
+# Contributor: Teteros <teteros at teknik dot io>
+# Contributor: Karol "Kenji Takahashi" Woźniak <kenji.sx>
 # Contributor: Jakob Gahde <j5lx@fmail.co.uk>
 
 pkgname=radium
-pkgver=6.9.96
+pkgver=7.1.68
 pkgrel=1
 pkgdesc='A graphical music editor. A next generation tracker.'
 arch=(x86_64)
@@ -29,6 +30,7 @@ depends=(
   ttf-bitstream-vera
   ttf-croscore
   ttf-lato
+  libatomic_ops
 )
 makedepends=(
   boost
@@ -38,7 +40,7 @@ makedepends=(
   libxinerama
   libxkbfile
   libxrandr
-  llvm
+  llvm11
   qt5-tools
   steinberg-vst36
 )
@@ -50,27 +52,43 @@ optdepends=(
 )
 options=(!strip)
 source=("$pkgname-$pkgver.tar.gz::https://github.com/kmatheussen/radium/archive/$pkgver.tar.gz"
-        add-vstsdk-location-var.patch
+				add-vstsdk-location-var.patch
+				build_libpds.patch
+				crashreporter.patch
+				radium.install
 )
-sha256sums=('0060734362c824fe70dfb9d4e0e12f048cbedb0fa7d2abb6043a5970f0c0aeca'
-            '74fd7a84a6aea46778e97a0559c9ffa7d2dc69de534a331d882a0b95d88e30ea')
+sha256sums=('7054cd218bee78eea01d3c6798350e531795f1e933000a3f13f95cd4cb4a04b4'
+            'ed456586a1f28eec9acd081a676e61145e13f07c1a6e967c0af1f7d08be4023e' 
+            '2f145e84c5940f4f82544ae68e668d5bd02ee7bce559d3354f60d12eaea1a548' 
+            '16b0c6dc95e835fed5c7d4f350780561cd996ef723b392c415db83edba07af94'
+						'f627730ff7a819e8cc5ac5c2b5f1fb2f2237327db6ea5442c55a23c1ce82ef14'
+					)
+install=radium.install
 
 prepare() {
   cd radium-$pkgver
 
   # 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"
 
   # 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 !!
   for file in bin/sounds/*.rad; do sed -i -e 's/Calf MultiChorus LADSPA/Calf Multi Chorus LADSPA/g' "$file"; done
   # See comment on calf-ladspa AUR page then on how to let Radium load Calf from LMMS package
+
+  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/add-vstsdk-location-var.patch b/add-vstsdk-location-var.patch
index 0c70e3ee74f7..9f4eb54d567a 100644
--- a/add-vstsdk-location-var.patch
+++ b/add-vstsdk-location-var.patch
@@ -30,12 +30,12 @@ diff -aur --no-dereference '--exclude=.git' radium-6.9.88.old/Makefile.Qt radium
 diff -aur --no-dereference '--exclude=.git' radium-6.9.88.old/pluginhost/Builds/Linux/Makefile radium-6.9.88.new/pluginhost/Builds/Linux/Makefile
 --- radium-6.9.88.old/pluginhost/Builds/Linux/Makefile	2021-07-24 21:33:34.000000000 +0100
 +++ radium-6.9.88.new/pluginhost/Builds/Linux/Makefile	2021-07-25 17:45:12.883773257 +0100
-@@ -11,7 +11,7 @@
- AVAILABLES=

- #"-DJUCE_MODULE_AVAILABLE_juce_audio_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_devices=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_formats=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_processors=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_utils=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1 -DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_dsp=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1"

+@@ -17,7 +17,7 @@
  

--COMMONCPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "_DEBUG=1" -D "JUCE_CHECK_MEMORY_LEAKS=0" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" $(AVAILABLES) -I /usr/include -I /usr/include/freetype2 -I../../JuceLibraryCode/modules/juce_audio_processors/format_types/VST3_SDK -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I ~/SDKs/vstsdk2.4 -DJUCE_APP_CONFIG_HEADER="\"AppConfig.h\"" -mfpmath=sse -msse2

-+COMMONCPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "_DEBUG=1" -D "JUCE_CHECK_MEMORY_LEAKS=0" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" $(AVAILABLES) -I /usr/include -I /usr/include/freetype2 -I../../JuceLibraryCode/modules/juce_audio_processors/format_types/VST3_SDK -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I ~/SDKs/vstsdk2.4 -I$(RADIUM_VST2SDK_PATH) -DJUCE_APP_CONFIG_HEADER="\"AppConfig.h\"" -mfpmath=sse -msse2

+ LV2FLAGS=-I$(JUCE_MODULES)juce_audio_processors/format_types/LV2_SDK -I$(JUCE_MODULES)juce_audio_processors/format_types/LV2_SDK/lv2  -I$(JUCE_MODULES)juce_audio_processors/format_types/LV2_SDK/lilv/src -I$(JUCE_MODULES)juce_audio_processors/format_types/LV2_SDK/lilv -I$(JUCE_MODULES)juce_audio_processors/format_types/LV2_SDK/sratom -I$(JUCE_MODULES)juce_audio_processors/format_types/LV2_SDK/sord/src -I$(JUCE_MODULES)juce_audio_processors/format_types/LV2_SDK/sord -I$(JUCE_MODULES)juce_audio_processors/format_types/LV2_SDK/serd -I$(JUCE_MODULES)juce_audio_processors/format_types/LV2_SDK/lv2 -I$(JUCE_MODULES)juce_audio_processors/format_types/LV2_SDK

+ 

+-COMMONCPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "JUCE_CHECK_MEMORY_LEAKS=0" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" $(AVAILABLES) -I /usr/include -I /usr/include/freetype2 -I$(JUCE_MODULES)/.. -I$(JUCE_MODULES) -I$(JUCE_MODULES)juce_audio_processors/format_types/VST3_SDK $(LV2FLAGS) -I $(JUCE_MODULES)JuceLibraryCode -I $(JUCE_MODULES)JuceLibraryCode/modules -I ~/SDKs/vstsdk2.4 -DJUCE_APP_CONFIG_HEADER="\"AppConfig.h\"" -mfpmath=sse -msse2 -DPLUGINHOST_BUILD_64BIT

++COMMONCPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "JUCE_CHECK_MEMORY_LEAKS=0" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" $(AVAILABLES) -I /usr/include -I /usr/include/freetype2 -I$(JUCE_MODULES)/.. -I$(JUCE_MODULES) -I$(JUCE_MODULES)juce_audio_processors/format_types/VST3_SDK $(LV2FLAGS) -I $(JUCE_MODULES)JuceLibraryCode -I $(JUCE_MODULES)JuceLibraryCode/modules -I$(RADIUM_VST2SDK_PATH) -I ~/SDKs/vstsdk2.4 -DJUCE_APP_CONFIG_HEADER="\"AppConfig.h\"" -mfpmath=sse -msse2 -DPLUGINHOST_BUILD_64BIT

  

  # -I~/SDKs/VST_SDK/VST3_SDK -I ~/SDKs/VST_SDK/VST2_SDK/ -I ~/SDKs/VST3\ SDK

  

diff --git a/build_libpds.patch b/build_libpds.patch
new file mode 100644
index 000000000000..f10c0e09c6f5
--- /dev/null
+++ b/build_libpds.patch
@@ -0,0 +1,10 @@
+--- build.sh	2022-04-24 21:53:02.147980665 +0200
++++ build.sh	2022-04-24 21:53:49.146983762 +0200
+@@ -109,6 +109,7 @@
+     sed -i 's/k_cext$//' make.scm
+     sed -i 's/oscx //' make.scm
+     sed -i 's/gcc -O3/gcc -fcommon -O3/' make.scm
++    sed -i 's/#define fsqrt/\/\/#define fsqrt/g' pure-data/extra/fiddle~/fiddle~.c
+     make clean
+     make -j`nproc`
+     cd ..
diff --git a/crashreporter.patch b/crashreporter.patch
new file mode 100644
index 000000000000..838eac38fc20
--- /dev/null
+++ b/crashreporter.patch
@@ -0,0 +1,33 @@
+--- src/radium-7.0.00/crashreporter/backtrace-symbols.c	2022-12-19 11:03:23.579772161 +0100
++++ src/radium-7.0.00/crashreporter/backtrace-symbols.c	2022-12-19 11:04:24.236437340 +0100
+@@ -114,10 +114,10 @@
+ 	if ((bfd_get_file_flags(abfd) & HAS_SYMS) == 0)
+ 		return;
+ 
+-	symcount = bfd_read_minisymbols(abfd, false, (PTR) & syms, &size);
++	symcount = bfd_read_minisymbols(abfd, false, (void **) & syms, &size);
+ 	if (symcount == 0)
+ 		symcount = bfd_read_minisymbols(abfd, true /* dynamic */ ,
+-						(PTR) & syms, &size);
++						(void **) & syms, &size);
+ 
+ 	if (symcount < 0)
+ 		bfd_fatal(bfd_get_filename(abfd));
+@@ -184,7 +184,7 @@
+ 
+ 		found = false;
+ 		bfd_map_over_sections(abfd, find_address_in_section,
+-		(PTR) NULL);
++		(void **) NULL);
+ 
+ 		if (!found) {
+ 			printf("[%s] \?\?() \?\?:0\n",addr[naddr-1]);
+@@ -244,7 +244,7 @@
+ 
+ 		found = false;
+ 		bfd_map_over_sections(abfd, find_address_in_section,
+-		(PTR) NULL);
++		(void **) NULL);
+ 
+ 		if (!found) {
+ 			total += snprintf(buf, len, "[0x%llx] \?\?() \?\?:0",(long long unsigned int) addr[naddr-1]) + 1;
diff --git a/radium.install b/radium.install
new file mode 100644
index 000000000000..9cf4f6312ab6
--- /dev/null
+++ b/radium.install
@@ -0,0 +1,11 @@
+### should create a symlink to ladspa in /opt/radium
+### to get rid off the errormessage
+
+post_install() {
+	ln -sf /usr/lib/ladspa /opt/radium/ladspa
+}
+
+pre_remove() {
+	rm /opt/radium/ladspa
+}
+