fix dmabuf example from upstream

3 files changed, 29 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b9acf98d10c7..e65114a5e049 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wlroots-nvidia
 	pkgdesc = Modular Wayland compositor library, with fix for nvidia flickering
 	pkgver = 0.16.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://gitlab.freedesktop.org/wlroots/wlroots
 	arch = x86_64
 	license = MIT
@@ -34,11 +34,13 @@ pkgbase = wlroots-nvidia
 	source = wlroots-0.16.2.tar.gz::https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.16.2/downloads/wlroots-0.16.2.tar.gz
 	source = https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.16.2/downloads/wlroots-0.16.2.tar.gz.sig
 	source = nvidia.patch
+	source = dmabuf-capture-example.patch
 	validpgpkeys = 34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
 	validpgpkeys = 9DDA3B9FA5D58DD5392C78E652CB6609B22DA89A
 	validpgpkeys = 4100929B33EEB0FD1DB852797BC79407090047CA
-	sha256sums = 130a1a86f6f8c4fa162ba4db82aaa70850273c5d01313b242baa0144e3d6d253
+	sha256sums = 83e9a11605f23d4bf781ab1947089483d9ec3f7e9ba65398e0609593b77d44aa
 	sha256sums = SKIP
 	sha256sums = 83cbb8211265fed66b4320e6fd986606731b8f5f04bf6cabe7280e8f5fdba783
+	sha256sums = 7d6690e2d59c17830b7e3a8004b58d07b03be50f50e1e8190430ebf8c1971353
 
 pkgname = wlroots-nvidia
diff --git a/PKGBUILD b/PKGBUILD
index eeb4380b53d7..212ab0a7f7f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname="wlroots-nvidia"
 pkgver="0.16.2"
-pkgrel="1"
+pkgrel="2"
 pkgdesc="Modular Wayland compositor library, with fix for nvidia flickering"
 license=("MIT")
 
@@ -50,11 +50,13 @@ source=(
 	"$wl_pkgname-$pkgver.tar.gz::https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$pkgver/downloads/wlroots-$pkgver.tar.gz"
 	"https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$pkgver/downloads/wlroots-$pkgver.tar.gz.sig"
 	"nvidia.patch"
+	"dmabuf-capture-example.patch"
 )
 sha256sums=(
 	'83e9a11605f23d4bf781ab1947089483d9ec3f7e9ba65398e0609593b77d44aa'
 	'SKIP'
 	'83cbb8211265fed66b4320e6fd986606731b8f5f04bf6cabe7280e8f5fdba783'
+	'7d6690e2d59c17830b7e3a8004b58d07b03be50f50e1e8190430ebf8c1971353'
 )
 validpgpkeys=(
 	'34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48' # Simon Ser
@@ -65,6 +67,8 @@ validpgpkeys=(
 prepare() {
 	patch --directory="$wl_pkgname-$pkgver" --forward --strip=0 \
 		--input="$srcdir/nvidia.patch"
+	patch --directory="$wl_pkgname-$pkgver" --forward --strip=0 \
+		--input="$srcdir/dmabuf-capture-example.patch"
 }
 
 build() {
diff --git a/dmabuf-capture-example.patch b/dmabuf-capture-example.patch
new file mode 100644
index 000000000000..ddde38523aed
--- /dev/null
+++ b/dmabuf-capture-example.patch
@@ -0,0 +1,20 @@
+--- examples/dmabuf-capture.c	2023-02-10 17:29:59.000000000 -0500
++++ examples/dmabuf-capture.c	2023-03-26 11:58:01.738090539 -0400
+@@ -520,8 +520,15 @@
+ 			}
+ 		};
+ 
+-		av_log(ctx, AV_LOG_INFO, "Encoded frame %i (%i in queue)\n",
+-				ctx->avctx->frame_number, get_fifo_size(&ctx->vid_frames));
++		int64_t frame_num;
++
++#if LIBAVUTIL_VERSION_MAJOR >= 58
++		frame_num = ctx->avctx->frame_num;
++#else
++		frame_num = ctx->avctx->frame_number;
++#endif
++		av_log(ctx, AV_LOG_INFO, "Encoded frame %"PRIi64" (%i in queue)\n",
++				frame_num, get_fifo_size(&ctx->vid_frames));
+ 
+ 	} while (!ctx->err);
+