This is an automatic generated email to let you know that the following patch were queued:
Subject: edid-decode: minor modifications to README and emscripten path Author: Hans Verkuil <hverkuil-ci...@xs4all.nl> Date: Fri May 10 11:40:32 2024 +0200 Use 'build' and 'build-wasm' as the build directories (i.e. no underscore prefix). This makes it consistent with the v4l-utils project. Drop the path from the default emscripten toolchain in wasm-crossfile.txt, i.e. by default it is assumed to be in the user's PATH. Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl> .gitignore | 1 + README | 17 ++++++++--------- emscripten/wasm-crossfile.txt | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) --- diff --git a/.gitignore b/.gitignore index a4ab473135af..c83b5ba66671 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ edid-decode emscripten/*.o emscripten/edid-decode.wasm emscripten/edid-decode.js +install-wasm diff --git a/README b/README index bf4e66870503..0a1154213f80 100644 --- a/README +++ b/README @@ -6,9 +6,9 @@ To build this do: git clone git://linuxtv.org/edid-decode.git cd edid-decode -meson setup _build -meson compile -C _build -meson install -C _build +meson setup build +meson compile -C build +meson install -C build Patches and bug reports can be sent to the linux-me...@vger.kernel.org mailinglist (see https://www.linuxtv.org/lists.php). Please make sure @@ -49,16 +49,15 @@ This is updated regularly with the latest edid-decode. It uses emscripten and the html file is maintained in the emscripten directory of edid-decode. To build it, set the project up using the provided crossfile: - meson setup _build-wasm \ - --cross-file ./emscripten/wasm-crossfile.txt \ - --prefix=$(pwd)/_install-wasm - meson install _build-wasm + meson setup build-wasm --cross-file ./emscripten/wasm-crossfile.txt --prefix=$(pwd)/install-wasm + meson install -C build-wasm # serve the files using a local webserver - cd _install-wasm/bin + cd install-wasm/bin python3 -m http.server This assumes that emscripten is installed, of course. The location of the -toolchain can be adjusted in emscripten/wasm-crossfile.txt. +toolchain can be adjusted in emscripten/wasm-crossfile.txt. Currently +it assumes that the emscripten tools are in your $PATH. See also https://emscripten.org/docs/getting_started/Tutorial.html and https://mesonbuild.com/Cross-compilation.html. diff --git a/emscripten/wasm-crossfile.txt b/emscripten/wasm-crossfile.txt index a41f46ca2ede..ef0d9d8f196b 100644 --- a/emscripten/wasm-crossfile.txt +++ b/emscripten/wasm-crossfile.txt @@ -1,8 +1,8 @@ [binaries] -c = '/usr/lib/emscripten/emcc' -cpp = '/usr/lib/emscripten/em++' -ar = '/usr/lib/emscripten/emar' -strip = '/usr/lib/emscripten/emstrip' +c = 'emcc' +cpp = 'em++' +ar = 'emar' +strip = 'emstrip' [built-in options] default_library = 'static' @@ -11,4 +11,4 @@ default_library = 'static' system = 'emscripten' cpu_family = 'wasm32' cpu = 'wasm32' -endian = 'little' \ No newline at end of file +endian = 'little'
