conda-recipe: Unpin libpng, allowing libpng's run_exports to handle t…

…he constraints for us.
janelia-flyem · Dec 23, 2024 · b921d7a · b921d7a
1 parent 90fca8d
commit b921d7a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/conda-recipe/conda_build_config.yaml b/conda-recipe/conda_build_config.yaml
@@ -19,6 +19,8 @@ hdf5:
   - 1.14.3
 jsoncpp:
   - 1.9.6
+libpng:
+  - '1.6'
 lz4_c:
   - 1.9.3
 numpy:

diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -55,7 +55,7 @@ requirements:
     - lz4-c {{ lz4_c }}
     - zeromq {{ zeromq }}
     - libdeflate
-    - libpng 1.6.28
+    - libpng
     - libjpeg-turbo 2  # Statically linked, so no runtime dependency below.
 
     # In 7.62.0, CURL_HTTP_VERSION_2TLS became the default setting for CURLOPT_HTTP_VERSION
@@ -76,8 +76,12 @@ requirements:
     - lz4-c {{ lz4_c }}
     - zeromq {{ zeromq }}
     - libdeflate
-    - libpng >=1.6.28,<1.7  # On Mac, libpng versions are not backwards compatible, unfortunately.
-                            # See: https://github.com/conda-forge/libpng-feedstock/issues/10
+
+    # On Mac, libpng versions are not backwards compatible, unfortunately.
+    # See: https://github.com/conda-forge/libpng-feedstock/issues/10
+    # However, I think the libpng run_exports (added in conda-build v3)
+    # should handle this for us, so we won't specify the constraints here.
+    - libpng
 
     # In 7.62.0, CURL_HTTP_VERSION_2TLS became the default setting for CURLOPT_HTTP_VERSION
     - curl >=7.62.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,8 @@ hdf5: @@
       - 1.14.3
     jsoncpp:
       - 1.9.6
+    libpng:
+      - '1.6'
     lz4_c:
       - 1.9.3
     numpy:
@@ Expand Down @@