Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package-system/zlib/FindZLIB.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions package-system/zlib/build_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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":[
Expand Down
8 changes: 4 additions & 4 deletions package_build_list_host_darwin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions package_build_list_host_linux-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions package_build_list_host_linux.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions package_build_list_host_windows.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
}
}