ffmpeg: Update deps to use sdl2 in place of sdl

- This patch needs to go together with the patch updating sdl to sdl2
   https://patchwork.ipfire.org/project/ipfire/patch/20210824212848.1311257-1-adolf.belka@ipfire.org/
- Update deps line in lfs to use sdl2 in place of sdl
- Update rootfile

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/packages/ffmpeg b/config/rootfiles/packages/ffmpeg
index b388d18f160f27fe94cce10d7be66b456aaea481..65dd0d3603c8c7e4d348c500212b97172f382f08 100644 (file)
--- a/config/rootfiles/packages/ffmpeg
+++ b/config/rootfiles/packages/ffmpeg
@@ -1,4 +1,5 @@
 usr/bin/ffmpeg
+usr/bin/ffplay
 usr/bin/ffprobe
 #usr/include/libavcodec
 #usr/include/libavcodec/ac3_parser.h
@@ -188,6 +189,8 @@ usr/lib/libswscale.so.5.9.100
 #usr/share/doc/ffmpeg/ffmpeg-scaler.html
 #usr/share/doc/ffmpeg/ffmpeg-utils.html
 #usr/share/doc/ffmpeg/ffmpeg.html
+#usr/share/doc/ffmpeg/ffplay-all.html
+#usr/share/doc/ffmpeg/ffplay.html
 #usr/share/doc/ffmpeg/ffprobe-all.html
 #usr/share/doc/ffmpeg/ffprobe.html
 #usr/share/doc/ffmpeg/general.html
@@ -246,6 +249,8 @@ usr/lib/libswscale.so.5.9.100
 #usr/share/man/man1/ffmpeg-scaler.1
 #usr/share/man/man1/ffmpeg-utils.1
 #usr/share/man/man1/ffmpeg.1
+#usr/share/man/man1/ffplay-all.1
+#usr/share/man/man1/ffplay.1
 #usr/share/man/man1/ffprobe-all.1
 #usr/share/man/man1/ffprobe.1
 #usr/share/man/man3/libavcodec.3

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index 1efa14a367850b86b5670b6fa405f1a0439c4a40..21c21cc88d5f9f5ed7c6713980aad5cb9f7cd524 100644 (file)
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ffmpeg
-PAK_VER    = 12
+PAK_VER    = 13
 
-DEPS       = sdl lame libvorbis xvid
+DEPS       = sdl2 lame libvorbis xvid
 
 ifeq "$(BUILD_ARCH)" "armv6l"
        LDFLAGS += -latomic