Skip to content

Commit

Permalink
Rebuild with shared openexr (#395)
Browse files Browse the repository at this point in the history 
automerged PR by conda-forge/automerge-action
  • Loading branch information
@github-actions
github-actions[bot] authored Mar 10, 2024
2 parents c4cf980 + de48073 commit 328ac16
Show file tree
Hide file tree
Showing 39 changed files with 76 additions and 13 deletions.
2 changes: 2 additions & 0 deletions .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ libwebp:
- '1'
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ libwebp:
- '1'
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ libwebp:
- '1'
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ libwebp:
- '1'
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ libwebp:
- '1'
numpy:
- '1.23'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ libwebp:
- '1'
numpy:
- '1.26'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ libwebp:
- '1'
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ libwebp:
- '1'
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ libwebp:
- '1'
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ libwebp:
- '1'
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ libwebp:
- '1'
numpy:
- '1.23'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ libwebp:
- '1'
numpy:
- '1.26'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ libwebp:
- '1'
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ libwebp:
- '1'
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ libwebp:
- '1'
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ libwebp:
- '1'
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ libwebp:
- '1'
numpy:
- '1.23'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ libwebp:
- '1'
numpy:
- '1.26'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
10 changes: 0 additions & 10 deletions .ci_support/migrations/libprotobuf4251.yaml
View file

This file was deleted.

2 changes: 2 additions & 0 deletions .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.23'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.26'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ macos_machine:
- arm64-apple-darwin20.0.0
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ macos_machine:
- arm64-apple-darwin20.0.0
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ macos_machine:
- arm64-apple-darwin20.0.0
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ macos_machine:
- arm64-apple-darwin20.0.0
numpy:
- '1.23'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ macos_machine:
- arm64-apple-darwin20.0.0
numpy:
- '1.26'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/win_64_numpy1.22python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ libwebp:
- '1'
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/win_64_numpy1.22python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ libwebp:
- '1'
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ libwebp:
- '1'
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/win_64_numpy1.22python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ libwebp:
- '1'
numpy:
- '1.22'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/win_64_numpy1.23python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ libwebp:
- '1'
numpy:
- '1.23'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/win_64_numpy1.26python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ libwebp:
- '1'
numpy:
- '1.26'
openexr:
- '3.2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
3 changes: 2 additions & 1 deletion recipe/bld.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ cmake -LAH -G "Ninja"
-DWITH_PROTOBUF=1 ^
-DBUILD_PROTOBUF=0 ^
-DPROTOBUF_UPDATE_FILES=1 ^
-DBUILD_OPENEXR=1 ^
-DBUILD_OPENEXR=0 ^
-DWITH_OPENEXR=1 ^
-DBUILD_JASPER=0 ^
-DWITH_JASPER=1 ^
-DWITH_OPENJPEG=0 ^
Expand Down
3 changes: 2 additions & 1 deletion recipe/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ cmake -LAH -G "Ninja" \
-DWITH_PROTOBUF=1 \
-DBUILD_PROTOBUF=0 \
-DPROTOBUF_UPDATE_FILES=1 \
-DBUILD_OPENEXR=1 \
-DBUILD_OPENEXR=0 \
-DWITH_OPENEXR=1 \
-DBUILD_JASPER=0 \
-DWITH_JASPER=1 \
-DWITH_OPENJPEG=0 \
Expand Down
3 changes: 2 additions & 1 deletion recipe/meta.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ source:
sha256: 78884f64b564a3b06dc6ee731ed33b60c6d8cd864cea07f21d94ba0f90c7b310

build:
number: 8
number: 9
string: py{{ PY_VER_MAJOR }}{{ PY_VER_MINOR }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}
run_exports:
# https://abi-laboratory.pro/index.php?view=timeline&l=opencv
Expand Down Expand Up @@ -104,6 +104,7 @@ requirements:
- libprotobuf
- libtiff
- libwebp
- openexr
- qt-main # [not osx and not ppc64le]
- zlib
- libopenvino-dev # [not ppc64le]
Expand Down

0 comments on commit 328ac16

Please sign in to comment.