From 69a95bf1f8916f8cd95fdf80bac892253cf47878 Mon Sep 17 00:00:00 2001 From: Chris Marsh Date: Tue, 8 Apr 2025 22:34:44 -0600 Subject: [PATCH] libpng: add v1.6.47 (#49872) * add 1.6.47, add cmake reqs * use open ended cmake versions Co-authored-by: Alec Scott --------- Co-authored-by: Alec Scott --- var/spack/repos/builtin/packages/libpng/package.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/libpng/package.py b/var/spack/repos/builtin/packages/libpng/package.py index a8d2137694e..5e141a40b44 100644 --- a/var/spack/repos/builtin/packages/libpng/package.py +++ b/var/spack/repos/builtin/packages/libpng/package.py @@ -11,12 +11,13 @@ class Libpng(CMakePackage): homepage = "http://www.libpng.org/pub/png/libpng.html" url = "https://prdownloads.sourceforge.net/libpng/libpng-1.6.37.tar.xz" - git = "https://github.com/glennrp/libpng.git" + git = "https://github.com/pnggroup/libpng" maintainers("AlexanderRichert-NOAA") license("Libpng") + version("1.6.47", sha256="b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631") version("1.6.39", sha256="1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937") version("1.6.37", sha256="505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca") # From http://www.libpng.org/pub/png/libpng.html (2019-04-15) @@ -29,8 +30,13 @@ class Libpng(CMakePackage): version("1.5.30", sha256="7d76275fad2ede4b7d87c5fd46e6f488d2a16b5a69dc968ffa840ab39ba756ed") version("1.2.57", sha256="0f4620e11fa283fedafb474427c8e96bf149511a1804bdc47350963ae5cf54d8") - depends_on("c", type="build") # generated - depends_on("cxx", type="build") # generated + depends_on("c", type="build") + depends_on("cxx", type="build") + + depends_on("cmake@3.14:", type="build", when="@1.6.47:") + depends_on("cmake@3.1:", type="build", when="@1.6.37:") + depends_on("cmake@2.8.3:", type="build", when="@1.5.30:") + depends_on("cmake@2.4.3:", type="build", when="@1.2.57:") depends_on("zlib-api")