upgpkg: gamescope-git 3.7.1.r58.g7dfb55c8a8db62ac-1

Update to latest upstream version

3 files changed, 19 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dc359500a646..e86955457da2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gamescope-git
 	pkgdesc = Micro-compositor formerly known as steamcompmgr
-	pkgver = 3.7.1.r41.g72c6296
+	pkgver = 3.7.1.r58.g7dfb55c8a8db62ac
 	pkgrel = 1
 	url = https://github.com/Plagman/gamescope
 	arch = x86_64
@@ -22,9 +22,11 @@ pkgbase = gamescope-git
 	conflicts = gamescope
 	conflicts = steamcompmgr
 	source = git+https://github.com/Plagman/gamescope.git
-	source = 0001-fix-wlserver-update-wlr_headless_backend_create-call.patch
+	source = https://patch-diff.githubusercontent.com/raw/Plagman/gamescope/pull/150.patch
+	source = https://patch-diff.githubusercontent.com/raw/Plagman/gamescope/pull/181.patch
 	sha512sums = SKIP
-	sha512sums = c79e380f2307744de7fff7d719da6b5ecdaf8daf03771acb2c4bf1770e34692876fa37ce5efc8441dee9d8d386a17331f6991fe635730c59012faaba7db4b50b
+	sha512sums = 939b87c9c83ba957ad1eda6b89d281fc03365f2c1e01377a4b1cb06647ceeba0cf00f6df100891d81b3b585a29d850089440c6ae62bc077554c9e5c32eca85df
+	sha512sums = 430db3983a92b664ab0f0ed1246d430a657122b68a9c14fb8f37d430987fc15ab6fcd1f70e18d4e4fd5891899963f766ea48ddf5b6085262080dedcb3ceecd65
 
 pkgname = gamescope-git
 
diff --git a/0001-fix-wlserver-update-wlr_headless_backend_create-call.patch b/0001-fix-wlserver-update-wlr_headless_backend_create-call.patch
deleted file mode 100644
index 284e7f40459e..000000000000
--- a/0001-fix-wlserver-update-wlr_headless_backend_create-call.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-
diff --git a/PKGBUILD b/PKGBUILD
index f41a5cf09668..b685a18532e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=gamescope
 pkgname=${_pkgname}-git
-pkgver=3.7.1.r41.g72c6296
+pkgver=3.7.1.r58.g7dfb55c8a8db62ac
 pkgrel=1
 pkgdesc="Micro-compositor formerly known as steamcompmgr"
 arch=(x86_64)
@@ -13,9 +13,11 @@ makedepends=("git" "meson" "ninja" "patch" "vulkan-headers" "glslang")
 provides=($_pkgname "steamcompmgr")
 conflicts=($_pkgname "steamcompmgr")
 source=("git+https://github.com/Plagman/gamescope.git"
-        "0001-fix-wlserver-update-wlr_headless_backend_create-call.patch")
+        "https://patch-diff.githubusercontent.com/raw/Plagman/gamescope/pull/150.patch"
+        "https://patch-diff.githubusercontent.com/raw/Plagman/gamescope/pull/181.patch")
 sha512sums=('SKIP'
-            'c79e380f2307744de7fff7d719da6b5ecdaf8daf03771acb2c4bf1770e34692876fa37ce5efc8441dee9d8d386a17331f6991fe635730c59012faaba7db4b50b')
+            '939b87c9c83ba957ad1eda6b89d281fc03365f2c1e01377a4b1cb06647ceeba0cf00f6df100891d81b3b585a29d850089440c6ae62bc077554c9e5c32eca85df'
+            '430db3983a92b664ab0f0ed1246d430a657122b68a9c14fb8f37d430987fc15ab6fcd1f70e18d4e4fd5891899963f766ea48ddf5b6085262080dedcb3ceecd65')
 
 
 pkgver() {
@@ -25,13 +27,17 @@ pkgver() {
 }
 
 prepare() {
-
-    rm -rf "$srcdir/$_pkgname/subprojects/libliftoff"
-    rm -rf "$srcdir/$_pkgname/subprojects/wlroots"
-
     cd "$srcdir/$_pkgname"
 
-    patch -Np1 < "$srcdir/0001-fix-wlserver-update-wlr_headless_backend_create-call.patch"
+    for src in "${source[@]}"; do
+        src="${src%%::*}"
+        src="${src##*/}"
+        [[ $src = *.patch ]] || continue
+        echo "Applying patch $src..."
+        git apply "../$src"
+    done
+
+    rm -rf "subprojects/libliftoff" "subprojects/wlroots"
 }
 
 build() {