Skip to content

Commit

Permalink
Merge pull request #39 from YoeDistro/kraj/6.7
Browse files Browse the repository at this point in the history
Bring latest changes from upstream 6.7 branch
  • Loading branch information
kraj authored Mar 21, 2024
2 parents 07befea + 2c41e17 commit d7780ec
Show file tree
Hide file tree
Showing 7 changed files with 117 additions and 6 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ URI: https://git.openembedded.org/openembedded-core/

URI: https://git.openembedded.org/meta-openembedded/

and optionally:

URI: https://github.com/kraj/meta-clang

Yocto version support
---------------------

Expand Down
11 changes: 6 additions & 5 deletions coin/module_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -66,7 +66,7 @@ target3: &target3
variableValue: master.xml
- type: EnvironmentVariable
variableName: TEST_CONFIGS
variableValue: ci configs
variableValue: ci configs python
enable_if:
condition: property
property: target.arch
Expand All @@ -82,7 +82,7 @@ target4: &target4
variableValue: nanbield.xml
- type: EnvironmentVariable
variableName: TEST_CONFIGS
variableValue: ci configs wayland mingw no-webengine
variableValue: ci configs wayland mingw no-webengine python
enable_if:
condition: property
property: target.arch
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions coin/test-python.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
RDEPENDS:${PN}:append:pn-packagegroup-qt6-addons = " python3-pyside6"

33 changes: 33 additions & 0 deletions recipes-python/pyside6/python3-pyside6.inc
Original file line number Diff line number Diff line change
@@ -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"
61 changes: 61 additions & 0 deletions recipes-python/pyside6/python3-pyside6_git.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
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++"

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('HOST_CC_ARCH').replace(' ',',')} \
--compiler-path=${PYSIDE_COMPILER} \
' \
"

FILES:${PN} += "\
${QT6_INSTALL_PLUGINSDIR}/designer \
"
FILES:${PN}-dev += "\
${datadir}/PySide6 \
"
9 changes: 9 additions & 0 deletions recipes-python/pyside6/python3-shiboken6_git.bb
Original file line number Diff line number Diff line change
@@ -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"
3 changes: 2 additions & 1 deletion recipes-qt/qt6/qt6-git.inc
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ SRCREV = "${SRCREV_${QT_MODULE}}"
SRCREV_tqtc-qmlcompilerplus = "eaa415997c3015648c99b172d6b8d57ec49e9bd1"
SRCREV_tqtc-qtinsighttracker = "5b85639156f9dfc10e7cb5e055f9c5d386dc078d"
SRCREV_tqtc-qtvncserver = "3c4cb95cdff7f69f6ed504cb2e9197ad9a2574c4"
SRCREV_pyside-setup = "f0fa7f37ea85402671805e54c0fa9c0a61e8e117"
SRCREV_qt3d = "518b432e62005cdae3d3ed4132cf576d0f5b1477"
SRCREV_qt3d-assimp = "c60a259fd35f09b8896b2920d48c436145914aae"
SRCREV_qt5compat = "3407e0fde0f3efb80cd916bd18fd96e585007aa9"
Expand Down Expand Up @@ -59,7 +60,7 @@ SRCREV_qtserialport = "5bd74239bc6c59cea652a16dc684d33da861ff92"
SRCREV_qtshadertools = "e52117a5ef9d16a5fe03dbbc61a6503bf68061ff"
SRCREV_qtspeech = "bcb935d12dee170de2baa999fa02b5a624752f23"
SRCREV_qtsvg = "867f49014b92fc345f59c52b13ccc4a4f4eb9ac1"
SRCREV_qttools = "c2ba2298544875a6e815ba2ddc4a60d125d2ddd4"
SRCREV_qttools = "a916ac4087b1a0ec76b7fb5b3c003274d685716d"
SRCREV_qttools-qlitehtml = "7e8eb0f5eaee53b0aeb04208bdaba74fcffc3a3f"
SRCREV_qttools-qlitehtml-litehtml = "6ca1ab0419e770e6d35a1ef690238773a1dafcee"
SRCREV_qttranslations = "fa8e1a3d3b3924d0ad46217a4a99a17a32dacfd8"
Expand Down

0 comments on commit d7780ec

Please sign in to comment.