From 74590c783cbfbc70271823ad3364909201525b05 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Wed, 8 Mar 2017 18:21:28 +0100 Subject: kodi: Don't append to PACKAGECONFIG, fix disabling opengl It's hard to override from a distro config and the defaults are unsuitable for EGL platforms. Signed-off-by: Andreas Oberritter --- meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb b/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb index 46a316b40a..3925dda903 100644 --- a/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb +++ b/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb @@ -93,12 +93,12 @@ 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} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', 'openglesv2', d)}" -PACKAGECONFIG[opengl] = "--enable-gl,--enable-gles," -PACKAGECONFIG[openglesv2] = "--enable-gles,--enable-gl,virtual/egl" +PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl," +PACKAGECONFIG[openglesv2] = "--enable-gles,--disable-gles,virtual/egl" PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5" -- cgit 1.2.3-korg