From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 16 Mar 2025 10:25:26 +0000 (+0300)
Subject: Fix libavif buildability
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=cc8c7c171f8f185f230f375ded01bacc467a8ff31ae06f88f313540901797e7e;p=bass.git

Fix libavif buildability
---

diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore
index adb4f8e..f0ff559 100644
--- a/build/distfiles/.gitignore
+++ b/build/distfiles/.gitignore
@@ -5,6 +5,8 @@
 /angie-1.5.0.tar.gz
 /apr-1.7.4.tar.bz2
 /apr-util-1.6.3.tar.bz2
+/libargparse-81998ffafb9c2ac8cf488d31e536a2e6fd6b3fdf.tar.zst
+/libargparse.git/
 /aria2-1.37.0.tar.xz
 /at-spi2-atk-2.38.0.tar.xz
 /at-spi2-core-2.52.0.tar.xz
@@ -107,7 +109,7 @@
 /libao-1.2.0.tar.gz
 /libass-0.17.2.tar.gz
 /libassuan-3.0.1.tar.bz2
-/libavif-v1.0.0-535-g7fbc20c.tar.zst
+/libavif-v1.1.1-255-g086e7e12.tar.zst
 /libavif.git/
 /libde265-v1.0.15-17-g01bb88b7.tar.zst
 /libde265.git/
@@ -232,7 +234,7 @@
 /sqlite-src-3450100.zip
 /stow-2.3.1.tar.bz2
 /supercat-0.5.8.tar.gz
-/svt-av1-v3.0.0.tar.zst
+/svt-av1-v3.0.1.tar.zst
 /svt-av1.git/
 /sxhkd-0.6.2-5-gb0923b6.tar.zst
 /sxhkd.git/
