[rpms/ffmpeg] epel9-next: Update to 6.1.1

[rpms/ffmpeg] epel9-next: Update to 6.1.1

[Neal Gompa]

A new commit has been pushed.

Repo   : rpms/ffmpeg
Branch : epel9-next
Commit : f3982b50da8b89a2437456a847f4363f485beff6
Author : Neal Gompa <ngompa@fedoraproject.org>
Date   : 2024-01-04T11:04:37-05:00
Stats  : +6/-33 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/ffmpeg/c/f3982b50da8b89a2437456a847f4363f485beff6?branch=epel9-next

Log:
Update to 6.1.1

---
diff --git a/0001-lavc-Makefile-build-vulkan-decode-code-if-vulkan_av1.patch b/0001-lavc-Makefile-build-vulkan-decode-code-if-vulkan_av1.patch
deleted file mode 100644
index 021aaae..0000000
--- a/0001-lavc-Makefile-build-vulkan-decode-code-if-vulkan_av1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b7c696af10784110844cc3dbe0ec21538393f309 Mon Sep 17 00:00:00 2001
-From: Lynne <dev@lynne.ee>
-Date: Sun, 3 Dec 2023 21:02:13 +0100
-Subject: [PATCH] lavc/Makefile: build vulkan decode code if vulkan_av1 has
- been enabled
-
-Forgotten.
----
- libavcodec/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index 748806e702..fd9883d2ca 100644
---- a/libavcodec/Makefile
-+++ b/libavcodec/Makefile
-@@ -998,7 +998,7 @@ OBJS-$(CONFIG_AV1_DXVA2_HWACCEL)          += dxva2_av1.o
- OBJS-$(CONFIG_AV1_NVDEC_HWACCEL)          += nvdec_av1.o
- OBJS-$(CONFIG_AV1_VAAPI_HWACCEL)          += vaapi_av1.o
- OBJS-$(CONFIG_AV1_VDPAU_HWACCEL)          += vdpau_av1.o
--OBJS-$(CONFIG_AV1_VULKAN_HWACCEL)         += vulkan_av1.o
-+OBJS-$(CONFIG_AV1_VULKAN_HWACCEL)         += vulkan_decode.o vulkan_av1.o
- OBJS-$(CONFIG_H263_VAAPI_HWACCEL)         += vaapi_mpeg4.o
- OBJS-$(CONFIG_H263_VIDEOTOOLBOX_HWACCEL)  += videotoolbox.o
- OBJS-$(CONFIG_H264_D3D11VA_HWACCEL)       += dxva2_h264.o
--- 
-2.43.0
-

diff --git a/ffmpeg.spec b/ffmpeg.spec
index f2e147b..48e9732 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -91,7 +91,7 @@
 Name:           ffmpeg
 %global pkg_name %{name}%{?pkg_suffix}
 
-Version:        6.1
+Version:        6.1.1
 Release:        1%{?dist}
 Summary:        A complete solution to record, convert and stream audio and video
 License:        GPL-3.0-or-later
@@ -116,9 +116,6 @@ Patch1:         ffmpeg-codec-choice.patch
 # Allow to build with fdk-aac-free
 # See https://bugzilla.redhat.com/show_bug.cgi?id=1501522#c112
 Patch2:         ffmpeg-allow-fdk-aac-free.patch
-# Backport fix for Vulkan Video with only AV1
-# From: https://ffmpeg.org/pipermail/ffmpeg-devel/2023-December/317728.html
-Patch3:         0001-lavc-Makefile-build-vulkan-decode-code-if-vulkan_av1.patch
 # Drop openh264 runtime version checks
 # https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=10211
 Patch4:         0001-lavc-libopenh264-Drop-openh264-runtime-version-check.patch
@@ -863,6 +860,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples
 %{_mandir}/man3/libswscale.3*
 
 %changelog
+* Thu Jan 04 2024 Neal Gompa <ngompa@fedoraproject.org> - 6.1.1-1
+- Update to 6.1.1
+
 * Thu Jan 04 2024 Neal Gompa <ngompa@fedoraproject.org> - 6.1-1
 - Rebase to 6.1
 

diff --git a/sources b/sources
index 537a8b7..932881f 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (ffmpeg-free-6.1.tar.xz) = eb2c0906b659a81f061e508b5c5004efd3fdb8299f2a5e4e954e1dd0589770baccfda768fa9d3e39bde1e1d8644c42015e0f6f674ab96a94776c69aad515d72d
-SHA512 (ffmpeg-6.1.tar.xz.asc) = e4885270869cc6a1681bc3f76f344f77c4858c490a517e45a758d15214ce67c3c2113a1caa8ca65eb6447b68d822fa1dd730081345bcc0928faaf82bb76037ba
+SHA512 (ffmpeg-free-6.1.1.tar.xz) = 4fdecf8316bc038839a1d05116630f47e4d75d3b25fa6b3480f9e654d5677c7996c6a2a83f93f4520e175a79843da05a987aeda24c9a6e7495079a808309569b
+SHA512 (ffmpeg-6.1.1.tar.xz.asc) = 0e10c1f560bab0812d759d286656593dea5940f02bb52d88d9ba7f10b12b9cc3d7aa2a41c5f7a45b319069e04dce22dc1286b3c1ba685b35cd6d04cd81c5a0f5
 SHA512 (ffmpeg-dlopen-headers.tar.xz) = 97e6986fc2bb9dfa4516135a76b04d27ceb52ff96f0af21a6169919aeefefb4d2e2e24a771959689cdbec385f5d71614ba661223c67c0e94089a6dd823a30099
 SHA512 (ffmpeg.keyring) = 9b36506835db36f776b7ddb53ad6fa9e915e6ca2f9c7cfebe8eb45513e1036a985283590a840ca313a111bf35dc3731f68885aaafb1fb7011ec433cc119e5165