Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "waffle: Fix broken patches" #1810

Merged
merged 1 commit into from
Apr 30, 2024
Merged

Revert "waffle: Fix broken patches" #1810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions recipes-graphics/waffle/waffle/0001-meson-Add-missing-wayland-dependency-on-EGL.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ Index: git/meson.build
===================================================================
--- git.orig/meson.build
+++ git/meson.build
@@ -64,6 +64,7 @@ dep_drm = _dep_null
@@ -65,6 +65,7 @@ dep_gl = _dep_null
dep_egl = _dep_null
dep_wayland_client = _dep_null
dep_wayland_egl = _dep_null
+dep_wayland_wayland_egl = _dep_null
dep_wayland_scanner = _dep_null
dep_wayland_proto = _dep_null
dep_x11_xcb = _dep_null
@@ -104,7 +105,8 @@ else
@@ -106,7 +107,8 @@ else
dep_wayland_client = dependency(
'wayland-client', version : '>= 1.10', required : get_option('wayland'),
)
Expand All @@ -36,12 +36,12 @@ Index: git/meson.build
'wayland-egl', version : '>= 9.1', required : get_option('wayland'),
)
dep_wayland_scanner = dependency(
@@ -122,7 +124,7 @@ else
@@ -124,7 +126,7 @@ else
wayland_xdg_shell_xml = join_paths(dep_wayland_proto.get_variable(pkgconfig: 'pkgdatadir'),
'stable/xdg-shell/xdg-shell.xml')
endif
- build_wayland = dep_egl.found() and dep_wayland_client.found() and dep_wayland_egl.found() and dep_wayland_scanner.found() and dep_wayland_proto.found()
+ build_wayland = dep_egl.found() and dep_wayland_client.found() and dep_wayland_egl.found() and dep_wayland_scanner.found() and dep_wayland_proto.found() and dep_wayland_wayland_egl.found()

# We're interested only in the headers provided
# FINISHME: make x11_xcb compile-only dependency
# FINISHME: make x11_xcb and udev compile-only dependency
22 changes: 12 additions & 10 deletions recipes-graphics/waffle/waffle/0002-meson-Separate-surfaceless-option-from-x11.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,27 @@ Signed-off-by: Tom Hochstein <[email protected]>
meson.build | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

Index: git/meson.build
===================================================================
--- git.orig/meson.build
+++ git/meson.build
@@ -72,6 +72,7 @@ dep_gbm = _dep_null
--- a/meson.build
+++ b/meson.build
@@ -72,6 +72,7 @@ dep_udev = _dep_null
dep_cocoa = _dep_null
dep_core_foundation = _dep_null
dep_gl_headers = _dep_null
+dep_surfaceless = _dep_null

# Get dependencies
if build_wgl
@@ -99,7 +100,8 @@ else
build_gbm = dep_drm.found() and dep_egl.found() and dep_gbm.found()
@@ -96,10 +97,11 @@ else
dep_egl = dependency('egl', required : get_option('gbm'))
dep_gbm = dependency('gbm', required : get_option('gbm'))
dep_udev = dependency('libudev', required : get_option('gbm'))
+ dep_surfaceless_egl = dependency('egl', required : get_option('surfaceless_egl'))
+ dep_surfaceless_gbm = dependency('gbm', required : get_option('surfaceless_egl'))
build_gbm = dep_egl.found() and dep_gbm.found() and dep_udev.found()

dep_egl = dependency('egl', required : get_option('surfaceless_egl'))
- dep_egl = dependency('egl', required : get_option('surfaceless_egl'))
- build_surfaceless = dep_egl.found()
+ dep_gbm = dependency('gbm', required : get_option('surfaceless_egl'))
+ build_surfaceless = dep_egl.found() and dep_gbm.found()
+ build_surfaceless = dep_surfaceless_egl.found() and dep_surfaceless_gbm.found()

dep_egl = dependency('egl', required : get_option('wayland'))
dep_wayland_client = dependency(
Loading