summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeteros2020-09-03 16:32:18 +0100
committerTeteros2020-09-03 16:32:18 +0100
commitcde8244394b5ae61a909b6f7bf2bc6e5153f3ba8 (patch)
tree090f5f7ac76edd28c67692b9e0d7858e417954e7
parent07dc85afffc437338c11a259a1b373f0ebb194b4 (diff)
downloadaur-cde8244394b5ae61a909b6f7bf2bc6e5153f3ba8.tar.gz
6.0.99-1
-rw-r--r--.SRCINFO23
-rw-r--r--PKGBUILD35
-rw-r--r--add-vstsdk-location-var.patch69
-rw-r--r--fix-packages-compile.patch21
4 files changed, 56 insertions, 92 deletions
diff --git a/.SRCINFO b/.SRCINFO
index aef19b67998..d0c44d1bf46 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
pkgbase = radium
pkgdesc = A graphical music editor. A next generation tracker.
- pkgver = 5.9.99
+ pkgver = 6.0.99
pkgrel = 1
url = https://users.notam02.no/~kjetism/radium
- arch = i686
arch = x86_64
+ groups = pro-audio
license = GPL2
makedepends = boost
makedepends = clang
@@ -28,22 +28,23 @@ pkgbase = radium
depends = libmpc
depends = libsndfile
depends = python2
- depends = qt5-webkit
depends = qt5-svg
+ depends = qt5-webkit
depends = qt5-x11extras
+ depends = shared-mime-info
depends = speex
depends = ttf-bitstream-vera
+ depends = ttf-croscore
depends = ttf-lato
- optdepends = calf-ladspa: Default chorus plugin
- optdepends = ladspa-plugins: Package group for default radium plugins included in binary releases
- optdepends = python: Used for scheme scripting
+ 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-5.9.99.tar.gz::https://github.com/kmatheussen/radium/archive/5.9.99.tar.gz
+ source = radium-6.0.99.tar.gz::https://github.com/kmatheussen/radium/archive/6.0.99.tar.gz
source = add-vstsdk-location-var.patch
- source = fix-packages-compile.patch
- sha256sums = a6140ed5287c01e8c502e56802d19cae7c1e5a30f610d3eeef005c893c26b9fc
- sha256sums = 46b2a16f9faf0b01a3e66bf5ca589be95dcdfb9fe887a339269be1b74e8ba3f3
- sha256sums = 3afbb5f4f7757056dc5f84b01a4787e5d8824214eb9b2d81908574e2fe5ed77d
+ sha256sums = 200e38de95d40505df9639e7925654f87c4fa12639aa36837114be1df060040e
+ sha256sums = 2466b88e345c48be43a835ee0001aac55189ce74b4181d3c4275e459089e7ccc
pkgname = radium
diff --git a/PKGBUILD b/PKGBUILD
index 6a26421e53f..8bc8794b896 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,13 @@
# Contributor: Jakob Gahde <j5lx@fmail.co.uk>
pkgname=radium
-pkgver=5.9.99
+pkgver=6.0.99
pkgrel=1
pkgdesc='A graphical music editor. A next generation tracker.'
-arch=(i686 x86_64)
+arch=(x86_64)
url=https://users.notam02.no/~kjetism/radium
license=(GPL2)
+groups=(pro-audio)
depends=(
desktop-file-utils
fftw
@@ -20,12 +21,14 @@ depends=(
liblrdf
libmpc
libsndfile
- python
- qt5-webkit
+ python2
qt5-svg
+ qt5-webkit
qt5-x11extras
+ shared-mime-info
speex
ttf-bitstream-vera
+ ttf-croscore
ttf-lato
)
makedepends=(
@@ -42,25 +45,27 @@ makedepends=(
steinberg-vst36
)
optdepends=(
- 'calf-ladspa: Default chorus plugin'
- 'ladspa-plugins: Package group for default radium plugins included in binary releases'
+ 'new-session-manager: for session management'
+ 'calf-ladspa: default chorus plugin used in new file templates'
+ 'ladspa-plugins: package group for plugins normally included in binary releases'
+ 'vst-plugins: more plugins'
)
options=(!strip)
-source=("$pkgname-$pkgver.tar.gz::https://github.com/kmatheussen/radium/archive/$pkgver.tar.gz"
- add-vstsdk-location-var.patch
- fix-packages-compile.patch)
-sha256sums=('a6140ed5287c01e8c502e56802d19cae7c1e5a30f610d3eeef005c893c26b9fc'
- '46b2a16f9faf0b01a3e66bf5ca589be95dcdfb9fe887a339269be1b74e8ba3f3'
- '3afbb5f4f7757056dc5f84b01a4787e5d8824214eb9b2d81908574e2fe5ed77d')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/kmatheussen/radium/archive/$pkgver.tar.gz" add-vstsdk-location-var.patch)
+sha256sums=('200e38de95d40505df9639e7925654f87c4fa12639aa36837114be1df060040e'
+ '2466b88e345c48be43a835ee0001aac55189ce74b4181d3c4275e459089e7ccc')
prepare() {
cd radium-$pkgver
- patch -p1 < "$srcdir/add-vstsdk-location-var.patch" # Reverted PR 1247
- patch -p1 < "$srcdir/fix-packages-compile.patch" # PRs 1275-1276
+ # Add VST2SDK env var so we can use VST2 headers from steinberg-vst36 in AUR
+ patch -p1 < "$srcdir/add-vstsdk-location-var.patch"
- # Edit new file template and demo songs to be compatible with chorus plugin from calf-ladspa
+ # 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
}
build() {
diff --git a/add-vstsdk-location-var.patch b/add-vstsdk-location-var.patch
index cc8cf9ecf15..92615a40916 100644
--- a/add-vstsdk-location-var.patch
+++ b/add-vstsdk-location-var.patch
@@ -1,62 +1,41 @@
-From 12a8bd02d330bb5fe54857af38271b4ae6fc8cae Mon Sep 17 00:00:00 2001
-From: Teteros <Teteros@users.noreply.github.com>
-Date: Wed, 22 Apr 2020 05:12:26 +0100
-Subject: [PATCH] Build: Add RADIUM_VST2SDK_PATH environment variable
-
-Adds an extra search path users can use to help locate their VST2 SDK.
-Simply export RADIUM_VST2SDK_PATH in before make packages when desired.
-
-Also fixes the link in the check_dependencies.sh since Steinberg
-deprecated VST2 so it was no longer available in the mentioned link.
----
- Makefile.Qt | 2 +-
- check_dependencies.sh | 9 +++++----
- pluginhost/Builds/Linux/Makefile | 2 +-
- 3 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile.Qt b/Makefile.Qt
-index bd2bd8161..4e2c8928b 100755
---- a/Makefile.Qt
-+++ b/Makefile.Qt
-@@ -297,7 +297,7 @@ MENU_TYPE = -DUSE_QT_MENU=1 -DUSE_GTK_MENU=0
+diff -aur --no-dereference '--exclude=.git' radium-6.0.99.old/Makefile.Qt radium-6.0.99.new/Makefile.Qt
+--- radium-6.0.99.old/Makefile.Qt 2020-09-01 14:37:08.000000000 +0100
++++ radium-6.0.99.new/Makefile.Qt 2020-09-01 20:10:33.357697286 +0100
+@@ -306,7 +306,7 @@
FLAGOPTS = $(DEFINES) -DGUIISQT -DFULL_VERSION=$(FULL_VERSION) -DIS_LITTLE_ENDIAN=1 -DUSE_OPENGL=1 $(VISUAL) $(REQTYPE_TYPE) $(MENU_TYPE)
--COMMONOPT = -c $(RADIUM_BFD_CFLAGS) `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 = -c $(RADIUM_BFD_CFLAGS) `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} -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 = -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 = -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
#-fdelete-null-pointer-checks
# -Werror
-diff --git a/check_dependencies.sh b/check_dependencies.sh
-index 1e13a5136..4cc11517b 100755
---- a/check_dependencies.sh
-+++ b/check_dependencies.sh
-@@ -225,10 +225,11 @@ if ! pkg-config --cflags glib-2.0 >/dev/null 2>/dev/null ; then
- echo "glib-2.0 not found"
+diff -aur --no-dereference '--exclude=.git' radium-6.0.99.old/check_dependencies.sh radium-6.0.99.new/check_dependencies.sh
+--- radium-6.0.99.old/check_dependencies.sh 2020-09-01 14:37:08.000000000 +0100
++++ radium-6.0.99.new/check_dependencies.sh 2020-09-01 20:12:11.634639063 +0100
+@@ -226,13 +226,6 @@
exit 5
fi
--
+
-if [[ ! -f ~/SDKs/vstsdk2.4/pluginterfaces/vst2.x/aeffect.h && ! -f ~/SDKs/"VST3 SDK"/pluginterfaces/vst2.x/aeffect.h && ! -f ~/SDKs/VST_SDK/VST2_SDK/pluginterfaces/vst2.x/aeffect.h ]] ; then
- echo 'Steinberg VST headers not found. (Missing "~/SDKs/vstsdk2.4/pluginterfaces/vst2.x/aeffect.h or "~/SDKs/VST3 SDK/pluginterfaces/vst2.x/aeffect.h" or "~/SDKs/VST_SDK/VST2_SDK/pluginterfaces/vst2.x/aeffect.h")'
-- echo 'You should find these files in the "VST Audio Plug-Ins SDK" from http://www.steinberg.net/en/company/developers.html . Unless Steinberg have changed the directory structure again, it should enough to unzip the file into your ~/SDKs directory.'
-+if [[ ! -f "${RADIUM_VST2SDK_PATH}/pluginterfaces/vst2.x/aeffect.h" && ! -f ~/SDKs/vstsdk2.4/pluginterfaces/vst2.x/aeffect.h && ! -f ~/SDKs/"VST3 SDK"/pluginterfaces/vst2.x/aeffect.h && ! -f ~/SDKs/VST_SDK/VST2_SDK/pluginterfaces/vst2.x/aeffect.h ]] ; then
-+ echo 'Steinberg VST2 headers not found. (Missing "~/SDKs/vstsdk2.4/pluginterfaces/vst2.x/aeffect.h or "~/SDKs/VST3 SDK/pluginterfaces/vst2.x/aeffect.h" or "~/SDKs/VST_SDK/VST2_SDK/pluginterfaces/vst2.x/aeffect.h")'
-+ echo 'You may obtain a copy of the VST2 SDK from here: https://www.steinberg.net/sdk_downloads/vstsdk367_03_03_2017_build_352.zip'
-+ echo 'It should enough to unzip the file into your ~/SDKs directory.'
-+ echo 'Alternatively pass the RADIUM_VST2SDK_PATH environment variable during build which has the above headers to specify another search path.'
- exit 5
- fi
-
-diff --git a/pluginhost/Builds/Linux/Makefile b/pluginhost/Builds/Linux/Makefile
-index ff10bea46..b58ee51f6 100644
---- a/pluginhost/Builds/Linux/Makefile
-+++ b/pluginhost/Builds/Linux/Makefile
-@@ -8,7 +8,7 @@ ifndef CONFIG
+- echo 'You should find these files in the "VST Audio Plug-Ins SDK" from http://www.steinberg.net/en/company/developers.html . Unless Steinberg has changed the directory structure again, it should enough to unzip the file into your ~/SDKs directory.'
+- exit 5
+-fi
+-
+-
+ if [[ $4 == "test_build" ]] ; then
+ if [ `uname` == "Linux" ] ; then
+ if [ ! -f bin/packages/deletemetorebuild ] ; then
+diff -aur --no-dereference '--exclude=.git' radium-6.0.99.old/pluginhost/Builds/Linux/Makefile radium-6.0.99.new/pluginhost/Builds/Linux/Makefile
+--- radium-6.0.99.old/pluginhost/Builds/Linux/Makefile 2020-09-01 14:37:08.000000000 +0100
++++ radium-6.0.99.new/pluginhost/Builds/Linux/Makefile 2020-09-01 20:18:12.189005049 +0100
+@@ -8,7 +8,7 @@
CONFIG=Debug
endif
-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~/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
ifeq (,$(findstring clang,$(CXX)))
COMMONCPPFLAGS += -Wno-class-memaccess
diff --git a/fix-packages-compile.patch b/fix-packages-compile.patch
deleted file mode 100644
index 99054c15b2d..00000000000
--- a/fix-packages-compile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -aur --no-dereference '--exclude=.git' radium-5.9.99.pristine/bin/packages/build.sh radium-5.9.99.new/bin/packages/build.sh
---- radium-5.9.99.pristine/bin/packages/build.sh 2020-08-15 08:11:06.000000000 +0100
-+++ radium-5.9.99.new/bin/packages/build.sh 2020-08-17 00:04:25.066598881 +0100
-@@ -100,6 +100,8 @@
- patch -p0 <../faust.patch
- patch -p1 <../faust_setlocale.patch
- patch -p0 <../faust_svgfix.patch
-+curl -sSLo ../faust_HTTPDServer_fix.patch "https://github.com/grame-cncm/faust/commit/8ccdc687572ec8de0e525b668c86611a3033e3fc.patch"
-+patch -p1 < ../faust_HTTPDServer_fix.patch
- if env |grep INCLUDE_FAUSTDEV_BUT_NOT_LLVM ; then
- patch -p0 <../faust_nollvm.patch
- fi
-@@ -173,7 +175,7 @@
- tar xvzf fluidsynth-1.1.6.tar.gz
- cd fluidsynth-1.1.6
- make clean
--CFLAGS="-fno-strict-aliasing -O3 -DDEFAULT_SOUNDFONT=\\\"\\\"" CPPFLAGS="-fno-strict-aliasing -O3" CXXFLAGS="-fno-strict-aliasing -O3" ./configure --enable-static --disable-aufile-support --disable-pulse-support --disable-alsa-support --disable-libsndfile-support --disable-portaudio-support --disable-oss-support --disable-midishare --disable-jack-support --disable-coreaudio --disable-coremidi --disable-dart --disable-lash --disable-ladcca --disable-aufile-support --disable-dbus-support --without-readline
-+CFLAGS="-fPIC -fno-strict-aliasing -O3 -DDEFAULT_SOUNDFONT=\\\"\\\"" CPPFLAGS="-fPIC -fno-strict-aliasing -O3" CXXFLAGS="-fPIC -fno-strict-aliasing -O3" ./configure --enable-static --disable-aufile-support --disable-pulse-support --disable-alsa-support --disable-libsndfile-support --disable-portaudio-support --disable-oss-support --disable-midishare --disable-jack-support --disable-coreaudio --disable-coremidi --disable-dart --disable-lash --disable-ladcca --disable-aufile-support --disable-dbus-support --without-readline
- # --enable-debug
- make -j`nproc`
- cd ..