[gstreamer1-plugins-bad-freeworld] Rebuild for new x265 version
by Leigh Scott
commit 331b5ef55aa555885b521f0e5098bfd34a7abd0e
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Apr 6 19:08:14 2024 +0100
Rebuild for new x265 version
gstreamer1-plugins-bad-freeworld.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/gstreamer1-plugins-bad-freeworld.spec b/gstreamer1-plugins-bad-freeworld.spec
index 59cf25a..ac1384e 100644
--- a/gstreamer1-plugins-bad-freeworld.spec
+++ b/gstreamer1-plugins-bad-freeworld.spec
@@ -2,7 +2,7 @@ Summary: GStreamer 1.0 streaming media framework "bad" plug-ins
Name: gstreamer1-plugins-bad-freeworld
Epoch: 1
Version: 1.22.9
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2+
URL: https://gstreamer.freedesktop.org/
Source0: %{url}/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.xz
@@ -91,6 +91,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
%changelog
+* Sat Apr 06 2024 Leigh Scott <leigh123linux(a)gmail.com> - 1:1.22.9-3
+- Rebuild for new x265 version
+
* Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1:1.22.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
1 month, 3 weeks
[fceux] Rebuild for new x265 version
by Leigh Scott
commit 0e04e95bb865098a0ac5afa0e259321b529bf62f
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Apr 6 19:05:54 2024 +0100
Rebuild for new x265 version
fceux.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/fceux.spec b/fceux.spec
index 064cda9..1a52647 100644
--- a/fceux.spec
+++ b/fceux.spec
@@ -3,7 +3,7 @@
Name: fceux
Version: 2.6.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A cross platform, NTSC and PAL Famicom/NES emulator
License: GPLv2+
@@ -117,6 +117,9 @@ desktop-file-validate \
%changelog
+* Sat Apr 06 2024 Leigh Scott <leigh123linux(a)gmail.com> - 2.6.6-4
+- Rebuild for new x265 version
+
* Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.6.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
1 month, 3 weeks
[compat-ffmpeg4] Rebuild for new x265 version
by Leigh Scott
commit 870cf598eb695acdd126376997e41706e0de4514
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Apr 6 17:47:15 2024 +0100
Rebuild for new x265 version
compat-ffmpeg4.spec | 8 +-
configure-fix-nvenc-detection.patch | 22 +++++
nvenc-stop-using-deprecated-rc-modes.patch | 130 +++++++++++++++++++++++++++++
3 files changed, 158 insertions(+), 2 deletions(-)
---
diff --git a/compat-ffmpeg4.spec b/compat-ffmpeg4.spec
index 99adc90..624e63d 100644
--- a/compat-ffmpeg4.spec
+++ b/compat-ffmpeg4.spec
@@ -20,7 +20,6 @@
%endif
%if 0%{?fedora}
-%global _without_nvenc 1
%ifarch x86_64
%global _with_mfx 1
%endif
@@ -44,13 +43,15 @@
Summary: Digital VCR and streaming server
Name: compat-ffmpeg4
Version: 4.4.4
-Release: 4%{?dist}
+Release: 5%{?dist}
License: %{ffmpeg_license}
URL: https://ffmpeg.org/
Source0: %{url}/releases/ffmpeg-%{version}.tar.xz
Source1: %{url}/releases/ffmpeg-%{version}.tar.xz.asc
Source2: %{url}/ffmpeg-devel.asc
Patch0: 25cd95a9dc3510c3cc0d7aad6f9d83f6a1078c7e.patch
+Patch1: configure-fix-nvenc-detection.patch
+Patch2: nvenc-stop-using-deprecated-rc-modes.patch
BuildRequires: gcc
BuildRequires: alsa-lib-devel
@@ -333,6 +334,9 @@ rm -rf %{buildroot}/%{_datadir}/compat-ffmpeg4/
%changelog
+* Sat Apr 06 2024 Leigh Scott <leigh123linux(a)gmail.com> - 4.4.4-5
+- Rebuild for new x265 version
+
* Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 4.4.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/configure-fix-nvenc-detection.patch b/configure-fix-nvenc-detection.patch
new file mode 100644
index 0000000..a827225
--- /dev/null
+++ b/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/nvenc-stop-using-deprecated-rc-modes.patch b/nvenc-stop-using-deprecated-rc-modes.patch
new file mode 100644
index 0000000..7bf48f3
--- /dev/null
+++ b/nvenc-stop-using-deprecated-rc-modes.patch
@@ -0,0 +1,130 @@
+diff -uNrp a/libavcodec/nvenc.c b/libavcodec/nvenc.c
+--- a/libavcodec/nvenc.c 2023-04-12 19:02:02.000000000 +0100
++++ b/libavcodec/nvenc.c 2024-04-06 17:42:31.123436353 +0100
+@@ -39,9 +39,14 @@
+ #define CHECK_CU(x) FF_CUDA_CHECK_DL(avctx, dl_fn->cuda_dl, x)
+
+ #define NVENC_CAP 0x30
++
++#ifndef NVENC_NO_DEPRECATED_RC
+ #define IS_CBR(rc) (rc == NV_ENC_PARAMS_RC_CBR || \
+ rc == NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ || \
+ rc == NV_ENC_PARAMS_RC_CBR_HQ)
++#else
++#define IS_CBR(rc) (rc == NV_ENC_PARAMS_RC_CBR)
++#endif
+
+ const enum AVPixelFormat ff_nvenc_pix_fmts[] = {
+ AV_PIX_FMT_YUV420P,
+@@ -825,6 +830,7 @@ static void nvenc_override_rate_control(
+ case NV_ENC_PARAMS_RC_CONSTQP:
+ set_constqp(avctx);
+ return;
++#ifndef NVENC_NO_DEPRECATED_RC
+ case NV_ENC_PARAMS_RC_VBR_MINQP:
+ if (avctx->qmin < 0) {
+ av_log(avctx, AV_LOG_WARNING,
+@@ -835,12 +841,15 @@ static void nvenc_override_rate_control(
+ }
+ /* fall through */
+ case NV_ENC_PARAMS_RC_VBR_HQ:
++#endif
+ case NV_ENC_PARAMS_RC_VBR:
+ set_vbr(avctx);
+ break;
+ case NV_ENC_PARAMS_RC_CBR:
++#ifndef NVENC_NO_DEPRECATED_RC
+ case NV_ENC_PARAMS_RC_CBR_HQ:
+ case NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ:
++#endif
+ break;
+ }
+
+@@ -1074,12 +1083,14 @@ static av_cold int nvenc_setup_h264_conf
+
+ h264->outputPictureTimingSEI = 1;
+
++#ifndef NVENC_NO_DEPRECATED_RC
+ if (cc->rcParams.rateControlMode == NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ ||
+ cc->rcParams.rateControlMode == NV_ENC_PARAMS_RC_CBR_HQ ||
+ cc->rcParams.rateControlMode == NV_ENC_PARAMS_RC_VBR_HQ) {
+ h264->adaptiveTransformMode = NV_ENC_H264_ADAPTIVE_TRANSFORM_ENABLE;
+ h264->fmoMode = NV_ENC_H264_FMO_DISABLE;
+ }
++#endif
+
+ if (ctx->flags & NVENC_LOSSLESS) {
+ h264->qpPrimeYZeroTransformBypassFlag = 1;
+diff -uNrp a/libavcodec/nvenc.h b/libavcodec/nvenc.h
+--- a/libavcodec/nvenc.h 2023-04-12 19:01:50.000000000 +0100
++++ b/libavcodec/nvenc.h 2024-04-06 17:42:31.123436353 +0100
+@@ -70,6 +70,11 @@ typedef void ID3D11Device;
+ #define NVENC_HAVE_H264_LVL6
+ #endif
+
++// SDK 12.1 compile time feature checks
++#if NVENCAPI_CHECK_VERSION(12, 1)
++#define NVENC_NO_DEPRECATED_RC
++#endif
++
+ typedef struct NvencSurface
+ {
+ NV_ENC_INPUT_PTR input_surface;
+diff -uNrp a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c
+--- a/libavcodec/nvenc_h264.c 2023-04-12 19:01:50.000000000 +0100
++++ b/libavcodec/nvenc_h264.c 2024-04-06 17:42:31.124436369 +0100
+@@ -100,6 +100,7 @@ static const AVOption options[] = {
+ { "constqp", "Constant QP mode", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_CONSTQP }, 0, 0, VE, "rc" },
+ { "vbr", "Variable bitrate mode", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_VBR }, 0, 0, VE, "rc" },
+ { "cbr", "Constant bitrate mode", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_CBR }, 0, 0, VE, "rc" },
++#ifndef NVENC_NO_DEPRECATED_RC
+ { "vbr_minqp", "Variable bitrate mode with MinQP (deprecated)", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR_MINQP) }, 0, 0, VE, "rc" },
+ { "ll_2pass_quality", "Multi-pass optimized for image quality (deprecated)",
+ 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_2_PASS_QUALITY) }, 0, 0, VE, "rc" },
+@@ -109,6 +110,17 @@ static const AVOption options[] = {
+ { "cbr_ld_hq", "Constant bitrate low delay high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ) }, 0, 0, VE, "rc" },
+ { "cbr_hq", "Constant bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR_HQ) }, 0, 0, VE, "rc" },
+ { "vbr_hq", "Variable bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR_HQ) }, 0, 0, VE, "rc" },
++#else
++ { "vbr_minqp", "Variable bitrate mode with MinQP (deprecated)", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" },
++ { "ll_2pass_quality", "Multi-pass optimized for image quality (deprecated)",
++ 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" },
++ { "ll_2pass_size", "Multi-pass optimized for constant frame size (deprecated)",
++ 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR) }, 0, 0, VE, "rc" },
++ { "vbr_2pass", "Multi-pass variable bitrate mode (deprecated)", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" },
++ { "cbr_ld_hq", "Constant bitrate low delay high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR) }, 0, 0, VE, "rc" },
++ { "cbr_hq", "Constant bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR) }, 0, 0, VE, "rc" },
++ { "vbr_hq", "Variable bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" },
++#endif
+ { "rc-lookahead", "Number of frames to look ahead for rate-control",
+ OFFSET(rc_lookahead), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },
+ { "surfaces", "Number of concurrent surfaces", OFFSET(nb_surfaces), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, MAX_REGISTERED_FRAMES, VE },
+diff -uNrp a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c
+--- a/libavcodec/nvenc_hevc.c 2023-04-12 19:01:50.000000000 +0100
++++ b/libavcodec/nvenc_hevc.c 2024-04-06 17:42:31.124436369 +0100
+@@ -89,6 +89,7 @@ static const AVOption options[] = {
+ { "constqp", "Constant QP mode", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_CONSTQP }, 0, 0, VE, "rc" },
+ { "vbr", "Variable bitrate mode", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_VBR }, 0, 0, VE, "rc" },
+ { "cbr", "Constant bitrate mode", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_CBR }, 0, 0, VE, "rc" },
++#ifndef NVENC_NO_DEPRECATED_RC
+ { "vbr_minqp", "Variable bitrate mode with MinQP (deprecated)", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR_MINQP) }, 0, 0, VE, "rc" },
+ { "ll_2pass_quality", "Multi-pass optimized for image quality (deprecated)",
+ 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_2_PASS_QUALITY) }, 0, 0, VE, "rc" },
+@@ -98,6 +99,17 @@ static const AVOption options[] = {
+ { "cbr_ld_hq", "Constant bitrate low delay high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ) }, 0, 0, VE, "rc" },
+ { "cbr_hq", "Constant bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR_HQ) }, 0, 0, VE, "rc" },
+ { "vbr_hq", "Variable bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR_HQ) }, 0, 0, VE, "rc" },
++#else
++ { "vbr_minqp", "Variable bitrate mode with MinQP (deprecated)", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" },
++ { "ll_2pass_quality", "Multi-pass optimized for image quality (deprecated)",
++ 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" },
++ { "ll_2pass_size", "Multi-pass optimized for constant frame size (deprecated)",
++ 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR) }, 0, 0, VE, "rc" },
++ { "vbr_2pass", "Multi-pass variable bitrate mode (deprecated)", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" },
++ { "cbr_ld_hq", "Constant bitrate low delay high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR) }, 0, 0, VE, "rc" },
++ { "cbr_hq", "Constant bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR) }, 0, 0, VE, "rc" },
++ { "vbr_hq", "Variable bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" },
++#endif
+ { "rc-lookahead", "Number of frames to look ahead for rate-control",
+ OFFSET(rc_lookahead), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },
+ { "surfaces", "Number of concurrent surfaces", OFFSET(nb_surfaces), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, MAX_REGISTERED_FRAMES, VE },
1 month, 3 weeks
[avidemux] fix
by Leigh Scott
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
1 month, 3 weeks
[avidemux] Fix nvenc build issue
by Leigh Scott
commit 20ba5b1c2c75084fd16e89c82e2736c6aebda9ea
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Apr 6 16:07:21 2024 +0100
Fix nvenc build issue
5b637ae04773b417c9e6b47ba015abf458a9c151.patch | 163 +++++++++++++++++++++++++
avidemux.spec | 1 +
2 files changed, 164 insertions(+)
---
diff --git a/5b637ae04773b417c9e6b47ba015abf458a9c151.patch b/5b637ae04773b417c9e6b47ba015abf458a9c151.patch
new file mode 100644
index 0000000..7c58232
--- /dev/null
+++ b/5b637ae04773b417c9e6b47ba015abf458a9c151.patch
@@ -0,0 +1,163 @@
+From 5b637ae04773b417c9e6b47ba015abf458a9c151 Mon Sep 17 00:00:00 2001
+From: eumagga0x2a <eumagga0x2a(a)users.noreply.github.com>
+Date: Tue, 31 Oct 2023 20:00:05 +0100
+Subject: [PATCH] [ffmpeg/patches] Add upstream patch to fix build with latest
+ nv-codec-headers
+
+---
+ ...nvenc-stop-using-deprecated-rc-modes.patch | 146 ++++++++++++++++++
+ 1 file changed, 146 insertions(+)
+ create mode 100644 avidemux_core/ffmpeg_package/patches/upstream/nvenc-stop-using-deprecated-rc-modes.patch
+
+diff --git a/avidemux_core/ffmpeg_package/patches/upstream/nvenc-stop-using-deprecated-rc-modes.patch b/avidemux_core/ffmpeg_package/patches/upstream/nvenc-stop-using-deprecated-rc-modes.patch
+new file mode 100644
+index 000000000..6c1c1d099
+--- /dev/null
++++ b/avidemux_core/ffmpeg_package/patches/upstream/nvenc-stop-using-deprecated-rc-modes.patch
+@@ -0,0 +1,146 @@
++From d2b46c1ef768bc31ba9180f6d469d5b8be677500 Mon Sep 17 00:00:00 2001
++From: Timo Rothenpieler <timo(a)rothenpieler.org>
++Date: Thu, 1 Jun 2023 23:46:46 +0200
++Subject: [PATCH] avcodec/nvenc: stop using deprecated rc modes with SDK 12.1
++
++---
++ libavcodec/nvenc.c | 11 +++++++++++
++ libavcodec/nvenc.h | 5 +++++
++ libavcodec/nvenc_h264.c | 12 ++++++++++++
++ libavcodec/nvenc_hevc.c | 12 ++++++++++++
++ 4 files changed, 40 insertions(+)
++
++diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
++index c1798ce564b7f..50371d63366de 100644
++--- a/libavcodec/nvenc.c
+++++ b/libavcodec/nvenc.c
++@@ -44,9 +44,14 @@
++ #define CHECK_CU(x) FF_CUDA_CHECK_DL(avctx, dl_fn->cuda_dl, x)
++
++ #define NVENC_CAP 0x30
+++
+++#ifndef NVENC_NO_DEPRECATED_RC
++ #define IS_CBR(rc) (rc == NV_ENC_PARAMS_RC_CBR || \
++ rc == NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ || \
++ rc == NV_ENC_PARAMS_RC_CBR_HQ)
+++#else
+++#define IS_CBR(rc) (rc == NV_ENC_PARAMS_RC_CBR)
+++#endif
++
++ const enum AVPixelFormat ff_nvenc_pix_fmts[] = {
++ AV_PIX_FMT_YUV420P,
++@@ -926,6 +931,7 @@ static void nvenc_override_rate_control(AVCodecContext *avctx)
++ case NV_ENC_PARAMS_RC_CONSTQP:
++ set_constqp(avctx);
++ return;
+++#ifndef NVENC_NO_DEPRECATED_RC
++ case NV_ENC_PARAMS_RC_VBR_MINQP:
++ if (avctx->qmin < 0) {
++ av_log(avctx, AV_LOG_WARNING,
++@@ -936,12 +942,15 @@ static void nvenc_override_rate_control(AVCodecContext *avctx)
++ }
++ /* fall through */
++ case NV_ENC_PARAMS_RC_VBR_HQ:
+++#endif
++ case NV_ENC_PARAMS_RC_VBR:
++ set_vbr(avctx);
++ break;
++ case NV_ENC_PARAMS_RC_CBR:
+++#ifndef NVENC_NO_DEPRECATED_RC
++ case NV_ENC_PARAMS_RC_CBR_HQ:
++ case NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ:
+++#endif
++ break;
++ }
++
++@@ -1211,12 +1220,14 @@ static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx)
++
++ h264->outputPictureTimingSEI = 1;
++
+++#ifndef NVENC_NO_DEPRECATED_RC
++ if (cc->rcParams.rateControlMode == NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ ||
++ cc->rcParams.rateControlMode == NV_ENC_PARAMS_RC_CBR_HQ ||
++ cc->rcParams.rateControlMode == NV_ENC_PARAMS_RC_VBR_HQ) {
++ h264->adaptiveTransformMode = NV_ENC_H264_ADAPTIVE_TRANSFORM_ENABLE;
++ h264->fmoMode = NV_ENC_H264_FMO_DISABLE;
++ }
+++#endif
++
++ if (ctx->flags & NVENC_LOSSLESS) {
++ h264->qpPrimeYZeroTransformBypassFlag = 1;
++diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h
++index 411c83aa94387..97aad80cd0657 100644
++--- a/libavcodec/nvenc.h
+++++ b/libavcodec/nvenc.h
++@@ -77,6 +77,11 @@ typedef void ID3D11Device;
++ #define NVENC_HAVE_SINGLE_SLICE_INTRA_REFRESH
++ #endif
++
+++// SDK 12.1 compile time feature checks
+++#if NVENCAPI_CHECK_VERSION(12, 1)
+++#define NVENC_NO_DEPRECATED_RC
+++#endif
+++
++ typedef struct NvencSurface
++ {
++ NV_ENC_INPUT_PTR input_surface;
++diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c
++index 5dc2961c3bcf3..698615855bf57 100644
++--- a/libavcodec/nvenc_h264.c
+++++ b/libavcodec/nvenc_h264.c
++@@ -100,6 +100,7 @@ static const AVOption options[] = {
++ { "constqp", "Constant QP mode", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_CONSTQP }, 0, 0, VE, "rc" },
++ { "vbr", "Variable bitrate mode", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_VBR }, 0, 0, VE, "rc" },
++ { "cbr", "Constant bitrate mode", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_CBR }, 0, 0, VE, "rc" },
+++#ifndef NVENC_NO_DEPRECATED_RC
++ { "vbr_minqp", "Variable bitrate mode with MinQP (deprecated)", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR_MINQP) }, 0, 0, VE, "rc" },
++ { "ll_2pass_quality", "Multi-pass optimized for image quality (deprecated)",
++ 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_2_PASS_QUALITY) }, 0, 0, VE, "rc" },
++@@ -109,6 +110,17 @@ static const AVOption options[] = {
++ { "cbr_ld_hq", "Constant bitrate low delay high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ) }, 0, 0, VE, "rc" },
++ { "cbr_hq", "Constant bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR_HQ) }, 0, 0, VE, "rc" },
++ { "vbr_hq", "Variable bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR_HQ) }, 0, 0, VE, "rc" },
+++#else
+++ { "vbr_minqp", "Variable bitrate mode with MinQP (deprecated)", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" },
+++ { "ll_2pass_quality", "Multi-pass optimized for image quality (deprecated)",
+++ 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" },
+++ { "ll_2pass_size", "Multi-pass optimized for constant frame size (deprecated)",
+++ 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR) }, 0, 0, VE, "rc" },
+++ { "vbr_2pass", "Multi-pass variable bitrate mode (deprecated)", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" },
+++ { "cbr_ld_hq", "Constant bitrate low delay high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR) }, 0, 0, VE, "rc" },
+++ { "cbr_hq", "Constant bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR) }, 0, 0, VE, "rc" },
+++ { "vbr_hq", "Variable bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" },
+++#endif
++ { "rc-lookahead", "Number of frames to look ahead for rate-control",
++ OFFSET(rc_lookahead), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },
++ { "surfaces", "Number of concurrent surfaces", OFFSET(nb_surfaces), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, MAX_REGISTERED_FRAMES, VE },
++diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c
++index 1362a927c8e46..d99077f17055f 100644
++--- a/libavcodec/nvenc_hevc.c
+++++ b/libavcodec/nvenc_hevc.c
++@@ -89,6 +89,7 @@ static const AVOption options[] = {
++ { "constqp", "Constant QP mode", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_CONSTQP }, 0, 0, VE, "rc" },
++ { "vbr", "Variable bitrate mode", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_VBR }, 0, 0, VE, "rc" },
++ { "cbr", "Constant bitrate mode", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_CBR }, 0, 0, VE, "rc" },
+++#ifndef NVENC_NO_DEPRECATED_RC
++ { "vbr_minqp", "Variable bitrate mode with MinQP (deprecated)", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR_MINQP) }, 0, 0, VE, "rc" },
++ { "ll_2pass_quality", "Multi-pass optimized for image quality (deprecated)",
++ 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_2_PASS_QUALITY) }, 0, 0, VE, "rc" },
++@@ -98,6 +99,17 @@ static const AVOption options[] = {
++ { "cbr_ld_hq", "Constant bitrate low delay high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ) }, 0, 0, VE, "rc" },
++ { "cbr_hq", "Constant bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR_HQ) }, 0, 0, VE, "rc" },
++ { "vbr_hq", "Variable bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR_HQ) }, 0, 0, VE, "rc" },
+++#else
+++ { "vbr_minqp", "Variable bitrate mode with MinQP (deprecated)", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" },
+++ { "ll_2pass_quality", "Multi-pass optimized for image quality (deprecated)",
+++ 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" },
+++ { "ll_2pass_size", "Multi-pass optimized for constant frame size (deprecated)",
+++ 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR) }, 0, 0, VE, "rc" },
+++ { "vbr_2pass", "Multi-pass variable bitrate mode (deprecated)", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" },
+++ { "cbr_ld_hq", "Constant bitrate low delay high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR) }, 0, 0, VE, "rc" },
+++ { "cbr_hq", "Constant bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR) }, 0, 0, VE, "rc" },
+++ { "vbr_hq", "Variable bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" },
+++#endif
++ { "rc-lookahead", "Number of frames to look ahead for rate-control",
++ OFFSET(rc_lookahead), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },
++ { "surfaces", "Number of concurrent surfaces", OFFSET(nb_surfaces), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, MAX_REGISTERED_FRAMES, VE },
diff --git a/avidemux.spec b/avidemux.spec
index 4f9ffd5..c8c4c35 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -19,6 +19,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.
Patch0: avidemux-disable_mp4v2.patch
Patch1: ffmpeg_buildfix.patch
+Patch2: 5b637ae04773b417c9e6b47ba015abf458a9c151.patch
# Don't try to build on arm, aarch64 or ppc
ExclusiveArch: i686 x86_64
1 month, 3 weeks
[avidemux] Rebuild for new x265 version
by Leigh Scott
commit a589e69223fa445f133b3633d135cdca2f4d106c
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Apr 6 15:38:28 2024 +0100
Rebuild for new x265 version
avidemux.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/avidemux.spec b/avidemux.spec
index 911c638..4f9ffd5 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -10,7 +10,7 @@
Name: avidemux
Version: 2.8.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Graphical video editing and transcoding tool
License: GPLv2+
@@ -311,6 +311,9 @@ fi
%changelog
+* Sat Apr 06 2024 Leigh Scott <leigh123linux(a)gmail.com> - 2.8.1-4
+- Rebuild for new x265 version
+
* Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.8.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
1 month, 3 weeks
[HandBrake] Rebuild for new x265 version
by Leigh Scott
commit 4ff972484fd5043f725ad5fe0b3b21aa942137d0
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Apr 6 14:58:21 2024 +0100
Rebuild for new x265 version
HandBrake.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/HandBrake.spec b/HandBrake.spec
index ab9352b..600b1c0 100644
--- a/HandBrake.spec
+++ b/HandBrake.spec
@@ -16,7 +16,7 @@
Name: HandBrake
Version: 1.6.1
-Release: 5%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
+Release: 6%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
Summary: An open-source multiplatform video transcoder
License: GPLv2+
URL: https://handbrake.fr/
@@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{desktop_id}.
%{_bindir}/HandBrakeCLI
%changelog
+* Sat Apr 06 2024 Leigh Scott <leigh123linux(a)gmail.com> - 1.6.1-6
+- Rebuild for new x265 version
+
* Mon Mar 11 2024 Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net> - 1.6.1-5
- Fix build with GCC14
1 month, 3 weeks
