6.7.68-1

3 files changed, 5 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 92c45d04df75..6bd1f272186b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = radium
 	pkgdesc = A graphical music editor. A next generation tracker.
-	pkgver = 6.6.77
+	pkgver = 6.7.68
 	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.6.77.tar.gz::https://github.com/kmatheussen/radium/archive/6.6.77.tar.gz
-	source = https://github.com/grame-cncm/faust/releases/download/2.27.2/faust-2.27.2.tar.gz
-	source = use-updated-faust.patch
+	source = radium-6.7.68.tar.gz::https://github.com/kmatheussen/radium/archive/6.7.68.tar.gz
 	source = add-vstsdk-location-var.patch
-	sha256sums = b60285bc77b28b731ec43dd3111a134924339696a618c7486fa05358348b5629
-	sha256sums = c9b21de69253d5a02a779c2eed74491fc62209d86c24724b429f68098191c39c
-	sha256sums = 8e6865eff42e0d1797a363f3ce6debfcdeab3aa0a4700f1bbca47916735ea8fd
+	sha256sums = 3fe78046cdbae38269b8ccd872b7e2900eac59bcdda0f5f1a2ceb8b0202bb552
 	sha256sums = 5094f3e9b5cec48f7f71f7291132269dbe34f2e96622c1ebf5257e9f4f2dcd56
 
 pkgname = radium
diff --git a/PKGBUILD b/PKGBUILD
index b0be2833d6bd..d5ffd4805a5e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jakob Gahde <j5lx@fmail.co.uk>
 
 pkgname=radium
-pkgver=6.6.77
+pkgver=6.7.68
 pkgrel=1
 pkgdesc='A graphical music editor. A next generation tracker.'
 arch=(x86_64)
@@ -50,13 +50,9 @@ optdepends=(
 )
 options=(!strip)
 source=("$pkgname-$pkgver.tar.gz::https://github.com/kmatheussen/radium/archive/$pkgver.tar.gz"
-        "https://github.com/grame-cncm/faust/releases/download/2.27.2/faust-2.27.2.tar.gz"
-        use-updated-faust.patch
         add-vstsdk-location-var.patch
 )
-sha256sums=('b60285bc77b28b731ec43dd3111a134924339696a618c7486fa05358348b5629'
-            'c9b21de69253d5a02a779c2eed74491fc62209d86c24724b429f68098191c39c'
-            '8e6865eff42e0d1797a363f3ce6debfcdeab3aa0a4700f1bbca47916735ea8fd'
+sha256sums=('3fe78046cdbae38269b8ccd872b7e2900eac59bcdda0f5f1a2ceb8b0202bb552'
             '5094f3e9b5cec48f7f71f7291132269dbe34f2e96622c1ebf5257e9f4f2dcd56')
 
 prepare() {
@@ -65,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"
 
-  # https://github.com/kmatheussen/radium/pull/1299
-  patch -p1 < "$srcdir/use-updated-faust.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/use-updated-faust.patch b/use-updated-faust.patch
deleted file mode 100644
index 1cf9ae20114f..000000000000
--- a/use-updated-faust.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -aur --no-dereference '--exclude=.git' radium-6.5.76.old/bin/packages/build.sh radium-6.5.76/bin/packages/build.sh
---- radium-6.5.76.old/bin/packages/build.sh	2020-11-14 17:18:13.886659457 +0000
-+++ radium-6.5.76/bin/packages/build.sh	2020-11-14 17:19:39.956981712 +0000
-@@ -91,16 +91,9 @@
- 
- 
- rm -fr faust
--tar xvzf faust-master-dev-2019-12-22.tar.gz 
--mv faust-master-dev faust
-+mv ../../../faust-2.27.2 faust
- cd faust
--tar xvzf ../faustlibraries-2019-12-22.tar.gz
--rm -fr libraries
--mv faustlibraries-master libraries
- patch -p0 <../faust.patch
--patch -p1 <../faust_setlocale.patch
--patch -p0 <../faust_svgfix.patch
--patch -p1 <../faust_HTTPDServer.patch 
- if env |grep INCLUDE_FAUSTDEV_BUT_NOT_LLVM ; then
-     patch -p0 <../faust_nollvm.patch
- fi