1.83.01-1

5 files changed, 79 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a80b2eee8d3e..c1f109e2010d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,13 @@
 pkgbase = psychopy
 	pkgdesc = An experiment builder for neuroscience, psychology and psychophysics
-	pkgver = 1.82.02
+	pkgver = 1.83.01
 	pkgrel = 1
 	url = http://www.psychopy.org
+	install = psychopy.install
 	arch = any
 	license = GPL
 	makedepends = python2-setuptools
+	depends = desktop-file-utils
 	depends = python2
 	depends = wxpython
 	depends = python2-numpy
@@ -27,6 +29,7 @@ pkgbase = psychopy
 	depends = python2-gevent
 	depends = python2-msgpack
 	depends = python2-xlib
+	depends = python2-pytables
 	optdepends = python2-pyparallel: To use the parallel port
 	optdepends = python2-pyserial: For interfacing with the serial port
 	optdepends = parallel-python: For parallel processing
@@ -34,9 +37,12 @@ pkgbase = psychopy
 	optdepends = python2-pytest: For running unit tests
 	optdepends = python2-coverage: For running unit tests
 	optdepends = python2-sphinx: For building documentation
-	options = !emptydirs
-	source = http://downloads.sourceforge.net/project/psychpy/PsychoPy/PsychoPy-1.82.02.zip
-	md5sums = 52309280bdca4408970aab0952c674e4
+	source = https://github.com/psychopy/psychopy/archive/1.83.01.tar.gz
+	source = linux2.patch
+	source = run.py.patch
+	md5sums = 57d0fe33ef8d99494f9488acc20993bf
+	md5sums = 3b55a69e8b37a621d8d1346aa2239fc6
+	md5sums = fd17a958a52b72ff5ecaa1a2861c361c
 
 pkgname = psychopy
 
diff --git a/PKGBUILD b/PKGBUILD
index 04b4e9a9764f..8ae792450337 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,14 @@
 # Contributor: Martin Corley <Martin.Corley@ed.ac.uk>
 
 pkgname=psychopy
-pkgver=1.82.02
+pkgver=1.83.01
 pkgrel=1
 pkgdesc="An experiment builder for neuroscience, psychology and psychophysics"
 arch=(any)
 url="http://www.psychopy.org"
 license=(GPL)
