5.0

3 files changed, 24 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7089efb2d60f..e50f6177a6a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = brainworkshop
 	pkgdesc = Brain Workshop is a free open-source version of the Dual N-Back mental exercise
-	pkgver = 4.8.4
-	pkgrel = 7
-	url = http://brainworkshop.sourceforge.net/
+	pkgver = 5.0
+	pkgrel = 1
+	url = https://github.com/samcv/brainworkshop
 	install = brainworkshop.install
 	arch = any
 	license = GPL
-	depends = python2-pyglet
-	depends = avbin7
+	depends = python-pyglet
 	depends = openal
-	source = http://downloads.sourceforge.net/brainworkshop/brainworkshop-4.8.4.zip
+	depends = ffmpeg
+	source = https://github.com/samcv/brainworkshop/archive/v5.0.tar.gz
 	source = brainworkshop.sh
 	source = brainworkshop.desktop
-	sha256sums = bb1f259eda90e945a803524eedbc0087283e3fb9ae2ab4c16ded88c8c4e95b15
-	sha256sums = 6b11101f516bf5d7479b2f9c1bb43f7764ed4ace41ae2272aaea37a18c5b4a53
+	sha256sums = 06844b8dbfc56ddfe4271457e78b915d2d30828a6047738666760684da7dbbfa
+	sha256sums = 13b70c017b98586e32e14b498bbe56e36ee067b4904030d1fcdd7f4a6779db29
 	sha256sums = 1e645c18ce0648f82285da25a5bbbad1e63e282bfe9d5c31329eb9d04c23f21c
 
 pkgname = brainworkshop
diff --git a/PKGBUILD b/PKGBUILD
index c444764b3189..573113fe513e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,35 @@
-# Contributor: Keerthan Jaic <jckeerthan at gmail dot com>
 pkgname=brainworkshop
-pkgver=4.8.4
-pkgrel=7
+pkgver=5.0
+pkgrel=1
 pkgdesc="Brain Workshop is a free open-source version of the Dual N-Back mental exercise"
 arch=('any')
-url="http://brainworkshop.sourceforge.net/"
+url="https://github.com/samcv/brainworkshop"
 license=('GPL')
-depends=('python2-pyglet' 'avbin7' 'openal')
+depends=('python-pyglet' 'openal' 'ffmpeg')
 install='brainworkshop.install'
-source=(http://downloads.sourceforge.net/brainworkshop/$pkgname-$pkgver.zip
+source=("https://github.com/samcv/brainworkshop/archive/v${pkgver}.tar.gz"
         brainworkshop.sh
         brainworkshop.desktop)
-sha256sums=('bb1f259eda90e945a803524eedbc0087283e3fb9ae2ab4c16ded88c8c4e95b15'
-            '6b11101f516bf5d7479b2f9c1bb43f7764ed4ace41ae2272aaea37a18c5b4a53'
+sha256sums=('06844b8dbfc56ddfe4271457e78b915d2d30828a6047738666760684da7dbbfa'
+            '13b70c017b98586e32e14b498bbe56e36ee067b4904030d1fcdd7f4a6779db29'
             '1e645c18ce0648f82285da25a5bbbad1e63e282bfe9d5c31329eb9d04c23f21c')
-
 prepare () {
-  cd "${srcdir}/${pkgname}"
-  sed -i "s|halign='middle'|align='center'|g" brainworkshop.pyw
-
-  # ManagedSoundPlayer was deprecated
-  sed -i "s|ManagedSoundPlayer|Player|g" brainworkshop.pyw
-
-  # avbin moved
-  sed -i "s|from pyglet.media import avbin|from pyglet.media.sources import avbin|g" brainworkshop.pyw
-
-  # set_position was deprecated
-  sed -i "s|.set_position|.position = |g" brainworkshop.pyw
+  cd "${srcdir}/brainworkshop-${pkgver}"
 }
 
 package() {
-
   #Data
-  _datadir="${pkgdir}/usr/share/${pkgname}"
+  _datadir="${pkgdir}/usr/share/brainworkshop"
   install -d ${_datadir}
-  cp -a ${srcdir}/${pkgname}/{brainworkshop.pyw,res,data} ${_datadir}
+  cp -a ${srcdir}/brainworkshop-${pkgver}/{brainworkshop.pyw,res,data} ${_datadir}
 
   #Docs
-  _docdir=${pkgdir}/usr/share/doc/${pkgname}
+  _docdir=${pkgdir}/usr/share/doc/brainworkshop
   install -d "${_docdir}"
-  install -D -m644 "${srcdir}/${pkgname}/Readme.txt" "${_docdir}"
+  install -D -m644 "${srcdir}/brainworkshop-${pkgver}/Readme.md" "${_docdir}"
 
   #Launcher and Icon
-  install -Dm75 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-  install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -D -m644 "${srcdir}/${pkgname}/res/misc/brain/brain.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+  install -Dm75 "${srcdir}/brainworkshop.sh" "${pkgdir}/usr/bin/brainworkshop"
+  install -D -m644 "${srcdir}/brainworkshop.desktop" "${pkgdir}/usr/share/applications/brainworkshop.desktop"
+  install -D -m644 "${srcdir}/brainworkshop-${pkgver}/res/misc/brain/brain.png" "${pkgdir}/usr/share/pixmaps/brainworkshop.png"
 }
diff --git a/brainworkshop.sh b/brainworkshop.sh
index 008468e15d39..8cebb67a97ff 100755
--- a/brainworkshop.sh
+++ b/brainworkshop.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-python2 /usr/share/brainworkshop/brainworkshop.pyw --resdir /usr/share/brainworkshop/res
+python /usr/share/brainworkshop/brainworkshop.pyw --resdir /usr/share/brainworkshop/res