update chromium_zlib and octomap (#1944)

* update chromium_zlib

* update octomap

* fix chromium_zlib

packages/c/chromium_zlib/port/xmake.lua

@@ -42,7 +42,8 @@ target("zlib")
         if is_arch(".+64") then
             add_defines("INFLATE_CHUNK_READ_64LE")
         end
-    elseif is_arch("arm.*") then
+    -- arm optimization disabled on windows, see http://crbug.com/v8/10012.
+    elseif is_arch("arm.*") and not is_plat("windows") then
         add_defines("ADLER32_SIMD_NEON", "INFLATE_CHUNK_SIMD_NEON")
         add_files("adler32_simd.c", "contrib/optimizations/inffast_chunk.c", "contrib/optimizations/inflate.c")
         if is_arch(".+64") then

packages/c/chromium_zlib/xmake.lua

@@ -7,6 +7,7 @@ package("chromium_zlib")
     add_urls("https://github.com/xmake-mirror/chromium_zlib.git")
     add_urls("https://chromium.googlesource.com/chromium/src/third_party/zlib.git")
     add_versions("2022.02.22", "6f44c22c1f003bd20011062abec283678842567c")
+    add_versions("2023.03.14", "5edb52d4302d7aef232d585ec9ae27ef5c3c5438")
 
     add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})
 

packages/o/octomap/xmake.lua

@@ -7,8 +7,9 @@ package("octomap")
     add_urls("https://github.com/OctoMap/octomap/archive/refs/tags/$(version).tar.gz",
              "https://github.com/OctoMap/octomap.git")
     add_versions("v1.9.7", "3e9ac020686ceb4e17e161bffc5a0dafd9cccab33adeb9adee59a61c418ea1c1")
+    add_versions("v1.9.8", "417af6da4e855e9a83b93458aa98b01a2c88f880088baad2b59d323ce162586e")
 
-    add_patches("v1.9.7", path.join(os.scriptdir(), "patches", "1.9.7", "build.patch"), "396b7b28c754f876c8552da93abf463f31bd65e327f454e75b8a5c10bb62ded4")
+    add_patches("1.9.x", path.join(os.scriptdir(), "patches", "1.9.7", "build.patch"), "396b7b28c754f876c8552da93abf463f31bd65e327f454e75b8a5c10bb62ded4")
 
     if is_plat("windows") then
         add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})