Build dav1d for AVIF on runners without ziran on PATH

The avif package now decodes with dav1d. Kryon resolves its source with
`ziran pkg path`, falling back to a ziran on PATH that CI runners do not
have, so every Linux build stopped with "Cannot resolve dav1d package".
Pass this build's ZIRAN_BIN to the codec configure steps, and install
Meson and Ninja (and NASM for Snap) wherever dav1d now builds: CI, Linux,
Android, Windows, Snap and the F-Droid recipe.
This commit is contained in:
waozi committed 2026-11-07 12:46:51 -03:00
1 parent 3b182f7ce1
commit 724182c67a
9 files changed
+24 -6

No files matched your search

+3
View File
@@ -1,2 +1,5 @@
python3-fonttools
nasm
# dav1d (the AVIF decoder) builds with Meson and Ninja.
meson
ninja-build
+3
View File
@@ -28,3 +28,6 @@ x11-utils
xvfb
zip
nasm
# dav1d (the AVIF decoder) builds with Meson and Ninja.
meson
ninja-build
+3
View File
@@ -29,3 +29,6 @@ imagemagick
python3-cryptography
nasm
# dav1d (the AVIF decoder) builds with Meson and Ninja.
meson
ninja-build
+3
View File
@@ -7,3 +7,6 @@ zip
nsis
python3-fonttools
nasm
# dav1d (the AVIF decoder) builds with Meson and Ninja.
meson
ninja-build
+1 -1
View File
@@ -45,7 +45,7 @@ jobs:
- name: Install recipe dependencies
run: |
apt-get update
apt-get install -y --no-install-recommends build-essential jimsh libssl-dev nasm python3-fonttools openjdk-21-jdk-headless fdroidserver git-lfs
apt-get install -y --no-install-recommends build-essential jimsh libssl-dev meson nasm ninja-build python3-fonttools openjdk-21-jdk-headless fdroidserver git-lfs
update-alternatives --set java /usr/lib/jvm/java-21-openjdk-amd64/bin/java
- name: Checkout candidate
+5 -3
View File
@@ -192,7 +192,9 @@ AVIF_BUILD_DIR := $(NATIVE_VENDOR_BUILD_DIR)/kryon-avif
AVIF_A := $(AVIF_BUILD_DIR)/avif/libavif.a
AOM_A := $(AVIF_BUILD_DIR)/aom/libaom.a
# Kryon's codec recipes come from the codec packages in this app's lock.
IMAGE_PACKAGE_DIRS := -DKRYON_WEBP_PACKAGE_DIR="$(abspath build/packages/webp)" -DKRYON_AVIF_PACKAGE_DIR="$(abspath build/packages/avif)"
# Kryon resolves the rest (dav1d) with this build's ziran, which CI runners
# do not have on PATH.
IMAGE_PACKAGE_DIRS := -DKRYON_WEBP_PACKAGE_DIR="$(abspath build/packages/webp)" -DKRYON_AVIF_PACKAGE_DIR="$(abspath build/packages/avif)" -DZIRAN_BIN="$(ZIRAN_BIN)"
WIN64_ARCH := x86_64
WIN64_CC ?= $(or $(WIN_CC),x86_64-w64-mingw32-gcc)
WIN64_AR ?= $(or $(WIN_AR),x86_64-w64-mingw32-ar)
@@ -548,11 +550,11 @@ $(RAYLIB_A): $(RAYLIB_SOURCES) $(RAYLIB_DIR)/Makefile
KRYON_NATIVE_CFLAGS := $(CFLAGS)
KRYON_SRCS += $(KRYON_RAYLIB_WRAPPERS_C)
$(WEBP_A): ziran.lock $(KRYON_DIR)/cmake/WebP.cmake $(KRYON_DIR)/cmake/ImagePackages.cmake $(KRYON_DIR)/cmake/webp/CMakeLists.txt $(wildcard build/packages/webp/native/*.cmake build/packages/libwebp/src/*/*.c build/packages/libwebp/src/*/*.h)
$(WEBP_A): ziran.lock $(KRYON_DIR)/cmake/WebP.cmake $(KRYON_DIR)/cmake/ImagePackages.cmake $(KRYON_DIR)/cmake/webp/CMakeLists.txt $(wildcard build/packages/webp/native/*.cmake build/packages/libwebp/src/*/*.c build/packages/libwebp/src/*/*.h) | $(ZIRAN_BIN)
$(CMAKE) -S $(KRYON_DIR)/cmake/webp -B $(WEBP_BUILD_DIR) -DWEBP_DIR="$(abspath build/packages/libwebp)" $(IMAGE_PACKAGE_DIRS) -DCMAKE_BUILD_TYPE=Release
$(CMAKE) --build $(WEBP_BUILD_DIR) --target kryonwebp --parallel 2
$(AVIF_A): ziran.lock $(KRYON_DIR)/cmake/AVIF.cmake $(KRYON_DIR)/cmake/ImagePackages.cmake $(KRYON_DIR)/cmake/avif/CMakeLists.txt $(wildcard build/packages/avif/native/*.cmake)
$(AVIF_A): ziran.lock $(KRYON_DIR)/cmake/AVIF.cmake $(KRYON_DIR)/cmake/ImagePackages.cmake $(KRYON_DIR)/cmake/avif/CMakeLists.txt $(wildcard build/packages/avif/native/*.cmake) | $(ZIRAN_BIN)
$(CMAKE) -S $(KRYON_DIR)/cmake/avif -B $(AVIF_BUILD_DIR) -DAVIF_DIR="$(abspath build/packages/libavif)" -DAOM_DIR="$(abspath build/packages/libaom)" $(IMAGE_PACKAGE_DIRS) -DCMAKE_BUILD_TYPE=Release
$(CMAKE) --build $(AVIF_BUILD_DIR) --target avif_static aom --parallel 2
@test -f $@
+1 -1
View File
@@ -43,7 +43,7 @@ WIN64_AVIF_BUILD_DIR := $(VENDOR_BUILD_DIR)/windows/$(WIN64_ARCH)/kryon-avif
WIN64_AVIF_A := $(WIN64_AVIF_BUILD_DIR)/avif/libavif.a
WIN64_AOM_A := $(WIN64_AVIF_BUILD_DIR)/aom/libaom.a
$(WIN64_AVIF_A): Makefile mk/windows.mk ziran.lock $(KRYON_DIR)/cmake/AVIF.cmake $(KRYON_DIR)/cmake/ImagePackages.cmake $(KRYON_DIR)/cmake/avif/CMakeLists.txt $(wildcard build/packages/avif/native/*.cmake)
$(WIN64_AVIF_A): Makefile mk/windows.mk ziran.lock $(KRYON_DIR)/cmake/AVIF.cmake $(KRYON_DIR)/cmake/ImagePackages.cmake $(KRYON_DIR)/cmake/avif/CMakeLists.txt $(wildcard build/packages/avif/native/*.cmake) | $(ZIRAN_BIN)
$(CMAKE) -S $(KRYON_DIR)/cmake/avif -B $(WIN64_AVIF_BUILD_DIR) \
-DCMAKE_SYSTEM_NAME=Windows \
-DCMAKE_SYSTEM_PROCESSOR=$(WIN64_CMAKE_SYSTEM_PROCESSOR) \
+1 -1
View File
@@ -2,7 +2,7 @@
"subdir": "droid/app",
"sudo": [
"apt-get update",
"apt-get install -y build-essential jimsh libssl-dev nasm python3-fonttools"
"apt-get install -y build-essential jimsh libssl-dev meson nasm ninja-build python3-fonttools"
],
"gradle": ["yes"],
"output": "build/outputs/apk/release/app-universal-release-unsigned.apk",
+4
View File
@@ -72,6 +72,10 @@ parts:
build-packages:
- build-essential
- cmake
# dav1d (the AVIF decoder) builds with Meson, Ninja and NASM.
- meson
- ninja-build
- nasm
- libssl-dev
- libcurl4-openssl-dev
- libgtk-3-dev