Skip to content

Commit be0dd40

Browse files
Jackie9527Jackie9527
committed
upgrade zlib version to 1.2.13, which is the latest release.
Signed-off-by: Jackie9527 <zhangqiangqiang@huawei.com>
1 parent 1d23ad1 commit be0dd40

6 files changed

Lines changed: 18 additions & 18 deletions

‎package-system/zlib/FindZLIB.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ endif()
3131
set(ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/zlib/include)
3232
set(ZLIB_INCLUDE_DIR ${ZLIB_INCLUDE_DIRS})
3333
set(ZLIB_LIBRARY ${ZLIB_LIBRARIES})
34-
set(ZLIB_VERSION_STRING "1.2.11")
34+
set(ZLIB_VERSION_STRING "1.2.13")
3535
set(ZLIB_VERSION_MAJOR "1")
3636
set(ZLIB_VERSION_MINOR "2")
37-
set(ZLIB_VERSION_PATCH "11")
37+
set(ZLIB_VERSION_PATCH "13")
3838
set(ZLIB_MAJOR_VERSION "1")
3939
set(ZLIB_MINOR_VERSION "2")
40-
set(ZLIB_PATCH_VERSION "11")
40+
set(ZLIB_PATCH_VERSION "13")
4141
set(ZLIB_FOUND True)
4242

4343
# declare the targets - O3DE has the 3rdParty namespace target, CMake has ZLIB::ZLIB

‎package-system/zlib/build_config.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"git_url":"https://github.com/madler/zlib",
3-
"git_tag":"v1.2.11",
4-
"git_commit":"cacf7f1d4e3d44d871b605da3b647f07d718623f",
3+
"git_tag":"v1.2.13",
4+
"git_commit":"04f42ceca40f73e2978b50e93806c2a18c1281fc",
55
"package_name":"zlib",
6-
"package_version":"1.2.11-rev5",
6+
"package_version":"1.2.13-rev1",
77
"package_url":"https://zlib.net",
88
"package_license":"Zlib",
99
"additional_src_files":[

‎package_build_list_host_darwin.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
"mikkelsen-1.0.0.4-mac": "package-system/mikkelsen/build_package_image.py --platform mac",
4646
"mikkelsen-1.0.0.4-ios": "package-system/mikkelsen/build_package_image.py --platform ios",
4747
"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",
48-
"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",
49-
"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",
48+
"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",
49+
"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",
5050
"lz4-1.9.3-vcpkg-rev4-mac": "package-system/lz4/build_package_image.py --platform-name mac",
5151
"lz4-1.9.3-vcpkg-rev4-ios": "package-system/lz4/build_package_image.py --platform-name ios",
5252
"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 @@
100100
"SQLite-3.37.2-rev2-mac": "package-system/SQLite-mac",
101101
"xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform",
102102
"qt-5.15.2-rev8-mac": "package-system/Qt/temp/qt-mac",
103-
"zlib-1.2.11-rev5-mac": "package-system/zlib-mac",
104-
"zlib-1.2.11-rev5-ios": "package-system/zlib-ios",
103+
"zlib-1.2.13-rev1-mac": "package-system/zlib-mac",
104+
"zlib-1.2.13-rev1-ios": "package-system/zlib-ios",
105105
"lz4-1.9.3-vcpkg-rev4-mac": "package-system/lz4-mac",
106106
"lz4-1.9.3-vcpkg-rev4-ios": "package-system/lz4-ios",
107107
"expat-2.4.2-rev2-mac": "package-system/expat/temp/expat-mac",

‎package_build_list_host_linux-aarch64.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"SQLite-3.37.2-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Linux-aarch64 --clean",
3636
"tiff-4.2.0.15-rev3-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Linux-aarch64 --clean",
3737
"v-hacd-2.3-1a49edf-rev1-linux-aarch64": "package-system/v-hacd/build_package_image.py --platform-name linux-aarch64",
38-
"zlib-1.2.11-rev5-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Linux-aarch64 --clean"
38+
"zlib-1.2.13-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Linux-aarch64 --clean"
3939
},
4040
"build_from_folder": {
4141
"astc-encoder-3.2-rev2-linux-aarch64": "package-system/astc-encoder/temp/astc-encoder-linux-aarch64",
@@ -69,6 +69,6 @@
6969
"SQLite-3.37.2-rev1-linux-aarch64": "package-system/sqlite/temp/SQLite-linux-aarch64",
7070
"tiff-4.2.0.15-rev3-linux-aarch64": "package-system/tiff/temp/tiff-linux-aarch64",
7171
"v-hacd-2.3-1a49edf-rev1-linux-aarch64": "package-system/v-hacd-linux-aarch64",
72-
"zlib-1.2.11-rev5-linux-aarch64": "package-system/zlib/temp/zlib-linux-aarch64"
72+
"zlib-1.2.13-rev1-linux-aarch64": "package-system/zlib/temp/zlib-linux-aarch64"
7373
}
7474
}

‎package_build_list_host_linux.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"python-3.10.5-rev2-linux": "package-system/python/build_package_image.py",
3838
"mikkelsen-1.0.0.4-linux": "package-system/mikkelsen/build_package_image.py",
3939
"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",
40-
"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",
40+
"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",
4141
"lz4-1.9.3-vcpkg-rev4-linux": "package-system/lz4/build_package_image.py --platform-name linux",
4242
"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",
4343
"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 @@
7878
"SQLite-3.37.2-rev1-linux": "package-system/SQLite-linux",
7979
"xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform",
8080
"qt-5.15.2-rev8-linux": "package-system/Qt/temp/qt-linux",
81-
"zlib-1.2.11-rev5-linux": "package-system/zlib-linux",
81+
"zlib-1.2.13-rev1-linux": "package-system/zlib-linux",
8282
"lz4-1.9.3-vcpkg-rev4-linux": "package-system/lz4-linux",
8383
"expat-2.4.2-rev2-linux": "package-system/expat/temp/expat-linux",
8484
"vulkan-validationlayers-1.2.198-rev1-linux": "package-system/vulkan-validationlayers/temp/vulkan-validationlayers-linux"

‎package_build_list_host_windows.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
"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",
6161
"v-hacd-2.3-1a49edf-rev1-windows": "package-system/v-hacd/build_package_image.py --platform-name windows",
6262
"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",
63-
"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",
64-
"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"
63+
"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",
64+
"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"
6565
},
6666
"build_from_folder": {
6767
"alembic-1.7.11-rev3-multiplatform": "package-system/alembic-multiplatform",
@@ -131,8 +131,8 @@
131131
"v-hacd-2.3-1a49edf-rev1-windows": "package-system/v-hacd-windows",
132132
"vulkan-validationlayers-1.2.198-rev1-windows": "package-system/vulkan-validationlayers-windows",
133133
"xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform",
134-
"zlib-1.2.11-rev5-android": "package-system/zlib-android",
135-
"zlib-1.2.11-rev5-windows": "package-system/zlib-windows",
134+
"zlib-1.2.13-rev1-android": "package-system/zlib-android",
135+
"zlib-1.2.13-rev1-windows": "package-system/zlib-windows",
136136
"zstd-1.35-multiplatform": "package-system/zstd-multiplatform"
137137
}
138138
}

0 commit comments

Comments
 (0)