Latest upstream.

3 files changed, 11 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3367b22ed29c..8491db43fd75 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Mar 23 11:08:37 UTC 2018
+# Sat Mar 24 06:22:34 UTC 2018
 pkgbase = purr-data
 	pkgdesc = Jonathan Wilkes' nw.js variant of Pd-L2Ork (git version)
-	pkgver = 2.5.0.r3907.d05f676a
+	pkgver = 2.5.0.r3910.66b9344d
 	pkgrel = 1
 	url = https://agraef.github.io/purr-data/
 	install = purr-data.install
@@ -61,11 +61,9 @@ pkgbase = purr-data
 	options = !makeflags
 	options = !strip
 	source = purr-data::git+https://bitbucket.org/agraef/purr-data.git#branch=release
-	source = RTcmix-pd-LCPLAY-stabilize.patch
 	source = gem-magick6-fixes.patch
 	md5sums = SKIP
-	md5sums = 39c53063dc18681f29b12c08d9c453aa
-	md5sums = 63c6794adbc47e4c239eeb50ed30bfa8
+	md5sums = 6f9b87db6e73a35ec63327e97ad95d66
 	source_i686 = http://dl.nwjs.io/v0.22.1/nwjs-sdk-v0.22.1-linux-ia32.tar.gz
 	md5sums_i686 = e4708d59006219eaa2c54cdb1d682794
 	source_x86_64 = http://dl.nwjs.io/v0.22.1/nwjs-sdk-v0.22.1-linux-x64.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 71af925e4be2..1a390c672af1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -30,7 +30,7 @@
 # /usr/lib/purr-data, so that 3rd party externals know where to find these.
 
 pkgname=purr-data
-pkgver=2.5.0.r3907.d05f676a
+pkgver=2.5.0.r3910.66b9344d
 pkgrel=1
 pkgdesc="Jonathan Wilkes' nw.js variant of Pd-L2Ork (git version)"
 url="https://agraef.github.io/purr-data/"
@@ -58,11 +58,9 @@ options=('!makeflags' '!strip')
 # deal with situations where upstream lags behind on already submitted merge
 # requests with important bugfixes and additions.
 source=("$pkgname::git+https://bitbucket.org/agraef/purr-data.git#branch=release"
-	"RTcmix-pd-LCPLAY-stabilize.patch"
 	"gem-magick6-fixes.patch")
 md5sums=('SKIP'
-         '39c53063dc18681f29b12c08d9c453aa'
-         '63c6794adbc47e4c239eeb50ed30bfa8')
+         '6f9b87db6e73a35ec63327e97ad95d66')
 # nw.js sdk binaries
 nwjsname=nwjs-sdk
 nwjsver=0.22.1
@@ -105,8 +103,6 @@ prepare() {
   # copy the nw.js sources to where purr-data wants them
   rm -rf pd/nw/nw
   cp -a $srcdir/$nwjsname-v$nwjsver-linux-$_arch pd/nw/nw
-  # make the sources compile with gcc 6.1+
-  cd $srcdir/$pkgname/externals/rtcmix-in-pd && patch -Np1 < $srcdir/RTcmix-pd-LCPLAY-stabilize.patch
   # make sure to link Gem with ImageMagick 6, it doesn't compile with 7
   cd $srcdir/$pkgname && patch -Np1 < $srcdir/gem-magick6-fixes.patch
 }
diff --git a/gem-magick6-fixes.patch b/gem-magick6-fixes.patch
index 6f1eb8abe5f1..13a4059e4a50 100644
--- a/gem-magick6-fixes.patch
+++ b/gem-magick6-fixes.patch
@@ -1,15 +1,15 @@
 diff --git a/externals/Makefile b/externals/Makefile
-index e60a73c9..09066109 100644
+index 414e1e2e..b7cfa952 100644
 --- a/externals/Makefile
 +++ b/externals/Makefile
-@@ -658,6 +658,10 @@ $(gem_src)/Gem.pd_linux: $(gem_src)/configure
+@@ -667,6 +667,10 @@ $(gem_src)/Gem.pd_linux: $(gem_src)/configure
  	test -s $(gem_src)/Gem.pd_linux || \
  		cd $(gem_src) && ./configure \
  			CXXFLAGS="-DHAVE_S_STUFF_H" \
-+			PKG_IMAGEMAGICK___CFLAGS="$(shell pkg-config --cflags ImageMagick-6.Q16HDRI)" \
-+			PKG_IMAGEMAGICK___LIBS="$(shell pkg-config --libs ImageMagick-6.Q16HDRI)" \
-+			PKG_MAGICKCORE_CFLAGS="$(shell pkg-config --cflags MagickCore-6.Q16HDRI)" \
-+			PKG_MAGICKCORE_LIBS="$(shell pkg-config --libs MagickCore-6.Q16HDRI)" \
++			PKG_IMAGEMAGICK___CFLAGS="$(shell PKG_CONFIG_PATH=/usr/lib/imagemagick6/pkgconfig pkg-config --cflags ImageMagick-6.Q16HDRI)" \
++			PKG_IMAGEMAGICK___LIBS="$(shell PKG_CONFIG_PATH=/usr/lib/imagemagick6/pkgconfig pkg-config --libs ImageMagick-6.Q16HDRI)" \
++			PKG_MAGICKCORE_CFLAGS="$(shell PKG_CONFIG_PATH=/usr/lib/imagemagick6/pkgconfig pkg-config --cflags MagickCore-6.Q16HDRI)" \
++			PKG_MAGICKCORE_LIBS="$(shell PKG_CONFIG_PATH=/usr/lib/imagemagick6/pkgconfig pkg-config --libs MagickCore-6.Q16HDRI)" \
  			--prefix=$(prefix) \
  			--with-video=plugins \
  			--with-film=plugins \