commit 4da1e12cff279eab5c829d9ce3208807ddb81045
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Apr 6 16:21:19 2024 +0100
fix
466d7c7198e5ea02092ab37b76c832473ac540f3.patch | 38 ++++++++++++++++++++++++++
avidemux.spec | 1 +
2 files changed, 39 insertions(+)
---
diff --git a/466d7c7198e5ea02092ab37b76c832473ac540f3.patch
b/466d7c7198e5ea02092ab37b76c832473ac540f3.patch
new file mode 100644
index 0000000..595373c
--- /dev/null
+++ b/466d7c7198e5ea02092ab37b76c832473ac540f3.patch
@@ -0,0 +1,38 @@
+From 466d7c7198e5ea02092ab37b76c832473ac540f3 Mon Sep 17 00:00:00 2001
+From: eumagga0x2a <eumagga0x2a(a)users.noreply.github.com>
+Date: Mon, 26 Jun 2023 08:53:22 +0200
+Subject: [PATCH] [ffmpeg/patches] Add upstream fix for NVENC detection
+
+---
+ .../configure-fix-nvenc-detection.patch | 22 +++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+ create mode 100644
avidemux_core/ffmpeg_package/patches/upstream/configure-fix-nvenc-detection.patch
+
+diff --git
a/avidemux_core/ffmpeg_package/patches/upstream/configure-fix-nvenc-detection.patch
b/avidemux_core/ffmpeg_package/patches/upstream/configure-fix-nvenc-detection.patch
+new file mode 100644
+index 000000000..a827225f6
+--- /dev/null
++++ b/avidemux_core/ffmpeg_package/patches/upstream/configure-fix-nvenc-detection.patch
+@@ -0,0 +1,22 @@
++From 03823ac0c6a38bd6ba972539e3203a592579792f Mon Sep 17 00:00:00 2001
++From: Timo Rothenpieler <timo(a)rothenpieler.org>
++Date: Thu, 1 Jun 2023 23:24:43 +0200
++Subject: [PATCH] configure: use non-deprecated nvenc GUID for conftest
++
++---
++ configure | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/configure b/configure
++index 495493aa0e8a..ae56540f4eb0 100755
++--- a/configure
+++++ b/configure
++@@ -7079,7 +7079,7 @@ enabled nvenc &&
++ test_cc -I$source_path <<EOF || disable nvenc
++ #include <ffnvcodec/nvEncodeAPI.h>
++ NV_ENCODE_API_FUNCTION_LIST flist;
++-void f(void) { struct { const GUID guid; } s[] = { { NV_ENC_PRESET_HQ_GUID } }; }
+++void f(void) { struct { const GUID guid; } s[] = { { NV_ENC_CODEC_H264_GUID } }; }
++ int main(void) { return 0; }
++ EOF
++
diff --git a/avidemux.spec b/avidemux.spec
index c8c4c35..0e56856 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -20,6 +20,7 @@ Source0:
http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.
Patch0: avidemux-disable_mp4v2.patch
Patch1: ffmpeg_buildfix.patch
Patch2: 5b637ae04773b417c9e6b47ba015abf458a9c151.patch
+Patch3:
https://github.com/mean00/avidemux2/commit/466d7c7198e5ea02092ab37b76c832...
# Don't try to build on arm, aarch64 or ppc
ExclusiveArch: i686 x86_64