Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: Unfork zlib (#1339) 

The issues we had with zlib and CMake have been resolved upstream.
This commit is contained in:
Joey Parrish 2024-02-12 14:10:51 -08:00 committed by GitHub
parent 9193a90f5a
commit df04d0ed6e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -15,7 +15,7 @@
url = https://github.com/Mbed-TLS/mbedtls url = https://github.com/Mbed-TLS/mbedtls
[submodule "packager/third_party/zlib/source"] [submodule "packager/third_party/zlib/source"]
path = packager/third_party/zlib/source path = packager/third_party/zlib/source
url = https://github.com/joeyparrish/zlib url = https://github.com/madler/zlib
[submodule "packager/third_party/libpng/source"] [submodule "packager/third_party/libpng/source"]
path = packager/third_party/libpng/source path = packager/third_party/libpng/source
url = https://github.com/glennrp/libpng url = https://github.com/glennrp/libpng

7
packager/third_party/zlib/CMakeLists.txt vendored
View File

@ -10,12 +10,11 @@
# submodule in an unclean state. # submodule in an unclean state.
set(RENAME_ZCONF OFF) set(RENAME_ZCONF OFF)
# Skip the building of zlib example apps and tests.
set(ZLIB_BUILD_EXAMPLES OFF)
# Don't install anything. # Don't install anything.
set(SKIP_INSTALL_ALL ON) set(SKIP_INSTALL_ALL ON)
# The configuration for x64 assembly in zlib's CMakeLists.txt doesn't seem to
# work, as the assembly files aren't in the repo for some reason. So don't set
# the AMD64 flag.
# With these set in scope of this folder, load the library's own CMakeLists.txt. # With these set in scope of this folder, load the library's own CMakeLists.txt.
add_subdirectory(source) add_subdirectory(source)

2
packager/third_party/zlib/source vendored

@ -1 +1 @@
Subproject commit 59acdd06fd89fee1f91a464373b1afd964f810a8 Subproject commit 5c42a230b7b468dff011f444161c0145b5efae59