summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD12
-rw-r--r--RTcmix-pd-LCPLAY-stabilize.patch13
3 files changed, 6 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 856f7dcd1612..c4c6a48a0c0a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = pd-l2ork-git
pkgdesc = L2Ork (Linux Laptop Orchestra) version of PureData (git version)
- pkgver = r1771.42cedfa8
- pkgrel = 2
+ pkgver = r1790.15f00bbf
+ pkgrel = 1
url = http://l2ork.music.vt.edu/main/?page_id=56
install = pd-l2ork.install
arch = i686
@@ -54,9 +54,7 @@ pkgbase = pd-l2ork-git
conflicts = pd-l2ork
options = !makeflags
source = pd-l2ork-git::git+https://github.com/pd-l2ork/pd.git
- source = RTcmix-pd-LCPLAY-stabilize.patch
md5sums = SKIP
- md5sums = 39c53063dc18681f29b12c08d9c453aa
pkgname = pd-l2ork-git
diff --git a/PKGBUILD b/PKGBUILD
index 224ae49a677d..e6ccee4700dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,8 +11,8 @@
# under /usr/include/pd-l2ork.
pkgname=pd-l2ork-git
-pkgver=r1771.42cedfa8
-pkgrel=2
+pkgver=r1790.15f00bbf
+pkgrel=1
pkgdesc="L2Ork (Linux Laptop Orchestra) version of PureData (git version)"
url="http://l2ork.music.vt.edu/main/?page_id=56"
arch=('i686' 'x86_64')
@@ -29,10 +29,8 @@ provides=('pd-l2ork')
conflicts=('pd-l2ork')
install=pd-l2ork.install
options=('!makeflags')
-source=("$pkgname::git+https://github.com/pd-l2ork/pd.git"
- "RTcmix-pd-LCPLAY-stabilize.patch")
-md5sums=('SKIP'
- '39c53063dc18681f29b12c08d9c453aa')
+source=("$pkgname::git+https://github.com/pd-l2ork/pd.git")
+md5sums=('SKIP')
# Run 'makepkg buildopt=-b' for an incremental build (this skips recompiling
# Gem which takes a *long* time to build). Note that this will only produce a
@@ -52,8 +50,6 @@ prepare() {
git submodule foreach git checkout .
# check out the latest source of all submodules
git submodule update --init
- # make the sources compile with gcc 6.1+
- cd $srcdir/$pkgname/l2ork_addons/rtcmix-in-pd && patch -Np1 < $srcdir/RTcmix-pd-LCPLAY-stabilize.patch
}
build() {
diff --git a/RTcmix-pd-LCPLAY-stabilize.patch b/RTcmix-pd-LCPLAY-stabilize.patch
deleted file mode 100644
index 20f10a8b1669..000000000000
--- a/RTcmix-pd-LCPLAY-stabilize.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/RTcmix-pd-4.0.1.6/insts/std/LPCPLAY/stabilize.cpp b/RTcmix-pd-4.0.1.6/insts/std/LPCPLAY/stabilize.cpp
-index 5753965..9cf85c4 100644
---- a/RTcmix-pd-4.0.1.6/insts/std/LPCPLAY/stabilize.cpp
-+++ b/RTcmix-pd-4.0.1.6/insts/std/LPCPLAY/stabilize.cpp
-@@ -29,7 +29,7 @@ stabilize(float *frameIn, int npoles)
- static Complex jay(0., 1.);
- static Complex tmp;
-
--inline double abs(double x) { return (x >= 0.) ? x : -x; }
-+//inline double abs(double x) { return (x >= 0.) ? x : -x; }
-
- static int
- factor(double *b, long *k4, double *rootr, double *rooti,