CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-04 16:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

kodi: Fix build when x11 is disabled

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Khem Raj 2017-05-09 00:57:11 -07:00 committed by Armin Kuster
parent 5506e2ce26
commit bdb16007aa
2 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
meta-multimedia/recipes-mediacenter/kodi/kodi-17/0001-change-order-of-detecting-libegl-and-libgles2.patch Normal file
View File

@ -0,0 +1,32 @@
From 21524598110e7a55113205dda4bc1a6d5987111c Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
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 <raj.khem@gmail.com>
---
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

10
meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb
View File

@ -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"