CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

more modules

Browse Source
This commit is contained in:
Samuli Piippo 2020-01-30 17:40:28 +02:00
parent 92e625526b
commit ac44da5f64
19 changed files with 391 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
recipes-qt/qt6/qt6.inc
View File

@ -1,5 +1,6 @@
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"
# If Qt6 (qtbase) is machine specific, then everything will be,
@ -105,17 +106,19 @@ FILES_${PN} += " \
${QT6_INSTALL_LIBDIR}/lib*${SOLIBS} \
${QT6_INSTALL_LIBEXECDIR} \
"
# Note: Not all mkspecs are in [INSTALL_DATADIR]/mkspecs
FILES_${PN}-dev += " \
${QT6_INSTALL_LIBDIR}/lib*${SOLIBSDEV} \
${QT6_INSTALL_LIBDIR}/pkgconfig \
${QT6_INSTALL_LIBDIR}/cmake/* \
${QT6_INSTALL_LIBDIR}/*.prl \
${QT6_INSTALL_LIBDIR}/*.la \
${QT6_INSTALL_LIBDIR}/metatypes \
${QT6_INSTALL_INCLUDEDIR}/* \
${QT6_INSTALL_DESCRIPTIONSDIR}/* \
${QT6_INSTALL_DOCDIR} \
${prefix}/mkspecs \
${QT6_INSTALL_DATADIR}/mkspecs \
${prefix}/mkspecs \
"
FILES_${PN}-staticdev += " \
${QT6_INSTALL_LIBDIR}/*.a \
@ -132,6 +135,9 @@ FILES_${PN}-staticdev += " \
${QT6_INSTALL_QMLDIR}/*/*/*/*/*.a \
${QT6_INSTALL_QMLDIR}/*/*/*/*/*.prl \
"
# Note: INSTALL_EXAMPLESDIR is not used
FILES_${PN}-examples = " \
${QT6_INSTALL_EXAMPLESDIR} \
${prefix}/examples \
"

2
recipes-qt/qt6/qtbase/0001-qtbase-don-t-use-neon-flags-on-arm64.patch
View File

@ -1,4 +1,4 @@
From fad480d114410847763ef98fb1b99b541e3084c7 Mon Sep 17 00:00:00 2001
From f064668e6f0fb64ba3623b962046c015ab01d578 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 21 Jan 2020 11:30:00 +0200
Subject: [PATCH 1/4] qtbase: don't use neon flags on arm64

4
recipes-qt/qt6/qtbase/0002-qtbase-use-syncqt.pl-from-QT_HOST_PATH.patch
View File

@ -1,4 +1,4 @@
From 10371ea77a78d9cee13b5adfda8b855432bf2647 Mon Sep 17 00:00:00 2001
From d675fd3aba34d4870fa565c94a2208659f818f35 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 21 Jan 2020 12:45:38 +0200
Subject: [PATCH 2/4] qtbase: use syncqt.pl from QT_HOST_PATH
@ -13,7 +13,7 @@ Change-Id: I165b17a5a02fd4dbb2340bf69a641b8aaab8fabd
1 file changed, 6 insertions(+)
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index 738f38fbd1..e4bb6f0e40 100644
index 738f38fbd1..d7014c3ed0 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -777,6 +777,12 @@ function(qt_ensure_sync_qt)

4
recipes-qt/qt6/qtbase/0004-Add-additional-include-path-for-DRM.patch → recipes-qt/qt6/qtbase/0003-Add-additional-include-path-for-DRM.patch
View File

@ -1,7 +1,7 @@
From ce2df20d68d32cecca12a3a4e65667624e3fdab8 Mon Sep 17 00:00:00 2001
From dc8d5028d50534e2339ea3fd371a0bd7d89cc1f9 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 23 Jan 2020 15:56:43 +0200
Subject: [PATCH 4/4] Add additional include path for DRM
Subject: [PATCH 3/4] Add additional include path for DRM
Tegra has drm.h header in include/drm instead of include/libdrm

16
recipes-qt/qt6/qtbase_git.bb
View File