diff --git a/build/distfiles/libargparse-81998ffafb9c2ac8cf488d31e536a2e6fd6b3fdf.tar.zst.do b/build/distfiles/libargparse-81998ffafb9c2ac8cf488d31e536a2e6fd6b3fdf.tar.zst.do
new file mode 100644
index 0000000..71c8198
--- /dev/null
+++ b/build/distfiles/libargparse-81998ffafb9c2ac8cf488d31e536a2e6fd6b3fdf.tar.zst.do
@@ -0,0 +1,7 @@
+[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../..
+sname=$1.do . "$BASS_ROOT"/lib/rc
+[ -d libargparse.git ] || git clone --depth 1 --bare https://github.com/maryla-uc/libargparse.git >&2
+cd libargparse.git
+commit=81998ffafb9c2ac8cf488d31e536a2e6fd6b3fdf
+git fetch origin $commit >&2
+git archive --prefix=${1%.tar.zst}/ $commit | $COMPRESSOR
diff --git a/build/distfiles/libavif-v1.0.0-535-g7fbc20c.tar.zst.do b/build/distfiles/libavif-v1.1.1-255-g086e7e12.tar.zst.do
similarity index 86%
rename from build/distfiles/libavif-v1.0.0-535-g7fbc20c.tar.zst.do
rename to build/distfiles/libavif-v1.1.1-255-g086e7e12.tar.zst.do
index 825c619..e72c95b 100644
--- a/build/distfiles/libavif-v1.0.0-535-g7fbc20c.tar.zst.do
+++ b/build/distfiles/libavif-v1.1.1-255-g086e7e12.tar.zst.do
@@ -2,6 +2,6 @@
 sname=$1.do . "$BASS_ROOT"/lib/rc
 [ -d libavif.git ] || git clone --depth 1 --bare https://github.com/AOMediaCodec/libavif.git >&2
 cd libavif.git
-commit=7fbc20cbfd8d92149bd33b7f03a8646fce48f999
+commit=086e7e127be93b7595fa2a2144bc6afb23ff3e22
 git fetch origin $commit >&2
 git archive --prefix=${1%.tar.zst}/ $commit | $COMPRESSOR
diff --git a/build/distfiles/svt-av1-v3.0.0.tar.zst.do b/build/distfiles/svt-av1-v3.0.1.tar.zst.do
similarity index 86%
rename from build/distfiles/svt-av1-v3.0.0.tar.zst.do
rename to build/distfiles/svt-av1-v3.0.1.tar.zst.do
index 1b4a5cb..848cd39 100644
--- a/build/distfiles/svt-av1-v3.0.0.tar.zst.do
+++ b/build/distfiles/svt-av1-v3.0.1.tar.zst.do
@@ -2,6 +2,6 @@
 sname=$1.do . "$BASS_ROOT"/lib/rc
 [ -d svt-av1.git ] || git clone --depth 1 --bare https://gitlab.com/AOMediaCodec/SVT-AV1.git svt-av1.git >&2
 cd svt-av1.git
-commit=442fc31a1cc12be618a9e112d3b41deb8fb398ab
+commit=d653d6c193d73c847d52ad48e3436719b77c5aaa
 git fetch origin $commit >&2
 git archive --prefix=${1%.tar.zst}/ $commit | $COMPRESSOR
diff --git a/build/skel/graphics/imlib2-1.12.2.do b/build/skel/graphics/imlib2-1.12.2.do
index c30b624..8124506 100644
--- a/build/skel/graphics/imlib2-1.12.2.do
+++ b/build/skel/graphics/imlib2-1.12.2.do
@@ -5,7 +5,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc
 bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1"
 rdeps="
 graphics/freetype-2.13.3
-graphics/libavif-v1.0.0-535-g7fbc20c
+graphics/libavif-v1.1.1-255-g086e7e12
 graphics/libjpeg-turbo-3.0.3
 graphics/libjxl-v0.11-snapshot-124-g9845054a
 graphics/libpng-1.6.43
diff --git a/build/skel/graphics/libavif-v1.0.0-535-g7fbc20c.do b/build/skel/graphics/libavif-v1.1.1-255-g086e7e12.do
similarity index 64%
rename from build/skel/graphics/libavif-v1.0.0-535-g7fbc20c.do
rename to build/skel/graphics/libavif-v1.1.1-255-g086e7e12.do
index 3dd9b25..4f21283 100644
--- a/build/skel/graphics/libavif-v1.0.0-535-g7fbc20c.do
+++ b/build/skel/graphics/libavif-v1.1.1-255-g086e7e12.do
@@ -2,15 +2,24 @@
 sname=$1.do . "$BASS_ROOT"/lib/rc
 . "$BASS_ROOT"/build/skel/common.rc
 
-bdeps="rc-paths stow archivers/zstd devel/cmake-3.28.3 devel/pkgconf-2.1.1"
+bdeps="
+rc-paths
+stow
+archivers/zstd
+devel/cmake-3.28.3
+devel/pkgconf-2.1.1
+devel/ninja-v1.12.1
+"
 rdeps="
 graphics/libjpeg-turbo-3.0.3
 graphics/libpng-1.6.43
 graphics/libyuv-2024-06-22
 multimedia/dav1d-1.5.0-53-gb129d9f2
-multimedia/svt-av1-v3.0.0
+multimedia/svt-av1-v3.0.1
 "
-redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.zst $rdeps
+redo-ifchange $bdeps $rdeps \
+    "$DISTFILES"/$NAME.tar.zst \
+    "$DISTFILES"/libargparse-81998ffafb9c2ac8cf488d31e536a2e6fd6b3fdf.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 $rdeps
@@ -21,8 +30,20 @@ $TAR xf "$DISTFILES"/$NAME.tar.zst
 cd $NAME
 mkdir -p ext/libyuv/build
 ln -s $tmp/local/lib/libyuv.a ext/libyuv/build/
+
+tar xfC "$DISTFILES"/libargparse-81998ffafb9c2ac8cf488d31e536a2e6fd6b3fdf.tar.zst ext
+mv ext/libargparse-81998ffafb9c2ac8cf488d31e536a2e6fd6b3fdf ext/libargparse
+cd ext/libargparse
+mkdir build
+cd build
+cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release .. >&2
+cd ../..
+ninja -C libargparse/build >&2
+cd ..
+
 mkdir build
 cd build
+export LDFLAGS="-lm $LDFLAGS"
 cmake \
     -DAVIF_CODEC_DAV1D=SYSTEM \
     -DAVIF_CODEC_SVT=SYSTEM \
diff --git a/build/skel/graphics/libjxl-v0.11-snapshot-124-g9845054a.do b/build/skel/graphics/libjxl-v0.11-snapshot-124-g9845054a.do
index 46ca05a..63560b6 100644
--- a/build/skel/graphics/libjxl-v0.11-snapshot-124-g9845054a.do
+++ b/build/skel/graphics/libjxl-v0.11-snapshot-124-g9845054a.do
@@ -10,7 +10,7 @@ devel/cmake-3.28.3
 devel/ninja-v1.12.1
 devel/pkgconf-2.1.1
 "
-rdeps="graphics/libavif-v1.0.0-535-g7fbc20c graphics/libwebp-1.4.0"
+rdeps="graphics/libavif-v1.1.1-255-g086e7e12 graphics/libwebp-1.4.0"
 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
diff --git a/build/skel/multimedia/ffmpeg-n7.2-dev-1370-g5021764413.do b/build/skel/multimedia/ffmpeg-n7.2-dev-1370-g5021764413.do
index e07f2f9..bd55ab1 100644
--- a/build/skel/multimedia/ffmpeg-n7.2-dev-1370-g5021764413.do
+++ b/build/skel/multimedia/ffmpeg-n7.2-dev-1370-g5021764413.do
@@ -17,7 +17,7 @@ audio/opus-1.5.2
 audio/wavpack-5.7.0
 multimedia/dav1d-1.5.0-53-gb129d9f2
 multimedia/libvpx-v1.14.1-303-gd6ae3ea465
-multimedia/svt-av1-v3.0.0
+multimedia/svt-av1-v3.0.1
 multimedia/x264-2024-05-12
 security/gnutls-3.8.6
 "
diff --git a/build/skel/multimedia/svt-av1-v3.0.0.do b/build/skel/multimedia/svt-av1-v3.0.1.do
similarity index 100%
rename from build/skel/multimedia/svt-av1-v3.0.0.do
rename to build/skel/multimedia/svt-av1-v3.0.1.do