From 6cb4ce41bc0e570bcd1c4fa34a9201e7e12d150f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 2 Sep 2021 17:28:50 +0200 Subject: [PATCH 1/3] python3-regex: upgrade to 2021.8.28 * 2021.8.27 causes python3 to segfault in various cases: https://bitbucket.org/mrabarnett/mrab-regex/issues/421/2021827-results-in-fatal-python-error and was already yanked from pypi: https://pypi.org/project/regex/2021.8.27/ Signed-off-by: Martin Jansa Signed-off-by: Khem Raj Signed-off-by: Trevor Gamblin --- .../{python3-regex_2021.8.27.bb => python3-regex_2021.8.28.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-regex_2021.8.27.bb => python3-regex_2021.8.28.bb} (80%) diff --git a/meta-python/recipes-devtools/python/python3-regex_2021.8.27.bb b/meta-python/recipes-devtools/python/python3-regex_2021.8.28.bb similarity index 80% rename from meta-python/recipes-devtools/python/python3-regex_2021.8.27.bb rename to meta-python/recipes-devtools/python/python3-regex_2021.8.28.bb index c869003c9fc..e375b5b28fe 100644 --- a/meta-python/recipes-devtools/python/python3-regex_2021.8.27.bb +++ b/meta-python/recipes-devtools/python/python3-regex_2021.8.28.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=f0a3e4a2554ebb89c0 inherit pypi setuptools3 -SRC_URI[sha256sum] = "e9700c52749cb3e90c98efd72b730c97b7e4962992fca5fbcaf1363be8e3b849" +SRC_URI[sha256sum] = "f585cbbeecb35f35609edccb95efd95a3e35824cd7752b586503f7e6087303f1" RDEPENDS:${PN} += " \ python3-stringold \ From 680280d43dd5ee8e2975da858f1f24de7e3c3ba4 Mon Sep 17 00:00:00 2001 From: William Huang Date: Thu, 2 Sep 2021 07:25:07 -0400 Subject: [PATCH 2/3] recipes-devtools: python: add support for Kivy Signed-off-by: Khem Raj Signed-off-by: Trevor Gamblin --- .../0001-add-support-for-glesv2.patch | 24 +++++++ .../python/python3-kivy_2.0.0.bb | 71 +++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-kivy/0001-add-support-for-glesv2.patch create mode 100644 meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb diff --git a/meta-python/recipes-devtools/python/python3-kivy/0001-add-support-for-glesv2.patch b/meta-python/recipes-devtools/python/python3-kivy/0001-add-support-for-glesv2.patch new file mode 100644 index 00000000000..e50c7e7e242 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-kivy/0001-add-support-for-glesv2.patch @@ -0,0 +1,24 @@ +diff --git a/setup.py b/setup.py +index 9a507c6c4..3f5b70866 100644 +--- a/setup.py ++++ b/setup.py +@@ -680,7 +680,18 @@ def determine_gl_flags(): + c_options['use_x11'] = True + c_options['use_egl'] = True + else: +- flags['libraries'] = ['GL'] ++ if cross_sysroot: ++ flags['include_dirs'] = [cross_sysroot + '/usr/include'] ++ flags['library_dirs'] = [cross_sysroot + '/usr/lib'] ++ ++ if c_options['use_opengl_es2']: ++ print("using GLESv2 libraries") ++ flags['libraries'] = ['GLESv2'] ++ else: ++ flags['libraries'] = ['GL'] ++ ++ ++ print("cross_sysroot: " + str(cross_sysroot)) + return flags, base_flags + + diff --git a/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb b/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb new file mode 100644 index 00000000000..3f6bafda81d --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb @@ -0,0 +1,71 @@ +SUMMARY = "Open source Python library for rapid development of applications \ + that make use of innovative user interfaces, such as multi-touch apps." +HOMEPAGE = "https://kivy.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f0c851d60495c7e27225a819e179208a" + +inherit setuptools3 + +SRC_URI = "\ + git://github.com/kivy/kivy.git;protocol=git;\ +" + +# Kivy's setup files only look for GLES libraries for Android, iOS, RPi, +# and mali-based OS's. We need to patch the setup file to tell Kivy setup +# that our machine has GLES libaries installed as well +# Also, if using SDL2 as backend, SDL2 needs to be configured wth gles +SRC_URI += " \ + file://0001-add-support-for-glesv2.patch \ +" +SRCREV = "dedcb6bcabe3d8d6758dcee607e8c33b174d782b" + +S = "${WORKDIR}/git" + +PACKAGES += "${PN}-examples" +FILES:${PN}-examples = "/usr/share/kivy-examples" + +USE_WAYLAND = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '1', '0', d)}" +export USE_WAYLAND + +# if using Wayland, let's use pure Wayland (and not XWayland) +# so do not build using X11 flag when we detect Wayland +USE_X11 = " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '0', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', '1', \ + '0', d), d)}" +export USE_X11 + +# Use OpenGL ES 2.0 library +KIVY_GRAPHICS = "gles" +export KIVY_GRAPHICS + +KIVY_CROSS_SYSROOT="${WORKDIR}/recipe-sysroot" +export KIVY_CROSS_SYSROOT + +DEPENDS += " \ + gstreamer1.0 \ + gstreamer1.0-python \ + libsdl2 \ + libsdl2-ttf \ + libsdl2-image \ + libsdl2-mixer \ + pango \ + python3 \ + python3-cython-native \ +" + +RDEPENDS_${PN} = " \ + gstreamer1.0 \ + gstreamer1.0-python \ + libsdl2 \ + libsdl2-ttf \ + libsdl2-image \ + libsdl2-mixer \ + pango \ + python3 \ + python3-docutils \ + python3-fcntl \ + python3-image \ + python3-pillow \ + python3-pygments \ +" From 63e2666a7c1309031a189f090ebc2257e9bdc45e Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Thu, 2 Sep 2021 11:39:10 -0400 Subject: [PATCH 3/3] python3-pytest-subtests: add recipe Newer versions of python3-cryptography will rely on the subtests fixture for their ptests. Add this recipe so that cryptography can be given the necessary RDEPENDS when it is upgraded. Signed-off-by: Trevor Gamblin Signed-off-by: Khem Raj Signed-off-by: Trevor Gamblin --- .../packagegroups/packagegroup-meta-python.bb | 1 + .../python/python3-pytest-subtests_0.5.0.bb | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-pytest-subtests_0.5.0.bb diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index ea5683ce683..b5a2f5d7d9f 100644 --- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -348,6 +348,7 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-pytest-html \ python3-pytest-metadata \ python3-pytest-runner \ + python3-pytest-subtests \ python3-pytest-tempdir \ python3-pytest-timeout \ python3-pythonping \ diff --git a/meta-python/recipes-devtools/python/python3-pytest-subtests_0.5.0.bb b/meta-python/recipes-devtools/python/python3-pytest-subtests_0.5.0.bb new file mode 100644 index 00000000000..2e03512bdeb --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pytest-subtests_0.5.0.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "unittest subTest() support and subtests fixture." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=242b4e17fa287dcf7aef372f6bc3dcb1" + +SRC_URI[sha256sum] = "5bd1e4bf0eda4c89a6cd42b0ee28e1d2ca0848de3fd67ad8cdd6d559ed00f120" + +inherit pypi setuptools3 + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-pytest \ +" + +BBCLASSEXTEND = "native nativesdk"