@ -16,7 +16,7 @@ include recipes-qt/qt6/qt6-git.inc
SRC_URI += "\
file://0001-qtbase-don-t-use-neon-flags-on-arm64.patch \
file://0002-qtbase-use-syncqt.pl-from-QT_HOST_PATH.patch \
file://0004-Add-additional-include-path-for-DRM.patch \
file://0003-Add-additional-include-path-for-DRM.patch \
"
DEPENDS = "\
@ -27,7 +27,6 @@ DEPENDS = "\
PACKAGECONFIG_class-native ?= "gui widgets dbus"
PACKAGECONFIG_class-nativesdk ?= "gui widgets dbus"
PACKAGECONFIG_class-target ?= "\
${PACKAGECONFIG_GL} \
${PACKAGECONFIG_DEFAULT} \
${PACKAGECONFIG_GL} \
${PACKAGECONFIG_FB} \
@ -39,14 +38,14 @@ PACKAGECONFIG_class-target ?= "\
"
PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', \
bb.utils.contains('DISTRO_FEATURES', 'opengl', 'eglfs gles2', '', d), d)}"
bb.utils.contains('DISTRO_FEATURES', 'opengl', 'eglfs 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_FONTS ?= ""
PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib dbus"
PACKAGECONFIG_DISTRO ?= ""
PACKAGECONFIG_DEFAULT ?= "accessibility dbus udev evdev gui widgets tools libs icu openssl \
PACKAGECONFIG_DEFAULT ?= "accessibility dbus udev evdev gui widgets tools libs icu openssl \
${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)} \
"
@ -65,6 +64,7 @@ PACKAGECONFIG[xcb] = "-DFEATURE_xcb=ON,-DFEATURE_xcb=OFF,libxcb libxkbcommon xcb
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"
EXTRA_OECMAKE += " \
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
@ -73,8 +73,12 @@ EXTRA_OECMAKE += " \
SYSROOT_DIRS += "${exec_prefix}/mkspecs"
do_install_append() {
# remove QT_SOURCE_TREE path pointing to the build directory
sed -i -e '/QT_SOURCE_TREE/,+2d' ${D}${libdir}/cmake/Qt6BuildInternals/QtBuildInternalsExtra.cmake
sed -i ${D}${libdir}/cmake/Qt6BuildInternals/QtBuildInternalsExtra.cmake \
-e '/QT_SOURCE_TREE/,+2d' \
-e '/CMAKE_INSTALL_PREFIX/,+2d'
# confligs with qttools module cmake files
rm -rf ${D}${libdir}/cmake/Qt6Tools
}
BBCLASSEXTEND =+ "native nativesdk"

17
recipes-qt/qt6/qtscxml_git.bb Normal file
View File

@ -0,0 +1,17 @@
LICENSE = "LGPL-3.0 & BSD & GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial"
LIC_FILES_CHKSUM = " \
file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
"
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtscxml-native"
BBCLASSEXTEND += "native nativesdk"
SRCREV = "804fb1f97a713edc96435433d15b09a3cb670416"

18
recipes-qt/qt6/qtserialbus.bb Normal file
View File

@ -0,0 +1,18 @@
LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0+) | The-Qt-Company-Commercial"
LIC_FILES_CHKSUM = " \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
"
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtserialport qtserialbus-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "a3e6b5b9617d2f87e00158ae4b15e8db3e9c656e"

19
recipes-qt/qt6/qtserialport.bb Normal file
View File

@ -0,0 +1,19 @@
LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
LIC_FILES_CHKSUM = " \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
"
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "4131118d849ef01c5a1f10ac0791088aec11b269"

15
recipes-qt/qt6/qtspeech.bb Normal file
View File

@ -0,0 +1,15 @@
LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0+) | The-Qt-Company-Commercial"
LIC_FILES_CHKSUM = " \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \
"
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "2088aacdc807e3fe0c551984cec2791d2ada6f9d"

16
recipes-qt/qt6/qtsvg.bb Normal file
View File

@ -0,0 +1,16 @@
LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
LIC_FILES_CHKSUM = " \
file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
"
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "7f695b0a198937f26adb354f36f6796734af618a"

23
recipes-qt/qt6/qttools.bb Normal file
View File

@ -0,0 +1,23 @@
LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
LIC_FILES_CHKSUM = " \
file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
"
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native qttools-native"
SRC_URI += "\
file://0001-Add-more-tools-as-part-of-Qt6-LinguistTools.patch \
"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "4c0ba237eabf66e028459e86620c448c4e21760a"

89
recipes-qt/qt6/qttools/0001-Add-more-tools-as-part-of-Qt6-LinguistTools.patch Normal file
View File

