From 43e7916924ef416a39f8d8a8bc27c9d17c4e3da5 Mon Sep 17 00:00:00 2001
From: sz <sz@recv.cc>
Date: Wed, 16 Oct 2024 01:40:41 -0500
Subject: [PATCH] Upgrade opencv version used for cimbar.js wasm build

+ also use a newer emscripten docker image.
---
 .github/workflows/release.yml               | 8 ++++----
 package-wasm.sh                             | 2 +-
 src/third_party_lib/wirehair/CMakeLists.txt | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6903150c..1f549b26 100644
--- 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
index 9d9894b6..d39df87b 100644
--- 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
index b3633236..5540c8d6 100644
--- 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()