From ecf010966c8bbc3192011c96d5d721c21a2edd71 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 9 May 2017 00:57:11 -0700 Subject: kodi: Fix build when x11 is disabled Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- ...ge-order-of-detecting-libegl-and-libgles2.patch | 32 ++++++++++++++++++++++ .../recipes-mediacenter/kodi/kodi_17.bb | 10 ++++--- 2 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 meta-multimedia/recipes-mediacenter/kodi/kodi-17/0001-change-order-of-detecting-libegl-and-libgles2.patch (limited to 'meta-multimedia/recipes-mediacenter') diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0001-change-order-of-detecting-libegl-and-libgles2.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0001-change-order-of-detecting-libegl-and-libgles2.patch new file mode 100644 index 0000000000..12a6c06e82 --- /dev/null +++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0001-change-order-of-detecting-libegl-and-libgles2.patch @@ -0,0 +1,32 @@ +From 21524598110e7a55113205dda4bc1a6d5987111c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 9 May 2017 06:41:33 +0000 +Subject: [PATCH] change order of detecting libegl and libgles2 + +This actually helps building it on rpi/userland +where libEGL depends on few functions from libGLESv2 +see +https://www.raspberrypi.org/forums/viewtopic.php?t=7090 + +Signed-off-by: Khem Raj +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b9e4240..1ca0297 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -951,8 +951,8 @@ if test "$use_gles" = "yes"; then + AC_MSG_RESULT(== WARNING: OpenGLES support is assumed.) + LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lmmal -lmmal_core -lmmal_util -lvcsm" + else +- AC_CHECK_LIB([EGL], [main],, AC_MSG_ERROR($missing_library)) + AC_CHECK_LIB([GLESv2],[main],, AC_MSG_ERROR($missing_library)) ++ AC_CHECK_LIB([EGL], [main],, AC_MSG_ERROR($missing_library)) + fi + fi + else +-- +1.9.1 + diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb b/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb index 8f75bb48de..23f09af51b 100644 --- a/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb +++ b/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb @@ -77,6 +77,7 @@ SRC_URI = "git://github.com/xbmc/xbmc.git;branch=Krypton \ file://0010-RssReader-Fix-compiler-warning-comparing-pointer-to-.patch \ file://0011-Let-configure-pass-on-unknown-architectures-setting-.patch \ file://0012-Revert-droid-fix-builds-with-AML-disabled.patch \ + file://0001-change-order-of-detecting-libegl-and-libgles2.patch \ " SRC_URI_append_libc-musl = " \ @@ -86,7 +87,9 @@ SRC_URI_append_libc-musl = " \ SRC_URI[addons.md5sum] = "719614fa764011a18665d08af5c8c92f" SRC_URI[addons.sha256sum] = "350da57408c27473eaf40e7f544bc94841bf101dc4346085260c5c4af0adac97" -inherit autotools-brokensep gettext pythonnative +inherit autotools-brokensep gettext pythonnative distro_features_check + +REQUIRED_DISTRO_FEATURES += "opengl" S = "${WORKDIR}/git" @@ -97,9 +100,8 @@ ACCEL ?= "" ACCEL_x86 = "vaapi vdpau" ACCEL_x86-64 = "vaapi vdpau" -PACKAGECONFIG ??= "${ACCEL}" -PACKAGECONFIG_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' x11', '', d)}" -PACKAGECONFIG_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', ' opengl', ' openglesv2', d)}" +PACKAGECONFIG ??= "${ACCEL} opengl" +PACKAGECONFIG_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' x11', ' openglesv2', d)}" PACKAGECONFIG[opengl] = "--enable-gl,--enable-gles," PACKAGECONFIG[openglesv2] = "--enable-gles,--enable-gl,virtual/egl" -- cgit 1.2.3-korg