diff options
| author | lhofhansl <larsh@apache.org> | 2021-08-31 17:32:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-31 17:32:31 -0700 |
| commit | d1624a552151bcb152b7abf63df6501b63458d78 (patch) | |
| tree | e73a7b216f23962c06e591c4d0d1e5333d949b08 /util | |
| parent | beac4a2c984706b636e7b1e03406e05c87435903 (diff) | |
| download | minetest-d1624a552151bcb152b7abf63df6501b63458d78.tar.gz minetest-d1624a552151bcb152b7abf63df6501b63458d78.tar.bz2 minetest-d1624a552151bcb152b7abf63df6501b63458d78.zip | |
Switch MapBlock compression to zstd (#10788)
* Add zstd support.
* Rearrange serialization order
* Compress entire mapblock
Co-authored-by: sfan5 <sfan5@live.de>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/buildbot/buildwin32.sh | 6 | ||||
| -rwxr-xr-x | util/buildbot/buildwin64.sh | 6 | ||||
| -rw-r--r-- | util/ci/common.sh | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh index 8ce9d4bd4..b6c188739 100755 --- a/util/buildbot/buildwin32.sh +++ b/util/buildbot/buildwin32.sh @@ -40,6 +40,7 @@ sqlite3_version=3.35.5 luajit_version=2.1.0-beta3 leveldb_version=1.23 zlib_version=1.2.11 +zstd_version=1.4.9 mkdir -p $libdir @@ -66,6 +67,7 @@ download () { cd $libdir download "https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win32.zip" irrlicht-$irrlicht_version.zip download "http://minetest.kitsunemimi.pw/zlib-$zlib_version-win32.zip" +download "http://minetest.kitsunemimi.pw/zstd-$zstd_version-win32.zip" download "http://minetest.kitsunemimi.pw/libogg-$ogg_version-win32.zip" download "http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win32.zip" download "http://minetest.kitsunemimi.pw/curl-$curl_version-win32.zip" @@ -120,6 +122,10 @@ cmake -S $sourcedir -B . \ -DZLIB_LIBRARIES=$libdir/zlib/lib/libz.dll.a \ -DZLIB_DLL=$libdir/zlib/bin/zlib1.dll \ \ + -DZSTD_INCLUDE_DIR=$libdir/zstd/include \ + -DZSTD_LIBRARY=$libdir/zstd/lib/libzstd.dll.a \ + -DZSTD_DLL=$libdir/zstd/bin/libzstd.dll \ + \ -DLUA_INCLUDE_DIR=$libdir/luajit/include \ -DLUA_LIBRARY=$libdir/luajit/libluajit.a \ \ diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh index 0e09f010f..c6cb80cda 100755 --- a/util/buildbot/buildwin64.sh +++ b/util/buildbot/buildwin64.sh @@ -40,6 +40,7 @@ sqlite3_version=3.35.5 luajit_version=2.1.0-beta3 leveldb_version=1.23 zlib_version=1.2.11 +zstd_version=1.4.9 mkdir -p $libdir @@ -66,6 +67,7 @@ download () { cd $libdir download "https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win64.zip" irrlicht-$irrlicht_version.zip download "http://minetest.kitsunemimi.pw/zlib-$zlib_version-win64.zip" +download "http://minetest.kitsunemimi.pw/zstd-$zstd_version-win64.zip" download "http://minetest.kitsunemimi.pw/libogg-$ogg_version-win64.zip" download "http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win64.zip" download "http://minetest.kitsunemimi.pw/curl-$curl_version-win64.zip" @@ -120,6 +122,10 @@ cmake -S $sourcedir -B . \ -DZLIB_LIBRARIES=$libdir/zlib/lib/libz.dll.a \ -DZLIB_DLL=$libdir/zlib/bin/zlib1.dll \ \ + -DZSTD_INCLUDE_DIR=$libdir/zstd/include \ + -DZSTD_LIBRARY=$libdir/zstd/lib/libzstd.dll.a \ + -DZSTD_DLL=$libdir/zstd/bin/libzstd.dll \ + \ -DLUA_INCLUDE_DIR=$libdir/luajit/include \ -DLUA_LIBRARY=$libdir/luajit/libluajit.a \ \ diff --git a/util/ci/common.sh b/util/ci/common.sh index 47b6650ce..88bed9ed4 100644 --- a/util/ci/common.sh +++ b/util/ci/common.sh @@ -5,7 +5,7 @@ install_linux_deps() { local pkgs=(cmake libpng-dev \ libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \ libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev \ - gettext libpq-dev libleveldb-dev libcurl4-openssl-dev) + gettext libpq-dev libleveldb-dev libcurl4-openssl-dev libzstd-dev) if [[ "$1" == "--old-irr" ]]; then shift |