More packageconfigs

This commit is contained in:
Samuli Piippo 2020-02-11 17:15:29 +02:00
parent 4fd21f00dd
commit 97bcd76c30
9 changed files with 67 additions and 33 deletions

View File

@ -1,12 +1,12 @@
DESCRIPTION ?= "Qt is a cross-platform application development framework for desktop, embedded and mobile."
HOMEPAGE ?= "https://www.qt.io"
QT6_MODULE ?= "${BPN}"
QT6_MODULE_BRANCH ?= "wip/cmake"
QT6_MODULE_BRANCH_PARAM ?= "branch=${QT6_MODULE_BRANCH};nobranch=1"
SRC_URI = "${QT6_GIT}/${QT6_GIT_PROJECT}/${QT6_MODULE}.git;name=${QT6_MODULE};${QT6_MODULE_BRANCH_PARAM};protocol=${QT6_GIT_PROTOCOL}"
DESCRIPTION ?= "Qt is a cross-platform application development framework for desktop, embedded and mobile."
HOMEPAGE ?= "https://www.qt.io"
CVE_PRODUCT = "qt"
S = "${WORKDIR}/git"

View File

@ -1,7 +1,7 @@
PACKAGECONFIG[examples] = "-DBUILD_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,"
PACKAGECONFIG[tests] = "-DBUILD_TESTING=ON,-DBUILD_TESTING=OFF,"
PACKAGECONFIG[translations] = ",,qttranslations,,qttranslations-${BPN}"
#PACKAGECONFIG[qtquickcompiler] = "-Dqtquickcompiler=ON,-Dqtquickcompiler=OFF,qtdeclarative-native"
PACKAGECONFIG[qtquickcompiler] = "-DFEATURE_qtquickcompiler=ON,-DFEATURE_qtquickcompiler=OFF"
PACKAGECONFIG[translations] = ",,,qttranslations-${BPN}"
# If Qt6 (qtbase) is machine specific, then everything will be,
# because the (initial) qtbase configuration becomes part of Qt5/qmake
@ -15,14 +15,6 @@ python __anonymous() {
d.setVar("PACKAGE_ARCH", tarch)
}
# if building static Qt5, add qtdeclarative-native dependency to all recipes
# that depend on qtdeclarative as it's required for qmlimportscannertool
python __anonymous() {
if bb.utils.contains('DISTRO_FEATURES', "qt5-static", True, False, d):
if bb.utils.contains('DEPENDS', "qtdeclarative", True, False, d):
d.appendVar("DEPENDS", " qtdeclarative-native")
}
# Many examples come with libraries installed outside of standard libdir,
# suppress QA check complaining
#INSANE_SKIP_${PN}-examples += "libdir staticdev dev-so"

View File

