Update to latest upstream. Also removed some obsolete and unmaintained dependencies.

3 files changed, 10 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1fd036d6a0d5..ffa381b62c0f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Mon Jul  4 10:50:36 UTC 2016
 pkgbase = pd-l2ork-git
 	pkgdesc = L2Ork (Linux Laptop Orchestra) version of PureData (git version)
-	pkgver = r1716.a1424f0
-	pkgrel = 2
+	pkgver = r1760.ecca59b6
+	pkgrel = 1
 	url = http://l2ork.music.vt.edu/main/?page_id=56
 	install = pd-l2ork.install
 	arch = i686
@@ -17,12 +15,11 @@ pkgbase = pd-l2ork-git
 	depends = desktop-file-utils
 	depends = dssi
 	depends = fftw
-	depends = flite1
+	depends = flite
 	depends = fluidsynth
 	depends = freeglut
 	depends = ftgl
 	depends = glew
-	depends = gmerlin
 	depends = gsl
 	depends = gsm
 	depends = hicolor-icon-theme
@@ -39,9 +36,7 @@ pkgbase = pd-l2ork-git
 	depends = libxxf86vm
 	depends = libtiff
 	depends = libiec61883
-	depends = libunicap
 	depends = libraw1394
-	depends = libsndobj-git
 	depends = libv4l
 	depends = libvorbis
 	depends = lua51
@@ -57,11 +52,9 @@ pkgbase = pd-l2ork-git
 	provides = pd-l2ork
 	conflicts = pd-l2ork
 	options = !makeflags
-	source = pd-l2ork-git::git+https://github.com/pd-l2ork/pd.git
-	source = Gem-pix_colorclassify.patch
+	source = pd-l2ork-git::git+https://github.com/pd-l2ork/pd.git#branch=arch-fixes
 	source = RTcmix-pd-LCPLAY-stabilize.patch
 	md5sums = SKIP
-	md5sums = 33dc1880e38ac8dbc7aa5075bfe49abd
 	md5sums = 39c53063dc18681f29b12c08d9c453aa
 
 pkgname = pd-l2ork-git
diff --git a/Gem-pix_colorclassify.patch b/Gem-pix_colorclassify.patch
deleted file mode 100644
index b6ff9756c43b..000000000000
--- a/Gem-pix_colorclassify.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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 640f054075f7..6c624cfbe969 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,29 +11,27 @@
 # under /usr/include/pd-l2ork.
 
 pkgname=pd-l2ork-git
-pkgver=r1716.a1424f0
-pkgrel=2
+pkgver=r1760.ecca59b6
+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')
 license=('BSD')
 depends=('bluez-libs' 'desktop-file-utils' 'dssi' 'fftw'
-  'flite1' 'fluidsynth' 'freeglut' 'ftgl' 'glew' 'gmerlin'
+  'flite' 'fluidsynth' 'freeglut' 'ftgl' 'glew'
   'gsl' 'gsm' 'hicolor-icon-theme' 'imagemagick' 'jack' 'ladspa' 'lame'
   'libdc1394' 'libdv' 'libgl' 'libiec61883' 'libjpeg' 'libquicktime'
-  'libxxf86vm' 'libtiff' 'libiec61883' 'libunicap' 'libraw1394'
-  'libsndobj-git' 'libv4l' 'libvorbis' 'lua51' 'portaudio'
+  'libxxf86vm' 'libtiff' 'libiec61883' 'libraw1394'
+  'libv4l' 'libvorbis' 'lua51' 'portaudio'
   'smpeg' 'speex' 'stk' 'tk' 'tkpng' 'vlc' 'xapian-tcl-bindings' 'zlib')
 makedepends=('autoconf' 'automake' 'libtool' 'git')
 provides=('pd-l2ork')
 conflicts=('pd-l2ork')
 install=pd-l2ork.install
 options=('!makeflags')
-source=("$pkgname::git+https://github.com/pd-l2ork/pd.git"
-	"Gem-pix_colorclassify.patch"
+source=("$pkgname::git+https://github.com/pd-l2ork/pd.git#branch=arch-fixes"
 	"RTcmix-pd-LCPLAY-stabilize.patch")
 md5sums=('SKIP'
-         '33dc1880e38ac8dbc7aa5075bfe49abd'
          '39c53063dc18681f29b12c08d9c453aa')
 
 # Run 'makepkg buildopt=-b' for an incremental build (this skips recompiling
@@ -55,7 +53,6 @@ prepare() {
   # check out the latest source of all submodules
   git submodule update --init
   # make the sources compile with gcc 6.1+
-  cd $srcdir/$pkgname/Gem && patch -Np1 < $srcdir/Gem-pix_colorclassify.patch
   cd $srcdir/$pkgname/l2ork_addons/rtcmix-in-pd && patch -Np1 < $srcdir/RTcmix-pd-LCPLAY-stabilize.patch
 }