From a431397d027c14455706990d9b641709c6a05d32 Mon Sep 17 00:00:00 2001
From: kalwalt <github@kalwaltart.it>
Date: Thu, 23 Jan 2025 00:59:20 +0100
Subject: [PATCH] changes to build xfeatures2d module again

---
 .github/workflows/build.yml | 12 ++++++------
 build.sh                    | 14 +++++++-------
 libs/opencv_contrib         |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5612214..da23ab4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,14 +36,14 @@ jobs:
       with:
         name: build
         path: |
-          packaging/opencv-4.7.0.zip
-          packaging/opencv-js-4.7.0-emcc-3.1.26.zip
-          packaging/opencv-js-4.7.0-emcc-3.1.26-simd.zip
+          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
     - name: Release
       uses: softprops/action-gh-release@v1
       if: startsWith(github.ref, 'refs/tags/')
       with:
        files: |
-        packaging/opencv-4.7.0.zip
-        packaging/opencv-js-4.7.0-emcc-3.1.26.zip
-        packaging/opencv-js-4.7.0-emcc-3.1.26-simd.zip
\ No newline at end of file
+        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
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 8e4e04d..02b3dc2 100755
--- a/build.sh
+++ b/build.sh
@@ -259,15 +259,15 @@ 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)  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.38 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:BOOL=OFF" \
-   --cmake_option="-DBUILD_opencv_objdetect:BOOL=OFF" \
-   --cmake_option="-DBUILD_opencv_photo:BOOL=OFF" \
-   --cmake_option="-DBUILD_opencv_imgcodecs:BOOL=ON" \
-   --cmake_option="-DBUILD_opencv_xfeatures2d:BOOL=ON"  \
-   --cmake_option="-DOPENCV_EXTRA_MODULES_PATH=./../libs/opencv_contrib/modules/xfeatures2d" \
+   --cmake_option="-DBUILD_opencv_dnn=OFF" \
+   --cmake_option="-DBUILD_opencv_objdetect=OFF" \
+   --cmake_option="-DBUILD_opencv_photo=OFF" \
+   --cmake_option="-DBUILD_opencv_imgcodecs=ON" \
+   --cmake_option="-DBUILD_opencv_xfeatures2d=ON"  \
+   --cmake_option="-DOPENCV_EXTRA_MODULES_PATH=./../libs/opencv_contrib/modules" \
    --build_flags=" -fwasm-exceptions -mbulk-memory -mnontrapping-fptoint -sWASM_BIGINT -sSUPPORT_LONGJMP=wasm "
 fi
 # /BUILD_PYTHON
diff --git a/libs/opencv_contrib b/libs/opencv_contrib
index 2c32791..4d8d42e 160000
--- a/libs/opencv_contrib
+++ b/libs/opencv_contrib
@@ -1 +1 @@
-Subproject commit 2c32791a9c500343568a21ea34bf2daeac2adae7
+Subproject commit 4d8d42edc2ca281359d1d67d948b5e26861b9935