summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSefa Eyeoglu2021-01-06 10:21:04 +0100
committerSefa Eyeoglu2021-01-06 10:21:04 +0100
commitc0af2350e2c2a44e1982edb72be60700138bce1f (patch)
tree876691a30e9d66db2838beb69a9eae66025881d0
parent1832f5d12436eed2b482cde96dea3baa05a129fa (diff)
downloadaur-c0af2350e2c2a44e1982edb72be60700138bce1f.tar.gz
upgpkg: gamescope-git 3.7.1.r9.gcf8cf60-1
fix build error with latest wlroots
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD12
-rw-r--r--fix-wlserver-update-wlr_headless_backend_create-call.patch25
3 files changed, 36 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8a771349b62d..db68c0232032 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = gamescope-git
pkgdesc = Micro-compositor formerly known as steamcompmgr
- pkgver = 3.7.1.r8.g072599c
+ pkgver = 3.7.1.r9.gcf8cf60
pkgrel = 1
url = https://github.com/Plagman/gamescope
arch = x86_64
@@ -22,7 +22,9 @@ pkgbase = gamescope-git
conflicts = gamescope
conflicts = steamcompmgr
source = git+https://github.com/Plagman/gamescope.git
+ source = fix-wlserver-update-wlr_headless_backend_create-call.patch
sha512sums = SKIP
+ sha512sums = c79e380f2307744de7fff7d719da6b5ecdaf8daf03771acb2c4bf1770e34692876fa37ce5efc8441dee9d8d386a17331f6991fe635730c59012faaba7db4b50b
pkgname = gamescope-git
diff --git a/PKGBUILD b/PKGBUILD
index 4d81092301cb..5e9b58c66434 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
_pkgname=gamescope
pkgname=${_pkgname}-git
-pkgver=3.7.1.r8.g072599c
+pkgver=3.7.1.r9.gcf8cf60
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"
+ "fix-wlserver-update-wlr_headless_backend_create-call.patch")
+sha512sums=('SKIP'
+ 'c79e380f2307744de7fff7d719da6b5ecdaf8daf03771acb2c4bf1770e34692876fa37ce5efc8441dee9d8d386a17331f6991fe635730c59012faaba7db4b50b')
pkgver() {
@@ -23,11 +25,13 @@ pkgver() {
}
prepare() {
- cd "$srcdir/$_pkgname"
rm -rf "$srcdir/$_pkgname/subprojects/libliftoff"
rm -rf "$srcdir/$_pkgname/subprojects/wlroots"
+ cd "$srcdir/$_pkgname"
+
+ patch -Np1 < "$srcdir/fix-wlserver-update-wlr_headless_backend_create-call.patch"
}
build() {
diff --git a/fix-wlserver-update-wlr_headless_backend_create-call.patch b/fix-wlserver-update-wlr_headless_backend_create-call.patch
new file mode 100644
index 000000000000..284e7f40459e
--- /dev/null
+++ b/fix-wlserver-update-wlr_headless_backend_create-call.patch
@@ -0,0 +1,25 @@
+From b62b641d08ee5e075f8cf7089ee197b76d159fac Mon Sep 17 00:00:00 2001
+From: Sefa Eyeoglu <contact@scrumplex.net>
+Date: Wed, 6 Jan 2021 10:17:47 +0100
+Subject: [PATCH] fix(wlserver): update wlr_headless_backend_create call
+
+---
+ src/wlserver.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/wlserver.cpp b/src/wlserver.cpp
+index 85869b8..186856d 100644
+--- a/src/wlserver.cpp
++++ b/src/wlserver.cpp
+@@ -442,7 +442,7 @@ int wlserver_init(int argc, char **argv, bool bIsNested) {
+
+ wl_signal_add( &wlserver.wlr.multi_backend->events.new_input, &new_input_listener );
+
+- wlserver.wlr.headless_backend = wlr_headless_backend_create( wlserver.wl_display, NULL );
++ wlserver.wlr.headless_backend = wlr_headless_backend_create( wlserver.wl_display );
+ if ( wlserver.wlr.headless_backend == NULL )
+ {
+ return 1;
+--
+2.30.0
+