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 0abc6c5c7e..e38b31d34d 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,19 @@ +From 98224fec48d6e0f32b28d81220bf1ee1637ce045 Mon Sep 17 00:00:00 2001 +From: William Huang +Date: Thu, 2 Sep 2021 07:25:07 -0400 +Subject: [PATCH] recipes-devtools: python: add support for Kivy + Upstream-Status: Pending +--- + setup.py | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index 35e34afdd..0ba3aca72 100644 --- a/setup.py +++ b/setup.py -@@ -695,7 +695,18 @@ def determine_gl_flags(): +@@ -730,7 +730,18 @@ def determine_gl_flags(): c_options['use_x11'] = True c_options['use_egl'] = True else: @@ -22,7 +33,7 @@ Upstream-Status: Pending return flags, base_flags -@@ -723,14 +734,13 @@ def determine_sdl2(): +@@ -774,14 +785,13 @@ def determine_sdl2(): sdl_inc = join(include, 'SDL2') if isdir(sdl_inc): sdl2_paths.append(sdl_inc) @@ -36,5 +47,5 @@ Upstream-Status: Pending - ['/usr/local/lib/']) + ['']) - if sdl2_flags: - flags = merge(flags, sdl2_flags) + if kivy_sdl2_path: + # If we have a custom path, we need to add the rpath to the linker diff --git a/meta-python/recipes-devtools/python/python3-kivy_2.1.0.bb b/meta-python/recipes-devtools/python/python3-kivy_2.2.1.bb similarity index 86% rename from meta-python/recipes-devtools/python/python3-kivy_2.1.0.bb rename to meta-python/recipes-devtools/python/python3-kivy_2.2.1.bb index b02c55a85b..67ab9a0175 100644 --- a/meta-python/recipes-devtools/python/python3-kivy_2.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-kivy_2.2.1.bb @@ -2,23 +2,20 @@ 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=22e7b4dd8140eec57fd7edfd9fa23dfc" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ed5cd0f2cfda42852c332e3b88c85fea" inherit setuptools3 pkgconfig features_check PIP_INSTALL_PACKAGE = "Kivy" -SRC_URI = "\ - git://github.com/kivy/kivy.git;protocol=https;branch=master \ -" +SRC_URI = "git://github.com/kivy/kivy.git;protocol=https;branch=stable \ + file://0001-add-support-for-glesv2.patch \ + " # 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 = "960b95dc666753f59eff1b449124490fbec10184" +SRCREV = "344768bfefd2e8f5302cc9dfb8ca41991ce6f7e7" S = "${WORKDIR}/git"