mirror of
https://codeberg.org/flk/meta-wayland.git
synced 2025-02-13 07:32:46 +01:00
hyprland: update
This commit is contained in:
parent
df8fdfb9ab
commit
acf9c8e353
@ -1,13 +1,3 @@
|
|||||||
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
|
diff --git a/meson.build b/meson.build
|
||||||
index 1d2c7f9f..c5ef4e67 100644
|
index 1d2c7f9f..c5ef4e67 100644
|
||||||
--- a/meson.build
|
--- a/meson.build
|
||||||
@ -34,17 +24,27 @@ index 1d2c7f9f..c5ef4e67 100644
|
|||||||
add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
|
add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@@ -69,8 +56,6 @@ if get_option('buildtype') == 'debug'
|
||||||
|
add_project_arguments('-DHYPRLAND_DEBUG', language: 'cpp')
|
||||||
|
endif
|
||||||
|
|
||||||
|
-version_h = run_command('sh', '-c', 'scripts/generateVersion.sh')
|
||||||
|
-
|
||||||
|
globber = run_command('find', 'src', '-name', '*.h*', check: true)
|
||||||
|
headers = globber.stdout().strip().split('\n')
|
||||||
|
foreach file : headers
|
||||||
diff --git a/src/meson.build b/src/meson.build
|
diff --git a/src/meson.build b/src/meson.build
|
||||||
index 0af864b9..38723b8c 100644
|
index 45701f5f..3505cefe 100644
|
||||||
--- a/src/meson.build
|
--- a/src/meson.build
|
||||||
+++ b/src/meson.build
|
+++ b/src/meson.build
|
||||||
@@ -9,16 +9,16 @@ executable('Hyprland', src,
|
@@ -9,17 +9,17 @@ executable('Hyprland', src,
|
||||||
server_protos,
|
server_protos,
|
||||||
dependency('wayland-server'),
|
dependency('wayland-server'),
|
||||||
dependency('wayland-client'),
|
dependency('wayland-client'),
|
||||||
- wlroots.get_variable('wlroots'),
|
- wlroots.get_variable('wlroots'),
|
||||||
+ dependency('wlroots'),
|
+ dependency('wlroots'),
|
||||||
dependency('cairo'),
|
dependency('cairo'),
|
||||||
|
dependency('hyprlang', version: '>= 0.3.2'),
|
||||||
dependency('libdrm'),
|
dependency('libdrm'),
|
||||||
dependency('egl'),
|
dependency('egl'),
|
||||||
dependency('xkbcommon'),
|
dependency('xkbcommon'),
|
||||||
|
@ -10,6 +10,7 @@ REQUIRED_DISTRO_FEATURES = "wayland opengl"
|
|||||||
|
|
||||||
DEPENDS += " \
|
DEPENDS += " \
|
||||||
cairo \
|
cairo \
|
||||||
|
hyprlang \
|
||||||
jq-native \
|
jq-native \
|
||||||
libdrm \
|
libdrm \
|
||||||
libinput \
|
libinput \
|
||||||
@ -38,8 +39,8 @@ SRC_URI = " \
|
|||||||
file://meson-build.patch \
|
file://meson-build.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRCREV = "84ab8d11e8951a6551d1e1bf87796a8589da6d47"
|
SRCREV = "1c460e98f870676b15871fe4e5bfeb1a32a3d6d8"
|
||||||
PV = "0.35.0"
|
PV = "0.36.0"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
inherit meson pkgconfig features_check
|
inherit meson pkgconfig features_check
|
||||||
@ -50,6 +51,10 @@ PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled"
|
|||||||
PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,libxcb xcb-util-wm xcb-util-renderutil xwayland,xwayland"
|
PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,libxcb xcb-util-wm xcb-util-renderutil xwayland,xwayland"
|
||||||
PACKAGECONFIG[legacy_renderer] = "-Dlegacy_renderer=enabled,-Dlegacy_renderer=disabled"
|
PACKAGECONFIG[legacy_renderer] = "-Dlegacy_renderer=enabled,-Dlegacy_renderer=disabled"
|
||||||
|
|
||||||
|
do_configure:prepend() {
|
||||||
|
cd ${S} && scripts/generateVersion.sh
|
||||||
|
}
|
||||||
|
|
||||||
FILES:${PN} += "${datadir}"
|
FILES:${PN} += "${datadir}"
|
||||||
|
|
||||||
CXXFLAGS += "-Wno-unused-result"
|
CXXFLAGS += "-Wno-unused-result"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user