summaryrefslogtreecommitdiffstats
path: root/ffmpeg
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2023-08-23 07:51:58 +0000
committer Eric Hameleers <alien@slackware.com>2023-08-23 07:51:58 +0000
commit894ddf4e063ea85bc078f7ea839f546e2f9bbaed (patch)
tree2fe9e75af287d16de526059e9e0522b3ac4949bd /ffmpeg
parent3aa0512ea70a4551281a7a12cccb6b46ec3ebfcf (diff)
downloadasb-894ddf4e063ea85bc078f7ea839f546e2f9bbaed.tar.gz
asb-894ddf4e063ea85bc078f7ea839f546e2f9bbaed.tar.xz
ffmpeg: updated to 5.1.3 for -current. Also updated internal libraries for dav1d, fribi, libgsm, libva, mfx_dispatch, opus, sdl2, v4l and libvpx.
Diffstat (limited to 'ffmpeg')
-rwxr-xr-xffmpeg/build/ffmpeg.SlackBuild38
1 files changed, 21 insertions, 17 deletions
diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild
index d2c6a4ce..30e12b89 100755
--- a/ffmpeg/build/ffmpeg.SlackBuild
+++ b/ffmpeg/build/ffmpeg.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
# $Id$
-# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Eric Hameleers, Eindhoven, NL
+# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Eric Hameleers, Eindhoven, NL
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -208,6 +208,8 @@
# libass and libvdpau libraries.
# 5.1.2-1: 12/oct/2022 by Eric Hameleers <alien@slackware.com>
# * Update.
+# 5.1.3-1: 22/aug/2023 by Eric Hameleers <alien@slackware.com>
+# * Update.
#
# Run 'sh ffmpeg.SlackBuild' to build a Slackware package.
# The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -217,7 +219,7 @@
PRGNAM=ffmpeg
-VERSION=${VERSION:-5.1.2}
+VERSION=${VERSION:-5.1.3}
BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-"-j$(nproc)"}
TAG=${TAG:-"alien"}
@@ -318,24 +320,24 @@ AMRWBENC=0.1.3
AMR=0.1.3
ASS=0.16.0
AVC1394=0.5.4
-DAV1D=1.0.0
+DAV1D=1.2.1
DC1394=2.2.6
FDKAAC=2.0.2
-FRIBIDI=1.0.12
+FRIBIDI=1.0.13
GME=0.6.3
-GSM=1.0.17
+GSM=1.0.22
LAME=3.100
-LIBVA=2.16.0
+LIBVA=2.19.0
LIBZVBI=0.2.35
-MFX=1.34
-OPUS=1.3.1
+MFX=1.35.1
+OPUS=1.4
RAW1394=2.0.5
RTMP=2.3
-SDL2=2.0.22
+SDL2=2.28.2
SPEEX=1.2.1
-V4L=1.22.1
+V4L=1.24.1
VDPAU=1.5
-VPX=1.12.0
+VPX=1.13.0
X264=20191217-2245
X265=3.5
@@ -1062,12 +1064,6 @@ echo -e "**\n** sdl2 ...\n**"
cd $TMP/tmp-$PRGNAM/SDL2-$SDL2
-if [ "$ARCH" != "x86_64" ]; then
- # Patch needed to compile on 32bit:
- cat $SRCDIR/patches/SDL2_32bit_gles.patch | patch -p1 --verbose
- 2>&1 | tee $OUTPUT/patch-${PRGNAM}_sdl2.log
-fi
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
LDFLAGS="$SLKLDFLAGS" \
@@ -1289,6 +1285,10 @@ make_mfx()
echo -e "**\n** mfx ...\n**"
cd $TMP/tmp-$PRGNAM/mfx_dispatch-$MFX
+# Make it work with GCC 13.x:
+cat $SRCDIR/patches/mfx_dispatch_gcc13.patch | patch -p1 --verbose \
+ 2>&1 | tee $OUTPUT/patch-${PRGNAM}_mfx.log
+
[ ! -x configure ] && autoreconf -vif
# Note: mfx_dispatch needs libva.
@@ -1728,6 +1728,10 @@ cd $TMP/tmp-$PRGNAM/ffmpeg-${VERSION}
#cat $SRCDIR/patches/x264_bitdepth.patch | patch -p1 --verbose \
# 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+# Fix assembly with binutils >= 2.41:
+cat $SRCDIR/patches/ffmpeg_binutils241.patch | patch -p1 --verbose \
+ 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+
# Restore missing function needed by Chromium and qt-webengine:
cat $SRCDIR/patches/add-av_stream_get_first_dts-for-chromium.patch \
| patch -p1 --verbose 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log