upgrade zlib version to 1.2.13, which is the latest release.

Signed-off-by: Jackie9527 <[email protected]>
o3de · Feb 6, 2023 · 70c5d74 · 70c5d74
1 parent 1d23ad1
commit 70c5d74
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/package-system/zlib/FindZLIB.cmake b/package-system/zlib/FindZLIB.cmake
@@ -31,13 +31,13 @@ endif()
 set(ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/zlib/include)
 set(ZLIB_INCLUDE_DIR ${ZLIB_INCLUDE_DIRS})
 set(ZLIB_LIBRARY ${ZLIB_LIBRARIES})
-set(ZLIB_VERSION_STRING "1.2.11")
+set(ZLIB_VERSION_STRING "1.2.13")
 set(ZLIB_VERSION_MAJOR "1")
 set(ZLIB_VERSION_MINOR "2")
-set(ZLIB_VERSION_PATCH "11")
+set(ZLIB_VERSION_PATCH "13")
 set(ZLIB_MAJOR_VERSION "1")
 set(ZLIB_MINOR_VERSION "2")
-set(ZLIB_PATCH_VERSION "11")
+set(ZLIB_PATCH_VERSION "13")
 set(ZLIB_FOUND True)
 
 # declare the targets - O3DE has the 3rdParty namespace target, CMake has ZLIB::ZLIB

diff --git a/package-system/zlib/build_config.json b/package-system/zlib/build_config.json
@@ -1,9 +1,9 @@
 {
     "git_url":"https://github.com/madler/zlib",
-    "git_tag":"v1.2.11",
-    "git_commit":"cacf7f1d4e3d44d871b605da3b647f07d718623f",
+    "git_tag":"v1.2.13",
+    "git_commit":"04f42ceca40f73e2978b50e93806c2a18c1281fc",
     "package_name":"zlib",
-    "package_version":"1.2.11-rev5",
+    "package_version":"1.2.13-rev1",
     "package_url":"https://zlib.net",
     "package_license":"Zlib",
     "additional_src_files":[

diff --git a/package_build_list_host_darwin.json b/package_build_list_host_darwin.json
@@ -45,8 +45,8 @@
         "mikkelsen-1.0.0.4-mac": "package-system/mikkelsen/build_package_image.py --platform mac",
         "mikkelsen-1.0.0.4-ios": "package-system/mikkelsen/build_package_image.py --platform ios",
         "qt-5.15.2-rev8-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Mac --package-root ../../package-system/Qt/temp --clean",
-        "zlib-1.2.11-rev5-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Mac --package-root ../../package-system --clean",
-        "zlib-1.2.11-rev5-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name iOS --package-root ../../package-system --clean",
+        "zlib-1.2.13-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Mac --package-root ../../package-system --clean",
+        "zlib-1.2.13-rev1-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name iOS --package-root ../../package-system --clean",
         "lz4-1.9.3-vcpkg-rev4-mac": "package-system/lz4/build_package_image.py --platform-name mac",
         "lz4-1.9.3-vcpkg-rev4-ios": "package-system/lz4/build_package_image.py --platform-name ios",
         "tiff-4.2.0.15-rev3-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Mac --package-root ../../package-system --clean",
@@ -100,8 +100,8 @@
         "SQLite-3.37.2-rev2-mac": "package-system/SQLite-mac",
         "xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform",
         "qt-5.15.2-rev8-mac": "package-system/Qt/temp/qt-mac",
-        "zlib-1.2.11-rev5-mac": "package-system/zlib-mac",
-        "zlib-1.2.11-rev5-ios": "package-system/zlib-ios",
+        "zlib-1.2.13-rev1-mac": "package-system/zlib-mac",
+        "zlib-1.2.13-rev1-ios": "package-system/zlib-ios",
         "lz4-1.9.3-vcpkg-rev4-mac": "package-system/lz4-mac",
         "lz4-1.9.3-vcpkg-rev4-ios": "package-system/lz4-ios",
         "expat-2.4.2-rev2-mac": "package-system/expat/temp/expat-mac",

diff --git a/package_build_list_host_linux-aarch64.json b/package_build_list_host_linux-aarch64.json
@@ -35,7 +35,7 @@
         "SQLite-3.37.2-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Linux-aarch64 --clean",
         "tiff-4.2.0.15-rev3-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Linux-aarch64 --clean",
         "v-hacd-2.3-1a49edf-rev1-linux-aarch64": "package-system/v-hacd/build_package_image.py --platform-name linux-aarch64",
-        "zlib-1.2.11-rev5-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Linux-aarch64 --clean"
+        "zlib-1.2.13-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Linux-aarch64 --clean"
     },
     "build_from_folder": {
         "astc-encoder-3.2-rev2-linux-aarch64": "package-system/astc-encoder/temp/astc-encoder-linux-aarch64",
@@ -69,6 +69,6 @@
         "SQLite-3.37.2-rev1-linux-aarch64": "package-system/sqlite/temp/SQLite-linux-aarch64",
         "tiff-4.2.0.15-rev3-linux-aarch64": "package-system/tiff/temp/tiff-linux-aarch64",
         "v-hacd-2.3-1a49edf-rev1-linux-aarch64": "package-system/v-hacd-linux-aarch64",
-        "zlib-1.2.11-rev5-linux-aarch64": "package-system/zlib/temp/zlib-linux-aarch64"
+        "zlib-1.2.13-rev1-linux-aarch64": "package-system/zlib/temp/zlib-linux-aarch64"
     }
 }
