Fix compile problems with upstream source after latest compiler update in Arch.

4 files changed, 66 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f563c4ddbf58..8a665cd210e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Apr 26 13:50:58 UTC 2016
+# Tue May 24 00:03:55 UTC 2016
 pkgbase = pd-l2ork
 	pkgdesc = L2Ork (Linux Laptop Orchestra) version of PureData
-	pkgver = 1644.ec3b96b
+	pkgver = 1656.da84fdf
 	pkgrel = 1
 	url = http://l2ork.music.vt.edu/main/?page_id=56
 	install = pd-l2ork.install
@@ -57,8 +57,12 @@ pkgbase = pd-l2ork
 	options = !makeflags
 	source = pd-l2ork::git+https://github.com/pd-l2ork/pd.git
 	source = menu_openfile.patch
+	source = Gem-pix_colorclassify.patch
+	source = RTcmix-pd-LCPLAY-stabilize.patch
 	md5sums = SKIP
 	md5sums = 6eb362b0165fc9fc4409e3db5d2278c2
+	md5sums = 33dc1880e38ac8dbc7aa5075bfe49abd
+	md5sums = 39c53063dc18681f29b12c08d9c453aa
 
 pkgname = pd-l2ork
 
diff --git a/Gem-pix_colorclassify.patch b/Gem-pix_colorclassify.patch
new file mode 100644
index 000000000000..b6ff9756c43b
--- /dev/null
+++ b/Gem-pix_colorclassify.patch
@@ -0,0 +1,31 @@
+diff --git a/src/Pixes/pix_colorclassify.cpp b/src/Pixes/pix_colorclassify.cpp
+index 7d922ea..1362fc2 100644
+--- a/src/Pixes/pix_colorclassify.cpp
++++ b/src/Pixes/pix_colorclassify.cpp
+@@ -151,7 +151,7 @@ unsigned char class_red[] = {
+ 0,/*blue-green,*/
+ 170,/*purple-pink-lavender,*/
+ 255,/*purple-pink-magenta,*/
+-0.5*255,/*gray,*/
++127,/*gray,*/
+ 154,/*none ~ brownish for visualization only ~ skin color in the future*/
+ };
+ 
+@@ -165,7 +165,7 @@ unsigned char class_green[] = {
+ 235,/*blue-green,*/
+ 0,/*purple-pink-lavender,*/
+ 0,/*purple-pink-magenta,*/
+-0.5*255,/*gray,*/
++127,/*gray,*/
+ 115/*none*/
+ };
+ 
+@@ -179,7 +179,7 @@ unsigned char class_blue[] = {
+ 217,/*blue-green,*/
+ 255,/*purple-pink-lavender,*/
+ 255,/*purple-pink-magenta,*/
+-0.5*255,/*gray,*/
++127,/*gray,*/
+ 86/*none*/
+ };
+ 
diff --git a/PKGBUILD b/PKGBUILD
index 71b84aed9cb6..add337c27be6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 # under /usr/include/pd-l2ork.
 
 pkgname=pd-l2ork
-pkgver=1644.ec3b96b
+pkgver=1656.da84fdf
 pkgrel=1
 pkgdesc="L2Ork (Linux Laptop Orchestra) version of PureData"
 url="http://l2ork.music.vt.edu/main/?page_id=56"
@@ -24,8 +24,13 @@ conflicts=('pd-l2ork')
 install=pd-l2ork.install
 options=('!makeflags')
 source=("$pkgname::git+https://github.com/pd-l2ork/pd.git"
-	"menu_openfile.patch")
-md5sums=('SKIP' '6eb362b0165fc9fc4409e3db5d2278c2')
+	"menu_openfile.patch"
+	"Gem-pix_colorclassify.patch"
+	"RTcmix-pd-LCPLAY-stabilize.patch")
+md5sums=('SKIP'
+         '6eb362b0165fc9fc4409e3db5d2278c2'
+         '33dc1880e38ac8dbc7aa5075bfe49abd'
+         '39c53063dc18681f29b12c08d9c453aa')
 
 pkgver() {
   cd $srcdir/$pkgname
@@ -34,7 +39,14 @@ pkgver() {
 
 prepare() {
   cd $srcdir/$pkgname
-  patch -p1 < ../menu_openfile.patch
+  # patch to make menu_openfile work again
+  patch -p1 < $srcdir/menu_openfile.patch
+  # check out the latest source of all submodules
+  git submodule update --init
+  git submodule foreach git pull origin master
+  # make the sources compile with gcc 6.1+
+  cd $srcdir/$pkgname/Gem && patch -p1 < $srcdir/Gem-pix_colorclassify.patch
+  cd $srcdir/$pkgname/l2ork_addons/rtcmix-in-pd && patch -p1 < $srcdir/RTcmix-pd-LCPLAY-stabilize.patch
 }
 
 build() {
diff --git a/RTcmix-pd-LCPLAY-stabilize.patch b/RTcmix-pd-LCPLAY-stabilize.patch
new file mode 100644
index 000000000000..20f10a8b1669
--- /dev/null
+++ b/RTcmix-pd-LCPLAY-stabilize.patch
@@ -0,0 +1,13 @@
+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,