@ -0,0 +1,89 @@
From 946de80d16b66bfdf96c497d94e5e019a9c11f27 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 30 Jan 2020 10:57:10 +0200
Subject: [PATCH] Add more tools as part of Qt6::LinguistTools
Needed for cross-compiling
Change-Id: Id92b1f99b4af2f8ec290a6f642567d8afc93f491
---
src/assistant/qcollectiongenerator/CMakeLists.txt | 1 +
src/assistant/qhelpgenerator/CMakeLists.txt | 1 +
src/linguist/lprodump/CMakeLists.txt | 1 +
src/linguist/lrelease-pro/CMakeLists.txt | 1 +
src/linguist/lupdate-pro/CMakeLists.txt | 1 +
src/qtattributionsscanner/CMakeLists.txt | 1 +
6 files changed, 6 insertions(+)
diff --git a/src/assistant/qcollectiongenerator/CMakeLists.txt b/src/assistant/qcollectiongenerator/CMakeLists.txt
index ba927bd7..96981b97 100644
--- a/src/assistant/qcollectiongenerator/CMakeLists.txt
+++ b/src/assistant/qcollectiongenerator/CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
qt_add_tool(qcollectiongenerator
+ TOOLS_TARGET Linguist # special case
SOURCES
main.c
PUBLIC_LIBRARIES
diff --git a/src/assistant/qhelpgenerator/CMakeLists.txt b/src/assistant/qhelpgenerator/CMakeLists.txt
index 564edd5e..793e47e6 100644
--- a/src/assistant/qhelpgenerator/CMakeLists.txt
+++ b/src/assistant/qhelpgenerator/CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
qt_add_tool(qhelpgenerator
+ TOOLS_TARGET Linguist # special case
SOURCES
../shared/collectionconfiguration.cpp ../shared/collectionconfiguration.h
collectionconfigreader.cpp collectionconfigreader.h
diff --git a/src/linguist/lprodump/CMakeLists.txt b/src/linguist/lprodump/CMakeLists.txt
index 2fb6df7f..350b4593 100644
--- a/src/linguist/lprodump/CMakeLists.txt
+++ b/src/linguist/lprodump/CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
qt_add_tool(lprodump
+ TOOLS_TARGET Linguist # special case
SOURCES
../shared/ioutils.cpp ../shared/ioutils.h
../shared/profileevaluator.cpp ../shared/profileevaluator.h
diff --git a/src/linguist/lrelease-pro/CMakeLists.txt b/src/linguist/lrelease-pro/CMakeLists.txt
index c1961603..84db24fb 100644
--- a/src/linguist/lrelease-pro/CMakeLists.txt
+++ b/src/linguist/lrelease-pro/CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
qt_add_tool(lrelease-pro
+ TOOLS_TARGET Linguist # special case
SOURCES
../shared/runqttool.cpp ../shared/runqttool.h
main.cpp
diff --git a/src/linguist/lupdate-pro/CMakeLists.txt b/src/linguist/lupdate-pro/CMakeLists.txt
index 07f7af6f..c366a2d6 100644
--- a/src/linguist/lupdate-pro/CMakeLists.txt
+++ b/src/linguist/lupdate-pro/CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
qt_add_tool(lupdate-pro
+ TOOLS_TARGET Linguist # special case
SOURCES
../shared/runqttool.cpp ../shared/runqttool.h
main.cpp
diff --git a/src/qtattributionsscanner/CMakeLists.txt b/src/qtattributionsscanner/CMakeLists.txt
index a7e7694e..e65e5068 100644
--- a/src/qtattributionsscanner/CMakeLists.txt
+++ b/src/qtattributionsscanner/CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
qt_add_tool(qtattributionsscanner
+ TOOLS_TARGET Linguist # special case
SOURCES
jsongenerator.cpp jsongenerator.h
logging.h

27
recipes-qt/qt6/qttranslations.bb Normal file
View File

@ -0,0 +1,27 @@
LICENSE = "GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial"
LIC_FILES_CHKSUM = " \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
"
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
PACKAGE_ARCH = "all"
DEPENDS += "qttools-native"
PACKAGES_DYNAMIC = "${PN}-*"
SRC_URI += "\
file://0001-Follow-INSTALL_TRANSLATIONSDIR-for-installations.patch \
"
python populate_packages_prepend () {
do_split_packages(d, d.expand('${QT6_INSTALL_TRANSLATIONSDIR}'),
r'^(.*?)(?:_..)+\.qm$', d.expand('${PN}-%s'),
'Qt translations for %s', extra_depends='')
}
SRCREV = "7991a2b2b2fa1d54e2c582d1490e91614664fe84"

32
recipes-qt/qt6/qttranslations/0001-Follow-INSTALL_TRANSLATIONSDIR-for-installations.patch Normal file
View File

@ -0,0 +1,32 @@
From cd00a283c8c1ee3af463dcb6d9d81b40d293d0d6 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 30 Jan 2020 12:21:23 +0200
Subject: [PATCH] Follow INSTALL_TRANSLATIONSDIR for installations
Change-Id: Id4ef15e1fb13b2b0a8be327f47f23027f3d83a4a
---
translations/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt
index 5798468..9369644 100644
--- a/translations/CMakeLists.txt
+++ b/translations/CMakeLists.txt
@@ -122,7 +122,7 @@ foreach(file IN LISTS ts_files)
BYPRODUCTS ${output_file}
COMMAND Qt::lrelease "${CMAKE_CURRENT_SOURCE_DIR}/${file}" -qm "${output_file}"
)
- qt_install(FILES ${output_file} DESTINATION translations)
+ qt_install(FILES ${output_file} DESTINATION "${INSTALL_TRANSLATIONSDIR}")
add_dependencies(updateqm updateqm-${file})
endforeach()
@@ -134,7 +134,7 @@ foreach(file IN LISTS ts_files)
BYPRODUCTS ${output_file}
COMMAND Qt::lrelease "${en_ts_file_dir}/${file}" -qm "${output_file}"
)
- qt_install(FILES ${output_file} DESTINATION translations)
+ qt_install(FILES ${output_file} DESTINATION "${INSTALL_TRANSLATIONSDIR}")
add_dependencies(updateqm updateqm-${file})
endforeach()

40
recipes-qt/qt6/qtwayland.bb Normal file
View File

@ -0,0 +1,40 @@
LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
LIC_FILES_CHKSUM = " \
file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
"
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
SRC_URI +="\
file://0001-Allow-qtwaylandscanner-to-be-built-without-dependenc.patch \
"
PACKAGECONFIG ?= "\
wayland-client \
wayland-server \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcomposite-glx', '', d)} \
"
PACKAGECONFIG_class-native ?= ""
PACKAGECONFIG_class-nativesdk ?= ""
PACKAGECONFIG[wayland-client] = "-DFEATURE_wayland_client=ON,-DFEATURE_wayland_client=OFF,"
PACKAGECONFIG[wayland-server] = "-DFEATURE_wayland_server=ON,-DFEATURE_wayland_server=OFF,"
PACKAGECONFIG[xcomposite-egl] = "-DFEATURE_xcomposite_egl=ON,-DFEATURE_xcomposite_egl=OFF,libxcomposite"
PACKAGECONFIG[xcomposite-glx] = "-DFEATURE_xcomposite_glx=ON,-DFEATURE_xcomposite_glx=OFF,libxcomposite virtual/mesa"
PACKAGECONFIG[dmabuf-client-buffer] = "-DFEATURE_wayland_dmabuf_client_buffer=ON,-DFEATURE_wayland_dmabuf_client_buffer=OFF,libdrm"
PACKAGECONFIG[dmabuf-server-buffer] = "-DFEATURE_wayland_dmabuf_server_buffer=ON,-DFEATURE_wayland_dmabuf_server_buffer=OFF,libdrm"
DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "12058b161e5f0d6f76523dc831acc8bdbc027fec"

23
recipes-qt/qt6/qtwayland/0001-Allow-qtwaylandscanner-to-be-built-without-dependenc.patch Normal file
View File

@ -0,0 +1,23 @@
From 8ff1b137523ea82c7e73e7eded90035a74c75702 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 29 Jan 2020 12:39:09 +0200
Subject: [PATCH] Allow qtwaylandscanner to be built without dependencies
Change-Id: I15aa5fc5128fcd0925d5950596bd56710b5b81d4
---
src/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 62c1adbe..87abb5ac 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,7 +3,7 @@
qt_find_package(WaylandScanner PROVIDED_TARGETS Wayland::Scanner)
qt_find_package(Wayland)
-if (NOT WaylandScanner_FOUND OR NOT Wayland_FOUND)
+if ((QT_FEATURE_wayland_server OR QT_FEATURE_wayland_client) AND (NOT WaylandScanner_FOUND OR NOT Wayland_FOUND))
message(WARNING "QtWayland is missing required dependencies, nothing will be built. \
Although this could be considered an error, the configuration will still pass as coin (Qt's \
continuous integration system) will fail the build if configure fails, but will still try to \

17
recipes-qt/qt6/qtwebchannel.bb Normal file
View File

@ -0,0 +1,17 @@
LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
LIC_FILES_CHKSUM = " \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
"
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native qtwebsockets"
SRCREV = "3c3d168487b10e7e4d7c06df5a28df9d4220b6de"

16
recipes-qt/qt6/qtwebsockets.bb Normal file
View File

@ -0,0 +1,16 @@
LICENSE = "GFDL-1.3 & (GPL-3 | LGPL-3.0) | The-Qt-Company-Commercial"
LIC_FILES_CHKSUM = " \
file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
"
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative"
SRCREV = "5fc2b148cfa763007810d7b6256ea50d82bf7e45"

17
recipes-qt/qt6/qtx11extras.bb Normal file
View File

@ -0,0 +1,17 @@
LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
LIC_FILES_CHKSUM = " \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
"
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "7540e57ea709459bd15c16d25535bb756392f923"