update for 0.19

2 files changed, 27 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 11281b8d9f6d..134a539bc93e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = fluxus-git
 	pkgdesc = A 3D game engine for livecoding worlds into existence
-	pkgver = v0.17rc5.r224.gd06cb52
-	pkgrel = 3
+	pkgver = v0.19
+	pkgrel = 1
 	url = http://www.pawfal.org/fluxus/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = git
-	makedepends = scons
+	makedepends = python2-scons
 	depends = ode
 	depends = fftw
 	depends = liblo
@@ -18,10 +18,8 @@ pkgbase = fluxus-git
 	depends = racket
 	provides = fluxus
 	conflicts = fluxus
-	source = git://git.savannah.nongnu.org/fluxus.git
-	source = use-constexpr.patch
+	source = git://gitlab.com/defaultxr/fluxus.git
 	md5sums = SKIP
-	md5sums = a92ca1ff4275308cdb43f17cd775b65c
 
 pkgname = fluxus-git
 
diff --git a/PKGBUILD b/PKGBUILD
index faeaeb0630c8..25a5c2182b31 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,42 @@
-# Maintainer:  Alain Kalker <a.c.kalker@gmail.com>
+# Maintainer: modula t. <defaultxr at gmail dot com>
+# Contributor: Alain Kalker <a.c.kalker at gmail dot com>
+
 _pkgname=fluxus
 pkgname=${_pkgname}-git
-pkgver=v0.17rc5.r224.gd06cb52
-pkgrel=3
+pkgver=v0.19
+pkgrel=1
 pkgdesc="A 3D game engine for livecoding worlds into existence"
 arch=('i686' 'x86_64')
 url="http://www.pawfal.org/fluxus/"
 license=('GPL')
 depends=('ode' 'fftw' 'liblo' 'glew' 'jack' 'freeglut' 'openal' 'racket')
-makedepends=('git' 'scons')
+makedepends=('git' 'python2-scons')
 provides=('fluxus')
 conflicts=('fluxus')
-source=(git://git.savannah.nongnu.org/fluxus.git
-        use-constexpr.patch)
-md5sums=('SKIP'
-         'a92ca1ff4275308cdb43f17cd775b65c')
-
-pkgver() {
-  cd "$srcdir/$_pkgname"
-  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
-  cd "$srcdir/$_pkgname"
+source=('git://gitlab.com/defaultxr/fluxus.git')
+md5sums=('SKIP')
 
-  # Fix boot script path
-  sed -i -e 's,/usr/local,/usr,' src/Interpreter.cpp
-
-  # Fix compile error on GCC 6.1 and above
-  patch -p1 -i "${srcdir}/use-constexpr.patch"
-}
+# pkgver() {
+#     cd "$srcdir/$_pkgname"
+#     git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+# }
 
 build() {
-  cd "$srcdir/$_pkgname"
+    cd "$srcdir/$_pkgname"
 
-  scons Prefix=/usr RacketPrefix=/usr
+    scons2 Prefix=/usr RacketPrefix=/usr
+    cd docs/helpmap
+    ./makehelpmap.scm
 }
 
 package() {
-  cd "$srcdir/$_pkgname"
+    cd "$srcdir/$_pkgname"
 
-  scons DESTDIR="$pkgdir/" Prefix=/usr RacketPrefix=/usr install
+    scons2 DESTDIR="$pkgdir/" Prefix=/usr RacketPrefix=/usr install
 
-  # Install icon and desktop file
-  install -d "$pkgdir"/usr/share/pixmaps
-  install -m 644 modules/material/textures/fluxus-icon.png "$pkgdir"/usr/share/pixmaps
-  install -d "$pkgdir"/usr/share/applications
-  install -m 644 debian/fluxus.desktop "$pkgdir"/usr/share/applications
+    # Install icon and desktop file
+    install -d "$pkgdir"/usr/share/pixmaps
+    install -m 644 modules/material/textures/fluxus-icon.png "$pkgdir"/usr/share/pixmaps
+    install -d "$pkgdir"/usr/share/applications
+    install -m 644 debian/fluxus.desktop "$pkgdir"/usr/share/applications
 }
-
-# vim:set ts=2 sw=2 et: