From 0cae3d02ee0bfa381e3717c1e70a1fbf9f43899a Mon Sep 17 00:00:00 2001
From: Austin Schuh <austin.linux@gmail.com>
Date: Fri, 3 May 2024 17:57:47 -0700
Subject: [PATCH] Use the canonical libpng and zlib repo names

When depending on other libraries in the Bazel world which compile zlib
and libpng from source, they use the repository names "@zlib", and
"@libpng".  Rather than force people to alias the libpng to
org_libpng_libpng, and zlib to net_zlib_zlib, rename them here.

Signed-off-by: Austin Schuh <austin.linux@gmail.com>
---
 bzl/repositories.bzl     | 12 ++++++------
 third_party/libpng.BUILD |  2 +-
 third_party/pcl.BUILD    |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bzl/repositories.bzl b/bzl/repositories.bzl
index 00b310a..814161a 100644
--- a/bzl/repositories.bzl
+++ b/bzl/repositories.bzl
@@ -50,19 +50,19 @@ def pcl_repositories():
 
     maybe(
         http_archive,
-        name = "net_zlib_zlib",
-        sha256 = "6d4d6640ca3121620995ee255945161821218752b551a1a180f4215f7d124d45",
+        name = "zlib",
+        sha256 = "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23",
         build_file = "@rules_pcl//third_party:zlib.BUILD",
-        strip_prefix = "zlib-cacf7f1d4e3d44d871b605da3b647f07d718623f",
+        strip_prefix = "zlib-1.3.1",
         urls = [
-            "https://mirror.bazel.build/github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz",
-            "https://github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz",
+            "https://mirror.bazel.build/github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz",
+            "https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz",
         ],
     )
 
     maybe(
         http_archive,
-        name = "org_libpng_libpng",
+        name = "libpng",
         build_file = "@rules_pcl//third_party:libpng.BUILD",
         sha256 = "7f415186d38ca71c23058386d7cf5135c8beda821ee1beecdc2a7a26c0356615",
         strip_prefix = "libpng-1.2.57",
diff --git a/third_party/libpng.BUILD b/third_party/libpng.BUILD
index 2557d78..ef5ce40 100644
--- a/third_party/libpng.BUILD
+++ b/third_party/libpng.BUILD
@@ -29,5 +29,5 @@ cc_library(
     includes = ["."],
     linkopts = ["-lm"],
     visibility = ["//visibility:public"],
-    deps = ["@net_zlib_zlib//:zlib"],
+    deps = ["@zlib"],
 )
diff --git a/third_party/pcl.BUILD b/third_party/pcl.BUILD
index 5548075..19356d8 100644
--- a/third_party/pcl.BUILD
+++ b/third_party/pcl.BUILD
@@ -207,7 +207,7 @@ pcl_library(
         "@boost//:tokenizer",
         "@boost//:utility",
         "@boost//:version",
-        "@org_libpng_libpng//:libpng",
+        "@libpng",
     ],
 )