From 583233460e2a1e22075fa15a5c2fa8feacb16165 Mon Sep 17 00:00:00 2001
From: Luau Project <luau.project@gmail.com>
Date: Tue, 11 Aug 2026 21:36:19 -0300
Subject: Bump lua-zlib from 1.2 to 1.4 as part of Lua 5.5 support (#1858)

* chore(deps): bump lua-zlib to 1.4

* refactor: adjust static lib for `lua-zlib` 1.4 rockspec

* refactor(ci): remove unused copy of zlib import lib for MSVC
---
 binary/Makefile.windows        |  2 +-
 binary/all_in_one              |  2 +-
 binary/lua-zlib-1.2-0.rockspec | 39 ------------------------------
 binary/lua-zlib-1.4-0.rockspec | 55 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 57 insertions(+), 41 deletions(-)
 delete mode 100644 binary/lua-zlib-1.2-0.rockspec
 create mode 100644 binary/lua-zlib-1.4-0.rockspec

(limited to 'binary')

diff --git a/binary/Makefile.windows b/binary/Makefile.windows
index 65445c47..c243a0a7 100644
--- a/binary/Makefile.windows
+++ b/binary/Makefile.windows
@@ -57,7 +57,7 @@ $(WINDOWS_DEPS_DIR)/lib/libz.a: $(BUILD_WINDOWS_DEPS_DIR)/zlib-$(ZLIB_VERSION)
 	cd $(BUILD_WINDOWS_DEPS_DIR)/zlib-$(ZLIB_VERSION) && cp zlib.h zconf.h ../../$(WINDOWS_DEPS_DIR)/include
 	cd $(BUILD_WINDOWS_DEPS_DIR)/zlib-$(ZLIB_VERSION) && $(MINGW_PREFIX)-strip -g libz.a
 	mkdir -p $(@D)
-	cd $(BUILD_WINDOWS_DEPS_DIR)/zlib-$(ZLIB_VERSION) && cp libz.a ../../$(WINDOWS_DEPS_DIR)/lib
+	cd $(BUILD_WINDOWS_DEPS_DIR)/zlib-$(ZLIB_VERSION) && cp libz.a ../../$(WINDOWS_DEPS_DIR)/lib/libzlib.a
 
 $(BUILD_WINDOWS_DEPS_DIR)/bzip2-$(BZIP2_VERSION).tar.gz:
 	mkdir -p $(@D)
diff --git a/binary/all_in_one b/binary/all_in_one
index 1b096936..4e0fa4d9 100755
--- a/binary/all_in_one
+++ b/binary/all_in_one
@@ -465,7 +465,7 @@ local function main()
       md5 = "md5",
       luasocket = "./binary/luasocket-3.1.0-1.rockspec",
       luasec = "./binary/luasec-1.3.2-1.rockspec",
-      ["lua-zlib"] = "./binary/lua-zlib-1.2-0.rockspec",
+      ["lua-zlib"] = "./binary/lua-zlib-1.4-0.rockspec",
       ["lua-bz2"] = "./binary/lua-bz2-0.2.1-1.rockspec",
       luaposix = if_platform("unix", "./binary/luaposix-35.1-1.rockspec"),
       luafilesystem = "luafilesystem",
diff --git a/binary/lua-zlib-1.2-0.rockspec b/binary/lua-zlib-1.2-0.rockspec
deleted file mode 100644
index 9d3adc8f..00000000
--- a/binary/lua-zlib-1.2-0.rockspec
+++ /dev/null
@@ -1,39 +0,0 @@
-package = "lua-zlib"
-version = "1.2-0"
-source = {
-   url = "git+https://github.com/brimworks/lua-zlib.git",
-   tag = "v1.2",
-}
-description = {
-   summary = "Simple streaming interface to zlib for Lua.",
-   detailed = [[
-      Simple streaming interface to zlib for Lua.
-      Consists of two functions: inflate and deflate.
-      Both functions return "stream functions" (takes a buffer of input and returns a buffer of output).
-      This project is hosted on github.
-   ]],
-   homepage = "https://github.com/brimworks/lua-zlib",
-   license = "MIT"
-}
-dependencies = {
-   "lua >= 5.1, <= 5.4"
-}
-external_dependencies = {
-    ZLIB = {
-       header = "zlib.h",
-       library = "z",
-    }
-}
-
-build = {
-   type = "builtin",
-   modules = {
-      zlib = {
-         sources = { "lua_zlib.c" },
-         libraries = { "z" },
-         defines = { "LZLIB_COMPAT" },
-         incdirs = { "$(ZLIB_INCDIR)" },
-         libdirs = { "$(ZLIB_LIBDIR)" },
-      }
-   },
-}
diff --git a/binary/lua-zlib-1.4-0.rockspec b/binary/lua-zlib-1.4-0.rockspec
new file mode 100644
index 00000000..bd6cbec3
--- /dev/null
+++ b/binary/lua-zlib-1.4-0.rockspec
@@ -0,0 +1,55 @@
+package = "lua-zlib"
+version = "1.4-0"
+source = {
+   url = "git+https://github.com/brimworks/lua-zlib.git",
+   tag = "v1.4",
+}
+description = {
+   summary = "Simple streaming interface to zlib for Lua.",
+   detailed = [[
+      Simple streaming interface to zlib for Lua.
+      Consists of two functions: inflate and deflate.
+      Both functions return "stream functions" (takes a buffer of input and returns a buffer of output).
+      This project is hosted on github.
+   ]],
+   homepage = "https://github.com/brimworks/lua-zlib",
+   license = "MIT"
+}
+dependencies = {
+   "lua >= 5.1, <= 5.5"
+}
+external_dependencies = {
+    ZLIB = {
+       header = "zlib.h"
+    }
+}
+
+build = {
+   type = "builtin",
+   modules = {
+      zlib = {
+         sources = { "lua_zlib.c" },
+         libraries = { "z" },
+         defines = { "LZLIB_COMPAT" },
+         incdirs = { "$(ZLIB_INCDIR)" },
+         libdirs = { "$(ZLIB_LIBDIR)" }
+      }
+   },
+   platforms = {
+      windows = {
+         modules = {
+            zlib = {
+               libraries = { "zlib" }
+            }
+         }
+      },
+      mingw = {
+         modules = {
+            zlib = {
+               libraries = { "zlib1" },
+               libdirs = { "$(ZLIB_INCDIR)/../bin" }
+            }
+         }
+      }
+   }
+}
-- 
cgit v1.2.3-55-g6feb