Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update libjpeg-turbo, libtiff and make #2861

Merged
merged 4 commits into from
Nov 24, 2023
Merged

update libjpeg-turbo, libtiff and make #2861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5017f85
update libjpeg-turbo
xq114 Nov 23, 2023
bb9aa67
update make
xq114 Nov 23, 2023
105229f
update libtiff
xq114 Nov 23, 2023
0c65284
use host compiler
xq114 Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/l/libjpeg-turbo/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)

Expand Down
1 change: 1 addition & 0 deletions packages/l/libtiff/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"})
Expand Down
6 changes: 4 additions & 2 deletions packages/m/make/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

应该得用 package:plat(), package:arch() 。。对于 binary 。就是 host plat/arch

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

另外，现在应该可以用 package:toolchain("msvc")

os.vrunv("build_w32.bat", {}, {envs = runenvs})
os.cp("WinRel/gnumake.exe", path.join(package:installdir("bin"), "make.exe"))
end)
Expand Down