aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Bernd Kuhls <bernd.kuhls@t-online.de>2018-04-01 15:01:07 +0200
committerGravatar Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2019-02-06 14:22:28 +0100
commit382cb50306dffa1d81f81808b7b65341d414f05a (patch)
tree126bca7f51447b45a9ac6bf715d8b33245ec8b72
parent5c97f7387b1e508c5bd792bda75c4b9704d59a9f (diff)
downloadbuildroot-382cb50306dffa1d81f81808b7b65341d414f05a.tar.gz
buildroot-382cb50306dffa1d81f81808b7b65341d414f05a.tar.bz2
package/kodi: remove X11-based OpenGL ES support
To prepare the bump to the next Kodi version 18.0-Leia we remove the current OpenGL ES support options. Kodi 18.0 will bring a major overhaul of the supported windowing platforms, x11-based gles support was removed, see upstream PR 12196. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
-rw-r--r--package/kodi/Config.in13
-rw-r--r--package/kodi/kodi.mk10
2 files changed, 3 insertions, 20 deletions
diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index e84f5c4014..700b1e459d 100644
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -15,21 +15,14 @@ comment "kodi needs python w/ .py modules, a uClibc or glibc toolchain w/ C++, t
|| !BR2_PACKAGE_PYTHON \
|| BR2_PACKAGE_PYTHON_PYC_ONLY
-config BR2_PACKAGE_KODI_EGL_GLES
- bool
- default y
- depends on BR2_PACKAGE_HAS_LIBEGL
- depends on BR2_PACKAGE_HAS_LIBGLES
- depends on !BR2_PACKAGE_KODI_GL_EGL # prefer GL if available
-
config BR2_PACKAGE_KODI_GL_EGL
bool
default y
depends on BR2_PACKAGE_HAS_LIBEGL
depends on BR2_PACKAGE_HAS_LIBGL
-comment "kodi needs an OpenGL EGL with either an openGL or an OpenGL ES backend"
- depends on !BR2_PACKAGE_KODI_GL_EGL && !BR2_PACKAGE_KODI_EGL_GLES
+comment "kodi needs an OpenGL EGL backend with OpenGL support"
+ depends on !BR2_PACKAGE_KODI_GL_EGL
menuconfig BR2_PACKAGE_KODI
bool "kodi"
@@ -38,7 +31,7 @@ menuconfig BR2_PACKAGE_KODI
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_TOOLCHAIN_USES_MUSL
- depends on BR2_PACKAGE_KODI_EGL_GLES || BR2_PACKAGE_KODI_GL_EGL
+ depends on BR2_PACKAGE_KODI_GL_EGL
depends on BR2_USE_WCHAR
depends on !BR2_STATIC_LIBS # gnutls, python and others
depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index 8d2430ea55..7039e35ed6 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -258,16 +258,6 @@ else
KODI_CONF_OPTS += -DENABLE_OPENGL=OFF -DENABLE_X11=OFF
endif
-ifeq ($(BR2_PACKAGE_KODI_EGL_GLES),y)
-KODI_DEPENDENCIES += libegl libgles
-KODI_CONF_OPTS += \
- -DENABLE_OPENGLES=ON
-KODI_C_FLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`
-KODI_CXX_FLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`
-else
-KODI_CONF_OPTS += -DENABLE_OPENGLES=OFF
-endif
-
ifeq ($(BR2_PACKAGE_KODI_LIBMICROHTTPD),y)
KODI_CONF_OPTS += -DENABLE_MICROHTTPD=ON
KODI_DEPENDENCIES += libmicrohttpd