diff --git a/package_build_list_host_linux.json b/package_build_list_host_linux.json
@@ -37,7 +37,7 @@
         "python-3.10.5-rev2-linux": "package-system/python/build_package_image.py",
         "mikkelsen-1.0.0.4-linux": "package-system/mikkelsen/build_package_image.py",
         "qt-5.15.2-rev8-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux --package-root ../../package-system/Qt/temp --clean",
-        "zlib-1.2.11-rev5-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Linux --package-root ../../package-system --clean",
+        "zlib-1.2.13-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Linux --package-root ../../package-system --clean",
         "lz4-1.9.3-vcpkg-rev4-linux": "package-system/lz4/build_package_image.py --platform-name linux",
         "expat-2.4.2-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/expat --platform-name Linux --package-root ../../package-system/expat/temp --clean",
         "vulkan-validationlayers-1.2.198-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/vulkan-validationlayers --platform-name Linux --package-root ../../package-system/vulkan-validationlayers/temp --clean"
@@ -78,7 +78,7 @@
         "SQLite-3.37.2-rev1-linux": "package-system/SQLite-linux",
         "xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform",
         "qt-5.15.2-rev8-linux": "package-system/Qt/temp/qt-linux",
-        "zlib-1.2.11-rev5-linux": "package-system/zlib-linux",
+        "zlib-1.2.13-rev1-linux": "package-system/zlib-linux",
         "lz4-1.9.3-vcpkg-rev4-linux": "package-system/lz4-linux",
         "expat-2.4.2-rev2-linux": "package-system/expat/temp/expat-linux",
         "vulkan-validationlayers-1.2.198-rev1-linux": "package-system/vulkan-validationlayers/temp/vulkan-validationlayers-linux"

diff --git a/package_build_list_host_windows.json b/package_build_list_host_windows.json
@@ -60,8 +60,8 @@
         "tiff-4.2.0.15-rev4-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Android --package-root ../../package-system --clean",
         "v-hacd-2.3-1a49edf-rev1-windows": "package-system/v-hacd/build_package_image.py --platform-name windows",
         "vulkan-validationlayers-1.2.198-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/vulkan-validationlayers --platform-name Windows --package-root ../../package-system --clean",
-        "zlib-1.2.11-rev5-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Android --package-root ../../package-system --clean",
-        "zlib-1.2.11-rev5-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Windows --package-root ../../package-system --clean"
+        "zlib-1.2.13-rev1-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Android --package-root ../../package-system --clean",
+        "zlib-1.2.13-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Windows --package-root ../../package-system --clean"
   },
   "build_from_folder": {
     "alembic-1.7.11-rev3-multiplatform": "package-system/alembic-multiplatform",
@@ -131,8 +131,8 @@
     "v-hacd-2.3-1a49edf-rev1-windows": "package-system/v-hacd-windows",
     "vulkan-validationlayers-1.2.198-rev1-windows": "package-system/vulkan-validationlayers-windows",
     "xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform",
-    "zlib-1.2.11-rev5-android": "package-system/zlib-android",
-    "zlib-1.2.11-rev5-windows": "package-system/zlib-windows",
+    "zlib-1.2.13-rev1-android": "package-system/zlib-android",
+    "zlib-1.2.13-rev1-windows": "package-system/zlib-windows",
     "zstd-1.35-multiplatform": "package-system/zstd-multiplatform"
   }
 }