updated to wlroots 0.16.1

3 files changed, 13 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 989dfd3bc82a..9051787af12d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wlroots-nvidia
 	pkgdesc = Modular Wayland compositor library, with fix for nvidia flickering
-	pkgver = 0.15.1
-	pkgrel = 2
+	pkgver = 0.16.1
+	pkgrel = 1
 	url = https://gitlab.freedesktop.org/wlroots/wlroots
 	arch = x86_64
 	license = MIT
@@ -31,14 +31,14 @@ pkgbase = wlroots-nvidia
 	provides = libwlroots.so
 	conflicts = wlroots
 	conflicts = wlroots-git
-	source = wlroots-0.15.1.tar.gz::https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.15.1/downloads/wlroots-0.15.1.tar.gz
-	source = https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.15.1/downloads/wlroots-0.15.1.tar.gz.sig
+	source = wlroots-0.16.1.tar.gz::https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.16.1/downloads/wlroots-0.16.1.tar.gz
+	source = https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.16.1/downloads/wlroots-0.16.1.tar.gz.sig
 	source = nvidia.patch
 	validpgpkeys = 34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
 	validpgpkeys = 9DDA3B9FA5D58DD5392C78E652CB6609B22DA89A
 	validpgpkeys = 4100929B33EEB0FD1DB852797BC79407090047CA
-	sha256sums = 5b92f11a52d978919ed1306e0d54c9d59f1762b28d44f0a2da3ef3b351305373
+	sha256sums = 130a1a86f6f8c4fa162ba4db82aaa70850273c5d01313b242baa0144e3d6d253
 	sha256sums = SKIP
-	sha256sums = 1d12d28e2dad7faaecb5f995144789b051c0e980917e6d90a9cd44501067379f
+	sha256sums = 83cbb8211265fed66b4320e6fd986606731b8f5f04bf6cabe7280e8f5fdba783
 
 pkgname = wlroots-nvidia
diff --git a/PKGBUILD b/PKGBUILD
index e968523c2f3e..1a0cc09710fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Keith Plant <kplantjr at gmail dot com>
 
 pkgname="wlroots-nvidia"
-pkgver="0.15.1"
-pkgrel="2"
+pkgver="0.16.1"
+pkgrel="1"
 pkgdesc="Modular Wayland compositor library, with fix for nvidia flickering"
 license=("MIT")
 
@@ -52,9 +52,9 @@ source=(
 	"nvidia.patch"
 )
 sha256sums=(
-	'5b92f11a52d978919ed1306e0d54c9d59f1762b28d44f0a2da3ef3b351305373'
+	'130a1a86f6f8c4fa162ba4db82aaa70850273c5d01313b242baa0144e3d6d253'
 	'SKIP'
-	'1d12d28e2dad7faaecb5f995144789b051c0e980917e6d90a9cd44501067379f'
+	'83cbb8211265fed66b4320e6fd986606731b8f5f04bf6cabe7280e8f5fdba783'
 )
 validpgpkeys=(
 	'34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48' # Simon Ser
diff --git a/nvidia.patch b/nvidia.patch
index 483757276de0..f914120b144a 100644
--- a/nvidia.patch
+++ b/nvidia.patch
@@ -1,30 +1,6 @@
---- examples/dmabuf-capture.c	2022-02-03 16:19:54.000000000 -0500
-+++ examples/dmabuf-capture.c	2022-08-20 09:29:17.031186547 -0400
-@@ -1,4 +1,5 @@
- #define _POSIX_C_SOURCE 199309L
-+#include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
- #include <libavutil/display.h>
- #include <libavutil/hwcontext_drm.h>
-@@ -619,12 +620,12 @@
- 	}
- 
- 	/* Find encoder */
--	AVCodec *out_codec = avcodec_find_encoder_by_name(ctx->encoder_name);
-+	const AVCodec *out_codec = avcodec_find_encoder_by_name(ctx->encoder_name);
- 	if (!out_codec) {
- 		av_log(ctx, AV_LOG_ERROR, "Codec not found (not compiled in lavc?)!\n");
- 		return AVERROR(EINVAL);
- 	}
--	ctx->avf->oformat->video_codec = out_codec->id;
-+	ctx->avf->oformat = av_guess_format(ctx->encoder_name, NULL, NULL);
- 	ctx->is_software_encoder = !(out_codec->capabilities & AV_CODEC_CAP_HARDWARE);
- 
- 	ctx->avctx = avcodec_alloc_context3(out_codec);
-
---- render/gles2/renderer.c	2022-02-03 16:19:54.000000000 -0500
-+++ render/gles2/renderer.c	2022-08-20 09:29:26.937878381 -0400
-@@ -159,7 +159,7 @@
+--- render/gles2/renderer.c	2022-12-25 10:50:12.000000000 -0500
++++ render/gles2/renderer.c	2023-01-04 18:34:37.961431132 -0500
+@@ -165,7 +165,7 @@
  		assert(wlr_egl_is_current(renderer->egl));
  
  		push_gles2_debug(renderer);