From 755ce9dac5b42e1ccf8078d245d74643054a1197 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 6 Apr 2017 08:35:47 +0200
Subject: [PATCH] build: replace android-gl check with a standard GLES3 check

There's no reason to make it Android specific, as it uses standard
include paths.
---
 video/out/opengl/common.h       | 2 +-
 video/out/opengl/header_fixes.h | 2 +-
 wscript                         | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/video/out/opengl/common.h b/video/out/opengl/common.h
index e9bda4918b..b3108d0676 100644
--- a/video/out/opengl/common.h
+++ b/video/out/opengl/common.h
@@ -39,7 +39,7 @@
 #elif HAVE_IOS_GL
 #include <OpenGLES/ES2/glext.h>
 #include <OpenGLES/ES3/glext.h>
-#elif HAVE_ANDROID_GL
+#elif HAVE_STANDARD_GLES3
 #include <GLES3/gl3.h>
 #else
 #include <GL/gl.h>
diff --git a/video/out/opengl/header_fixes.h b/video/out/opengl/header_fixes.h
index d26d77b64d..ec00087b89 100644
--- a/video/out/opengl/header_fixes.h
+++ b/video/out/opengl/header_fixes.h
@@ -67,7 +67,7 @@
 #define GL_BACK_LEFT                      0x0402
 #endif
 
-#if HAVE_ANDROID_GL
+#if HAVE_STANDARD_GLES3
 #define GL_UNSIGNED_BYTE_3_3_2            0x8032
 #define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
 #define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
diff --git a/wscript b/wscript
index 1dd00eb0db..02117044f8 100644
--- a/wscript
+++ b/wscript
@@ -752,9 +752,9 @@ video_output_features = [
             check_statement('GL/gl.h', '(void)GL_LUMINANCE16') # arbitrary OpenGL legacy-only symbol
         ),
     } , {
-        'name': '--android-gl',
-        'desc': 'Android OpenGL ES support',
-        'deps': ['android'],
+        'name': '--standard-gles3',
+        'desc': 'Standard OpenGL ES 3.0 support',
+        'deps_neg': [ 'standard-gl' ],
         'func': check_statement('GLES3/gl3.h', '(void)GL_RGB32F'),  # arbitrary OpenGL ES 3.0 symbol
     } , {
         'name': '--ios-gl',
@@ -763,7 +763,7 @@ video_output_features = [
     } , {
         'name': '--any-gl',
         'desc': 'Any OpenGL (ES) support',
-        'deps_any': ['standard-gl', 'android-gl', 'ios-gl', 'cocoa'],
+        'deps_any': ['standard-gl', 'standard-gles3', 'ios-gl', 'cocoa'],
         'func': check_true
     } , {
         'name': '--plain-gl',