summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD11
-rw-r--r--use-new-cxx11-abi.patch41
-rw-r--r--use-system-vstsdk.patch18
4 files changed, 16 insertions, 66 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ffba9896f10..588cfdd0ff5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Thu Oct 5 01:21:26 UTC 2017
pkgbase = radium
pkgdesc = A graphical music editor. A next generation tracker.
- pkgver = 5.1.5
+ pkgver = 5.4.2
pkgrel = 1
url = https://users.notam02.no/~kjetism/radium/
arch = i686
@@ -32,16 +30,14 @@ pkgbase = radium
optdepends = calf-ladspa
optdepends = ladspa-plugins
options = !strip
- source = https://github.com/kmatheussen/radium/archive/5.1.5.tar.gz
+ source = https://github.com/kmatheussen/radium/archive/5.4.2.tar.gz
source = radium
source = use-system-libxcb.patch
source = use-system-vstsdk.patch
- source = use-new-cxx11-abi.patch
- md5sums = e0690bc1d5eb57348de5f92f9de82d82
+ md5sums = 123b4ee8119010e3bb8c7fc036477ae2
md5sums = 092735a1ff69f02e41b28a0e849179f4
md5sums = ec8251af460ad72ebba82c718615de1b
- md5sums = e587c15b18f761ae9af31d86162355ad
- md5sums = ecc15fbbf114b44a657cfc3c6bf64fb8
+ md5sums = f20b79f1adb0fe9b87acb249094c9103
pkgname = radium
diff --git a/PKGBUILD b/PKGBUILD
index ac3f278a964..7b54988d915 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Teteros <teteros -at- opmbx -dot- org>
pkgname=radium
-pkgver=5.1.5
+pkgver=5.4.2
pkgrel=1
pkgdesc="A graphical music editor. A next generation tracker."
arch=('i686' 'x86_64')
@@ -40,20 +40,15 @@ source=("https://github.com/kmatheussen/${pkgname}/archive/${pkgver}.tar.gz"
"radium"
"use-system-libxcb.patch"
"use-system-vstsdk.patch"
- "use-new-cxx11-abi.patch"
)
-md5sums=('e0690bc1d5eb57348de5f92f9de82d82'
+md5sums=('123b4ee8119010e3bb8c7fc036477ae2'
'092735a1ff69f02e41b28a0e849179f4'
'ec8251af460ad72ebba82c718615de1b'
- 'e587c15b18f761ae9af31d86162355ad'
- 'ecc15fbbf114b44a657cfc3c6bf64fb8')
+ 'f20b79f1adb0fe9b87acb249094c9103')
prepare() {
cd "${pkgname}-${pkgver}"
- msg2 "Fixing faust2 LLVM ABI problem"
- patch -Nsp1 < "${srcdir}/use-new-cxx11-abi.patch"
-
msg2 "Switching to system-wide libxcb"
patch -Nsp1 < "${srcdir}/use-system-libxcb.patch"
diff --git a/use-new-cxx11-abi.patch b/use-new-cxx11-abi.patch
deleted file mode 100644
index 6f5a991647f..00000000000
--- a/use-new-cxx11-abi.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -aur --no-dereference radium.pristine/bin/packages/build.sh radium.new/bin/packages/build.sh
---- radium.pristine/bin/packages/build.sh 2017-08-02 01:59:17.650319582 +0100
-+++ radium.new/bin/packages/build.sh 2017-08-02 02:01:25.370318484 +0100
-@@ -195,9 +195,9 @@
- # Build faust last since we reset the build flags.
-
- # faust, debug
--export CFLAGS="-mtune=generic -msse2 -mfpmath=sse -O0 -fsanitize=address -g -Wno-misleading-indentation -fPIC -D_GLIBCXX_USE_CXX11_ABI=0 -fno-strict-aliasing"
--export CPPFLAGS="-mtune=generic -msse2 -mfpmath=sse -O0 -fsanitize=address -g -fPIC -D_GLIBCXX_USE_CXX11_ABI=0 -fno-strict-aliasing"
--export CXXFLAGS="-mtune=generic -msse2 -mfpmath=sse -O0 -fsanitize=address -g -fPIC -D_GLIBCXX_USE_CXX11_ABI=0 -fno-strict-aliasing"
-+export CFLAGS="-mtune=generic -msse2 -mfpmath=sse -O0 -fsanitize=address -g -Wno-misleading-indentation -fPIC -D_GLIBCXX_USE_CXX11_ABI=1 -fno-strict-aliasing"
-+export CPPFLAGS="-mtune=generic -msse2 -mfpmath=sse -O0 -fsanitize=address -g -fPIC -D_GLIBCXX_USE_CXX11_ABI=1 -fno-strict-aliasing"
-+export CXXFLAGS="-mtune=generic -msse2 -mfpmath=sse -O0 -fsanitize=address -g -fPIC -D_GLIBCXX_USE_CXX11_ABI=1 -fno-strict-aliasing"
- export LDFLAGS="-fsanitize=address"
- cd faust2
- make -j `nproc`
-@@ -206,9 +206,9 @@
- cd ..
-
- #faust, release
--export CFLAGS="-mtune=generic -msse2 -mfpmath=sse -O2 -g -Wno-misleading-indentation -fPIC -D_GLIBCXX_USE_CXX11_ABI=0 -fno-strict-aliasing"
--export CPPFLAGS="-mtune=generic -msse2 -mfpmath=sse -O2 -g -fPIC -D_GLIBCXX_USE_CXX11_ABI=0 -fno-strict-aliasing"
--export CXXFLAGS="-mtune=generic -msse2 -mfpmath=sse -O2 -g -fPIC -D_GLIBCXX_USE_CXX11_ABI=0 -fno-strict-aliasing"
-+export CFLAGS="-mtune=generic -msse2 -mfpmath=sse -O2 -g -Wno-misleading-indentation -fPIC -D_GLIBCXX_USE_CXX11_ABI=1 -fno-strict-aliasing"
-+export CPPFLAGS="-mtune=generic -msse2 -mfpmath=sse -O2 -g -fPIC -D_GLIBCXX_USE_CXX11_ABI=1 -fno-strict-aliasing"
-+export CXXFLAGS="-mtune=generic -msse2 -mfpmath=sse -O2 -g -fPIC -D_GLIBCXX_USE_CXX11_ABI=1 -fno-strict-aliasing"
- export LDFLAGS=""
- cd faust2
- make -j `nproc`
-diff -aur --no-dereference radium.pristine/Makefile.Qt radium.new/Makefile.Qt
---- radium.pristine/Makefile.Qt 2017-08-02 01:59:17.600319582 +0100
-+++ radium.new/Makefile.Qt 2017-08-02 02:00:50.420318784 +0100
-@@ -1780,7 +1780,7 @@
- FAUST_OPTS = $(QTOPT) $(CPUOPT) -Ibin/packages/faust2/architecture $(WNO_SUGGEST_OVERRIDE) -Wno-overloaded-virtual
-
- ifeq ($(GCC_MAJOR),7)
-- FAUST_OPTS += -D_GLIBCXX_USE_CXX11_ABI=0 -fno-sanitize=signed-integer-overflow
-+ FAUST_OPTS += -D_GLIBCXX_USE_CXX11_ABI=1 -fno-sanitize=signed-integer-overflow
- endif
-
- Faust_plugins.o: audio/Faust_plugins.cpp audio/Faust_factory_factory.cpp $(FAUST_DEPENDENCIES)
diff --git a/use-system-vstsdk.patch b/use-system-vstsdk.patch
index 65683899f4c..57ea49ef286 100644
--- a/use-system-vstsdk.patch
+++ b/use-system-vstsdk.patch
@@ -1,6 +1,6 @@
diff -aur --no-dereference package.pristine/check_dependencies.sh package.new/check_dependencies.sh
---- package.pristine/check_dependencies.sh 2017-08-06 00:40:00.000000000 +0200
-+++ package.new/check_dependencies.sh 2017-08-06 01:57:08.330732447 +0200
+--- package.pristine/check_dependencies.sh 2017-12-23 18:57:54.000000000 +0100
++++ package.new/check_dependencies.sh 2017-12-30 19:54:15.480847588 +0100
@@ -137,8 +137,8 @@
exit 5
fi
@@ -13,20 +13,20 @@ diff -aur --no-dereference package.pristine/check_dependencies.sh package.new/ch
exit 5
fi
diff -aur --no-dereference package.pristine/Makefile.Qt package.new/Makefile.Qt
---- package.pristine/Makefile.Qt 2017-08-06 00:40:00.000000000 +0200
-+++ package.new/Makefile.Qt 2017-08-06 01:58:12.061943151 +0200
-@@ -226,7 +226,7 @@
+--- package.pristine/Makefile.Qt 2017-12-23 18:57:54.000000000 +0100
++++ package.new/Makefile.Qt 2017-12-30 19:55:16.022340947 +0100
+@@ -225,7 +225,7 @@
FLAGOPTS = $(DEFINES) -DGUIISQT -DUSE_GFX_OP_QUEUE -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_63_0 -I ~/SDKs/VST3\ SDK -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -fno-omit-frame-pointer -Wno-unknown-pragmas -fno-strict-aliasing
-+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_63_0 -I /usr/include/vst36 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -fno-omit-frame-pointer -Wno-unknown-pragmas -fno-strict-aliasing
+-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_63_0 -I ~/SDKs/VST3\ SDK -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unknown-pragmas -fno-strict-aliasing
++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_63_0 -I /usr/include/vst36 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unknown-pragmas -fno-strict-aliasing
#-Wstrict-overflow=4 -Wsuggest-attribute=format -Wstringop-overflow=4
#-Wsuggest-final-types -Wsuggest-final-methods
diff -aur --no-dereference package.pristine/pluginhost/Builds/Linux/Makefile package.new/pluginhost/Builds/Linux/Makefile
---- package.pristine/pluginhost/Builds/Linux/Makefile 2017-08-06 00:40:00.000000000 +0200
-+++ package.new/pluginhost/Builds/Linux/Makefile 2017-08-06 03:30:46.394038149 +0200
+--- package.pristine/pluginhost/Builds/Linux/Makefile 2017-12-23 18:57:54.000000000 +0100
++++ package.new/pluginhost/Builds/Linux/Makefile 2017-12-30 19:57:17.815121091 +0100
@@ -18,7 +18,7 @@
TARGET_ARCH := -march=native
endif