From 27d655d000967988b05e8f928a666b033095dda4 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Sun, 23 Jun 2024 21:13:11 +0200 Subject: [PATCH] gamescope: update --- ...eson.build-dont-fail-if-stb-is-not-found.patch | 6 +++--- recipes-wlroots/gamescope/gamescope_git.bb | 15 ++++++++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/recipes-wlroots/gamescope/gamescope/0001-meson.build-dont-fail-if-stb-is-not-found.patch b/recipes-wlroots/gamescope/gamescope/0001-meson.build-dont-fail-if-stb-is-not-found.patch index 73edfa6..1343533 100644 --- a/recipes-wlroots/gamescope/gamescope/0001-meson.build-dont-fail-if-stb-is-not-found.patch +++ b/recipes-wlroots/gamescope/gamescope/0001-meson.build-dont-fail-if-stb-is-not-found.patch @@ -10,13 +10,13 @@ manually add it to CXXFLAGS 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/meson.build b/src/meson.build -index 7f7e793..c61077f 100644 +index e0254e6..e6e88bd 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -20,7 +20,7 @@ cap_dep = dependency('libcap', required: get_option('rt_cap')) +@@ -21,7 +21,7 @@ cap_dep = dependency('libcap', required: get_option('rt_cap')) epoll_dep = dependency('epoll-shim', required: false) glm_dep = dependency('glm') - sdl_dep = dependency('SDL2', required: get_option('sdl2_backend')) + 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')) diff --git a/recipes-wlroots/gamescope/gamescope_git.bb b/recipes-wlroots/gamescope/gamescope_git.bb index 173c1e9..9a1de95 100644 --- a/recipes-wlroots/gamescope/gamescope_git.bb +++ b/recipes-wlroots/gamescope/gamescope_git.bb @@ -13,6 +13,7 @@ DEPENDS += " \ libei \ libdecor \ libdisplay-info \ + libdrm \ libinput \ libx11\ libxcomposite \ @@ -22,6 +23,10 @@ DEPENDS += " \ libxmu \ libxrender \ libxtst \ + libxxf86vm \ + libxfixes \ + libxext \ + libxdamage \ seatd \ stb \ vulkan-loader \ @@ -37,7 +42,7 @@ RDEPENDS:${PN} = "xwayland hwdata" CXXFLAGS:append = " -I${STAGING_INCDIR}/stb" -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pipewire', d)} rt_cap avif_screenshots openvr input_emulation drm_backend sdl2_backend" +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pipewire', d)} rt_cap avif_screenshots openvr input_emulation drm_backend" PACKAGECONFIG[benchmark] = "-Dbenchmark=enabled,-Dbenchmark=disabled" PACKAGECONFIG[input_emulation] = "-Dinput_emulation=enabled,-Dinput_emulation=disabled,libei" PACKAGECONFIG[openvr] = "-Denable_openvr_support=true,-Denable_openvr_support=false" @@ -45,15 +50,15 @@ PACKAGECONFIG[pipewire] = "-Dpipewire=enabled,-Dpipewire=disabled,pipewire" PACKAGECONFIG[avif_screenshots] = "-Davif_screenshots=enabled,-Davif_screenshots=disabled,libavif" PACKAGECONFIG[rt_cap] = "-Drt_cap=enabled,-Drt_cap=disabled,libcap" PACKAGECONFIG[sdl2_backend] = "-Dsdl2_backend=enabled,-Dsdl2_backend=disabled,libsdl2" -PACKAGECONFIG[drm_backend] = "-Ddrm_backend=enabled,-Ddrm_backend=disabled,libdrm" +PACKAGECONFIG[drm_backend] = "-Ddrm_backend=enabled,-Ddrm_backend=disabled" SRC_URI = " \ - gitsm://github.com/ValveSoftware/gamescope.git;branch=jupiter-3.6;protocol=https \ + gitsm://github.com/ValveSoftware/gamescope.git;branch=master;protocol=https \ file://0001-meson.build-dont-fail-if-stb-is-not-found.patch \ file://0001-meson.build-dont-leak-buildpath.patch \ " -SRCREV = "420eb91387a484fd7b1ea71449091f0480d9e538" -PV = "3.14.18" +SRCREV = "3b69847e15c84c0a4f93e82c2eb16b623f9765b9" +PV = "3.14.22" S = "${WORKDIR}/git"