mirror of
https://codeberg.org/flk/meta-wayland.git
synced 2025-06-17 19:04:21 +02:00
gamescope: update
This commit is contained in:
parent
537101c085
commit
80c761ad87
@ -1,29 +0,0 @@
|
|||||||
From d09dae4bd9494c03fb85c216fe33c883a7b7f64d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Markus Volk <f_l_k@t-online.de>
|
|
||||||
Date: Mon, 8 Jan 2024 14:00:07 +0100
|
|
||||||
Subject: [PATCH] meson.build: dont fail if stb is not found
|
|
||||||
|
|
||||||
we have neigher pkconfig nor cmake support
|
|
||||||
manually add it to CXXFLAGS
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
---
|
|
||||||
src/meson.build | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/meson.build b/src/meson.build
|
|
||||||
index e0254e6..e6e88bd 100644
|
|
||||||
--- a/src/meson.build
|
|
||||||
+++ b/src/meson.build
|
|
||||||
@@ -21,7 +21,7 @@ cap_dep = dependency('libcap', required: get_option('rt_cap'))
|
|
||||||
epoll_dep = dependency('epoll-shim', required: false)
|
|
||||||
glm_dep = dependency('glm')
|
|
||||||
sdl2_dep = dependency('SDL2', required: get_option('sdl2_backend'))
|
|
||||||
-stb_dep = dependency('stb')
|
|
||||||
+stb_dep = dependency('stb', required: false)
|
|
||||||
avif_dep = dependency('libavif', version: '>=1.0.0', required: get_option('avif_screenshots'))
|
|
||||||
|
|
||||||
wlroots_dep = dependency(
|
|
||||||
--
|
|
||||||
2.43.0
|
|
||||||
|
|
@ -0,0 +1,32 @@
|
|||||||
|
From bd4e5efd7f69faae366b794c0210734418fdf0ca Mon Sep 17 00:00:00 2001
|
||||||
|
From: Markus Volk <f_l_k@t-online.de>
|
||||||
|
Date: Wed, 4 Jun 2025 00:08:08 +0200
|
||||||
|
Subject: [PATCH] meson.build: dont use wrap based subprojects
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [oe-specific]
|
||||||
|
---
|
||||||
|
meson.build | 10 +++++-----
|
||||||
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/meson.build b/meson.build
|
||||||
|
index 9050f008..da400551 100644
|
||||||
|
--- a/meson.build
|
||||||
|
+++ b/meson.build
|
||||||
|
@@ -50,10 +50,10 @@ dep_x11 = dependency('x11')
|
||||||
|
dep_wayland = dependency('wayland-client')
|
||||||
|
vulkan_dep = dependency('vulkan')
|
||||||
|
|
||||||
|
-glm_proj = subproject('glm')
|
||||||
|
-glm_dep = glm_proj.get_variable('glm_dep')
|
||||||
|
-stb_proj = subproject('stb')
|
||||||
|
-stb_dep = stb_proj.get_variable('stb_dep')
|
||||||
|
+#glm_proj = subproject('glm')
|
||||||
|
+glm_dep = dependency('glm')
|
||||||
|
+#stb_proj = subproject('stb')
|
||||||
|
+stb_dep = dependency('stb', required: false)
|
||||||
|
|
||||||
|
if get_option('enable_openvr_support')
|
||||||
|
openvr_dep = dependency('openvr', version: '>= 2.7', required : false)
|
||||||
|
--
|
||||||
|
2.49.0
|
||||||
|
|
@ -55,11 +55,11 @@ PACKAGECONFIG[drm_backend] = "-Ddrm_backend=enabled,-Ddrm_backend=disabled"
|
|||||||
|
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
gitsm://github.com/ValveSoftware/gamescope.git;branch=master;lfs=0;protocol=https \
|
gitsm://github.com/ValveSoftware/gamescope.git;branch=master;lfs=0;protocol=https \
|
||||||
file://0001-meson.build-dont-fail-if-stb-is-not-found.patch \
|
file://0001-meson.build-dont-use-wrap-based-subprojects.patch \
|
||||||
file://0001-meson.build-dont-leak-buildpath.patch \
|
file://0001-meson.build-dont-leak-buildpath.patch \
|
||||||
"
|
"
|
||||||
SRCREV = "f1f105b3a95b4fec5c92e8a10e6927cbb76fe804"
|
SRCREV = "df15bcd81ec65e109c740019cacff06ac6fb07db"
|
||||||
PV = "3.16.3"
|
PV = "3.16.11"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user