* [meta-python][PATCH 1/3] python3-kivy: Remove hardcoded include paths
@ 2021-09-04 17:45 Khem Raj
2021-09-04 17:45 ` [meta-python][PATCH 2/3] python3-kivy: Check for x11 and opengl before enabling the recipe Khem Raj
2021-09-04 17:45 ` [meta-python][PATCH 3/3] packagegroup-meta-python: Add python3-kivy Khem Raj
0 siblings, 2 replies; 5+ messages in thread
From: Khem Raj @ 2021-09-04 17:45 UTC (permalink / raw)
To: openembedded-devel; +Cc: Khem Raj, William Huang
Use RECIPE_SYSROOT instead of synthesizing the sysroot
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: William Huang <whuang8933@gmail.com>
---
.../0001-add-support-for-glesv2.patch | 20 ++++++++++++++++---
.../python/python3-kivy_2.0.0.bb | 2 +-
2 files changed, 18 insertions(+), 4 deletions(-)
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 e50c7e7e24..bb236b4195 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 3f6bafda81..63c2ae7334 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
@@ -39,7 +39,7 @@ export USE_X11
KIVY_GRAPHICS = "gles"
export KIVY_GRAPHICS
-KIVY_CROSS_SYSROOT="${WORKDIR}/recipe-sysroot"
+KIVY_CROSS_SYSROOT="${RECIPE_SYSROOT}"
export KIVY_CROSS_SYSROOT
DEPENDS += " \
--
2.33.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [meta-python][PATCH 2/3] python3-kivy: Check for x11 and opengl before enabling the recipe
2021-09-04 17:45 [meta-python][PATCH 1/3] python3-kivy: Remove hardcoded include paths Khem Raj
@ 2021-09-04 17:45 ` Khem Raj
2021-09-04 17:49 ` Khem Raj
2021-09-04 17:45 ` [meta-python][PATCH 3/3] packagegroup-meta-python: Add python3-kivy Khem Raj
1 sibling, 1 reply; 5+ messages in thread
From: Khem Raj @ 2021-09-04 17:45 UTC (permalink / raw)
To: openembedded-devel; +Cc: Khem Raj, Martin Jansa, William Huang
Fixes
ERROR: Nothing PROVIDES 'libsdl2-ttf' (but meta-openembedded/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb DEPENDS on or otherwise requires it)
libsdl2-ttf was skipped: missing required distro feature 'opengl' (not in DISTRO_FEATURES)
ERROR: Nothing RPROVIDES 'python3-kivy-dev' (but meta-openembedded/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb RDEPENDS on or otherwise requires it)
No eligible RPROVIDERs exist for 'python3-kivy-dev'
NOTE: Runtime target 'python3-kivy-dev' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['python3-kivy-dev']
ERROR: Nothing RPROVIDES 'python3-kivy' (but meta-openembedded/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb RDEPENDS on or otherwise requires it)
No eligible RPROVIDERs exist for 'python3-kivy'
NOTE: Runtime target 'python3-kivy' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['python3-kivy']
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Martin Jansa <Martin.Jansa@gmail.com>
Cc: William Huang <whuang8933@gmail.com>
---
meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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 63c2ae7334..29a050a891 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 distro_features_check
SRC_URI = "\
git://github.com/kivy/kivy.git;protocol=git;\
@@ -42,6 +42,8 @@ export KIVY_GRAPHICS
KIVY_CROSS_SYSROOT="${RECIPE_SYSROOT}"
export KIVY_CROSS_SYSROOT
+REQUIRED_DISTRO_FEATURES += "x11 opengl"
+
DEPENDS += " \
gstreamer1.0 \
gstreamer1.0-python \
--
2.33.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [meta-python][PATCH 3/3] packagegroup-meta-python: Add python3-kivy
2021-09-04 17:45 [meta-python][PATCH 1/3] python3-kivy: Remove hardcoded include paths Khem Raj
2021-09-04 17:45 ` [meta-python][PATCH 2/3] python3-kivy: Check for x11 and opengl before enabling the recipe Khem Raj
@ 2021-09-04 17:45 ` Khem Raj
2021-09-07 1:36 ` [oe] " William Huang
1 sibling, 1 reply; 5+ messages in thread
From: Khem Raj @ 2021-09-04 17:45 UTC (permalink / raw)
To: openembedded-devel; +Cc: Khem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../recipes-core/packagegroups/packagegroup-meta-python.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
index b5a2f5d7d9..2d51b4e1a3 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 \
--
2.33.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [meta-python][PATCH 2/3] python3-kivy: Check for x11 and opengl before enabling the recipe
2021-09-04 17:45 ` [meta-python][PATCH 2/3] python3-kivy: Check for x11 and opengl before enabling the recipe Khem Raj
@ 2021-09-04 17:49 ` Khem Raj
0 siblings, 0 replies; 5+ messages in thread
From: Khem Raj @ 2021-09-04 17:49 UTC (permalink / raw)
To: openembeded-devel; +Cc: Martin Jansa, William Huang
On Sat, Sep 4, 2021 at 10:45 AM Khem Raj <raj.khem@gmail.com> wrote:
>
> Fixes
>
> ERROR: Nothing PROVIDES 'libsdl2-ttf' (but meta-openembedded/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb DEPENDS on or otherwise requires it)
> libsdl2-ttf was skipped: missing required distro feature 'opengl' (not in DISTRO_FEATURES)
> ERROR: Nothing RPROVIDES 'python3-kivy-dev' (but meta-openembedded/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb RDEPENDS on or otherwise requires it)
> No eligible RPROVIDERs exist for 'python3-kivy-dev'
> NOTE: Runtime target 'python3-kivy-dev' is unbuildable, removing...
> Missing or unbuildable dependency chain was: ['python3-kivy-dev']
> ERROR: Nothing RPROVIDES 'python3-kivy' (but meta-openembedded/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb RDEPENDS on or otherwise requires it)
> No eligible RPROVIDERs exist for 'python3-kivy'
> NOTE: Runtime target 'python3-kivy' is unbuildable, removing...
> Missing or unbuildable dependency chain was: ['python3-kivy']
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Cc: Martin Jansa <Martin.Jansa@gmail.com>
> Cc: William Huang <whuang8933@gmail.com>
> ---
> meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> 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 63c2ae7334..29a050a891 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 distro_features_check
this should be using features_check I have fixed it before staging
into master-next
>
> SRC_URI = "\
> git://github.com/kivy/kivy.git;protocol=git;\
> @@ -42,6 +42,8 @@ export KIVY_GRAPHICS
> KIVY_CROSS_SYSROOT="${RECIPE_SYSROOT}"
> export KIVY_CROSS_SYSROOT
>
> +REQUIRED_DISTRO_FEATURES += "x11 opengl"
> +
> DEPENDS += " \
> gstreamer1.0 \
> gstreamer1.0-python \
> --
> 2.33.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [oe] [meta-python][PATCH 3/3] packagegroup-meta-python: Add python3-kivy
2021-09-04 17:45 ` [meta-python][PATCH 3/3] packagegroup-meta-python: Add python3-kivy Khem Raj
@ 2021-09-07 1:36 ` William Huang
0 siblings, 0 replies; 5+ messages in thread
From: William Huang @ 2021-09-07 1:36 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-devel
Thanks for fixing up the recipe!
On Sat, Sep 4, 2021 at 1:45 PM Khem Raj <raj.khem@gmail.com> wrote:
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> .../recipes-core/packagegroups/packagegroup-meta-python.bb | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
> index b5a2f5d7d9..2d51b4e1a3 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 \
> --
> 2.33.0
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-09-07 1:36 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-04 17:45 [meta-python][PATCH 1/3] python3-kivy: Remove hardcoded include paths Khem Raj
2021-09-04 17:45 ` [meta-python][PATCH 2/3] python3-kivy: Check for x11 and opengl before enabling the recipe Khem Raj
2021-09-04 17:49 ` Khem Raj
2021-09-04 17:45 ` [meta-python][PATCH 3/3] packagegroup-meta-python: Add python3-kivy Khem Raj
2021-09-07 1:36 ` [oe] " William Huang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.