diff options
author | Tobias Langendorf | 2020-11-19 21:25:28 +0100 |
---|---|---|
committer | Tobias Langendorf | 2020-11-19 21:25:28 +0100 |
commit | 6f0e035a7d0bb9987281da6a3712d09becb17840 (patch) | |
tree | 9c74bd01212d77508fb29258eb467eb44a9d4040 | |
parent | 3788e1b66f099843d59c06ed28a62152c184b28a (diff) | |
download | aur-6f0e035a7d0bb9987281da6a3712d09becb17840.tar.gz |
gamescope-git: Fix build with wlroots master
wlroots e06c9e43afd8d2067c2c28bc25ed0830e43e5c78
Removed wlr_touch.h include
wlroots 7693f61d813869f7f8b3c658f610a16f6283b24f
Replaced wlr_key_state with wl_keyboard_key_state
-rw-r--r-- | PKGBUILD | 13 | ||||
-rw-r--r-- | wlroots-master.patch | 21 |
2 files changed, 30 insertions, 4 deletions
@@ -2,7 +2,7 @@ _pkgname=gamescope pkgname=${_pkgname}-git -pkgver=3.7.r11.gcd31090 +pkgver=3.7.1.r0.gc9d0b5d pkgrel=1 pkgdesc="Micro-compositor formerly known as steamcompmgr" arch=(x86_64) @@ -12,8 +12,10 @@ depends=("wlroots-git" "sdl2" "libxcomposite" "vulkan-icd-loader" "libxtst" "lib makedepends=("git" "meson" "ninja" "patch" "vulkan-headers" "glslang") provides=($_pkgname "steamcompmgr") conflicts=($_pkgname "steamcompmgr") -source=("git+https://github.com/Plagman/gamescope.git") -sha512sums=('SKIP') +source=("git+https://github.com/Plagman/gamescope.git" + "wlroots-master.patch") +sha512sums=('SKIP' + 'ae4aa8129575eb41ffa65119a05707d0b27e69502d15acd6ffb4540d65cdbb84cdb1f3a2bc636ffce5d971839fc7d4cc55db5a87f5a06d81b3492b9246b67d90') pkgver() { @@ -23,9 +25,12 @@ pkgver() { } prepare() { - + cd "$srcdir/$_pkgname" + patch -p1 < "${srcdir}/wlroots-master.patch" + rm -rf "$srcdir/$_pkgname/subprojects/libliftoff" rm -rf "$srcdir/$_pkgname/subprojects/wlroots" + } build() { diff --git a/wlroots-master.patch b/wlroots-master.patch new file mode 100644 index 000000000000..7d7d5be9c36f --- /dev/null +++ b/wlroots-master.patch @@ -0,0 +1,21 @@ +diff --git a/src/wlserver.cpp b/src/wlserver.cpp +index 7830b7a..78e25c7 100644 +--- a/src/wlserver.cpp ++++ b/src/wlserver.cpp +@@ -25,6 +25,7 @@ extern "C" { + #include <wlr/backend/libinput.h> + #include <wlr/interfaces/wlr_pointer.h> + #include <wlr/render/wlr_renderer.h> ++#include <wlr/types/wlr_touch.h> + #include <wlr/xwayland.h> + #include <wlr/util/log.h> + #undef static +@@ -135,7 +136,7 @@ static void wlserver_handle_key(struct wl_listener *listener, void *data) + xkb_keycode_t keycode = event->keycode + 8; + xkb_keysym_t keysym = xkb_state_key_get_one_sym(keyboard->device->keyboard->xkb_state, keycode); + +- if (wlserver.wlr.session && event->state == WLR_KEY_PRESSED && keysym >= XKB_KEY_XF86Switch_VT_1 && keysym <= XKB_KEY_XF86Switch_VT_12) { ++ if (wlserver.wlr.session && event->state == WL_KEYBOARD_KEY_STATE_PRESSED && keysym >= XKB_KEY_XF86Switch_VT_1 && keysym <= XKB_KEY_XF86Switch_VT_12) { + unsigned vt = keysym - XKB_KEY_XF86Switch_VT_1 + 1; + wlr_session_change_vt(wlserver.wlr.session, vt); + return; |