Add Meson and Ninja dependencies for dav1d compilation; enhance host machine build condition in prepare.php

matyhtf · matyhtf · commit 98ea3d665630 · 2026-05-22T18:31:52.000+08:00
diff --git a/prepare.php b/prepare.php
@@ -31,7 +31,7 @@
 }
 
 // Compile directly on the host machine, not in the docker container
-if ($p->getInputOption('without-docker') || $p->isMacos()) {
+if ($p->getInputOption('without-docker') || ($p->isMacos()) || ($p->isLinux() && is_file('/.dockerenv'))) {
     $p->setWorkDir(__DIR__);
     $p->setBuildDir(__DIR__ . '/thirdparty');
 }
diff --git a/sapi/docker/Dockerfile b/sapi/docker/Dockerfile
@@ -19,4 +19,6 @@ RUN apk add libc++-static libltdl-static
 RUN apk add python3
 # Compiling AOM requires the use of NASM/YASM assembly compiler
 RUN apk add nasm
+# Compiling dav1d requires the use of Meson and Ninja tools
+RUN apk add meson ninja
 WORKDIR /work

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`// Compile directly on the host machine, not in the docker container`
`34`		`-if ($p->getInputOption('without-docker') \|\| $p->isMacos()) {`
	`34`	`+if ($p->getInputOption('without-docker') \|\| ($p->isMacos()) \|\| ($p->isLinux() && is_file('/.dockerenv'))) {`
`35`	`35`	`$p->setWorkDir(__DIR__);`
`36`	`36`	`$p->setBuildDir(__DIR__ . '/thirdparty');`
`37`	`37`	`}`