From d817bed7edebb062d64472aff2d7ef2b21f683ff Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 11 Oct 2023 23:00:58 +0000
Subject: [PATCH] extra/ffmpeg4.4 to 4.4.4-3

---
 extra/ffmpeg4.4/.SRCINFO | 2 +-
 extra/ffmpeg4.4/PKGBUILD | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/extra/ffmpeg4.4/.SRCINFO b/extra/ffmpeg4.4/.SRCINFO
index e67ac4fa9..80637e901 100644
--- a/extra/ffmpeg4.4/.SRCINFO
+++ b/extra/ffmpeg4.4/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ffmpeg4.4
 	pkgdesc = Complete solution to record, convert and stream audio and video
 	pkgver = 4.4.4
-	pkgrel = 2
+	pkgrel = 3
 	url = https://ffmpeg.org/
 	arch = x86_64
 	license = GPL3
diff --git a/extra/ffmpeg4.4/PKGBUILD b/extra/ffmpeg4.4/PKGBUILD
index 75c2d412c..8af99a9d5 100644
--- a/extra/ffmpeg4.4/PKGBUILD
+++ b/extra/ffmpeg4.4/PKGBUILD
@@ -16,7 +16,7 @@
 
 pkgname=ffmpeg4.4
 pkgver=4.4.4
-pkgrel=2
+pkgrel=3
 pkgdesc='Complete solution to record, convert and stream audio and video'
 arch=(x86_64)
 url=https://ffmpeg.org/
@@ -111,6 +111,10 @@ prepare() {
   git cherry-pick -n 988f2e9eb063db7c1a678729f58aab6eba59a55b # fix nvenc on older gpus
   git cherry-pick -n 031f1561cd286596cdb374da32f8aa816ce3b135 # remove compressed_ten_bit_format
   patch -p1 -i ../binutils-2.41.patch # Fix build with binutils 2.41
+
+  # use non-deprecated nvenc GUID for conftest
+  git cherry-pick -n 03823ac0c6a38bd6ba972539e3203a592579792f
+  git cherry-pick -n d2b46c1ef768bc31ba9180f6d469d5b8be677500
 }
 
 build() {