From: Sergey Matveev <stargrave@stargrave.org>
Date: Mon, 14 Jul 2025 11:55:52 +0000 (+0300)
Subject: Add newer FFmpeg
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=5035e9e987e018c51c260bc4313c3235e0e843d47c5edcf39586c47a8ab8e0bc;p=bass.git

Add newer FFmpeg

mpv currently does not build with it.
---

diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore
index 251efd1..2944fd9 100644
--- a/build/distfiles/.gitignore
+++ b/build/distfiles/.gitignore
@@ -38,6 +38,7 @@
 /dq.git/
 /expat-2.6.2.tar.xz
 /ffmpeg-n7.2-dev-1370-g5021764413.tar.zst
+/ffmpeg-n7.2-dev-3093-g35a6de137a.tar.zst
 /ffmpeg.git/
 /flac-1.4.3.tar.xz
 /fltk-1.3.9-docs-html.tar.gz
diff --git a/build/distfiles/ffmpeg-n7.2-dev-3093-g35a6de137a.tar.zst.do b/build/distfiles/ffmpeg-n7.2-dev-3093-g35a6de137a.tar.zst.do
new file mode 100644
index 0000000..2b2c47e
--- /dev/null
+++ b/build/distfiles/ffmpeg-n7.2-dev-3093-g35a6de137a.tar.zst.do
@@ -0,0 +1,7 @@
+[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../..
+sname=$1.do . "$BASS_ROOT"/lib/rc
+[ -d ffmpeg.git ] || git clone --depth 1 --bare https://github.com/FFmpeg/FFmpeg.git ffmpeg.git >&2
+cd ffmpeg.git
+commit=35a6de137a39f274d5e01ed0e0e6c4f04d0aaf07
+git fetch origin $commit >&2
+git archive --prefix=${1%.tar.zst}/ $commit | $COMPRESSOR
diff --git a/build/skel/multimedia/ffmpeg-n7.2-dev-3093-g35a6de137a.do b/build/skel/multimedia/ffmpeg-n7.2-dev-3093-g35a6de137a.do
new file mode 100644
index 0000000..195f9ab
--- /dev/null
+++ b/build/skel/multimedia/ffmpeg-n7.2-dev-3093-g35a6de137a.do
@@ -0,0 +1,51 @@
+[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../..
+sname=$1.do . "$BASS_ROOT"/lib/rc
+. "$BASS_ROOT"/build/skel/common.rc
+
+bdeps="
+rc-paths
+stow
+archivers/zstd
+devel/gmake-4.4.1
+devel/pkgconf-2.1.1
+textproc/texinfo-7.1.1
+devel/nasm-2.16.01
+"
+rdeps="
+audio/flac-1.4.3
+audio/opus-1.5.2
+audio/wavpack-5.7.0
+multimedia/dav1d-1.5.1
+multimedia/libvpx-v1.14.1-303-gd6ae3ea465
+multimedia/svt-av1-v3.0.2
+multimedia/x264-2024-05-12
+security/gnutls-3.8.6
+"
+redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.zst $rdeps
+hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
+. "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
+"$BASS_ROOT"/build/bin/pkg-inst $bdeps $rdeps
+. ./rc
+$TAR xf "$DISTFILES"/$NAME.tar.zst
+"$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
+
+cd $NAME
+./configure --prefix="$SKELBINS"/$ARCH/$NAME-$hsh \
+    --cc=cc --cxx=c++ --objcc=cc --dep-cc=cc \
+    --enable-gpl \
+    --enable-shared --enable-pic \
+    --enable-avfilter \
+    --enable-pthreads \
+    --disable-alsa \
+    --enable-gnutls \
+    --enable-libsvtav1 --enable-libdav1d \
+    --enable-libopus --enable-libvorbis \
+    --enable-libvpx \
+    --enable-libx264 \
+    --disable-manpages >&2
+gmake -j$MAKE_JOBS >&2
+gmake install install-doc >&2
+
+cd "$SKELBINS"/$ARCH
+"$BASS_ROOT"/build/lib/prepare-preinst-010-rdeps $NAME-$hsh $rdeps
+"$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh