glfw: add packageconfig and wayland dependencies
PATCH 1/1 glfw: add packageconfig and wayland dependencies
From: Randolph Sapp <[email protected]>
GLFW has the ability to use a wayland backend. This patch adds a config for it and attempts to automatically resolve the most common collision since the wayland and x11 backends are mutually exclusive.
--- meta-oe/recipes-core/glfw/glfw_3.3.bb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
meta-oe/recipes-core/glfw/glfw_3.3.bb +13 -2
@@ -20,7 +20,18 @@ EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_DOCS=OFF" CFLAGS += "-fPIC" -DEPENDS = "libpng libglu zlib libxrandr libxinerama libxi libxcursor" -REQUIRED_DISTRO_FEATURES = "x11 opengl" +DEPENDS = "libpng libglu zlib" +REQUIRED_DISTRO_FEATURES = "opengl" +ANY_OF_DISTRO_FEATURES = "wayland x11" + +# upstream considers x11 and wayland backends mutually exclusive and will +# prioritize wayland if it is enabled + +PACKAGECONFIG ??= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', 'x11', d)} \ +" + +PACKAGECONFIG[wayland] = "-DGLFW_USE_WAYLAND=ON,,wayland wayland-native wayland-protocols extra-cmake-modules libxkbcommon" +PACKAGECONFIG[x11] = ",,libxrandr libxinerama libxi libxcursor" COMPATIBLE_HOST:libc-musl = "null"
Signature · 1 line
2.40.0
PATCH 1/1 glfw: add packageconfig and wayland dependencies
From: Randolph Sapp <[email protected]>
GLFW has the ability to use a wayland backend. This patch adds a config for it and attempts to automatically resolve the most common collision since the wayland and x11 backends are mutually exclusive.
--- meta-oe/recipes-core/glfw/glfw_3.3.bb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
meta-oe/recipes-core/glfw/glfw_3.3.bb +13 -2
@@ -20,7 +20,18 @@ EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_DOCS=OFF" CFLAGS += "-fPIC" -DEPENDS = "libpng libglu zlib libxrandr libxinerama libxi libxcursor" -REQUIRED_DISTRO_FEATURES = "x11 opengl" +DEPENDS = "libpng libglu zlib" +REQUIRED_DISTRO_FEATURES = "opengl" +ANY_OF_DISTRO_FEATURES = "wayland x11" + +# upstream considers x11 and wayland backends mutually exclusive and will +# prioritize wayland if it is enabled + +PACKAGECONFIG ??= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', 'x11', d)} \ +" + +PACKAGECONFIG[wayland] = "-DGLFW_USE_WAYLAND=ON,,wayland wayland-native wayland-protocols extra-cmake-modules libxkbcommon" +PACKAGECONFIG[x11] = ",,libxrandr libxinerama libxi libxcursor" COMPATIBLE_HOST:libc-musl = "null"
Signature · 1 line
2.40.0
fails layer check perhaps it has some cross layer deps
https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/2693
Quoted 49 lines · Randolph Sapp via lists.openembedded.org
From: Randolph Sapp <[email protected]>
GLFW has the ability to use a wayland backend. This patch adds a config for it and attempts to automatically resolve the most common collision since the wayland and x11 backends are mutually exclusive.
Signed-off-by Randolph Sapp <[email protected]>--- meta-oe/recipes-core/glfw/glfw_3.3.bb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)meta-oe/recipes-core/glfw/glfw_3.3.bb +13
-3@@ -20,7 +20,18 @@ EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_DOCS=OFF" CFLAGS += "-fPIC" -DEPENDS = "libpng libglu zlib libxrandr libxinerama libxi libxcursor" -REQUIRED_DISTRO_FEATURES = "x11 opengl" +DEPENDS = "libpng libglu zlib" +REQUIRED_DISTRO_FEATURES = "opengl" +ANY_OF_DISTRO_FEATURES = "wayland x11" + +# upstream considers x11 and wayland backends mutually exclusive and will +# prioritize wayland if it is enabled + +PACKAGECONFIG ??= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', 'x11', d)} \ +" + +PACKAGECONFIG[wayland] = "-DGLFW_USE_WAYLAND=ON,,wayland wayland-native wayland-protocols extra-cmake-modules libxkbcommon" +PACKAGECONFIG[x11] = ",,libxrandr libxinerama libxi libxcursor" COMPATIBLE_HOST:libc-musl = "null" --2.40.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#102202): https://lists.openembedded.org/g/openembedded-devel/message/102202
Mute This Topic: https://lists.openembedded.org/mt/98523628/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Quoted 26 lines · Khem Raj
fails layer check perhaps it has some cross layer deps
https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/2693
Quoted 20 lines · Randolph Sapp via lists.openembedded.org
From: Randolph Sapp <[email protected]>
GLFW has the ability to use a wayland backend. This patch adds a config for it and attempts to automatically resolve the most common collision since the wayland and x11 backends are mutually exclusive.
Signed-off-by Randolph Sapp <[email protected]>--- meta-oe/recipes-core/glfw/glfw_3.3.bb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)meta-oe/recipes-core/glfw/glfw_3.3.bb +0
-0@@ -20,7 +20,18 @@ EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_DOCS=OFF" CFLAGS += "-fPIC"
Quoted 14 lines
Quoted 4 lines
meta-oe/recipes-core/glfw/glfw_3.3.bb +2
-2-DEPENDS = "libpng libglu zlib libxrandr libxinerama libxi libxcursor" -REQUIRED_DISTRO_FEATURES = "x11 opengl" +DEPENDS = "libpng libglu zlib" +REQUIRED_DISTRO_FEATURES = "opengl"meta-oe/recipes-core/glfw/glfw_3.3.bb EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_DOCS=OFF" · line 34
Quoted 10 lines
meta-oe/recipes-core/glfw/glfw_3.3.bb +10
-0+ANY_OF_DISTRO_FEATURES = "wayland x11" + +# upstream considers x11 and wayland backends mutually exclusive and will +# prioritize wayland if it is enabled + +PACKAGECONFIG ??= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', 'x11', d)} \ +" + +PACKAGECONFIG[wayland] = "-DGLFW_USE_WAYLAND=ON,,wayland wayland-native wayland-protocols extra-cmake-modules libxkbcommon"
^^^ extra-cmake-modules is a KDE piece and available from these layers:
https://layers.openembedded.org/layerindex/branch/master/recipes/?q=extra-cmake-modules
Quoted 5 lines
Quoted 5 lines
meta-oe/recipes-core/glfw/glfw_3.3.bb +1
-1+PACKAGECONFIG[x11] = ",,libxrandr libxinerama libxi libxcursor" COMPATIBLE_HOST:libc-musl = "null" --2.40.0
Quoted 36 lines · Denys Dmytriyenko
Quoted 35 lines · Khem Raj
fails layer check perhaps it has some cross layer deps
https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/2693
Quoted 29 lines · Randolph Sapp via lists.openembedded.org
From: Randolph Sapp <[email protected]>
GLFW has the ability to use a wayland backend. This patch adds a config for it and attempts to automatically resolve the most common collision since the wayland and x11 backends are mutually exclusive.
Signed-off-by Randolph Sapp <[email protected]>--- meta-oe/recipes-core/glfw/glfw_3.3.bb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)meta-oe/recipes-core/glfw/glfw_3.3.bb +7
-2@@ -20,7 +20,18 @@ EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_DOCS=OFF" CFLAGS += "-fPIC" -DEPENDS = "libpng libglu zlib libxrandr libxinerama libxi libxcursor" -REQUIRED_DISTRO_FEATURES = "x11 opengl" +DEPENDS = "libpng libglu zlib" +REQUIRED_DISTRO_FEATURES = "opengl" +ANY_OF_DISTRO_FEATURES = "wayland x11" + +# upstream considers x11 and wayland backends mutually exclusive and will +# prioritize wayland if it is enabled +
Quoted 15 lines
Quoted 5 lines
meta-oe/recipes-core/glfw/glfw_3.3.bb EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_DOCS=OFF" · line 34
Quoted 5 lines
meta-oe/recipes-core/glfw/glfw_3.3.bb +5
-0+PACKAGECONFIG ??= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', 'x11', d)} \ +" + +PACKAGECONFIG[wayland] = "-DGLFW_USE_WAYLAND=ON,,wayland wayland-native wayland-protocols extra-cmake-modules libxkbcommon"^^^ extra-cmake-modules is a KDE piece and available from these layers:
https://layers.openembedded.org/layerindex/branch/master/recipes/?q=extra-cmake-modulesQuoted 5 lines
Quoted 5 lines
meta-oe/recipes-core/glfw/glfw_3.3.bb +1
-1+PACKAGECONFIG[x11] = ",,libxrandr libxinerama libxi libxcursor" COMPATIBLE_HOST:libc-musl = "null" --2.40.0
Rats. Well now I guess I know why this was never enabled. What's the play? Drop this or add a new layer dependency? I think I already know the answer but I figure I should ask anyway.
Quoted 53 lines · Randolph Sapp
Quoted 14 lines · Denys Dmytriyenko
Quoted 13 lines · Khem Raj
fails layer check perhaps it has some cross layer deps
https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/2693
Quoted 7 lines · Randolph Sapp via lists.openembedded.org
From: Randolph Sapp <[email protected]>
GLFW has the ability to use a wayland backend. This patch adds a config for it and attempts to automatically resolve the most common collision since the wayland and x11 backends are mutually exclusive.
Quoted 6 lines
Quoted 6 lines
Review
Quoted 6 lines
Signed-off-by Randolph Sapp <[email protected]>--- meta-oe/recipes-core/glfw/glfw_3.3.bb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)(quoted diff) +0
-0b/meta-oe/recipes-core/glfw/glfw_3.3.bb
Quoted 4 lines
Quoted 4 lines
meta-oe/recipes-core/glfw/glfw_3.3.bb EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON
Quoted 4 lines
index
b31bba6b6b..29d7b5de42100644meta-oe/recipes-core/glfw/glfw_3.3.bb +0
-0@@ -20,7 +20,18 @@ EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON-DGLFW_BUILD_DOCS=OFF"
Quoted 10 lines
Quoted 10 lines
meta-oe/recipes-core/glfw/glfw_3.3.bb EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_DOCS=OFF"
Quoted 10 lines
meta-oe/recipes-core/glfw/glfw_3.3.bb +5
-2CFLAGS += "-fPIC" -DEPENDS = "libpng libglu zlib libxrandr libxinerama libxi libxcursor" -REQUIRED_DISTRO_FEATURES = "x11 opengl" +DEPENDS = "libpng libglu zlib" +REQUIRED_DISTRO_FEATURES = "opengl" +ANY_OF_DISTRO_FEATURES = "wayland x11" + +# upstream considers x11 and wayland backends mutually exclusive andwill
Quoted 4 lines
Quoted 4 lines
meta-oe/recipes-core/glfw/glfw_3.3.bb EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_DOCS=OFF"
Quoted 4 lines
meta-oe/recipes-core/glfw/glfw_3.3.bb +4
-0+# prioritize wayland if it is enabled + +PACKAGECONFIG ??= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland','x11', d)} \
Quoted 3 lines
Quoted 3 lines
meta-oe/recipes-core/glfw/glfw_3.3.bb EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_DOCS=OFF"
Quoted 3 lines
meta-oe/recipes-core/glfw/glfw_3.3.bb +3
-0+" + +PACKAGECONFIG[wayland] = "-DGLFW_USE_WAYLAND=ON,,waylandwayland-native wayland-protocols extra-cmake-modules libxkbcommon"
Quoted 3 lines
^^^ extra-cmake-modules is a KDE piece and available from these layers:
https://layers.openembedded.org/layerindex/branch/master/recipes/?q=extra-cmake-modules
Quoted 2 lines
Quoted 8 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
meta-oe/recipes-core/glfw/glfw_3.3.bb +1
-1+PACKAGECONFIG[x11] = ",,libxrandr libxinerama libxi libxcursor" COMPATIBLE_HOST:libc-musl = "null" --2.40.0
Rats. Well now I guess I know why this was never enabled. What's the play? Drop this or add a new layer dependency? I think I already know
You can add this as dependency via packageconfig and keep it disabled by default
Quoted 2 lines
the answer but I figure I should ask anyway.
Quoted 76 lines · Khem Raj
On Thu, Apr 27, 2023 at 9:14 AM Randolph Sapp <[email protected] <mailto:[email protected]>> wrote:
On 4/27/23 11:02, Denys Dmytriyenko wrote: > On Thu, Apr 27, 2023 at 01:22:16AM -0700, Khem Raj wrote: >> fails layer check perhaps it has some cross layer deps >> >> https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/2693 <https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/2693> >> >> On Wed, Apr 26, 2023 at 1:35 PM Randolph Sapp via >> lists.openembedded.org <http://lists.openembedded.org> <[email protected] <mailto:[email protected]>> wrote: >>> >>> From: Randolph Sapp <[email protected] <mailto:[email protected]>> >>> >>> GLFW has the ability to use a wayland backend. This patch adds a config >>> for it and attempts to automatically resolve the most common collision >>> since the wayland and x11 backends are mutually exclusive. >>> >>> Signed-off-by: Randolph Sapp <[email protected] <mailto:[email protected]>> >>> --- >>> meta-oe/recipes-core/glfw/glfw_3.3.bb <http://glfw_3.3.bb> | 15 +++++++++++++-- >>> 1 file changed, 13 insertions(+), 2 deletions(-) >>> >>> diff --git a/meta-oe/recipes-core/glfw/glfw_3.3.bb <http://glfw_3.3.bb> b/meta-oe/recipes-core/glfw/glfw_3.3.bb <http://glfw_3.3.bb> >>> index b31bba6b6b..29d7b5de42 100644 >>> --- a/meta-oe/recipes-core/glfw/glfw_3.3.bb <http://glfw_3.3.bb> >>> +++ b/meta-oe/recipes-core/glfw/glfw_3.3.bb <http://glfw_3.3.bb> >>> @@ -20,7 +20,18 @@ EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_DOCS=OFF" >>> >>> CFLAGS += "-fPIC" >>> >>> -DEPENDS = "libpng libglu zlib libxrandr libxinerama libxi libxcursor" >>> -REQUIRED_DISTRO_FEATURES = "x11 opengl" >>> +DEPENDS = "libpng libglu zlib" >>> +REQUIRED_DISTRO_FEATURES = "opengl" >>> +ANY_OF_DISTRO_FEATURES = "wayland x11" >>> + >>> +# upstream considers x11 and wayland backends mutually exclusive and will >>> +# prioritize wayland if it is enabled >>> + >>> +PACKAGECONFIG ??= " \ >>> + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', 'x11', d)} \ >>> +" >>> + >>> +PACKAGECONFIG[wayland] = "-DGLFW_USE_WAYLAND=ON,,wayland wayland-native wayland-protocols extra-cmake-modules libxkbcommon" > > ^^^ extra-cmake-modules is a KDE piece and available from these layers: > https://layers.openembedded.org/layerindex/branch/master/recipes/?q=extra-cmake-modules <https://layers.openembedded.org/layerindex/branch/master/recipes/?q=extra-cmake-modules> > > >>> +PACKAGECONFIG[x11] = ",,libxrandr libxinerama libxi libxcursor" >>> >>> COMPATIBLE_HOST:libc-musl = "null" >>> -- >>> 2.40.0 Rats. Well now I guess I know why this was never enabled. What's the play? Drop this or add a new layer dependency? I think I already know
Quoted 1 line
You can add this as dependency via packageconfig and keep it disabled by default
Better than nothing. V2 in a minute.