From 5772cb66352c60137f4825729e3c18ec2125b9ec Mon Sep 17 00:00:00 2001
From: Hoildkv <42310255+xq114@users.noreply.github.com>
Date: Fri, 24 Nov 2023 13:10:29 +0800
Subject: [PATCH] update libjpeg-turbo, libtiff and make (#2861)

---
 packages/l/libjpeg-turbo/xmake.lua | 10 +++++-----
 packages/l/libtiff/xmake.lua       |  1 +
 packages/m/make/xmake.lua          |  6 ++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/l/libjpeg-turbo/xmake.lua b/packages/l/libjpeg-turbo/xmake.lua
index 168940d59..15caebd28 100644
--- a/packages/l/libjpeg-turbo/xmake.lua
+++ b/packages/l/libjpeg-turbo/xmake.lua
@@ -12,17 +12,18 @@ package("libjpeg-turbo")
     add_versions("2.1.0",  "d6b7790927d658108dfd3bee2f0c66a2924c51ee7f9dc930f62c452f4a638c52")
     add_versions("2.1.1",  "20e9cd3e5f517950dfb7a300ad344543d88719c254407ffb5ad88d891bf701c4")
     add_versions("2.1.2",  "e7fdc8a255c45bc8fbd9aa11c1a49c23092fcd7379296aeaeb14d3343a3d1bed")
-    add_versions("2.1.3", "dbda0c685942aa3ea908496592491e5ec8160d2cf1ec9d5fd5470e50768e7859")
-    add_versions("2.1.4", "a78b05c0d8427a90eb5b4eb08af25309770c8379592bb0b8a863373128e6143f")
+    add_versions("2.1.3",  "dbda0c685942aa3ea908496592491e5ec8160d2cf1ec9d5fd5470e50768e7859")
+    add_versions("2.1.4",  "a78b05c0d8427a90eb5b4eb08af25309770c8379592bb0b8a863373128e6143f")
+    add_versions("3.0.1",  "5b9bbca2b2a87c6632c821799438d358e27004ab528abf798533c15d50b39f82")
 
     add_configs("jpeg", {description = "libjpeg API/ABI emulation target version.", default = "6", type = "string", values = {"6", "7", "8"}})
 
-    if is_subhost("windows") and is_plat("android") then
+    if is_plat("android") then
         add_deps("make")
     end
 
     on_load(function (package)
-        if not package.is_built or package:is_built() then
+        if package:is_built() then
             package:add("deps", "cmake", "nasm")
         end
     end)
@@ -53,7 +54,6 @@ package("libjpeg-turbo")
             io.replace("CMakeLists.txt", 'message(STATUS "${BITS}-bit build (${CPU_TYPE})")',
                 'set(CPU_TYPE arm64)\nmessage(STATUS "${BITS}-bit build (${CPU_TYPE})")', {plain = true})
         end
-        table.insert(configs, "-DCMAKE_INSTALL_LIBDIR:PATH=lib")
         import("package.tools.cmake").install(package, configs)
     end)
 
diff --git a/packages/l/libtiff/xmake.lua b/packages/l/libtiff/xmake.lua
index d0c1007be..a3489cbcc 100644
--- a/packages/l/libtiff/xmake.lua
+++ b/packages/l/libtiff/xmake.lua
@@ -9,6 +9,7 @@ package("libtiff")
     add_versions("v4.2.0", "f87463ac8984b43e8dd84a04c14816f5f217796d9f1f459756239c499857e75a")
     add_versions("v4.3.0", "5abe48cb2ea469fefb36d85718ddb1b9f28f95c87063e006696c83f23f5b8e41")
     add_versions("v4.4.0", "d118fc97748333ae6c53302ea06584148b72e128e924253d346b802d2a80a567")
+    add_versions("v4.6.0", "fdd1a2a35b20734a5232527a81d7365eb66e54732bfc44474a3124bcb85221c7")
 
     add_configs("tools",      {description = "build TIFF tools", default = false, type = "boolean"})
     add_configs("zlib",       {description = "use zlib (required for Deflate compression)", default = false, type = "boolean"})
diff --git a/packages/m/make/xmake.lua b/packages/m/make/xmake.lua
index 07a8f5ca5..f5753a85a 100644
--- a/packages/m/make/xmake.lua
+++ b/packages/m/make/xmake.lua
@@ -4,11 +4,13 @@ package("make")
     set_homepage("https://www.gnu.org/software/make/")
     set_description("GNU make tool.")
 
-    add_urls("https://ftp.gnu.org/gnu/make/make-$(version).tar.gz",
+    add_urls("https://ftpmirror.gnu.org/gnu/make/make-$(version).tar.gz",
+             "https://ftp.gnu.org/gnu/make/make-$(version).tar.gz",
              "https://mirrors.ustc.edu.cn/gnu/make/make-$(version).tar.gz",
              "http://mirror.easyname.at/gnu/make/make-$(version).tar.gz")
     add_versions("4.2.1", "e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7")
     add_versions("4.3", "e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19")
+    add_versions("4.4.1", "dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3")
 
     if is_host("linux") then
         add_extsources("pacman::make", "apt::make")
@@ -18,7 +20,7 @@ package("make")
 
     on_install("@windows", function(package)
         import("core.tool.toolchain")
-        local runenvs = toolchain.load("msvc"):runenvs()
+        local runenvs = toolchain.load("msvc", {plat = "windows", arch = os.arch()}):runenvs()
         os.vrunv("build_w32.bat", {}, {envs = runenvs})
         os.cp("WinRel/gnumake.exe", path.join(package:installdir("bin"), "make.exe"))
     end)