Upgrade to OpenCV 4.12.0 + Emscripten 3.1.69

.github/workflows/build.yml

@@ -36,14 +36,14 @@ jobs:
       with:
         name: build
         path: |
-          packaging/opencv-4.10.0.zip
-          packaging/opencv-js-4.10.0-emcc-3.1.38.zip
-          packaging/opencv-js-4.10.0-emcc-3.1.38-simd.zip
+          packaging/opencv-4.12.0.zip
+          packaging/opencv-js-4.12.0-emcc-3.1.69.zip
+          packaging/opencv-js-4.12.0-emcc-3.1.69-simd.zip
     - name: Release
       uses: softprops/action-gh-release@v1
       if: startsWith(github.ref, 'refs/tags/')
       with:
        files: |
-        packaging/opencv-4.10.0.zip
-        packaging/opencv-js-4.10.0-emcc-3.1.38.zip
-        packaging/opencv-js-4.10.0-emcc-3.1.38-simd.zip
+        packaging/opencv-4.12.0.zip
+        packaging/opencv-js-4.12.0-emcc-3.1.69.zip
+        packaging/opencv-js-4.12.0-emcc-3.1.69-simd.zip

README.md

@@ -40,7 +40,7 @@ include(FetchContent)
 
 FetchContent_Declare(
   build_opencv
- URL https://github.com/webarkit/opencv-em/releases/download/0.1.6/opencv-4.10.0.zip
+ URL https://github.com/webarkit/opencv-em/releases/download/0.2.0/opencv-4.12.0.zip
 )
 
 FetchContent_MakeAvailable(build_opencv)

build.sh

@@ -218,7 +218,7 @@ OPENCV_VERSION_STATUS="$(cat libs/opencv/modules/core/include/opencv2/core/versi
 OPENCV_VERSION="${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPENCV_VERSION_REVISION}"
 VERSION=""
 if [ $BUILD_PYTHON ] ; then
-    VERSION="${OPENCV_VERSION}-emcc-3.1.38"
+    VERSION="${OPENCV_VERSION}-emcc-3.1.69"
 else
     VERSION=${OPENCV_VERSION}
 fi
@@ -259,7 +259,7 @@ OPENCV_CONF="${OPENCV_DEFINES} ${OPENCV_EXCLUDE} ${OPENCV_INCLUDE} ${OPENCV_MODU
 
 if [ $BUILD_PYTHON ] ; then
   echo "Building OpenCV for the web with Emscripten"
-  docker run --rm -v $(pwd):/src -u $(id -u):$(id -g) -e "EMSCRIPTEN=/emsdk/upstream/emscripten" emscripten/emsdk:3.1.38 emcmake python3 ./libs/opencv/platforms/js/build_js.py ${BUILD_HOME_BASE} --config="./opencv.webarkit_config.py" --build_wasm \
+  docker run --rm -v $(pwd):/src -u $(id -u):$(id -g) -e "EMSCRIPTEN=/emsdk/upstream/emscripten" emscripten/emsdk:3.1.69 emcmake python3 ./libs/opencv/platforms/js/build_js.py ${BUILD_HOME_BASE} --config="./opencv.webarkit_config.py" --build_wasm \
    ${OPENCV_EM_INTRINSICES} \
    ${OPENCV_EM_PTHREADS} \
    --cmake_option="-DBUILD_opencv_dnn=OFF" \