From d4763d4add9b732f72ce9015410ba2f8f18dee6e Mon Sep 17 00:00:00 2001 From: Chloe Christine Fontenot Date: Tue, 21 Jul 2026 16:49:39 -0500 Subject: [PATCH 1/3] Make glm and stb an include instead of an internal dependency --- layer/meson.build | 7 ++++--- meson.build | 6 ++---- src/meson.build | 10 +++++----- subprojects/.wraplock | 0 subprojects/libliftoff.wrap | 2 ++ 5 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 subprojects/.wraplock create mode 100644 subprojects/libliftoff.wrap diff --git a/layer/meson.build b/layer/meson.build index 830cd89..efd98d0 100644 --- a/layer/meson.build +++ b/layer/meson.build @@ -4,8 +4,9 @@ dep_x11_xcb = dependency('x11-xcb') wayland_client = dependency('wayland-client') gamescope_wsi_layer = shared_library('VkLayer_FROG_gamescope_wsi_' + build_machine.cpu_family(), 'VkLayer_FROG_gamescope_wsi.cpp', protocols_client_src, - dependencies : [ vkroots_dep, dep_xcb, dep_x11, dep_x11_xcb, glm_dep, wayland_client ], - install : true ) + dependencies : [ vkroots_dep, dep_xcb, dep_x11, dep_x11_xcb, wayland_client ], + include_directories : [ glm_include ], + install : true ) out_lib_dir = join_paths(prefix, lib_dir) @@ -15,4 +16,4 @@ configure_file( configuration : {'family' : build_machine.cpu_family(), 'lib_dir' : out_lib_dir }, install : true, install_dir : join_paths(data_dir, 'vulkan', 'implicit_layer.d'), -) \ No newline at end of file +) diff --git a/meson.build b/meson.build index f7662ca..cd33386 100644 --- a/meson.build +++ b/meson.build @@ -50,10 +50,8 @@ 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_include = include_directories('/usr/include/glm') +stb_include = include_directories('/usr/include/stb') if get_option('enable_openvr_support') openvr_dep = dependency('openvr', version: '>= 2.7', required : false) diff --git a/src/meson.build b/src/meson.build index 425e790..56cf623 100644 --- a/src/meson.build +++ b/src/meson.build @@ -192,13 +192,13 @@ gamescope_version = configure_file( executable( 'gamescope', src, reshade_src, gamescope_version, - include_directories : [reshade_include, sol2_include], + include_directories : [reshade_include, sol2_include, glm_include, stb_include], dependencies: [ dep_wayland, dep_x11, dep_xdamage, dep_xcomposite, dep_xrender, dep_xext, dep_xfixes, - dep_xxf86vm, dep_xres, glm_dep, drm_dep, wayland_server, + dep_xxf86vm, dep_xres, drm_dep, wayland_server, xkbcommon, thread_dep, sdl2_dep, wlroots_dep, vulkan_dep, liftoff_dep, dep_xtst, dep_xmu, cap_dep, epoll_dep, pipewire_dep, librt_dep, - stb_dep, displayinfo_dep, openvr_dep, dep_xcursor, avif_dep, dep_xi, + displayinfo_dep, openvr_dep, dep_xcursor, avif_dep, dep_xi, libdecor_dep, eis_dep, luajit_dep, libinput_dep, pixman_dep, udev_dep, ], install: true, @@ -220,9 +220,9 @@ endif executable('gamescopereaper', ['Apps/gamescopereaper.cpp', gamescope_core_src], gamescope_version, dependencies: [cap_dep], install:true ) benchmark_dep = dependency('benchmark', required: get_option('benchmark'), disabler: true) -executable('gamescope_color_microbench', ['color_bench.cpp', 'color_helpers.cpp'], gamescope_core_src, gamescope_version, dependencies:[benchmark_dep, glm_dep, cap_dep]) +executable('gamescope_color_microbench', ['color_bench.cpp', 'color_helpers.cpp'], gamescope_core_src, gamescope_version, dependencies:[benchmark_dep, cap_dep], include_directories:[glm_include]) -executable('gamescope_color_tests', ['color_tests.cpp', 'color_helpers.cpp'], gamescope_core_src, gamescope_version, dependencies:[glm_dep, cap_dep]) +executable('gamescope_color_tests', ['color_tests.cpp', 'color_helpers.cpp'], gamescope_core_src, gamescope_version, dependencies:[cap_dep], include_directories: [glm_include]) executable('gamescopectl', ['Apps/gamescopectl.cpp'], gamescope_core_src, gamescope_version, protocols_client_src, dependencies: [dep_wayland, cap_dep], install:true ) diff --git a/subprojects/.wraplock b/subprojects/.wraplock new file mode 100644 index 0000000..e69de29 diff --git a/subprojects/libliftoff.wrap b/subprojects/libliftoff.wrap new file mode 100644 index 0000000..0d060ca --- /dev/null +++ b/subprojects/libliftoff.wrap @@ -0,0 +1,2 @@ +[wrap-redirect] +filename = wlroots/subprojects/libliftoff.wrap -- 2.55.0 From 53c2a6602fa91e1685591531c2f3cb63c2ddd6fc Mon Sep 17 00:00:00 2001 From: Chloe Christine Fontenot Date: Tue, 21 Jul 2026 16:57:58 -0500 Subject: [PATCH 2/3] Make glm and stb an include instead of an internal dependency --- src/steamcompmgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp index c782e10..ca4eba7 100644 --- a/src/steamcompmgr.cpp +++ b/src/steamcompmgr.cpp @@ -117,7 +117,7 @@ static const int g_nBaseCursorScale = 36; #define STB_IMAGE_WRITE_IMPLEMENTATION #include #include -#include +#include #define GPUVIS_TRACE_IMPLEMENTATION #include "gpuvis_trace_utils.h" -- 2.55.0 From 8c48c4d43a0b0e5e13af9ab4b2d2e56e5c4dae95 Mon Sep 17 00:00:00 2001 From: Chloe Christine Fontenot Date: Tue, 21 Jul 2026 17:00:38 -0500 Subject: [PATCH 3/3] Make glm and stb an include instead of an internal dependency --- src/reshade_effect_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/reshade_effect_manager.cpp b/src/reshade_effect_manager.cpp index 959a973..cd1d39e 100644 --- a/src/reshade_effect_manager.cpp +++ b/src/reshade_effect_manager.cpp @@ -17,7 +17,7 @@ #include #define STB_IMAGE_RESIZE_IMPLEMENTATION -#include +#include #include -- 2.55.0