diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index b5a2f5d7d9f..2d51b4e1a3d 100644 --- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -210,6 +210,7 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-kconfiglib \ python3-keras-applications \ python3-keras-preprocessing \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11 opengl", "python3-kivy", "", d)} \ python3-kiwisolver \ python3-langtable \ python3-lazy-object-proxy \ diff --git a/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.4.7.bb b/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.4.8.bb similarity index 81% rename from meta-python/recipes-devtools/python/python3-cryptography-vectors_3.4.7.bb rename to meta-python/recipes-devtools/python/python3-cryptography-vectors_3.4.8.bb index 565e223bfc5..2fb48f3cf75 100644 --- a/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.4.7.bb +++ b/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.4.8.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "Apache-2.0 | BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4" -SRC_URI[sha256sum] = "a7ac3aaa57514687696ad65f833e5e39b6fa3c5d41de2b8c938346ee119204c2" +SRC_URI[sha256sum] = "4c84410257993d3de058b44b777a49e1da2ae35ebea2970a360c7e3aa0f580f2" PYPI_PACKAGE = "cryptography_vectors" diff --git a/meta-python/recipes-devtools/python/python3-google-api-python-client_2.18.0.bb b/meta-python/recipes-devtools/python/python3-google-api-python-client_2.19.1.bb similarity index 86% rename from meta-python/recipes-devtools/python/python3-google-api-python-client_2.18.0.bb rename to meta-python/recipes-devtools/python/python3-google-api-python-client_2.19.1.bb index 0dc31826b5d..564058e98f8 100644 --- a/meta-python/recipes-devtools/python/python3-google-api-python-client_2.18.0.bb +++ b/meta-python/recipes-devtools/python/python3-google-api-python-client_2.19.1.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/googleapis/google-api-python-client" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "a25661ec6cf4c159f41fe9c061c2bee31b2dddaf2ad787e23617048a25b53842" +SRC_URI[sha256sum] = "c89b345615188fbd525f52d59013156ad3bfd1023af27041f2dec3d7877ba112" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-ipython_7.26.0.bb b/meta-python/recipes-devtools/python/python3-ipython_7.27.0.bb similarity index 89% rename from meta-python/recipes-devtools/python/python3-ipython_7.26.0.bb rename to meta-python/recipes-devtools/python/python3-ipython_7.27.0.bb index 4c1d4ebd705..2ec0722c35b 100644 --- a/meta-python/recipes-devtools/python/python3-ipython_7.26.0.bb +++ b/meta-python/recipes-devtools/python/python3-ipython_7.27.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f" PYPI_PACKAGE = "ipython" -SRC_URI[sha256sum] = "0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e" +SRC_URI[sha256sum] = "58b55ebfdfa260dad10d509702dc2857cb25ad82609506b070cf2d7b7df5af13" RDEPENDS:${PN} = "\ ${PYTHON_PN}-setuptools \ 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 index e50c7e7e242..bb236b41951 100644 --- 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 @@ -1,8 +1,6 @@ -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(): +@@ -695,7 +695,18 @@ def determine_gl_flags(): c_options['use_x11'] = True c_options['use_egl'] = True else: @@ -22,3 +20,19 @@ index 9a507c6c4..3f5b70866 100644 return flags, base_flags +@@ -723,14 +734,13 @@ def determine_sdl2(): + sdl_inc = join(include, 'SDL2') + if isdir(sdl_inc): + sdl2_paths.append(sdl_inc) +- sdl2_paths.extend(['/usr/local/include/SDL2', '/usr/include/SDL2']) + + flags['include_dirs'] = sdl2_paths + flags['extra_link_args'] = [] + flags['extra_compile_args'] = [] + flags['library_dirs'] = ( + sdl2_paths if sdl2_paths else +- ['/usr/local/lib/']) ++ ['']) + + if sdl2_flags: + flags = merge(flags, sdl2_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 index 3f6bafda81d..d046489021c 100644 --- a/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://kivy.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=f0c851d60495c7e27225a819e179208a" -inherit setuptools3 +inherit setuptools3 pkgconfig features_check SRC_URI = "\ git://github.com/kivy/kivy.git;protocol=git;\ @@ -39,9 +39,11 @@ export USE_X11 KIVY_GRAPHICS = "gles" export KIVY_GRAPHICS -KIVY_CROSS_SYSROOT="${WORKDIR}/recipe-sysroot" +KIVY_CROSS_SYSROOT="${RECIPE_SYSROOT}" export KIVY_CROSS_SYSROOT +REQUIRED_DISTRO_FEATURES += "x11 opengl" + DEPENDS += " \ gstreamer1.0 \ gstreamer1.0-python \ diff --git a/meta-python/recipes-devtools/python/python3-kiwisolver_1.3.1.bb b/meta-python/recipes-devtools/python/python3-kiwisolver_1.3.2.bb similarity index 73% rename from meta-python/recipes-devtools/python/python3-kiwisolver_1.3.1.bb rename to meta-python/recipes-devtools/python/python3-kiwisolver_1.3.2.bb index fb66619dbd6..cf14c49e6c1 100644 --- a/meta-python/recipes-devtools/python/python3-kiwisolver_1.3.1.bb +++ b/meta-python/recipes-devtools/python/python3-kiwisolver_1.3.2.bb @@ -3,8 +3,7 @@ HOMEPAGE = "https://github.com/nucleic/kiwi" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://setup.py;endline=7;md5=e54bd74bd9d0a84ae3f8f6d21ada0ab4" -SRC_URI[md5sum] = "81012578317ddcfa3daed806142f8fed" -SRC_URI[sha256sum] = "950a199911a8d94683a6b10321f9345d5a3a8433ec58b217ace979e18f16e248" +SRC_URI[sha256sum] = "fc4453705b81d03568d5b808ad8f09c77c47534f6ac2e72e733f9ca4714aa75c" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.17.13.bb b/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.17.16.bb similarity index 75% rename from meta-python/recipes-devtools/python/python3-ruamel-yaml_0.17.13.bb rename to meta-python/recipes-devtools/python/python3-ruamel-yaml_0.17.16.bb index d28e8a12fed..e64f1960046 100644 --- a/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.17.13.bb +++ b/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.17.16.bb @@ -8,10 +8,12 @@ PYPI_PACKAGE = "ruamel.yaml" inherit pypi setuptools3 -SRC_URI[sha256sum] = "02f0ed93e98ea32498d25a2952635bbd9fabd553599b8ad67724b4ac88dd8f6c" +SRC_URI[sha256sum] = "1a771fc92d3823682b7f0893ad56cb5a5c87c48e62b5399d6f42c8759a583b33" RDEPENDS:${PN} += "\ ${PYTHON_PN}-shell \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-netclient \ " do_install:prepend() { diff --git a/meta-python/recipes-devtools/python/python3-traitlets_5.0.5.bb b/meta-python/recipes-devtools/python/python3-traitlets_5.1.0.bb similarity index 72% rename from meta-python/recipes-devtools/python/python3-traitlets_5.0.5.bb rename to meta-python/recipes-devtools/python/python3-traitlets_5.1.0.bb index 01fdffb87f1..da234215ea8 100644 --- a/meta-python/recipes-devtools/python/python3-traitlets_5.0.5.bb +++ b/meta-python/recipes-devtools/python/python3-traitlets_5.1.0.bb @@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.md;md5=eec4de4d599518742e54e75954e33b46" PYPI_PACKAGE = "traitlets" -SRC_URI[md5sum] = "2ffe54aee5d0d87890127dd28ce3f6c4" -SRC_URI[sha256sum] = "178f4ce988f69189f7e523337a3e11d91c786ded9360174a3d9ca83e79bc5396" +SRC_URI[sha256sum] = "bd382d7ea181fbbcce157c133db9a829ce06edffe097bcf3ab945b435452b46d" RDEPENDS:${PN} = "\ ${PYTHON_PN}-ipython-genutils \