Added more vispy patches

inclement · inclement · commit e799f5e939a6 · 2015-07-15T00:02:35.000+01:00
diff --git a/pythonforandroid/recipes/vispy/disable_font_triage.patch b/pythonforandroid/recipes/vispy/disable_font_triage.patch
@@ -0,0 +1,27 @@
+diff --git a/vispy/util/fonts/_triage.py b/vispy/util/fonts/_triage.py
+index ddbc93d..324c161 100644
+--- a/vispy/util/fonts/_triage.py
++++ b/vispy/util/fonts/_triage.py
+@@ -9,14 +9,14 @@ import sys
+ from ._vispy_fonts import _vispy_fonts
+ if sys.platform.startswith('linux'):
+     from ._freetype import _load_glyph
+-    from ...ext.fontconfig import _list_fonts
+-elif sys.platform == 'darwin':
+-    from ._quartz import _load_glyph, _list_fonts
+-elif sys.platform.startswith('win'):
+-    from ._freetype import _load_glyph  # noqa, analysis:ignore
+-    from ._win32 import _list_fonts  # noqa, analysis:ignore
+-else:
+-    raise NotImplementedError('unknown system %s' % sys.platform)
++    # from ...ext.fontconfig import _list_fonts
++# elif sys.platform == 'darwin':
++#     from ._quartz import _load_glyph, _list_fonts
++# elif sys.platform.startswith('win'):
++#     from ._freetype import _load_glyph  # noqa, analysis:ignore
++#     from ._win32 import _list_fonts  # noqa, analysis:ignore
++# else:
++#     raise NotImplementedError('unknown system %s' % sys.platform)
+ 
+ _fonts = {}
+ 
diff --git a/pythonforandroid/recipes/vispy/disable_freetype.patch b/pythonforandroid/recipes/vispy/disable_freetype.patch
@@ -0,0 +1,31 @@
+diff --git a/vispy/util/fonts/_freetype.py b/vispy/util/fonts/_freetype.py
+index 3b33d0b..229d559 100644
+--- a/vispy/util/fonts/_freetype.py
++++ b/vispy/util/fonts/_freetype.py
+@@ -12,12 +12,12 @@ import numpy as np
+ 
+ # Convert face to filename
+ from ._vispy_fonts import _vispy_fonts, _get_vispy_font_filename
+-if sys.platform.startswith('linux'):
+-    from ...ext.fontconfig import find_font
+-elif sys.platform.startswith('win'):
+-    from ._win32 import find_font  # noqa, analysis:ignore
+-else:
+-    raise NotImplementedError
++# if sys.platform.startswith('linux'):
++#     from ...ext.fontconfig import find_font
++# elif sys.platform.startswith('win'):
++#     from ._win32 import find_font  # noqa, analysis:ignore
++# else:
++#     raise NotImplementedError
+ 
+ _font_dict = {}
+ 
+@@ -41,6 +41,7 @@ def _load_font(face, bold, italic):
+ 
+ def _load_glyph(f, char, glyphs_dict):
+     """Load glyph from font into dict"""
++    return
+     from ...ext.freetype import (FT_LOAD_RENDER, FT_LOAD_NO_HINTING,
+                                  FT_LOAD_NO_AUTOHINT)
+     flags = FT_LOAD_RENDER | FT_LOAD_NO_HINTING | FT_LOAD_NO_AUTOHINT
diff --git a/pythonforandroid/recipes/vispy/use_es2.patch b/pythonforandroid/recipes/vispy/use_es2.patch
@@ -0,0 +1,14 @@
+diff --git a/vispy/gloo/gl/__init__.py b/vispy/gloo/gl/__init__.py
+index 93813fa..c41859c 100644
+--- a/vispy/gloo/gl/__init__.py
++++ b/vispy/gloo/gl/__init__.py
+@@ -210,7 +210,7 @@ def check_error(when='periodic check'):
+ 
+ 
+ # Load default gl backend
+-from . import gl2 as default_backend  # noqa
++from . import es2 as default_backend  # noqa
+ 
+ # Call use to start using our default backend
+-use_gl()
++use_gl('es2')
