summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD12
-rw-r--r--add-vstsdk-location-var.patch34
-rw-r--r--fix-faust-llvm12-gettypebyname.patch26
-rw-r--r--fix-faust-llvm12.patch10
5 files changed, 24 insertions, 70 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8ff3432e6d8..a7218451768 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = radium
pkgdesc = A graphical music editor. A next generation tracker.
- pkgver = 6.9.82
+ pkgver = 6.9.88
pkgrel = 1
url = https://users.notam02.no/~kjetism/radium
arch = x86_64
@@ -39,13 +39,9 @@ pkgbase = radium
optdepends = ladspa-plugins: package group for plugins normally included in binary releases
optdepends = vst-plugins: more plugins
options = !strip
- source = radium-6.9.82.tar.gz::https://github.com/kmatheussen/radium/archive/6.9.82.tar.gz
+ source = radium-6.9.88.tar.gz::https://github.com/kmatheussen/radium/archive/6.9.88.tar.gz
source = add-vstsdk-location-var.patch
- source = fix-faust-llvm12.patch
- source = fix-faust-llvm12-gettypebyname.patch
- sha256sums = cb233e1178ab8ffdf6158e532a978dd0fbc86e50a7f9f639a076b3adae233ed6
- sha256sums = 8d66045d1a927df67670d2ce0855b246614f2969105bd6c4b78a1fcfd971cc9c
- sha256sums = 8890f30d7afd2e6e2713d19243354b57e859d20e63ba8c6c8579b754900c6f9f
- sha256sums = 363d3776bada0c4c74ad43388a6ade503670c88a41c144522f960188ee9e1d37
+ sha256sums = a1bb77a9c1ec828ad2d3b0cba99449ac9848c22697e2c7344d4433457085d355
+ sha256sums = 74fd7a84a6aea46778e97a0559c9ffa7d2dc69de534a331d882a0b95d88e30ea
pkgname = radium
diff --git a/PKGBUILD b/PKGBUILD
index ae797b94d29..34e67c95ef3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Jakob Gahde <j5lx@fmail.co.uk>
pkgname=radium
-pkgver=6.9.82
+pkgver=6.9.88
pkgrel=1
pkgdesc='A graphical music editor. A next generation tracker.'
arch=(x86_64)
@@ -51,12 +51,9 @@ optdepends=(
options=(!strip)
source=("$pkgname-$pkgver.tar.gz::https://github.com/kmatheussen/radium/archive/$pkgver.tar.gz"
add-vstsdk-location-var.patch
- fix-faust-llvm12.patch fix-faust-llvm12-gettypebyname.patch
)
-sha256sums=('cb233e1178ab8ffdf6158e532a978dd0fbc86e50a7f9f639a076b3adae233ed6'
- '8d66045d1a927df67670d2ce0855b246614f2969105bd6c4b78a1fcfd971cc9c'
- '8890f30d7afd2e6e2713d19243354b57e859d20e63ba8c6c8579b754900c6f9f'
- '363d3776bada0c4c74ad43388a6ade503670c88a41c144522f960188ee9e1d37')
+sha256sums=('a1bb77a9c1ec828ad2d3b0cba99449ac9848c22697e2c7344d4433457085d355'
+ '74fd7a84a6aea46778e97a0559c9ffa7d2dc69de534a331d882a0b95d88e30ea')
prepare() {
cd radium-$pkgver
@@ -64,9 +61,6 @@ prepare() {
# Add VST2SDK env var so we can use VST2 headers from steinberg-vst36 in AUR
patch -p1 < "$srcdir/add-vstsdk-location-var.patch"
- cp "$srcdir/fix-faust-llvm12-gettypebyname.patch" bin/packages
- patch -p0 < "$srcdir/fix-faust-llvm12.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 fcaba67c7f2..0c70e3ee74f 100644
--- a/add-vstsdk-location-var.patch
+++ b/add-vstsdk-location-var.patch
@@ -1,6 +1,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
+diff -aur --no-dereference '--exclude=.git' radium-6.9.88.old/check_dependencies.sh radium-6.9.88.new/check_dependencies.sh
+--- radium-6.9.88.old/check_dependencies.sh 2021-07-24 21:33:34.000000000 +0100
++++ radium-6.9.88.new/check_dependencies.sh 2021-07-25 17:42:43.213233704 +0100
@@ -246,13 +246,6 @@
exit 5
fi
@@ -15,10 +15,10 @@ diff -aur --no-dereference '--exclude=.git' radium-6.9.72.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.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 @@
+diff -aur --no-dereference '--exclude=.git' radium-6.9.88.old/Makefile.Qt radium-6.9.88.new/Makefile.Qt
+--- radium-6.9.88.old/Makefile.Qt 2021-07-24 21:33:34.000000000 +0100
++++ radium-6.9.88.new/Makefile.Qt 2021-07-25 17:42:43.219900395 +0100
+@@ -343,7 +343,7 @@
FLAGOPTS = $(DEFINES) -DGUIISQT -DFULL_VERSION=$(FULL_VERSION) -DIS_LITTLE_ENDIAN=1 -DUSE_OPENGL=1 $(VISUAL) $(REQTYPE_TYPE) $(MENU_TYPE)
@@ -27,15 +27,15 @@ diff -aur --no-dereference '--exclude=.git' radium-6.9.72.old/Makefile.Qt radium
#-fdelete-null-pointer-checks
# -Werror
-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 -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"
--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" -I /usr/include -I /usr/include/freetype2 -I~/SDKs/VST_SDK/VST3_SDK -I ~/SDKs/VST_SDK/VST2_SDK/ -I ~/SDKs/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" -I /usr/include -I /usr/include/freetype2 -I$(RADIUM_VST2SDK_PATH) -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -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 -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
+
+ # -I~/SDKs/VST_SDK/VST3_SDK -I ~/SDKs/VST_SDK/VST2_SDK/ -I ~/SDKs/VST3\ SDK
- ifeq (,$(findstring clang,$(CXX)))
- COMMONCPPFLAGS += -Wno-class-memaccess
diff --git a/fix-faust-llvm12-gettypebyname.patch b/fix-faust-llvm12-gettypebyname.patch
deleted file mode 100644
index aa77f9853b2..00000000000
--- a/fix-faust-llvm12-gettypebyname.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- compiler/generator/llvm/llvm_instructions.hh~ 2020-12-23 21:09:06.000000000 +0000
-+++ compiler/generator/llvm/llvm_instructions.hh 2021-07-06 18:35:53.832423033 +0100
-@@ -170,7 +170,11 @@
- LLVMType getStructType(const string& name, const LLVMVecTypes& types)
- {
- // We want to have a unique creation for struct types, so check if the given type has already been created
-+ #if defined(LLVM_120)
-+ StructType* struct_type = StructType::getTypeByName(fModule->getContext(), name);
-+ #else
- StructType* struct_type = fModule->getTypeByName(name);
-+ #endif
- if (!struct_type) {
- struct_type = StructType::create(fModule->getContext(), name);
- // Create "packed" struct type to match the size of C++ "packed" defined ones
-@@ -191,7 +195,11 @@
- if (basic_typed) {
- return fTypeMap[basic_typed->fType];
- } else if (named_typed) {
-+ #if defined(LLVM_120)
-+ LLVMType type = StructType::getTypeByName(fModule->getContext(), "struct.dsp" + named_typed->fName);
-+ #else
- LLVMType type = fModule->getTypeByName("struct.dsp" + named_typed->fName);
-+ #endif
- // Subcontainer type (RWTable...)
- return (type) ? getTyPtr(type) : convertFIRType(named_typed->fType);
- } else if (array_typed) {
diff --git a/fix-faust-llvm12.patch b/fix-faust-llvm12.patch
deleted file mode 100644
index bf158fc14ca..00000000000
--- a/fix-faust-llvm12.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- bin/packages/build.sh~ 2021-07-06 19:29:31.940048964 +0100
-+++ bin/packages/build.sh 2021-07-06 19:29:04.396551247 +0100
-@@ -104,6 +104,7 @@
- fi
- patch -p1 <../faust_llvm_fix.patch
- patch -p0 <../faust_add_include.patch
-+ patch -p0 <../fix-faust-llvm12-gettypebyname.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 ..
- }