Update packageconfig options

This commit is contained in:
Samuli Piippo 2020-02-05 16:31:24 +02:00
parent cab2b78a1e
commit 96cc43c309
3 changed files with 13 additions and 3 deletions

View File

@ -41,9 +41,10 @@ PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'direct
PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xcb-xinput glib xkb xkbcommon', '', d)}"
PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups fontconfig kms gbm libinput sql-sqlite openssl', '', d)}"
PACKAGECONFIG_FONTS ?= ""
PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib dbus"
PACKAGECONFIG_SYSTEM ?= ""
PACKAGECONFIG_DISTRO ?= ""
PACKAGECONFIG_DEFAULT ?= "accessibility dbus udev evdev gui widgets tools libs icu openssl \
PACKAGECONFIG_DEFAULT ?= "accessibility dbus udev gui widgets icu openssl \
jpeg libpng dbus \
${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)} \
"
@ -53,7 +54,7 @@ BUILD_TYPE ?= "Release"
OPENSSL_LINKING_MODE ?= "runtime"
PACKAGECONFIG[gui] = "-DFEATURE_gui=ON,-DFEATURE_gui=OFF,libpng"
PACKAGECONFIG[opengl] = "-DFEATURE_opengl=ON,-DFEATURE_opengl=OFF,virtual/libgl"
PACKAGECONFIG[opengl] = "-DFEATURE_opengl_desktop=ON,-DFEATURE_opengl_desktop=OFF,virtual/libgl"
PACKAGECONFIG[gles2] = "-DFEATURE_opengles2=ON,-DFEATURE_opengles2=OFF,virtual/libgles2 virtual/egl"
PACKAGECONFIG[iconv] = "-DFEATURE_iconv=ON,-DFEATURE_iconv=OFF,virtual/libiconv"
PACKAGECONFIG[icu] = "-DFEATURE_icu=ON,-DFEATURE_icu=OFF,icu"
@ -63,6 +64,9 @@ PACKAGECONFIG[dbus] = "-DFEATURE_dbus=ON,-DFEATURE_dbus=OFF,dbus"
PACKAGECONFIG[openssl] = "-DFEATURE_openssl_${OPENSSL_LINKING_MODE}=ON,-DFEATURE_openssl=OFF,openssl,libssl"
PACKAGECONFIG[sql-sqlite] = "-DFEATURE_sql_sqlite=ON,-DFEATURE_sql_sqlite=OFF,sqlite3"
PACKAGECONFIG[accessibility] = "-DFEATURE_accessibility=ON,-DFEATURE_accessibility=OFF,at-spi2-atk"
PACKAGECONFIG[jpeg] = "-DFEATURE_jpeg=ON,-DFEATURE_jpeg=OFF,jpeg"
PACKAGECONFIG[libpng] = "-DFEATURE_libpng=ON,-DFEATURE_libpng=OFF,libpng"
PACKAGECONFIG[udev] = "-DFEATURE_libudev=ON,-DFEATURE_libudev=OFF,udev"
EXTRA_OECMAKE += " \
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \

View File

@ -8,10 +8,13 @@ LIC_FILES_CHKSUM = " \
"
inherit qt6-cmake
inherit features_check
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
REQUIRED_DISTRO_FEATURES = "opengl"
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
SRCREV = "936be561e4b2d28b51a1c1a9dae4b7baf1f932e1"

View File

@ -8,10 +8,13 @@ LIC_FILES_CHKSUM = " \
"
inherit qt6-cmake
inherit features_check
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
REQUIRED_DISTRO_FEATURES = "x11"
DEPENDS += "qtbase"
SRCREV = "7540e57ea709459bd15c16d25535bb756392f923"