mirror of
https://codeberg.org/flk/meta-wayland.git
synced 2024-12-30 15:28:22 +01:00
61 lines
1.8 KiB
Diff
61 lines
1.8 KiB
Diff
|
From 19e0c04a57bfb3677caf1ac8c22527b066666a95 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Markus Volk <f_l_k@t-online.de>
|
||
|
|
Date: Sun, 23 Jul 2023 10:19:54 +0200
|
||
|
|
Subject: [PATCH] hyprland: update
|
||
|
|
|
||
|
|
---
|
||
|
|
meson.build | 17 +----------------
|
||
|
|
src/meson.build | 6 +++---
|
||
|
|
2 files changed, 4 insertions(+), 19 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/meson.build b/meson.build
|
||
|
|
index 1d2c7f9f..c5ef4e67 100644
|
||
|
|
--- a/meson.build
|
||
|
|
+++ b/meson.build
|
||
|
|
@@ -33,20 +33,7 @@ if cpp_compiler.check_header('execinfo.h')
|
||
|
|
add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
|
||
|
|
endif
|
||
|
|
|
||
|
|
-wlroots = subproject('wlroots', default_options: ['examples=false', 'renderers=gles2'])
|
||
|
|
-have_xwlr = wlroots.get_variable('features').get('xwayland')
|
||
|
|
-xcb_dep = dependency('xcb', required: get_option('xwayland'))
|
||
|
|
-
|
||
|
|
-cmake = import('cmake')
|
||
|
|
-udis = cmake.subproject('udis86')
|
||
|
|
-udis86 = udis.dependency('libudis86')
|
||
|
|
-
|
||
|
|
-if get_option('xwayland').enabled() and not have_xwlr
|
||
|
|
- error('Cannot enable Xwayland in Hyprland: wlroots has been built without Xwayland support')
|
||
|
|
-endif
|
||
|
|
-have_xwayland = xcb_dep.found() and have_xwlr
|
||
|
|
-
|
||
|
|
-if not have_xwayland
|
||
|
|
+if get_option('xwayland').disabled()
|
||
|
|
add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
|
||
|
|
endif
|
||
|
|
|
||
|
|
diff --git a/src/meson.build b/src/meson.build
|
||
|
|
index 0af864b9..38723b8c 100644
|
||
|
|
--- a/src/meson.build
|
||
|
|
+++ b/src/meson.build
|
||
|
|
@@ -9,16 +9,16 @@ executable('Hyprland', src,
|
||
|
|
server_protos,
|
||
|
|
dependency('wayland-server'),
|
||
|
|
dependency('wayland-client'),
|
||
|
|
- wlroots.get_variable('wlroots'),
|
||
|
|
+ dependency('wlroots'),
|
||
|
|
dependency('cairo'),
|
||
|
|
dependency('libdrm'),
|
||
|
|
dependency('egl'),
|
||
|
|
dependency('xkbcommon'),
|
||
|
|
dependency('libinput'),
|
||
|
|
- xcb_dep,
|
||
|
|
+ dependency('xcb', required: get_option('xwayland')),
|
||
|
|
backtrace_dep,
|
||
|
|
systemd_dep,
|
||
|
|
- udis86,
|
||
|
|
+ dependency('udis86'),
|
||
|
|
|
||
|
|
dependency('pixman-1'),
|
||
|
|
dependency('gl', 'opengl'),
|