Modified vispy recipe for vispy's internal changes

inclement · inclement · commit 6e2e12da83cf · 2015-10-24T16:58:18.000+01:00
diff --git a/pythonforandroid/recipes/vispy/__init__.py b/pythonforandroid/recipes/vispy/__init__.py
@@ -6,8 +6,9 @@
 
 
 class VispyRecipe(PythonRecipe):
-    version = '0.4.0'
-    url = 'https://github.com/vispy/vispy/archive/v{version}.tar.gz'
+    # version = 'v0.4.0'
+    version = 'master'
+    url = 'https://github.com/vispy/vispy/archive/{version}.tar.gz'
     # version = 'campagnola-scenegraph-update'
     # url = 'https://github.com/campagnola/vispy/archive/scenegraph-update.zip'
     # version = '???'
@@ -25,6 +26,10 @@ def prebuild_arch(self, arch):
         self.apply_patch('disable_font_triage.patch')
         self.apply_patch('use_es2.patch')
         self.apply_patch('remove_ati_check.patch')
+
+        self.apply_patch('make_shader_es2_compliant.patch')
+        self.apply_patch('detect_finger_events.patch')
+
         shprint(sh.touch, join(build_dir, '.patched'))
 
 recipe = VispyRecipe()
diff --git a/tests/vispy_testapp/main.py b/tests/vispy_testapp/main.py
@@ -11,6 +11,9 @@
 print('imported util')
 print(ctypes.util.find_library)
 
+import vispy
+# vispy.set_log_level('debug')
+
 import sys
 from vispy import scene
 from vispy.geometry.torusknot import TorusKnot
@@ -19,6 +22,7 @@
 import numpy as np
 
 canvas = scene.SceneCanvas(keys='interactive', bgcolor='white')
+canvas.unfreeze()
 canvas.view = canvas.central_widget.add_view()
 
 points1 = TorusKnot(5, 3).first_component[:-1]
