mirror of
http://code.qt.io/yocto/meta-qt6.git
synced 2026-01-04 16:10:12 +00:00
pyside6: include PySide6 recipes for Qt 6.8.1
Bring all pyside related changes from 6.7 branch to 6.8. Fixes: PYSIDE-2889 Change-Id: I69b692815b715ebacd9ed708d0ca64c828021d82 Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
This commit is contained in:
parent
586a6cb5ae
commit
ed91cc08df
|
|
@ -34,7 +34,7 @@ target1: &target1
|
|||
variableValue: master.xml
|
||||
- type: EnvironmentVariable
|
||||
variableName: TEST_CONFIGS
|
||||
variableValue: ci configs wayland
|
||||
variableValue: ci configs wayland python
|
||||
enable_if:
|
||||
condition: property
|
||||
property: target.arch
|
||||
|
|
@ -50,7 +50,7 @@ target2: &target2
|
|||
variableValue: master.xml
|
||||
- type: EnvironmentVariable
|
||||
variableName: TEST_CONFIGS
|
||||
variableValue: ci configs
|
||||
variableValue: ci configs python
|
||||
enable_if:
|
||||
condition: property
|
||||
property: target.arch
|
||||
|
|
@ -66,7 +66,7 @@ target3: &target3
|
|||
variableValue: scarthgap.xml
|
||||
- type: EnvironmentVariable
|
||||
variableName: TEST_CONFIGS
|
||||
variableValue: ci configs mingw
|
||||
variableValue: ci configs mingw python
|
||||
enable_if:
|
||||
condition: property
|
||||
property: target.arch
|
||||
|
|
@ -82,7 +82,7 @@ target4: &target4
|
|||
variableValue: nanbield.xml
|
||||
- type: EnvironmentVariable
|
||||
variableName: TEST_CONFIGS
|
||||
variableValue: ci configs wayland no-webengine
|
||||
variableValue: ci configs wayland no-webengine python
|
||||
enable_if:
|
||||
condition: property
|
||||
property: target.arch
|
||||
|
|
@ -98,7 +98,7 @@ target5: &target5
|
|||
variableValue: kirkstone.xml
|
||||
- type: EnvironmentVariable
|
||||
variableName: TEST_CONFIGS
|
||||
variableValue: ci configs wayland static no-webengine
|
||||
variableValue: ci configs wayland static no-webengine python
|
||||
enable_if:
|
||||
condition: property
|
||||
property: target.arch
|
||||
|
|
@ -149,6 +149,7 @@ instructions:
|
|||
bitbake-layers add-layer ../meta-openembedded/meta-python
|
||||
bitbake-layers add-layer ../meta-openembedded/meta-multimedia
|
||||
bitbake-layers add-layer ../meta-mingw
|
||||
bitbake-layers add-layer ../meta-clang
|
||||
bitbake-layers add-layer ${SOURCE_DIR}
|
||||
|
||||
for conf in ${TEST_CONFIGS}; do
|
||||
|
|
|
|||
2
coin/test-python.inc
Normal file
2
coin/test-python.inc
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
RDEPENDS:${PN}:append:pn-packagegroup-qt6-addons = " python3-pyside6"
|
||||
|
||||
33
recipes-python/pyside6/python3-pyside6.inc
Normal file
33
recipes-python/pyside6/python3-pyside6.inc
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only)"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
|
||||
file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
|
||||
file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
|
||||
file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
|
||||
file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
|
||||
file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
|
||||
"
|
||||
|
||||
python() {
|
||||
if 'clang-layer' not in d.getVar('BBFILE_COLLECTIONS').split():
|
||||
raise bb.parse.SkipRecipe('Requires meta-clang to be present.')
|
||||
}
|
||||
|
||||
inherit setuptools3
|
||||
inherit qt6-cmake
|
||||
|
||||
require recipes-qt/qt6/qt6-git.inc
|
||||
|
||||
QT_GIT_PROJECT = "pyside"
|
||||
QT_MODULE = "pyside-setup"
|
||||
QT_MODULE_BRANCH = "dev"
|
||||
|
||||
FILESEXTRAPATHS:prepend := "${THISDIR}/pyside6:"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
EXTRA_OECMAKE += "-DBUILD_TESTS=FALSE"
|
||||
EXTRA_OECMAKE:append:class-target = " -DQFP_SHIBOKEN_HOST_PATH=${STAGING_EXECPREFIXDIR} -DQFP_PYTHON_HOST_PATH=${PYTHON}"
|
||||
|
||||
INSANE_SKIP:${PN} += "already-stripped"
|
||||
71
recipes-python/pyside6/python3-pyside6_git.bb
Normal file
71
recipes-python/pyside6/python3-pyside6_git.bb
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
require python3-pyside6.inc
|
||||
|
||||
DEPENDS += "\
|
||||
python3-shiboken6 \
|
||||
python3-shiboken6-native \
|
||||
${PYSIDE_QT_MODULES} \
|
||||
"
|
||||
PYSIDE_QT_MODULES ?= "\
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d', '', d)} \
|
||||
qtbase \
|
||||
qtcharts \
|
||||
qtconnectivity \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdatavis3d', '', d)} \
|
||||
qtdeclarative \
|
||||
qtdeclarative-native \
|
||||
qtgraphs \
|
||||
${@bb.utils.contains('QT_COMMERCIAL_MODULES', '1', 'qthttpserver', '', d)} \
|
||||
qtlocation \
|
||||
qtmultimedia \
|
||||
qtnetworkauth \
|
||||
qtpositioning \
|
||||
qtquick3d \
|
||||
qtquick3d-native \
|
||||
qtremoteobjects \
|
||||
qtremoteobjects-native \
|
||||
qtscxml \
|
||||
qtscxml-native \
|
||||
qtsensors \
|
||||
qtserialbus \
|
||||
qtserialport \
|
||||
qtspeech \
|
||||
qtsvg \
|
||||
qttools \
|
||||
qtwebchannel \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)} \
|
||||
qtwebsockets \
|
||||
"
|
||||
|
||||
OECMAKE_SOURCEPATH = "${S}/sources/pyside6"
|
||||
|
||||
export LLVM_INSTALL_DIR = "${STAGING_DIR_NATIVE}${exec_prefix}"
|
||||
|
||||
PYSIDE_COMPILER = "${HOST_SYS}-g++"
|
||||
PYSIDE_COMPILER:toolchain-clang = "${HOST_SYS}-clang++"
|
||||
# Workaround big.LITTLE architecture args not supported by clang
|
||||
PYSIDE_COMPILER_FLAGS = "${@d.getVar('HOST_CC_ARCH') \
|
||||
.replace('cortex-a15.cortex','cortex') \
|
||||
.replace('cortex-a17.cortex','cortex') \
|
||||
.replace('cortex-a57.cortex','cortex') \
|
||||
.replace('cortex-a72.cortex','cortex') \
|
||||
.replace('cortex-a73.cortex','cortex') \
|
||||
.replace('cortex-a75.cortex','cortex') \
|
||||
.replace('cortex-a76.cortex','cortex')} \
|
||||
"
|
||||
|
||||
EXTRA_OECMAKE += "\
|
||||
-DSTANDALONE=ON \
|
||||
-DPYSIDE_TREAT_QT_INCLUDE_DIRS_AS_NON_SYSTEM=ON \
|
||||
-DSHIBOKEN_GENERATOR_EXTRA_FLAGS='\
|
||||
--clang-options=--sysroot=${STAGING_DIR_TARGET},--target=${HOST_SYS},${@d.getVar('PYSIDE_COMPILER_FLAGS').replace(' ',',')} \
|
||||
--compiler-path=${PYSIDE_COMPILER} \
|
||||
' \
|
||||
"
|
||||
|
||||
FILES:${PN} += "\
|
||||
${QT6_INSTALL_PLUGINSDIR}/designer \
|
||||
"
|
||||
FILES:${PN}-dev += "\
|
||||
${datadir}/PySide6 \
|
||||
"
|
||||
9
recipes-python/pyside6/python3-shiboken6_git.bb
Normal file
9
recipes-python/pyside6/python3-shiboken6_git.bb
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
require python3-pyside6.inc
|
||||
|
||||
DEPENDS += "qtbase clang-native python3-shiboken6-native"
|
||||
|
||||
OECMAKE_SOURCEPATH = "${S}/sources/shiboken6"
|
||||
|
||||
EXTRA_OECMAKE += "-DSHIBOKEN_BUILD_LIBS=ON"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
|
@ -21,6 +21,7 @@ SRCREV = "${SRCREV_${QT_MODULE}}"
|
|||
SRCREV_tqtc-qmlcompilerplus = "76c324fa8e7c2010f2f4520448b255532127ace4"
|
||||
SRCREV_tqtc-qtinsighttracker = "6aa8109c7b7dbc8892fb99a0706c304d49d53931"
|
||||
SRCREV_tqtc-qtvncserver = "6ea9cc5dfc1ec5c306e99f3b0183624b9bc66fb6"
|
||||
SRCREV_pyside-setup = "dfe3819559ed1e04089f9d5bc009268a7b48b7c2"
|
||||
SRCREV_qt3d = "6972b993b0854c83ce7c5848374243f588020212"
|
||||
SRCREV_qt3d-assimp = "647f94648c0ae24b9c6684383a9dbbc0e2fc23b7"
|
||||
SRCREV_qt5compat = "6b4bf0cfe62dda68741624ff5defe4c57b1a6d8a"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user