diff --git a/0001-configure-extend-SDL-check-to-accept-all-2.x-version.patch b/0001-configure-extend-SDL-check-to-accept-all-2.x-version.patch deleted file mode 100644 index 7fc40c7..0000000 --- a/0001-configure-extend-SDL-check-to-accept-all-2.x-version.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 32f9a3e0c23c403cd6c6dc812939253227001f88 Mon Sep 17 00:00:00 2001 -From: Christopher Degawa -Date: Wed, 11 May 2022 15:11:04 -0500 -Subject: [PATCH 1/2] configure: extend SDL check to accept all 2.x versions - -sdl2 recently changed their versioning, moving the patch level to minor level -https://github.com/libsdl-org/SDL/commit/cd7c2f1de7d9e418bb554047d714dd7cacc020ff -and have said that they will instead ship sdl3.pc for 3.0.0 - -Fixes ticket 9768 - -Signed-off-by: Christopher Degawa -Signed-off-by: Gyan Doshi - -(cherry picked from commit e5163b1d34381a3319214a902ef1df923dd2eeba) ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 2369ea0240..e731a9d3ff 100755 ---- a/configure -+++ b/configure -@@ -6742,7 +6742,7 @@ fi - - if enabled sdl2; then - SDL2_CONFIG="${cross_prefix}sdl2-config" -- test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent -+ test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent - if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then - sdl2_cflags=$("${SDL2_CONFIG}" --cflags) - sdl2_extralibs=$("${SDL2_CONFIG}" --libs) --- -2.36.1 - diff --git a/ffmpeg.spec b/ffmpeg.spec index b51b57b..9f0fbe3 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -85,8 +85,8 @@ Name: ffmpeg %global pkg_name %{name}%{?pkg_suffix} -Version: 5.0.1 -Release: 12%{?dist} +Version: 5.0.2 +Release: 1%{?dist} Summary: A complete solution to record, convert and stream audio and video License: GPLv3+ URL: https://ffmpeg.org/ @@ -121,7 +121,6 @@ Patch6: ffmpeg-fix-gnutls-priority.patch # http://ffmpeg.org/pipermail/ffmpeg-devel/2022-February/293194.html Patch7: ffmpeg-openh264-averr-on-bad-version.patch # Backport fixes to recognize sdl2 with new versioning scheme -Patch8: 0001-configure-extend-SDL-check-to-accept-all-2.x-version.patch Patch9: 0002-configure-fix-SDL2-version-check-for-pkg_config-fall.patch # Set up dlopen for openh264 @@ -840,6 +839,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples %{_mandir}/man3/libswscale.3* %changelog +* Tue Nov 22 2022 Neal Gompa - 5.0.2-1 +- Update to 5.0.2 + * Wed Oct 12 2022 Neal Gompa - 5.0.1-12 - Refresh dlopen headers and patch for OpenH264 2.3.1 - Backport patches to fix building with newer SDL2 versions diff --git a/sources b/sources index 9ecf186..e8b3dfa 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (ffmpeg-free-5.0.1.tar.xz) = 313277c2fb62829606c3434f03392351b7964734bef188f7838f754a383d8ad8b890ddd615aa7360ba2a72755fa54a6b967ff2f5a30da7a5490d31b562028e19 -SHA512 (ffmpeg-5.0.1.tar.xz.asc) = 9c4bd404196c3a3808bae92873aefc77f8c26a9419cc6130a3f2359a75c8e83189d206e9aee8ff85c5a7fe4a98da24e11cf607ec351386c18979ec2d5ad3b3ad +SHA512 (ffmpeg-free-5.0.2.tar.xz) = ece3a28114c86129db6c6f00d8b59b321e7fb770fdf169796fb1c39c61f1a75bcdb3c2905cd32a36a2e8c5c9921e8133c9d10756413c58baa6a2444ba9b6183d +SHA512 (ffmpeg-5.0.2.tar.xz.asc) = 2cbe55fc15ff20a90b7b3beba22364e013338db53f68b9f228f3c773d955ed149221730ac403dc781c74bbb8c5909573bfd27377b96654496428f709fa79225c SHA512 (ffmpeg-dlopen-headers.tar.xz) = 97e6986fc2bb9dfa4516135a76b04d27ceb52ff96f0af21a6169919aeefefb4d2e2e24a771959689cdbec385f5d71614ba661223c67c0e94089a6dd823a30099 SHA512 (ffmpeg.keyring) = 9b36506835db36f776b7ddb53ad6fa9e915e6ca2f9c7cfebe8eb45513e1036a985283590a840ca313a111bf35dc3731f68885aaafb1fb7011ec433cc119e5165