update pybind11, libjpeg-turbo, zstd, lyra (#4487)

* update pybind11

* update libjpeg-turbo

* update zstd

* update lyra

* pybind11 require native python

* try fix libjpeg-turbo
pull/4495/head
Hoildkv 5 months ago committed by GitHub
parent 68a51878cd
commit aa328dcfc9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 6
      packages/l/libjpeg-turbo/xmake.lua
  2. 3
      packages/l/lyra/xmake.lua
  3. 5
      packages/p/pybind11/xmake.lua
  4. 3
      packages/z/zstd/xmake.lua

@ -4,7 +4,7 @@ package("libjpeg-turbo")
set_description("A JPEG image codec that uses SIMD instructions (MMX, SSE2, AVX2, Neon, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, Arm, and PowerPC systems.") set_description("A JPEG image codec that uses SIMD instructions (MMX, SSE2, AVX2, Neon, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, Arm, and PowerPC systems.")
set_license("BSD-3-Clause") set_license("BSD-3-Clause")
add_urls("https://github.com/libjpeg-turbo/libjpeg-turbo/archive/$(version).tar.gz", add_urls("https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/$(version).tar.gz",
"https://github.com/libjpeg-turbo/libjpeg-turbo.git") "https://github.com/libjpeg-turbo/libjpeg-turbo.git")
add_versions("2.0.5", "b3090cd37b5a8b3e4dbd30a1311b3989a894e5d3c668f14cbc6739d77c9402b7") add_versions("2.0.5", "b3090cd37b5a8b3e4dbd30a1311b3989a894e5d3c668f14cbc6739d77c9402b7")
add_versions("2.0.6", "005aee2fcdca252cee42271f7f90574dda64ca6505d9f8b86ae61abc2b426371") add_versions("2.0.6", "005aee2fcdca252cee42271f7f90574dda64ca6505d9f8b86ae61abc2b426371")
@ -15,6 +15,7 @@ package("libjpeg-turbo")
add_versions("2.1.3", "dbda0c685942aa3ea908496592491e5ec8160d2cf1ec9d5fd5470e50768e7859") add_versions("2.1.3", "dbda0c685942aa3ea908496592491e5ec8160d2cf1ec9d5fd5470e50768e7859")
add_versions("2.1.4", "a78b05c0d8427a90eb5b4eb08af25309770c8379592bb0b8a863373128e6143f") add_versions("2.1.4", "a78b05c0d8427a90eb5b4eb08af25309770c8379592bb0b8a863373128e6143f")
add_versions("3.0.1", "5b9bbca2b2a87c6632c821799438d358e27004ab528abf798533c15d50b39f82") add_versions("3.0.1", "5b9bbca2b2a87c6632c821799438d358e27004ab528abf798533c15d50b39f82")
add_versions("3.0.3", "a649205a90e39a548863a3614a9576a3fb4465f8e8e66d54999f127957c25b21")
add_configs("jpeg", {description = "libjpeg API/ABI emulation target version.", default = "6", type = "string", values = {"6", "7", "8"}}) add_configs("jpeg", {description = "libjpeg API/ABI emulation target version.", default = "6", type = "string", values = {"6", "7", "8"}})
@ -29,6 +30,9 @@ package("libjpeg-turbo")
end) end)
on_install("windows", "linux", "macosx", "android", "mingw", function (package) on_install("windows", "linux", "macosx", "android", "mingw", function (package)
io.replace("sharedlib/CMakeLists.txt", "string(REGEX REPLACE \"/MT\" \"/MD\"", "#", {plain = true})
io.replace("sharedlib/CMakeLists.txt", "set(CMAKE_MSVC_RUNTIME_LIBRARY", "#", {plain = true})
io.replace("sharedlib/CMakeLists.txt", "/NODEFAULTLIB:LIBCMT /NODEFAULTLIB:LIBCMTD", "", {plain = true})
if package:is_plat("windows") and not package:config("shared") then if package:is_plat("windows") and not package:config("shared") then
io.replace("release/libjpeg.pc.in", "-ljpeg", "-ljpeg-static", {plain = true}) io.replace("release/libjpeg.pc.in", "-ljpeg", "-ljpeg-static", {plain = true})
io.replace("release/libturbojpeg.pc.in", "-lturbojpeg", "-lturbojpeg-static", {plain = true}) io.replace("release/libturbojpeg.pc.in", "-lturbojpeg", "-lturbojpeg-static", {plain = true})

@ -4,10 +4,11 @@ package("lyra")
set_description("A simple to use, composable, command line parser for C++ 11 and beyond") set_description("A simple to use, composable, command line parser for C++ 11 and beyond")
set_license("BSL-1.0") set_license("BSL-1.0")
add_urls("https://github.com/bfgroup/Lyra/archive/$(version).tar.gz", add_urls("https://github.com/bfgroup/Lyra/archive/refs/tags/$(version).tar.gz",
"https://github.com/bfgroup/Lyra.git") "https://github.com/bfgroup/Lyra.git")
add_versions("1.5.1", "11ccdfc6f776b9a2ebe987d9b4e492981f88f3642546fd1c2e1115741863cae0") add_versions("1.5.1", "11ccdfc6f776b9a2ebe987d9b4e492981f88f3642546fd1c2e1115741863cae0")
add_versions("1.6", "919e92a9c02fea3f365a3a7bdccd8b306311a28a7f2044dac8e7651106d7b644") add_versions("1.6", "919e92a9c02fea3f365a3a7bdccd8b306311a28a7f2044dac8e7651106d7b644")
add_versions("1.6.1", "a93f247ed89eba11ca36eb24c4f8ba7be636bf24e74aaaa8e1066e0954bec7e3")
on_install(function (package) on_install(function (package)
os.cp("include", package:installdir()) os.cp("include", package:installdir())

@ -5,7 +5,7 @@ package("pybind11")
set_description("Seamless operability between C++11 and Python.") set_description("Seamless operability between C++11 and Python.")
set_license("BSD-3-Clause") set_license("BSD-3-Clause")
add_urls("https://github.com/pybind/pybind11/archive/$(version).zip", add_urls("https://github.com/pybind/pybind11/archive/refs/tags/$(version).zip",
"https://github.com/pybind/pybind11.git") "https://github.com/pybind/pybind11.git")
add_versions("v2.5.0", "1859f121837f6c41b0c6223d617b85a63f2f72132bae3135a2aa290582d61520") add_versions("v2.5.0", "1859f121837f6c41b0c6223d617b85a63f2f72132bae3135a2aa290582d61520")
add_versions("v2.6.2", "0bdb5fd9616fcfa20918d043501883bf912502843d5afc5bc7329a8bceb157b3") add_versions("v2.6.2", "0bdb5fd9616fcfa20918d043501883bf912502843d5afc5bc7329a8bceb157b3")
@ -15,9 +15,10 @@ package("pybind11")
add_versions("v2.9.2", "d1646e6f70d8a3acb2ddd85ce1ed543b5dd579c68b8fb8e9638282af20edead8") add_versions("v2.9.2", "d1646e6f70d8a3acb2ddd85ce1ed543b5dd579c68b8fb8e9638282af20edead8")
add_versions("v2.10.0", "225df6e6dea7cea7c5754d4ed954e9ca7c43947b849b3795f87cb56437f1bd19") add_versions("v2.10.0", "225df6e6dea7cea7c5754d4ed954e9ca7c43947b849b3795f87cb56437f1bd19")
add_versions("v2.12.0", "411f77380c43798506b39ec594fc7f2b532a13c4db674fcf2b1ca344efaefb68") add_versions("v2.12.0", "411f77380c43798506b39ec594fc7f2b532a13c4db674fcf2b1ca344efaefb68")
add_versions("v2.13.1", "a3c9ea1225cb731b257f2759a0c12164db8409c207ea5cf851d4b95679dda072")
add_deps("cmake", "python 3.x") add_deps("cmake", "python 3.x")
on_install("windows", "macosx", "linux", function (package) on_install("windows|native", "macosx", "linux", function (package)
import("package.tools.cmake").install(package, {"-DPYBIND11_TEST=OFF"}) import("package.tools.cmake").install(package, {"-DPYBIND11_TEST=OFF"})
end) end)

@ -4,12 +4,13 @@ package("zstd")
set_description("Zstandard - Fast real-time compression algorithm") set_description("Zstandard - Fast real-time compression algorithm")
set_license("BSD-3-Clause") set_license("BSD-3-Clause")
set_urls("https://github.com/facebook/zstd/archive/$(version).tar.gz", set_urls("https://github.com/facebook/zstd/archive/refs/tags/$(version).tar.gz",
"https://github.com/facebook/zstd.git") "https://github.com/facebook/zstd.git")
add_versions("v1.4.5", "734d1f565c42f691f8420c8d06783ad818060fc390dee43ae0a89f86d0a4f8c2") add_versions("v1.4.5", "734d1f565c42f691f8420c8d06783ad818060fc390dee43ae0a89f86d0a4f8c2")
add_versions("v1.5.0", "0d9ade222c64e912d6957b11c923e214e2e010a18f39bec102f572e693ba2867") add_versions("v1.5.0", "0d9ade222c64e912d6957b11c923e214e2e010a18f39bec102f572e693ba2867")
add_versions("v1.5.2", "f7de13462f7a82c29ab865820149e778cbfe01087b3a55b5332707abf9db4a6e") add_versions("v1.5.2", "f7de13462f7a82c29ab865820149e778cbfe01087b3a55b5332707abf9db4a6e")
add_versions("v1.5.5", "98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1") add_versions("v1.5.5", "98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1")
add_versions("v1.5.6", "30f35f71c1203369dc979ecde0400ffea93c27391bfd2ac5a9715d2173d92ff7")
on_load("windows", function (package) on_load("windows", function (package)
if package:config("shared") then if package:config("shared") then

Loading…
Cancel
Save