@ -14,8 +14,8 @@ include recipes-qt/qt6/qt6.inc
include recipes-qt/qt6/qt6-git.inc
DEPENDS = "\
pcre2 \
freetype \
pcre2 \
"
PACKAGECONFIG_class-native ?= "gui widgets dbus"
@ -31,16 +31,16 @@ PACKAGECONFIG_class-target ?= "\
${PACKAGECONFIG_DISTRO} \
"
PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', \
bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d), d)}"
PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \
bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'gles2', d), '', d)}"
PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
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_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb glib xkbcommon', '', d)}"
PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups kms gbm libinput sql-sqlite', '', d)}"
PACKAGECONFIG_FONTS ?= ""
PACKAGECONFIG_SYSTEM ?= ""
PACKAGECONFIG_DISTRO ?= ""
PACKAGECONFIG_DEFAULT ?= "accessibility dbus udev gui widgets icu openssl \
jpeg libpng dbus \
jpeg png dbus translations libinput fontconfig harfbuzz \
${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)} \
"
@ -49,20 +49,50 @@ BUILD_TYPE ?= "Release"
# OpenSSL linking mode: runtime, linked
OPENSSL_LINKING_MODE ?= "runtime"
PACKAGECONFIG[gui] = "-DFEATURE_gui=ON,-DFEATURE_gui=OFF,libpng"
PACKAGECONFIG[opengl] = "-DFEATURE_opengl_desktop=ON,-DFEATURE_opengl_desktop=OFF,virtual/libgl"
# gui
PACKAGECONFIG[gui] = "-DFEATURE_gui=ON,-DFEATURE_gui=OFF"
PACKAGECONFIG[accessibility] = "-DFEATURE_accessibility=ON,-DFEATURE_accessibility=OFF,at-spi2-atk"
PACKAGECONFIG[directfb] = "-DFEATURE_directfb=ON,-DFEATURE_directfb=OFF,directfb"
PACKAGECONFIG[fontconfig] = "-DFEATURE_fontconfig=ON,-DFEATURE_fontconfig=OFF,fontconfig"
PACKAGECONFIG[gbm] = "-DFEATURE_gbm=ON,-DFEATURE_gbm=OFF,virtual/libgbm"
PACKAGECONFIG[gles2] = "-DFEATURE_opengles2=ON,-DFEATURE_opengles2=OFF,virtual/libgles2 virtual/egl"
PACKAGECONFIG[harfbuzz] = "-DFEATURE_harfbuzz=ON,-DFEATURE_harfbuzz=OFF,harfbuzz"
PACKAGECONFIG[jpeg] = "-DFEATURE_jpeg=ON,-DFEATURE_jpeg=OFF,jpeg"
PACKAGECONFIG[kms] = "-DFEATURE_kms=ON,-DFEATURE_kms=OFF,drm virtual/egl"
PACKAGECONFIG[libinput] = "-DFEATURE_libinput=ON,-DFEATURE_libinput=OFF,libinput"
PACKAGECONFIG[mtdev] = "-DFEATURE_mtdev=ON,-DFEATURE_mtdev=OFF,mtdev"
PACKAGECONFIG[opengl] = "-DFEATURE_opengl_desktop=ON,-DFEATURE_opengl_desktop=OFF,virtual/libgl"
PACKAGECONFIG[png] = "-DFEATURE_png=ON,-DFEATURE_png=OFF,libpng"
PACKAGECONFIG[tslib] = "-DFEATURE_tslib=ON,-DFEATURE_tslib=OFF,tslib"
PACKAGECONFIG[vulkan] = "-DFEATURE_vulkan=ON,-DFEATURE_vulkan=OFF,vulkan-headers vulkan-loader"
PACKAGECONFIG[xcb] = "-DFEATURE_xcb=ON,-DFEATURE_xcb=OFF,libxcb libxkbcommon xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil libxext"
PACKAGECONFIG[xkbcommon] = "-DFEATURE_xkbcommon=ON,-DFEATURE_xkbcommon=OFF,libxkbcommon,xkeyboard-config"
# widgets
PACKAGECONFIG[widgets] = "-DFEATURE_widgets=ON,-DFEATURE_widgets=OFF"
PACKAGECONFIG[gtk] = "-DFEATURE_gtk3=ON,-DFEATUER_gtk3=OFF,gtk+3"
# corelib
PACKAGECONFIG[glib] = "-DFEATURE_glib=ON,-DFEATURE_glib=OFF,glib-2.0"
PACKAGECONFIG[iconv] = "-DFEATURE_iconv=ON,-DFEATURE_iconv=OFF,virtual/libiconv"
PACKAGECONFIG[icu] = "-DFEATURE_icu=ON,-DFEATURE_icu=OFF,icu"
PACKAGECONFIG[widgets] = "-DFEATURE_widgets=ON,-DFEATURE_widgets=OFF"
PACKAGECONFIG[xcb] = "-DFEATURE_xcb=ON,-DFEATURE_xcb=OFF,libxcb libxkbcommon xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil libxext"
PACKAGECONFIG[dbus] = "-DFEATURE_dbus=ON,-DFEATURE_dbus=OFF,dbus"
PACKAGECONFIG[journald] = "-DFEATURE_journald=ON,-DFEATURE_journald=OFF,systemd"
PACKAGECONFIG[lttng] = "-DFEATURE_lttng=ON,-DFEATURE_lttng=OFF,lttng-ust"
# network
PACKAGECONFIG[gssapi] = "-DFEATURE_gssapi=ON,-DFEATURE_gssapi=OFF,krb5"
PACKAGECONFIG[libproxy] = "-DFEATURE_libproxy=ON,-DFEATURE_libproxy=OFF,libproxy"
PACKAGECONFIG[openssl] = "-DFEATURE_openssl_${OPENSSL_LINKING_MODE}=ON,-DFEATURE_openssl=OFF,openssl,libssl"
# sqldrivers
PACKAGECONFIG[sql-mysql] = "-DFEATURE_sql_mysql=ON,-DFEATURE_sql_mysql=OFF,mysql5"
PACKAGECONFIG[sql-psql] = "-DFEATURE_sql_psql=ON,-DFEATURE_sql-psql=OFF,postgresql"
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[cups] = "-DFEATURE_cups=ON,-DFEATURE_cups=OFF,cups"
PACKAGECONFIG[dbus] = "-DFEATURE_dbus=ON,-DFEATURE_dbus=OFF,dbus"
PACKAGECONFIG[udev] = "-DFEATURE_libudev=ON,-DFEATURE_libudev=OFF,udev"
PACKAGECONFIG[zstd] = "-DFEATURE_zstd=ON,-DFEATURE_zstd=OFF,zstd"
EXTRA_OECMAKE += " \
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
@ -85,4 +115,4 @@ FILES_${PN}-tools += "\
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "225113d59bae389d004fac8e73e7b8cec0bcc4ea"
SRCREV = "9bab556005e4d0475eeaf1b279c1da9ddac398f3"

View File

@ -16,8 +16,12 @@ SRC_URI += "\
file://0001-Use-correct-default-install-dir-for-qml-files.patch \
"
PACKAGECONFIG ?= "translations"
PACKAGECONFIG_class-native ?= ""
PACKAGECONFIG_class-nativesdk ?= ""
DEPENDS += "qtbase qtdeclarative-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "8ee679b50f20dc9f74af6ecec5492880c5b8b92e"
SRCREV = "3e0edc61cf4d2e0a613ed971f42a96120b094ecc"

View File

@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
inherit features_check
REQUIRED_DISTRO_FEATURES = "opengl"
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

@ -10,6 +10,8 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
PACKAGECONFIG ?= "translations"
DEPENDS = "qtbase qtdeclarative qtdeclarative-native"
SRCREV = "2bd4f5cd587e258227c69b3124757d7b8e019c9f"

View File

@ -12,6 +12,10 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
PACKAGECONFIG ?= "translations"
PACKAGECONFIG_class-native ?= ""
PACKAGECONFIG_class-nativesdk ?= ""
DEPENDS += "qtbase"
BBCLASSEXTEND =+ "native nativesdk"

View File

@ -11,6 +11,8 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
PACKAGECONFIG ?= "translations"
DEPENDS += "qtbase qtdeclarative"
SRCREV = "5fc2b148cfa763007810d7b6256ea50d82bf7e45"

View File

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