From: Sergey Matveev <stargrave@stargrave.org>
Date: Thu, 7 Aug 2025 19:24:18 +0000 (+0300)
Subject: FFmpeg with z.lib
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=33aba04b43215f35b5d80f276171f31b225f4b1bd148ce79cf25885ca51bd42d;p=bass.git

FFmpeg with z.lib
---

diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore
index c53d6c5..e8757c6 100644
--- a/build/distfiles/.gitignore
+++ b/build/distfiles/.gitignore
@@ -272,5 +272,7 @@
 /zathura-cb-0.1.11.tar.xz
 /zathura-djvu-0.2.10.tar.xz
 /zathura-pdf-mupdf-0.4.4.tar.xz
+/zimg-3.0.5-207-g0e56801.tar.zst
+/zimg/
 /zsh-5.9.tar.xz
 /zstd-1.5.7.tar.gz
diff --git a/build/distfiles/zimg-3.0.5-207-g0e56801.tar.zst.do b/build/distfiles/zimg-3.0.5-207-g0e56801.tar.zst.do
new file mode 100644
index 0000000..a60403b
--- /dev/null
+++ b/build/distfiles/zimg-3.0.5-207-g0e56801.tar.zst.do
@@ -0,0 +1,13 @@
+[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../..
+sname=$1.do . "$BASS_ROOT"/lib/rc
+[ -d zimg ] || git clone --depth 1 https://github.com/sekrit-twc/zimg.git >&2
+cd zimg
+commit=0e56801f98db3e363c974fca794fa06022d40ee4
+git fetch origin $commit >&2
+git checkout $commit >&2
+git submodule update --init --recursive >&2
+dir=${1%.tar.zst}
+{
+    git archive --prefix=$dir/ @
+    git submodule --quiet foreach 'git archive --prefix='$dir'/$sm_path/ @'
+} | $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
index 9118c42..7ef2678 100644
--- a/build/skel/multimedia/ffmpeg-n7.2-dev-3093-g35a6de137a.do
+++ b/build/skel/multimedia/ffmpeg-n7.2-dev-3093-g35a6de137a.do
@@ -19,6 +19,7 @@ multimedia/dav1d-1.5.1
 multimedia/libvpx-v1.14.1-303-gd6ae3ea465
 multimedia/svt-av1-v3.1.0
 multimedia/x264-2024-05-12
+multimedia/zimg-3.0.5-207-g0e56801
 security/gnutls-3.8.6
 "
 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.zst $rdeps
@@ -42,6 +43,7 @@ cd $NAME
     --enable-libopus --enable-libvorbis \
     --enable-libvpx \
     --enable-libx264 \
+    --enable-libzimg \
     --disable-manpages >&2
 gmake -j$MAKE_JOBS >&2
 gmake install install-doc >&2
diff --git a/build/skel/multimedia/zimg-3.0.5-207-g0e56801.do b/build/skel/multimedia/zimg-3.0.5-207-g0e56801.do
new file mode 100644
index 0000000..4a1a974
--- /dev/null
+++ b/build/skel/multimedia/zimg-3.0.5-207-g0e56801.do
@@ -0,0 +1,26 @@
+[ -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/autotools
+"
+redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.zst
+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
+. ./rc
+$TAR xf "$DISTFILES"/$NAME.tar.zst --options read_concatenated_archives
+"$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
+
+cd $NAME
+./autogen.sh >&2
+./configure --prefix="$SKELBINS"/$ARCH/$NAME-$hsh >&2
+make -j$MAKE_JOBS >&2
+make install >&2
+
+cd "$SKELBINS"/$ARCH
+"$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh