Upgrade opencv version used for cimbar.js wasm build

+ also use a newer emscripten docker image.
sz3 · Oct 16, 2024 · 43e7916 · 43e7916
1 parent 75d6cfb
commit 43e7916
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,14 +16,14 @@ jobs:
 
       - name: Get openCV
         run: |
-          wget https://github.com/opencv/opencv/archive/refs/tags/4.5.5.zip
-          unzip 4.5.5.zip
-          mv opencv-4.5.5 opencv4
+          wget https://github.com/opencv/opencv/archive/refs/tags/4.10.0.zip
+          unzip 4.10.0.zip
+          mv opencv-4.10.0 opencv4
 
       - name: Run the build process with Docker
         uses: addnab/docker-run-action@v3
         with:
-          image: emscripten/emsdk:3.1.39
+          image: emscripten/emsdk:3.1.69
           options: -v ${{ github.workspace }}:/usr/src/app
           shell: bash
           run: |

diff --git a/package-wasm.sh b/package-wasm.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-#docker run --mount type=bind,source="$(pwd)",target="/usr/src/app" -it emscripten/emsdk:3.1.39
+#docker run --mount type=bind,source="$(pwd)",target="/usr/src/app" -it emscripten/emsdk:3.1.69 bash
 
 cd /usr/src/app
 

diff --git a/src/third_party_lib/wirehair/CMakeLists.txt b/src/third_party_lib/wirehair/CMakeLists.txt
@@ -54,7 +54,7 @@ set(GEN_TABLES
         gf256.h
         )
 
-if(NOT ANDROID)
+if(NOT ANDROID AND NOT USE_WASM)
     set(ARCH_NATIVE "-march=native")
 endif()
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,7 @@ set(GEN_TABLES @@
             gf256.h
             )
-    if(NOT ANDROID)
+    if(NOT ANDROID AND NOT USE_WASM)
         set(ARCH_NATIVE "-march=native")
     endif()
@@ Expand Down @@