Add a few protobuf builds

conda-forge · Nov 1, 2023 · 4128dca · 4128dca
1 parent ed413f6
commit 4128dca
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -135,4 +135,4 @@ cmake -LAH -G "Ninja"                                                     \
     -DOPENCV_PYTHON2_INSTALL_PATH=                                        \
     ..
 
-ninja install -v -j${CPU_COUNT}
+ninja install -j${CPU_COUNT}
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -2,3 +2,22 @@ MACOSX_SDK_VERSION:            # [osx and x86_64]
   - "10.13"                    # [osx and x86_64]
 MACOSX_DEPLOYMENT_TARGET:      # [osx and x86_64]
   - "10.13"                    # [osx and x86_64]
+
+# Save the size of our build matrix.
+# Build with older protobuf upon request
+# https://github.com/conda-forge/libprotobuf-feedstock/issues/198
+# hmaarrfk - 2023/10 - requested to have builds for linux64
+# 4.23.4 is the latest protobuf migration
+# 3.21 is the version that tensorflow 2.13 was last built with
+libprotobuf:  # [linux64]
+- '4.24.3'    # [linux64]
+- '3.21'      # [linux64]
+
+libgrpc:      # [linux64]
+- '1.58'      # [linux64]
+- '1.54'      # [linux64]
+
+zip_keys:            # [linux64]
+  -                  # [linux64]
+    - libgrpc        # [linux64]
+    - libprotobuf    # [linux64]
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -50,7 +50,7 @@ source:
     sha256: 78884f64b564a3b06dc6ee731ed33b60c6d8cd864cea07f21d94ba0f90c7b310
 
 build:
-  number: 3
+  number: 4
   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
@@ -208,6 +208,8 @@ outputs:
         # opencv    for pypy36 and python3.6
         # similarly for pypy37 and python3.7
         - python
+        # Similarly for libprotobuf since we are building a few different versions now
+        - libprotobuf
       run:
         - {{ pin_subpackage('libopencv', exact=True) }}
         - {{ pin_subpackage('py-opencv', exact=True) }}
@@ -230,6 +232,8 @@ outputs:
       host:
         - python
         - numpy
+        # Similarly for libprotobuf since we are building a few different versions now
+        - libprotobuf
       run:
         - python
         - {{ pin_compatible('numpy') }}