jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 06:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/kodi: remove X11-based OpenGL ES support

Browse Source 
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>
This commit is contained in:
Bernd Kuhls 2018-04-01 15:01:07 +02:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent 5c97f7387b
commit 382cb50306
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
package/kodi/Config.in
View File

@ -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 \
|| BR2_PACKAGE_PYTHON_PYC_ONLY || 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 config BR2_PACKAGE_KODI_GL_EGL
bool bool
default y default y
depends on BR2_PACKAGE_HAS_LIBEGL depends on BR2_PACKAGE_HAS_LIBEGL
depends on BR2_PACKAGE_HAS_LIBGL depends on BR2_PACKAGE_HAS_LIBGL
comment "kodi needs an OpenGL EGL with either an openGL or an OpenGL ES backend" comment "kodi needs an OpenGL EGL backend with OpenGL support"
depends on !BR2_PACKAGE_KODI_GL_EGL && !BR2_PACKAGE_KODI_EGL_GLES depends on !BR2_PACKAGE_KODI_GL_EGL
menuconfig BR2_PACKAGE_KODI menuconfig BR2_PACKAGE_KODI
bool "kodi" bool "kodi"
@ -38,7 +31,7 @@ menuconfig BR2_PACKAGE_KODI
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_TOOLCHAIN_USES_MUSL 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_USE_WCHAR
depends on !BR2_STATIC_LIBS # gnutls, python and others depends on !BR2_STATIC_LIBS # gnutls, python and others
depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS

10
package/kodi/kodi.mk
View File

@ -258,16 +258,6 @@ else
KODI_CONF_OPTS += -DENABLE_OPENGL=OFF -DENABLE_X11=OFF KODI_CONF_OPTS += -DENABLE_OPENGL=OFF -DENABLE_X11=OFF
endif 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) ifeq ($(BR2_PACKAGE_KODI_LIBMICROHTTPD),y)
KODI_CONF_OPTS += -DENABLE_MICROHTTPD=ON KODI_CONF_OPTS += -DENABLE_MICROHTTPD=ON
KODI_DEPENDENCIES += libmicrohttpd KODI_DEPENDENCIES += libmicrohttpd