Accepting request 1009347 from home:iznogood:branches:multimedia:libs

- Update to version 4.4.3: * Stable bug fix release, mainly codecs, filter and format fixes. - Drop ffmpeg-sdl2-detection.patch: Fixed upstream. - Refresh patches with quilt: * ffmpeg-libglslang-detection.patch * ffmpeg-4.2-dlopen-fdk_aac.patch OBS-URL: https://build.opensuse.org/request/show/1009347 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=186
2022-10-10 17:13:28 +00:00 · 2022-10-10 17:13:28 +00:00 · 037338de44
commit 037338de44
parent f1f8e75c79
9 changed files with 41 additions and 62 deletions
--- a/ffmpeg-4.2-dlopen-fdk_aac.patch
+++ b/ffmpeg-4.2-dlopen-fdk_aac.patch
@ -1,7 +1,7 @@
-Index: ffmpeg-4.4.1/configure
+Index: ffmpeg-4.4.3/configure
 ===================================================================
--- ffmpeg-4.4.1.orig/configure
-+++ ffmpeg-4.4.1/configure
+--- ffmpeg-4.4.3.orig/configure
+++ ffmpeg-4.4.3/configure
@@ -232,6 +232,7 @@ External library support:
   --enable-libdc1394       enable IIDC-1394 grabbing using libdc1394
                            and libraw1394 [no]
@ -18,7 +18,7 @@ Index: ffmpeg-4.4.1/configure
     openssl
     libtls
 "
-@@ -6361,6 +6363,7 @@ enabled libdrm            && require_pkg
+@@ -6368,6 +6370,7 @@ enabled libdrm            && require_pkg
 enabled libfdk_aac        && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen ||
                                { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac &&
                                  warn "using libfdk without pkg-config"; } }
@ -26,10 +26,10 @@ Index: ffmpeg-4.4.1/configure
 flite_extralibs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
 enabled libflite          && require libflite "flite/flite.h" flite_init $flite_extralibs
 enabled fontconfig        && enable libfontconfig
-Index: ffmpeg-4.4.1/libavcodec/dlopen.h
+Index: ffmpeg-4.4.3/libavcodec/dlopen.h
 ===================================================================
 --- /dev/null
-+++ ffmpeg-4.4.1/libavcodec/dlopen.h
+++ ffmpeg-4.4.3/libavcodec/dlopen.h
@@ -0,0 +1,12 @@
 +#ifndef LOCALINC_DLOPEN_H
 +#define LOCALINC_DLOPEN_H
@ -43,10 +43,10 @@ Index: ffmpeg-4.4.1/libavcodec/dlopen.h
 +		goto error;
 +
 +#endif
-Index: ffmpeg-4.4.1/libavcodec/libfdk-aacdec.c
+Index: ffmpeg-4.4.3/libavcodec/libfdk-aacdec.c
 ===================================================================
--- ffmpeg-4.4.1.orig/libavcodec/libfdk-aacdec.c
-+++ ffmpeg-4.4.1/libavcodec/libfdk-aacdec.c
+--- ffmpeg-4.4.3.orig/libavcodec/libfdk-aacdec.c
+++ ffmpeg-4.4.3/libavcodec/libfdk-aacdec.c
@@ -37,6 +37,54 @@
 #define AAC_PCM_MAX_OUTPUT_CHANNELS AAC_PCM_OUTPUT_CHANNELS
 #endif
