update cmake and jasper (#512)

* update cmake

* update jasper

* fix archlinux ci

* remove mirror for cmake

.github/workflows/archlinux.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Installation
         run: |
           pacman -Sy --noconfirm --needed git base-devel perl make unzip
-          pacman -Sy --noconfirm --needed mesa gcc-fortran
+          pacman -Sy --noconfirm --needed mesa gcc-fortran glu
       - uses: actions/checkout@v1
       - uses: xmake-io/github-action-setup-xmake@v1
         with:

packages/c/cmake/xmake.lua

@@ -6,45 +6,54 @@ package("cmake")
 
     if is_host("macosx") then
         add_urls("https://cmake.org/files/v$(version)-Darwin-x86_64.tar.gz", {version = function (version)
-                return table.concat(table.slice((version):split('%.'), 1, 2), '.') .. "/cmake-" .. version
+                return table.concat(table.slice((version):split('%.'), 1, 2), '.') .. "/cmake-" .. version .. (version:ge("3.20") and "-macos-universal" or "-Darwin-x86_64")
+            end})
+        add_urls("https://github.com/Kitware/CMake/releases/download/v$(version).tar.gz", {version = function (version)
+                return version .. "/cmake-" .. version .. (version:ge("3.20") and "-macos-universal" or "-Darwin-x86_64")
             end})
-        add_urls("https://github.com/Kitware/CMake/releases/download/v$(version)/cmake-$(version)-Darwin-x86_64.tar.gz")
-        add_urls("https://gitlab.com/xmake-mirror/cmake-releases/raw/master/cmake-$(version)-Darwin-x86_64.tar.gz")
         add_versions("3.11.4", "2b5eb705f036b1906a5e0bce996e9cd56d43d73bdee8318ece3e5ce31657b812")
         add_versions("3.15.4", "adfbf611d21daa83b9bf6d85ab06a455e481b63a38d6e1270d563b03d4e5f829")
         add_versions("3.18.4", "9d27049660474cf134ab46fa0e0db771b263313fcb8ba82ee8b2d1a1a62f8f20")
+        add_versions("3.21.0", "c1c6f19dfc9c658a48b5aed22806595b2337bb3aedb71ab826552f74f568719f")
     elseif is_host("linux") and os.arch() == "x86_64" then
-        add_urls("https://cmake.org/files/v$(version)-Linux-x86_64.tar.gz", {version = function (version)
-                return table.concat(table.slice((version):split('%.'), 1, 2), '.') .. "/cmake-" .. version
+        add_urls("https://cmake.org/files/v$(version)-x86_64.tar.gz", {version = function (version)
+                return table.concat(table.slice((version):split('%.'), 1, 2), '.') .. "/cmake-" .. version .. (version:ge("3.20") and "-linux" or "-Linux")
+            end})
+        add_urls("https://github.com/Kitware/CMake/releases/download/v$(version)-x86_64.tar.gz", {version = function (version)
+            return version .. "/cmake-" .. version .. (version:ge("3.20") and "-linux" or "-Linux")
             end})
-        add_urls("https://github.com/Kitware/CMake/releases/download/v$(version)/cmake-$(version)-Linux-x86_64.tar.gz")
-        add_urls("https://gitlab.com/xmake-mirror/cmake-releases/raw/master/cmake-$(version)-Linux-x86_64.tar.gz")
         add_versions("3.11.4", "6dab016a6b82082b8bcd0f4d1e53418d6372015dd983d29367b9153f1a376435")
         add_versions("3.15.4", "7c2b17a9be605f523d71b99cc2e5b55b009d82cf9577efb50d4b23056dee1109")
         add_versions("3.18.4", "149e0cee002e59e0bb84543cf3cb099f108c08390392605e944daeb6594cbc29")
+        add_versions("3.21.0", "d54ef6909f519740bc85cec07ff54574cd1e061f9f17357d9ace69f61c6291ce")
     elseif is_host("windows") then
         if os.arch() == "x64" then
-            add_urls("https://cmake.org/files/v$(version)-win64-x64.zip", {excludes = {"*/doc/*"}, version = function (version)
-                    return table.concat(table.slice((version):split('%.'), 1, 2), '.') .. "/cmake-" .. version
+            add_urls("https://cmake.org/files/v$(version).zip", {excludes = {"*/doc/*"}, version = function (version)
+                    return table.concat(table.slice((version):split('%.'), 1, 2), '.') .. "/cmake-" .. version .. (version:ge("3.20") and "-windows-x86_64" or "-win64-x64")
+                end})
+            add_urls("https://github.com/Kitware/CMake/releases/download/v$(version).zip", {excludes = {"*/doc/*"}, version = function (version)
+                    return version .. "/cmake-" .. version .. (version .. (version:ge("3.20") and "-windows-x86_64" or "-win64-x64"))
                 end})
-            add_urls("https://github.com/Kitware/CMake/releases/download/v$(version)/cmake-$(version)-win64-x64.zip", {excludes = {"*/doc/*"}})
-            add_urls("https://gitlab.com/xmake-mirror/cmake-releases/raw/master/cmake-$(version)-win64-x64.zip", {excludes = {"*/doc/*"}})
             add_versions("3.11.4", "d3102abd0ded446c898252b58857871ee170312d8e7fd5cbff01fbcb1068a6e5")
             add_versions("3.15.4", "5bb49c0274800c38833e515a01af75a7341db68ea82c71856bb3cf171d2068be")
             add_versions("3.18.4", "a932bc0c8ee79f1003204466c525b38a840424d4ae29f9e5fb88959116f2407d")
+            add_versions("3.21.0", "c7b88c907a753f4ec86e43ddc89f91f70bf1b011859142f7f29e6d51ea4abb3c")
         else
             add_urls("https://cmake.org/files/v$(version)-win32-x86.zip", {excludes = {"*/doc/*"}, version = function (version)
-                    return table.concat(table.slice((version):split('%.'), 1, 2), '.') .. "/cmake-" .. version
+                    return table.concat(table.slice((version):split('%.'), 1, 2), '.') .. "/cmake-" .. version .. (version:ge("3.20") and "-windows-i386" or "-win32-x86")
+                end})
+            add_urls("https://github.com/Kitware/CMake/releases/download/v$(version).zip", {excludes = {"*/doc/*"}, version = function (version)
+                    return version .. "/cmake-" .. version .. (version .. (version:ge("3.20") and "-windows-i386" or "-win32-x86"))
                 end})
-            add_urls("https://github.com/Kitware/CMake/releases/download/v$(version)/cmake-$(version)-win32-x86.zip", {excludes = {"*/doc/*"}})
-            add_urls("https://gitlab.com/xmake-mirror/cmake-releases/raw/master/cmake-$(version)-win32-x86.zip", {excludes = {"*/doc/*"}})
             add_versions("3.11.4", "b068001ff879f86e704977c50a8c5917e4b4406c66242366dba2674abe316579")
             add_versions("3.15.4", "19c2bfd26c4de4d8046dd5ad6de95b57a2556559ec81b13b94e63ea4ae49b3f2")
             add_versions("3.18.4", "4c519051853686927f87df99669ada3ff15a3086535a7131892febd7c6e2f122")
+            add_versions("3.21.0", "11ee86b7f9799724fc16664c63e308bfe3fbc22c9df8ef4955ad4b248f3e680b")
         end
     else
         add_urls("https://github.com/Kitware/CMake/releases/download/v$(version)/cmake-$(version).tar.gz")
         add_versions("3.18.4", "597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77")
+        add_versions("3.21.0", "4a42d56449a51f4d3809ab4d3b61fd4a96a469e56266e896ce1009b5768bd2ab")
     end
 
     on_install("@macosx", function (package)

packages/j/jasper/xmake.lua

@@ -6,6 +6,7 @@ package("jasper")
 
     add_urls("https://github.com/jasper-software/jasper/archive/refs/tags/version-$(version).tar.gz")
     add_versions("2.0.28", "6b4e5f682be0ab1a5acb0eeb6bf41d6ce17a658bb8e2dbda95de40100939cc88")
+    add_versions("2.0.32", "a3583a06698a6d6106f2fc413aa42d65d86bedf9a988d60e5cfa38bf72bc64b9")
 
     add_deps("cmake", "libjpeg")
     if not is_plat("macosx") then