On Fri, Mar 08, 2019 at 07:15:51PM -0500, Ruei, Eric wrote: > On 3/8/2019 6:47 PM, Denys Dmytriyenko wrote: > >On Fri, Mar 08, 2019 at 06:02:06PM -0500, Eric Ruei wrote: > >>- enable gbm/kms for eglfs_kms > >>- fix compiling error at platform/eglfs_kms > >>- remove unused patch which has been upstreamed > >> > >>Signed-off-by: Eric Ruei <[email protected]> > >>--- > >>+ > >>diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend > >>b/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend > >>index 4cb8f9c..1570e1f 100644 > >>--- a/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend > >>+++ b/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend > >>@@ -4,7 +4,14 @@ GLES_EXTRA_DEPS = "libdrm wayland" > >> PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl > >> ${GLES_EXTRA_DEPS}" > >>-PR_append = ".arago13" > >>+# the orginal gbm packageconfig requires virtual/libgbm > > > >Shouldn't be doing this. Our own libgbm should now provide virtual/libgbm - > >sent a patch to meta-ti. > > > > > Got it. I shall remove this. > > > > >>+# Implement the patch here > >>+ > >>+PACKAGECONFIG[gbm] = "-gbm,-no-gbm,drm virtual/egl" > >>+PACKAGECONFIG += "gbm" > >>+PACKAGECONFIG += "kms" > > > >Any PACKAGECONFIG settings should be done in the distro conf. > > > > > I do not understand. This is addition to qtbase specific PACKAGECONFIG as > defined at qtbase_git.bb:
A recipe defines different PACKAGECONFIG options and a sane default set of them to be enabled by default: PACKAGECONFIG[a] = "..." PACKAGECONFIG[b] = "..." PACKAGECONFIG[c] = "..." PACKAGECONFIG = "a c" It is not recommended to change the default set in the recipe itself or in a bbappend. It is recommended to tweak it in a specific configuration - could be distro.conf, could be local.conf, etc. We do this in arago.conf: http://arago-project.org/git/?p=meta-arago.git;a=blob;f=meta-arago-distro/conf/distro/arago.conf;hb=HEAD#l102 It also can be conditional based on DISTRO_FEATURES, or anything else... > # separate some parts of PACKAGECONFIG which are often changed > PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', > '', d)}" > PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', > 'directfb', '', d)}" > PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb > xinput2 glib xkb xkbcommon-evdev', '', d)}" > PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm > cups fontconfig kms gbm libinput', '', d)}" > PACKAGECONFIG_FONTS ?= "" > PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" > PACKAGECONFIG_DISTRO ?= "" > # Either release or debug, can be overridden in bbappends > PACKAGECONFIG_RELEASE ?= "release" > # This is in qt5.inc, because qtwebkit-examples are using it to enable > ca-certificates dependency > # PACKAGECONFIG_OPENSSL ?= "openssl" > PACKAGECONFIG_DEFAULT ?= "dbus udev evdev widgets tools libs freetype tests > \ > ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size > ltcg', '', d)} \ > ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)} > \ > " > > PACKAGECONFIG ?= " \ > ${PACKAGECONFIG_RELEASE} \ > ${PACKAGECONFIG_DEFAULT} \ > ${PACKAGECONFIG_OPENSSL} \ > ${PACKAGECONFIG_GL} \ > ${PACKAGECONFIG_FB} \ > ${PACKAGECONFIG_X11} \ > ${PACKAGECONFIG_KDE} \ > ${PACKAGECONFIG_FONTS} \ > ${PACKAGECONFIG_SYSTEM} \ > ${PACKAGECONFIG_DISTRO} \ > " > > Eric > > >>+ > >>+PR_append = ".arago14" > >> QT_CONFIG_FLAGS += "-qpa ${@bb.utils.contains('DISTRO_FEATURES', > >> 'wayland', 'wayland', 'eglfs', d)}" > >>@@ -14,12 +21,11 @@ QT_EGLFS_PATCHES = "\ > >> file://quit.png \ > >> " > >>-# file://0001-QOpenGLTexture-Set-wrap-mode-if-NPOT-textures-are-no.patch > >>- > >> SRC_URI += "\ > >> ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', > >> "${QT_EGLFS_PATCHES}", d)}\ > >> file://0001-deform-Fix-how-controls-are-shown.patch \ > >> file://0002-deform-disable-opengl-button.patch \ > >>+ file://0001-qtbase-plugins-platforms-eglfs_kms-fix-compiler-erro.patch > >>\ > >> " > >> python do_patch_append() { > >>-- > >>1.9.1 > >> > >>_______________________________________________ > >>meta-arago mailing list > >>[email protected] > >>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago > _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