@ -114,10 +114,10 @@ Index: ffmpeg-4.4.1/libavcodec/libfdk-aacdec.c
     s->handle = aacDecoder_Open(avctx->extradata_size ? TT_MP4_RAW : TT_MP4_ADTS, 1);
     if (!s->handle) {
         av_log(avctx, AV_LOG_ERROR, "Error opening decoder\n");
-Index: ffmpeg-4.4.1/libavcodec/libfdk-aacenc.c
+Index: ffmpeg-4.4.3/libavcodec/libfdk-aacenc.c
 ===================================================================
--- ffmpeg-4.4.1.orig/libavcodec/libfdk-aacenc.c
-+++ ffmpeg-4.4.1/libavcodec/libfdk-aacenc.c
+--- ffmpeg-4.4.3.orig/libavcodec/libfdk-aacenc.c
+++ ffmpeg-4.4.3/libavcodec/libfdk-aacenc.c
@@ -35,6 +35,48 @@
 #define FDKENC_VER_AT_LEAST(vl0, vl1) 0
 #endif
--- a/ffmpeg-4.4.2.tar.xz
+++ b/ffmpeg-4.4.2.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:af419a7f88adbc56c758ab19b4c708afbcae15ef09606b82b855291f6a6faa93
-size 9562968
--- a/ffmpeg-4.4.2.tar.xz.asc
+++ b/ffmpeg-4.4.2.tar.xz.asc
@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQFMBAABCAA2FiEE/PmG6hXm4pOlZE8QtDIvBNZ2WNgFAmJYhScYHGZmbXBlZy1k
-ZXZlbEBmZm1wZWcub3JnAAoJELQyLwTWdljYLJ4IAIyrLLZPr25k5KG3DFd3M/c6
-L2Ct5tpGdzTFUhAt7Ai/EUU9WPQGsPZkv8NRJsL7kV7b7R3l+kgZH2fgWi3B1WMy
-XXJedDbRty+UhAgjRk/b+z4AwOaRc9BrQdtAt5WsaBS0mrh9f7jqRKCF1NYw2nQt
-qtUzqhURO8Sjq1yJnRVDAkHa6h0dzrZ82fhLXpZzgZPBjiQU4m1etuG7Qm0OJ6cs
-pw/4sPEKxfehadyW0PqxfplR0sSL9hNv7gKgMJL4LNp+cFWeTb89e10h1fqZTaxX
-IYvgih7L1IKtw71fAm6aLMIs4Rub8RzRD9gmDF3dr6YmMHpIepaddFR5zUv8rVw=
-=/K/d
-----END PGP SIGNATURE-----
--- a/ffmpeg-4.4.3.tar.xz
+++ b/ffmpeg-4.4.3.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c5b6c195e61534766a0b5fe16acc919170c883362612816d0a1c7f4f947006e
+size 9566020
--- a/ffmpeg-4.4.3.tar.xz.asc
+++ b/ffmpeg-4.4.3.tar.xz.asc
@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQFMBAABCAA2FiEE/PmG6hXm4pOlZE8QtDIvBNZ2WNgFAmNDHJkYHGZmbXBlZy1k
+ZXZlbEBmZm1wZWcub3JnAAoJELQyLwTWdljY/vAH/jLAuIyOsVl0B+FkziukD1kY
+l8OBOgZSe1Nfi3sw3Zke58QseVkT9wFhdKXs3wmhMOZHHgPYWH7ps2O3OSGw0UNH
+NJqU7NPoGY8t8+YQS7gRoGkGyXKruHaz7qw7JMfLPeTSTR/+CI145wKkArgh1lsF
+zsVMYz+7aBH3EzuJJPm1DjtOvIT6Q8LIhELIgiyQb8I6V+Xb6od5Ty3mO35CBO2q
+j31iow7sOFA758SYUcKeqWo+K8gYV7lEco1d3ouQ23JxIoExIuV7dipEFrWAl+0x
+kdALcl3ZQbb/bRheG9Ndk0eQqo0pZdKv+NNs9A6Bo2TATme6NkLbXOg4fkZ+Hug=
+=u5U1
+-----END PGP SIGNATURE-----
--- a/ffmpeg-4.changes
+++ b/ffmpeg-4.changes
@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Oct 10 11:18:30 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 4.4.3:
+  * Stable bug fix release, mainly codecs, filter and format fixes.
+- Drop ffmpeg-sdl2-detection.patch: Fixed upstream.
+- Refresh patches with quilt:
+  * ffmpeg-libglslang-detection.patch
+  * ffmpeg-4.2-dlopen-fdk_aac.patch
+
 -------------------------------------------------------------------
 Mon Aug 29 05:39:31 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>

--- a/ffmpeg-4.spec
+++ b/ffmpeg-4.spec
@ -95,7 +95,7 @@
 %define _major_version 4
 %define _major_expected 5
 Name:           ffmpeg-4
-Version:        4.4.2
+Version:        4.4.3
 Release:        0
 Summary:        Set of libraries for working with various multimedia formats
 License:        GPL-3.0-or-later
@ -120,7 +120,6 @@ Patch8:         vmaf-trim-usr-local.patch
 Patch9:         ffmpeg-4.4-CVE-2020-22046.patch
 Patch10:        ffmpeg-chromium.patch
 Patch11:        ffmpeg-libglslang-detection.patch
-Patch12:        ffmpeg-sdl2-detection.patch
 BuildRequires:  ladspa-devel
 BuildRequires:  libgsm-devel
 BuildRequires:  libmp3lame-devel
--- a/ffmpeg-libglslang-detection.patch
+++ b/ffmpeg-libglslang-detection.patch
@ -1,8 +1,8 @@
-Index: ffmpeg-4.4.1/configure
+Index: ffmpeg-4.4.3/configure
 ===================================================================
--- ffmpeg-4.4.1.orig/configure
-+++ ffmpeg-4.4.1/configure
-@@ -6370,7 +6370,12 @@ enabled fontconfig        && enable libf
+--- ffmpeg-4.4.3.orig/configure
+++ ffmpeg-4.4.3/configure
+@@ -6377,7 +6377,12 @@ enabled fontconfig        && enable libf
 enabled libfontconfig     && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit
 enabled libfreetype       && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
 enabled libfribidi        && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
--- a/ffmpeg-sdl2-detection.patch
+++ b/ffmpeg-sdl2-detection.patch
@ -1,30 +0,0 @@
-From 839f98ff6719cf2db0cbd88cd787a1b19b9cbf47 Mon Sep 17 00:00:00 2001
-From: Christopher Degawa <ccom@randomderp.com>
-Date: Wed, 11 May 2022 15:11:04 -0500
-Subject: [PATCH] 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 <ccom@randomderp.com>
-Signed-off-by: Gyan Doshi <ffmpeg@gyani.pro>
---
- configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 927857fd1024..16d9c78a0fdc 100755
--- a/configure
-+++ b/configure
-@@ -6383,7 +6383,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)