Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package ffmpeg-4 for openSUSE:Factory 
checked in at 2022-08-30 14:48:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ffmpeg-4 (Old)
 and      /work/SRC/openSUSE:Factory/.ffmpeg-4.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ffmpeg-4"

Tue Aug 30 14:48:17 2022 rev:53 rq:999856 version:4.4.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/ffmpeg-4/ffmpeg-4.changes        2022-06-19 
21:10:48.694121443 +0200
+++ /work/SRC/openSUSE:Factory/.ffmpeg-4.new.2083/ffmpeg-4.changes      
2022-08-30 14:48:18.875941461 +0200
@@ -1,0 +2,6 @@
+Mon Aug 29 05:39:31 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Add patch to detect SDL2 >= 2.1.0 (boo#1202848):
+  * ffmpeg-sdl2-detection.patch
+
+-------------------------------------------------------------------

New:
----
  ffmpeg-sdl2-detection.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ffmpeg-4.spec ++++++
--- /var/tmp/diff_new_pack.nNJurz/_old  2022-08-30 14:48:19.531943280 +0200
+++ /var/tmp/diff_new_pack.nNJurz/_new  2022-08-30 14:48:19.535943291 +0200
@@ -120,6 +120,7 @@
 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
@@ -807,7 +808,23 @@
 
 %files
 %doc Changelog CREDITS README.md
-%_bindir/*
+%_bindir/aviocat
+%_bindir/cws2fws
+%_bindir/ffescape
+%_bindir/ffeval
+%_bindir/ffhash
+%_bindir/ffmpeg
+%_bindir/ffplay
+%_bindir/ffprobe
+%_bindir/fourcc2pixfmt
+%_bindir/graph2dot
+%_bindir/ismindex
+%_bindir/pktdumper
+%_bindir/probetest
+%_bindir/qt-faststart
+%_bindir/seek_print
+%_bindir/sidxindex
+%_bindir/trasher
 %_mandir/man1/ff*.1*
 %_datadir/ffmpeg/
 %_libdir/libavcodec.so.58



++++++ ffmpeg-sdl2-detection.patch ++++++
>From 839f98ff6719cf2db0cbd88cd787a1b19b9cbf47 Mon Sep 17 00:00:00 2001
From: Christopher Degawa <c...@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 <c...@randomderp.com>
Signed-off-by: Gyan Doshi <ffm...@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)

Reply via email to