From 18b273696d359999cf913ca78d827ba6fd0a988f Mon Sep 17 00:00:00 2001 From: Wan-Teh Chang Date: Mon, 20 May 2024 15:41:18 -0700 Subject: [PATCH 1/3] Echo a message on setting PKG_CONFIG_PATH Similar to the message added to third-party/svt.cmd in commit 1a1b4d4d. --- third-party/aom.cmd | 5 +++++ third-party/dav1d.cmd | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/third-party/aom.cmd b/third-party/aom.cmd index 77fd88e755..fad5ddbb93 100644 --- a/third-party/aom.cmd +++ b/third-party/aom.cmd @@ -18,3 +18,8 @@ cmake -S . -B build.libavif -G Ninja -DCMAKE_INSTALL_PREFIX="$(pwd)/dist" -DCMAK ninja -C build.libavif ninja -C build.libavif install cd .. + +echo "" +echo "----- NOTE ----" +echo "Please add the path to the pkg-config file to your PKG_CONFIG_PATH, like this:" +echo "export PKG_CONFIG_PATH=\$PKG_CONFIG_PATH:`pwd`/aom/dist/lib/pkgconfig" diff --git a/third-party/dav1d.cmd b/third-party/dav1d.cmd index 761a285b64..7368ccd62a 100644 --- a/third-party/dav1d.cmd +++ b/third-party/dav1d.cmd @@ -21,3 +21,8 @@ meson build --default-library=static --buildtype release --prefix "$(pwd)/dist" ninja -C build ninja -C build install cd .. + +echo "" +echo "----- NOTE ----" +echo "Please add the path to the pkg-config file to your PKG_CONFIG_PATH, like this:" +echo "export PKG_CONFIG_PATH=\$PKG_CONFIG_PATH:`pwd`/dav1d/dist/lib/x86_64-linux-gnu/pkgconfig" From dad35f4954b8a98bad8cc26f28e4318c54173b8b Mon Sep 17 00:00:00 2001 From: Wan-Teh Chang Date: Mon, 20 May 2024 16:46:49 -0700 Subject: [PATCH 2/3] Replace `pwd` with $(pwd) for command substitution --- third-party/aom.cmd | 2 +- third-party/dav1d.cmd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/third-party/aom.cmd b/third-party/aom.cmd index fad5ddbb93..18bd4a1102 100644 --- a/third-party/aom.cmd +++ b/third-party/aom.cmd @@ -22,4 +22,4 @@ cd .. echo "" echo "----- NOTE ----" echo "Please add the path to the pkg-config file to your PKG_CONFIG_PATH, like this:" -echo "export PKG_CONFIG_PATH=\$PKG_CONFIG_PATH:`pwd`/aom/dist/lib/pkgconfig" +echo "export PKG_CONFIG_PATH=\$PKG_CONFIG_PATH:$(pwd)/aom/dist/lib/pkgconfig" diff --git a/third-party/dav1d.cmd b/third-party/dav1d.cmd index 7368ccd62a..56e044c104 100644 --- a/third-party/dav1d.cmd +++ b/third-party/dav1d.cmd @@ -25,4 +25,4 @@ cd .. echo "" echo "----- NOTE ----" echo "Please add the path to the pkg-config file to your PKG_CONFIG_PATH, like this:" -echo "export PKG_CONFIG_PATH=\$PKG_CONFIG_PATH:`pwd`/dav1d/dist/lib/x86_64-linux-gnu/pkgconfig" +echo "export PKG_CONFIG_PATH=\$PKG_CONFIG_PATH:$(pwd)/dav1d/dist/lib/x86_64-linux-gnu/pkgconfig" From f0e1d3daa3f9b3edf921c22a094a6b6c5524ea67 Mon Sep 17 00:00:00 2001 From: Wan-Teh Chang Date: Tue, 21 May 2024 14:39:23 -0700 Subject: [PATCH 3/3] Clarify the Linux-specific path is just an example --- third-party/dav1d.cmd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/third-party/dav1d.cmd b/third-party/dav1d.cmd index 56e044c104..e546222bd9 100644 --- a/third-party/dav1d.cmd +++ b/third-party/dav1d.cmd @@ -24,5 +24,6 @@ cd .. echo "" echo "----- NOTE ----" -echo "Please add the path to the pkg-config file to your PKG_CONFIG_PATH, like this:" +echo "Please add the path to the pkg-config file to your PKG_CONFIG_PATH. For" +echo "example, on Linux x86_64, run:" echo "export PKG_CONFIG_PATH=\$PKG_CONFIG_PATH:$(pwd)/dav1d/dist/lib/x86_64-linux-gnu/pkgconfig"