Update to latest upstream, remove some obsolete and unmaintained dependencies.

3 files changed, 11 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fd499e2dcb91..7063d28cd7c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sat Nov 19 18:09:52 UTC 2016
 pkgbase = pd-l2ork
 	pkgdesc = L2Ork (Linux Laptop Orchestra) version of PureData
-	pkgver = 20161118.r1722.de1ee11
+	pkgver = 20190809.r1761.eab3e978
 	pkgrel = 1
 	url = http://l2ork.music.vt.edu/main/?page_id=56
 	install = pd-l2ork.install
@@ -18,12 +16,11 @@ pkgbase = pd-l2ork
 	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
@@ -40,9 +37,7 @@ pkgbase = pd-l2ork
 	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
 	depends = zlib
 	conflicts = pd-l2ork
 	options = !makeflags
-	source = pd-l2ork::git+https://github.com/pd-l2ork/pd.git#commit=de1ee118b8fa712cc1cec65da23216ad93e72b5b
-	source = Gem-pix_colorclassify.patch
+	source = pd-l2ork::git+https://github.com/pd-l2ork/pd.git#commit=eab3e978654b2d8cb0df5095f34481c09f56689d
 	source = RTcmix-pd-LCPLAY-stabilize.patch
 	md5sums = SKIP
-	md5sums = 33dc1880e38ac8dbc7aa5075bfe49abd
 	md5sums = 39c53063dc18681f29b12c08d9c453aa
 
 pkgname = pd-l2ork
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 15f98c3fc8b6..2a9ddd7ecd96 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,28 +10,26 @@
 # under /usr/include/pd-l2ork.
 
 pkgname=pd-l2ork
-pkgver=20161118.r1722.de1ee11
+pkgver=20190809.r1761.eab3e978
 pkgrel=1
 pkgdesc="L2Ork (Linux Laptop Orchestra) version of PureData"
 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' 'rsync')
 conflicts=('pd-l2ork')
 install=pd-l2ork.install
 options=('!makeflags')
-source=("$pkgname::git+https://github.com/pd-l2ork/pd.git#commit=de1ee118b8fa712cc1cec65da23216ad93e72b5b"
-	"Gem-pix_colorclassify.patch"
+source=("$pkgname::git+https://github.com/pd-l2ork/pd.git#commit=eab3e978654b2d8cb0df5095f34481c09f56689d"
 	"RTcmix-pd-LCPLAY-stabilize.patch")
 md5sums=('SKIP'
-         '33dc1880e38ac8dbc7aa5075bfe49abd'
          '39c53063dc18681f29b12c08d9c453aa')
 
 # Run 'makepkg buildopt=-b' for an incremental build (this skips recompiling
@@ -53,7 +51,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
 }
 
@@ -63,7 +60,9 @@ build() {
   unset INCLUDES
 
   cd $srcdir/$pkgname/l2ork_addons
-  ./tar_em_up.sh $buildopt -n
+  # -k: try to fix IEM GUI sizes (needed since tar_em_up.sh will only detect
+  # newer Ubuntu systems automagically)
+  ./tar_em_up.sh $buildopt -n -k
 }
 
 package() {