webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: Update deps to use sdl2 in place of sdl

Browse Source 
- 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>
This commit is contained in:
Adolf Belka
2021-09-01 22:21:00 +02:00
committed by Arne Fitzenreiter
parent 15c01e309d
commit fd0e08feb9
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/rootfiles/packages/ffmpeg
View File

@@ -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

4
lfs/ffmpeg
View File

@@ -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