From ebd849092cb69dce7ad8b248ffd1e89ce048bf53 Mon Sep 17 00:00:00 2001 From: kalwalt Date: Fri, 24 Jan 2025 15:49:25 +0100 Subject: [PATCH 1/5] testing opencv 4.10.0 --- WebARKit/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WebARKit/CMakeLists.txt b/WebARKit/CMakeLists.txt index a809470..724e5cd 100644 --- a/WebARKit/CMakeLists.txt +++ b/WebARKit/CMakeLists.txt @@ -14,13 +14,13 @@ if(${EMSCRIPTEN_COMP} EQUAL 1) message("Fetching opencv for emscripten compilation from webarkit/opencv-em ...") FetchContent_Declare( build_opencv - URL https://github.com/webarkit/opencv-em/releases/download/0.1.4/opencv-js-4.7.0-emcc-3.1.26.zip + URL https://github.com/webarkit/opencv-em/releases/download/0.1.6/opencv-js-4.10.0-emcc-3.1.38.zip ) else() message("Fetching opencv from webarkit/opencv-em ...") FetchContent_Declare( build_opencv - URL https://github.com/webarkit/opencv-em/releases/download/0.1.4/opencv-4.7.0.zip + URL https://github.com/webarkit/opencv-em/releases/download/0.1.6/opencv-4.10.0.zip ) endif() From 2c6d32031def6d7a4591418220d1649f4333be12 Mon Sep 17 00:00:00 2001 From: kalwalt Date: Fri, 24 Jan 2025 15:53:07 +0100 Subject: [PATCH 2/5] updating webARKit tests to opencv 4.10.0 --- tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b053da3..503a7fb 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -19,7 +19,7 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) FetchContent_Declare( build_opencv - URL https://github.com/webarkit/opencv-em/releases/download/0.1.4/opencv-4.7.0.zip + URL https://github.com/webarkit/opencv-em/releases/download/0.1.6/opencv-4.10.0.zip ) FetchContent_MakeAvailable(googletest build_opencv) From e6bb5582fa6deaaf9cf6274d0dee2e23e2066a34 Mon Sep 17 00:00:00 2001 From: kalwalt Date: Fri, 24 Jan 2025 16:04:07 +0100 Subject: [PATCH 3/5] Add step to update Ubuntu and install libjpeg-dev in CI workflow --- .github/workflows/test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e6ec908..a965576 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,6 +10,9 @@ jobs: uses: actions/setup-node@v4 with: node-version: '20.x' + - name: Update Ubuntu and install libjpeg-dev + run: | + sudo apt-get update && apt-get install libjpeg-dev - name: Build and test WebARKitLib run: | cd tests && mkdir build && cd build && cmake -DEMSCRIPTEN_COMP=0 .. && make && ./webarkit_test From 94cce9481a3fc700eab25759e7fdee77ef6292ea Mon Sep 17 00:00:00 2001 From: kalwalt Date: Fri, 24 Jan 2025 16:08:01 +0100 Subject: [PATCH 4/5] fix for sudo command --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a965576..ae33295 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: node-version: '20.x' - name: Update Ubuntu and install libjpeg-dev run: | - sudo apt-get update && apt-get install libjpeg-dev + sudo apt-get update && sudo apt install libjpeg-dev - name: Build and test WebARKitLib run: | cd tests && mkdir build && cd build && cmake -DEMSCRIPTEN_COMP=0 .. && make && ./webarkit_test From 98a81d493600f126ae80d8de9a6e38e8cbc05283 Mon Sep 17 00:00:00 2001 From: kalwalt Date: Fri, 24 Jan 2025 23:41:02 +0100 Subject: [PATCH 5/5] test with emsdk 3.1.38 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ae33295..4c0dbb4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: run: | cd .. ls - docker run -dit --name emscripten-webarkit-testing -v $(pwd):/src emscripten/emsdk:3.1.26 bash + docker run -dit --name emscripten-webarkit-testing -v $(pwd):/src emscripten/emsdk:3.1.38 bash docker exec emscripten-webarkit-testing emcmake cmake -B WebARKitLib/WebARKit/build -S WebARKitLib/WebARKit -DEMSCRIPTEN_COMP=1 .. docker exec emscripten-webarkit-testing emmake make -C WebARKitLib/WebARKit/build \ No newline at end of file