From 2bc84cb7e4eff566a34e2c6202a3ba787578f325 Mon Sep 17 00:00:00 2001 From: Alexis Placet Date: Thu, 9 Jul 2026 17:09:50 +0200 Subject: [PATCH 1/4] Fix opencv --- recipes/recipes_emscripten/libopencv/recipe.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes/recipes_emscripten/libopencv/recipe.yaml b/recipes/recipes_emscripten/libopencv/recipe.yaml index 6c3134fdc4..29dbef5921 100644 --- a/recipes/recipes_emscripten/libopencv/recipe.yaml +++ b/recipes/recipes_emscripten/libopencv/recipe.yaml @@ -1,7 +1,7 @@ context: version: 5.0.0 name: opencv - build_number: 3 + build_number: 4 build: number: ${{ build_number }} @@ -19,6 +19,7 @@ outputs: - ninja - python - cross-python_emscripten-wasm32 + - numpy host: - zlib - libpng @@ -39,6 +40,7 @@ outputs: ignore_run_exports: from_package: - python + - numpy source: - url: https://github.com/opencv/opencv/archive/refs/tags/${{ version }}.tar.gz sha256: b0528f5a1d379d59d4701cb28c36e22214cc51cf64594e5b56f2d3e6c0233095 @@ -52,6 +54,7 @@ outputs: inherit: build-cache build: number: ${{ build_number }} + string: h${{ hash }}_${{ build_number }} script: echo "Collecting C++ files from cache" files: include: @@ -127,6 +130,7 @@ outputs: inherit: build-cache build: number: ${{ build_number }} + string: h${{ hash }}_${{ build_number }} script: echo "Collecting Python files from cache" files: include: From 62d9abb0e35b1c27ab8c93b8e9370f52d61f0d22 Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Thu, 9 Jul 2026 19:32:10 +0200 Subject: [PATCH 2/4] Align with conda-forge --- .../recipes_emscripten/libopencv/recipe.yaml | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/recipes/recipes_emscripten/libopencv/recipe.yaml b/recipes/recipes_emscripten/libopencv/recipe.yaml index 29dbef5921..1e5a24e7b7 100644 --- a/recipes/recipes_emscripten/libopencv/recipe.yaml +++ b/recipes/recipes_emscripten/libopencv/recipe.yaml @@ -17,9 +17,7 @@ outputs: - ${{ compiler('cxx') }} - cmake - ninja - - python - cross-python_emscripten-wasm32 - - numpy host: - zlib - libpng @@ -41,6 +39,7 @@ outputs: from_package: - python - numpy + - cross-python_emscripten-wasm32 source: - url: https://github.com/opencv/opencv/archive/refs/tags/${{ version }}.tar.gz sha256: b0528f5a1d379d59d4701cb28c36e22214cc51cf64594e5b56f2d3e6c0233095 @@ -82,6 +81,8 @@ outputs: - sqlitecpp - jasper - gdcm + run_exports: + - ${{ pin_subpackage('libopencv', exact=True) }} tests: - package_contents: include: @@ -125,12 +126,11 @@ outputs: - tests/ - package: - name: opencv + name: py-opencv version: ${{ version }} inherit: build-cache build: number: ${{ build_number }} - string: h${{ hash }}_${{ build_number }} script: echo "Collecting Python files from cache" files: include: @@ -143,11 +143,12 @@ outputs: skip_pyc_compilation: - '**/*.py' requirements: - run: + host: - python - - python_abi 3.13.* *_cp313 - numpy + run: - libopencv =${{ version }} + tests: - script: pytester files: @@ -159,6 +160,20 @@ outputs: run: - pytester-run + - package: + name: opencv + version: ${{ version }} + build: + number: ${{ build_number }} + string: h${{ hash }}_${{ build_number }} + script: echo "OpenCV meta-package" + requirements: + run: + - ${{ pin_subpackage('libopencv', exact=True) }} + - ${{ pin_subpackage('py-opencv', exact=True) }} + tests: + - script: echo "OpenCV meta-package" + about: homepage: https://opencv.org/ license: Apache-2.0 From 44d5ef937a149d70406ffdfc17a4490f155dcaaa Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Thu, 9 Jul 2026 19:32:53 +0200 Subject: [PATCH 3/4] Rename directory --- recipes/recipes_emscripten/{libopencv => opencv}/build.sh | 0 recipes/recipes_emscripten/{libopencv => opencv}/build_tests.sh | 0 recipes/recipes_emscripten/{libopencv => opencv}/recipe.yaml | 0 recipes/recipes_emscripten/{libopencv => opencv}/test_pyopencv.py | 0 .../recipes_emscripten/{libopencv => opencv}/tests/CMakeLists.txt | 0 .../{libopencv => opencv}/tests/test_opencv.cpp | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename recipes/recipes_emscripten/{libopencv => opencv}/build.sh (100%) rename recipes/recipes_emscripten/{libopencv => opencv}/build_tests.sh (100%) rename recipes/recipes_emscripten/{libopencv => opencv}/recipe.yaml (100%) rename recipes/recipes_emscripten/{libopencv => opencv}/test_pyopencv.py (100%) rename recipes/recipes_emscripten/{libopencv => opencv}/tests/CMakeLists.txt (100%) rename recipes/recipes_emscripten/{libopencv => opencv}/tests/test_opencv.cpp (100%) diff --git a/recipes/recipes_emscripten/libopencv/build.sh b/recipes/recipes_emscripten/opencv/build.sh similarity index 100% rename from recipes/recipes_emscripten/libopencv/build.sh rename to recipes/recipes_emscripten/opencv/build.sh diff --git a/recipes/recipes_emscripten/libopencv/build_tests.sh b/recipes/recipes_emscripten/opencv/build_tests.sh similarity index 100% rename from recipes/recipes_emscripten/libopencv/build_tests.sh rename to recipes/recipes_emscripten/opencv/build_tests.sh diff --git a/recipes/recipes_emscripten/libopencv/recipe.yaml b/recipes/recipes_emscripten/opencv/recipe.yaml similarity index 100% rename from recipes/recipes_emscripten/libopencv/recipe.yaml rename to recipes/recipes_emscripten/opencv/recipe.yaml diff --git a/recipes/recipes_emscripten/libopencv/test_pyopencv.py b/recipes/recipes_emscripten/opencv/test_pyopencv.py similarity index 100% rename from recipes/recipes_emscripten/libopencv/test_pyopencv.py rename to recipes/recipes_emscripten/opencv/test_pyopencv.py diff --git a/recipes/recipes_emscripten/libopencv/tests/CMakeLists.txt b/recipes/recipes_emscripten/opencv/tests/CMakeLists.txt similarity index 100% rename from recipes/recipes_emscripten/libopencv/tests/CMakeLists.txt rename to recipes/recipes_emscripten/opencv/tests/CMakeLists.txt diff --git a/recipes/recipes_emscripten/libopencv/tests/test_opencv.cpp b/recipes/recipes_emscripten/opencv/tests/test_opencv.cpp similarity index 100% rename from recipes/recipes_emscripten/libopencv/tests/test_opencv.cpp rename to recipes/recipes_emscripten/opencv/tests/test_opencv.cpp From 58a338f83fec662d3c570c184a7f5824669a5cfc Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Thu, 9 Jul 2026 20:23:20 +0200 Subject: [PATCH 4/4] Inherit cache for license --- recipes/recipes_emscripten/opencv/recipe.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/recipes_emscripten/opencv/recipe.yaml b/recipes/recipes_emscripten/opencv/recipe.yaml index 1e5a24e7b7..ed168688c4 100644 --- a/recipes/recipes_emscripten/opencv/recipe.yaml +++ b/recipes/recipes_emscripten/opencv/recipe.yaml @@ -163,6 +163,7 @@ outputs: - package: name: opencv version: ${{ version }} + inherit: build-cache build: number: ${{ build_number }} string: h${{ hash }}_${{ build_number }}