-makedepends=('python2-setuptools')
-depends=('python2' 'wxpython' 'python2-numpy' 'python2-pandas' 'python2-scipy' 'python2-imaging' 'python2-lxml' 'python2-pyglet' 'python2-matplotlib' 'glu' 'python2-pyo' 'python2-opengl' 'python2-pygame' 'avbin7' 'python2-openpyxl' 'ttf-freefont' 'python2-psutil' 'python2-yaml' 'python2-gevent' 'python2-msgpack' 'python2-xlib')
-
+makedepends=(python2-setuptools)
+depends=(desktop-file-utils python2 wxpython python2-numpy python2-pandas python2-scipy python2-imaging python2-lxml python2-pyglet python2-matplotlib glu python2-pyo python2-opengl python2-pygame avbin7 python2-openpyxl ttf-freefont python2-psutil python2-yaml python2-gevent python2-msgpack python2-xlib python2-pytables)
 optdepends=(
 'python2-pyparallel: To use the parallel port'
 'python2-pyserial: For interfacing with the serial port'
@@ -20,19 +19,34 @@ optdepends=(
 'python2-coverage: For running unit tests'
 'python2-sphinx: For building documentation'
 )
-
-options=(!emptydirs)
-source=("http://downloads.sourceforge.net/project/psychpy/PsychoPy/PsychoPy-${pkgver}.zip")
-md5sums=('52309280bdca4408970aab0952c674e4')
-
+install="${pkgname}.install"
+source=("https://github.com/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz"
+        'linux2.patch'
+        'run.py.patch')
+md5sums=('57d0fe33ef8d99494f9488acc20993bf'
+         '3b55a69e8b37a621d8d1346aa2239fc6'
+         'fd17a958a52b72ff5ecaa1a2861c361c')
 
 prepare() {
-  sed -i 's/py.test /py.test2 /' "${srcdir}/PsychoPy-${pkgver}/${pkgname}/tests/run.py"
+  # Deal with iohub issues
+  patch "${srcdir}/${pkgname}-${pkgver}/psychopy/iohub/devices/mouse/linux2.py" < \
+      "${srcdir}/linux2.patch"
+  patch "${srcdir}/${pkgname}-${pkgver}/psychopy/demos/coder/iohub/elotouchscreen/run.py" < \
+      "${srcdir}/run.py.patch"
+
+  # Make sure all calls are to python2 functions
+  sed -i 's/py.test /py.test2 /' "${srcdir}/${pkgname}-${pkgver}/psychopy/tests/run.py"
 }
 
 package() {
-  (cd "${srcdir}/PsychoPy-${pkgver}"; python2 setup.py install --root="${pkgdir}/" --optimize=1)
-  install -m 755 "${srcdir}/PsychoPy-${pkgver}/${pkgname}/app/psychopyApp.py" "${pkgdir}/usr/bin/"
-  install -Dm644 "${srcdir}/PsychoPy-${pkgver}/${pkgname}/app/Resources/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -Dm644 "${srcdir}/PsychoPy-${pkgver}/${pkgname}/app/Resources/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+  (cd "${srcdir}/${pkgname}-${pkgver}"; \
+      python2 setup.py install --root="${pkgdir}/" --optimize=1)
+  install -m 755 "${srcdir}/${pkgname}-${pkgver}/psychopy/app/psychopyApp.py" \
+      "${pkgdir}/usr/bin/"
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/psychopy/app/Resources/${pkgname}.desktop" \
+      "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/psychopy/app/Resources/${pkgname}.png" \
+      "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/psychopy/app/Resources/${pkgname}.xml" \
+      "${pkgdir}/usr/share/mime/packages/${pkgname}.xml"
 }
diff --git a/linux2.patch b/linux2.patch
new file mode 100644
index 000000000000..9fb0d3396384
--- /dev/null
+++ b/linux2.patch
@@ -0,0 +1,28 @@
+@@ -9,6 +9,7 @@
+ from . import MouseDevice
+ from ... import print2err,MouseConstants,printExceptionDetailsToStdErr
+ from .. import Computer,Keyboard
++from .. import xlib
+ 
+ currentSec=Computer.getTime
+ 
+@@ -33,8 +34,6 @@
+         if Mouse._xdll is None:
+             try:
+                 Mouse._xdll = cdll.LoadLibrary('libX11.so') 
+-                Mouse._xdisplay = self._xdll.XOpenDisplay(None) 
+-                Mouse._xscreen_count = self._xdll.XScreenCount(self._xdisplay)  
+                 try:
+                     # should use linux cmd:
+                     # find /usr/lib -name libXfixes.so\*
+@@ -49,6 +48,10 @@
+             except:
+                 print2err('ERROR: Mouse._xdll is None. libX11.so cound not be found')
+                
++
++        Mouse._xdisplay = xlib.XOpenDisplay(None)
++        Mouse._xscreen_count = xlib.XScreenCount(Mouse._xdisplay)
++
+         if Mouse._xfixsdll and self._xdll and self._display_device and self._display_device._xwindow is None:
+             self._display_device._xwindow= self._xdll.XRootWindow(Mouse._xdisplay, self._display_device.getIndex())
+ 
diff --git a/psychopy.install b/psychopy.install
new file mode 100644
index 000000000000..bca322ab7d35
--- /dev/null
+++ b/psychopy.install
@@ -0,0 +1,4 @@
+post_install() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime
+}
diff --git a/run.py.patch b/run.py.patch
new file mode 100644
index 000000000000..d4a99b3d898e
--- /dev/null
+++ b/run.py.patch
@@ -0,0 +1,9 @@
+@@ -44,7 +44,7 @@
+         #   query_reply=touch.queryDevice('ID') 
+         #   
+         id_dict=touch.queryDevice('ID')
+-        print("queryDevice('ID'):" + str(,id_dict))
++        print("queryDevice('ID'):" + str(id_dict))
+         print()
+         
+         # getHardwareConfiguration returns the results from the following