From 53ceab0e1f37693871002cf9147501953899a1a3 Mon Sep 17 00:00:00 2001 From: Leon Anavi Date: Wed, 8 Jan 2025 11:38:47 +0200 Subject: python3-kivy: Upgrade 2.3.0 -> 2.3.1 Upgrade to release 2.3.1: - [Backport devel-2.3.x] Fix PyInstaller hooks to work with v6.x.x - Remove duplicated code block for dependency management (applies to stable branches only) - [Backport devel-2.3.x] Bump SDL2 deps versions to latest available releases (macOS, Linux, Windows) - [Backport devel-2.3.x] Fix issue with CompoundSelectionBehavior silently ignoring ValueError in on_selected_nodes event - [Backport devel-2.3.x] Label: Prevent overwriting disabled_color attribute when color is updated - [Backport devel-2.3.x] Fix ConfigParser.write error with when --save is supplied as an argument - [Backport devel-2.3.x] Update monitor module to use dp - [Backport devel-2.3.x] Rename CaptureDelegate to KivyCaptureDelegate in AVFoundationCamera to avoid duplicated symbols - [Backport devel-2.3.x] avplayer audio provider: Fixes seek and state on iOS and macOS - [Backport devel-2.3.x] Fix numpy float/int error when using CameraAndroid.decode_frame - [Backport devel-2.3.x] Use filetype as imghdr built-in module is deprecated and slated for removal in Python 3.13 - [Backport devel-2.3.x] Updated ES vkeyboard layout to resemble a real ES keyboard layout - [Backport devel-2.3.x] Fix xsel import when clipboard is empty, and add timeout failsafe - [Backport devel-2.3.x] Fix SDL_EventFilter definitions to match SDL definitions (fixes build on GCC 14) Signed-off-by: Leon Anavi Signed-off-by: Khem Raj --- .../recipes-devtools/python/python3-kivy_2.3.0.bb | 75 ---------------------- .../recipes-devtools/python/python3-kivy_2.3.1.bb | 75 ++++++++++++++++++++++ 2 files changed, 75 insertions(+), 75 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-kivy_2.3.0.bb create mode 100644 meta-python/recipes-devtools/python/python3-kivy_2.3.1.bb (limited to 'meta-python/recipes-devtools/python') diff --git a/meta-python/recipes-devtools/python/python3-kivy_2.3.0.bb b/meta-python/recipes-devtools/python/python3-kivy_2.3.0.bb deleted file mode 100644 index 4c09e5d9e3..0000000000 --- a/meta-python/recipes-devtools/python/python3-kivy_2.3.0.bb +++ /dev/null @@ -1,75 +0,0 @@ -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=6d3bc49400e35d5a2279d14c40dcfb09" - -inherit setuptools3 pkgconfig features_check cython - -# 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 with gles -SRC_URI = "git://github.com/kivy/kivy.git;protocol=https;branch=stable \ - file://0001-add-support-for-glesv2.patch \ - " - -SRCREV = "9ef218027178115a66b417ae34b21f488bdd3617" - -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="${RECIPE_SYSROOT}" -export KIVY_CROSS_SYSROOT - -REQUIRED_DISTRO_FEATURES += "opengl gobject-introspection-data" - -ANY_OF_DISTRO_FEATURES = "x11 wayland" - -DEPENDS += " \ - gstreamer1.0 \ - gstreamer1.0-python \ - libsdl2 \ - libsdl2-ttf \ - libsdl2-image \ - libsdl2-mixer \ - pango \ -" - -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 \ -" - -# http://errors.yoctoproject.org/Errors/Details/766917/ -# python3-kivy/2.3.0/git/kivy/graphics/cgl_backend/cgl_gl.c:4568:52: error: assignment to 'void (*)(GLuint, GLsizei, const GLchar **, const GLint *)' {aka 'void (*)(unsigned int, int, const char **, const int *)'} from incompatible pointer type 'void (*)(GLuint, GLsizei, const GLchar * const*, const GLint *)' {aka 'void (*)(unsigned int, int, const char * const*, const int *)'} [-Wincompatible-pointer-types] -# python3-kivy/2.3.0/git/kivy/core/window/_window_sdl2.c:8781:23: error: passing argument 1 of 'SDL_SetEventFilter' from incompatible pointer type [-Wincompatible-pointer-types] -CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-python/recipes-devtools/python/python3-kivy_2.3.1.bb b/meta-python/recipes-devtools/python/python3-kivy_2.3.1.bb new file mode 100644 index 0000000000..e64a62bd36 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-kivy_2.3.1.bb @@ -0,0 +1,75 @@ +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=6d3bc49400e35d5a2279d14c40dcfb09" + +inherit setuptools3 pkgconfig features_check cython + +# 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 with gles +SRC_URI = "git://github.com/kivy/kivy.git;protocol=https;branch=stable \ + file://0001-add-support-for-glesv2.patch \ + " + +SRCREV = "20d74dcd30f143abbd1aa94c76bafc5bd934d5bd" + +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="${RECIPE_SYSROOT}" +export KIVY_CROSS_SYSROOT + +REQUIRED_DISTRO_FEATURES += "opengl gobject-introspection-data" + +ANY_OF_DISTRO_FEATURES = "x11 wayland" + +DEPENDS += " \ + gstreamer1.0 \ + gstreamer1.0-python \ + libsdl2 \ + libsdl2-ttf \ + libsdl2-image \ + libsdl2-mixer \ + pango \ +" + +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 \ +" + +# http://errors.yoctoproject.org/Errors/Details/766917/ +# python3-kivy/2.3.0/git/kivy/graphics/cgl_backend/cgl_gl.c:4568:52: error: assignment to 'void (*)(GLuint, GLsizei, const GLchar **, const GLint *)' {aka 'void (*)(unsigned int, int, const char **, const int *)'} from incompatible pointer type 'void (*)(GLuint, GLsizei, const GLchar * const*, const GLint *)' {aka 'void (*)(unsigned int, int, const char * const*, const int *)'} [-Wincompatible-pointer-types] +# python3-kivy/2.3.0/git/kivy/core/window/_window_sdl2.c:8781:23: error: passing argument 1 of 'SDL_SetEventFilter' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" -- cgit v1.2.3-54-g00ecf