Small changes to vispy and python2 recipes

inclement · inclement · commit 46631d0cdde4 · 2015-10-04T14:33:36.000+01:00
diff --git a/pythonforandroid/recipes/python2/__init__.py b/pythonforandroid/recipes/python2/__init__.py
@@ -30,7 +30,8 @@ def prebuild_armeabi(self):
         self.apply_patch(join('patches', 'fix-remove-corefoundation.patch'))
         self.apply_patch(join('patches', 'fix-dynamic-lookup.patch'))
         self.apply_patch(join('patches', 'fix-dlfcn.patch'))
-        self.apply_patch(join('patches', 'ctypes-find-library.patch'))
+        # self.apply_patch(join('patches', 'ctypes-find-library.patch'))
+        self.apply_patch(join('patches', 'ctypes-find-library-updated.patch'))
 
         if uname()[0] == 'Linux':
             self.apply_patch(join('patches', 'fix-configure-darwin.patch'))
diff --git a/pythonforandroid/recipes/vispy/__init__.py b/pythonforandroid/recipes/vispy/__init__.py
@@ -8,8 +8,10 @@
 class VispyRecipe(PythonRecipe):
     version = '0.4.0'
     url = 'https://github.com/vispy/vispy/archive/v{version}.tar.gz'
+    # version = 'campagnola-scenegraph-update'
+    # url = 'https://github.com/campagnola/vispy/archive/scenegraph-update.zip'
 
-    depends = ['python2', 'numpy']
+    depends = ['python2', 'numpy', 'pysdl2']
 
     def prebuild_arch(self, arch):
         super(VispyRecipe, self).prebuild_arch(arch)
@@ -20,6 +22,7 @@ def prebuild_arch(self, arch):
         self.apply_patch('disable_freetype.patch')
         self.apply_patch('disable_font_triage.patch')
         self.apply_patch('use_es2.patch')
+        self.apply_patch('remove_ati_check.patch')
         shprint(sh.touch, join(build_dir, '.patched'))
 
 recipe = VispyRecipe()
