Prechádzať zdrojové kódy

update some packages (#406)

* update some packages

* fix libjpeg-turbo

* fix pybind11
Hoildkv 4 rokov pred
rodič
commit
6075e90bf7

+ 2 - 1
packages/l/libjpeg-turbo/xmake.lua

@@ -9,6 +9,7 @@ package("libjpeg-turbo")
     add_versions("2.0.5",  "b3090cd37b5a8b3e4dbd30a1311b3989a894e5d3c668f14cbc6739d77c9402b7")
     add_versions("2.0.6",  "005aee2fcdca252cee42271f7f90574dda64ca6505d9f8b86ae61abc2b426371")
     add_versions("2.0.90", "6a965adb02ad898b2ae48214244618fe342baea79db97157fdc70d8844ac6f09")
+    add_versions("2.1.0",  "d6b7790927d658108dfd3bee2f0c66a2924c51ee7f9dc930f62c452f4a638c52")
 
     add_configs("jpeg", {description = "libjpeg API/ABI emulation target version.", default = "6", type = "string", values = {"6", "7", "8"}})
 
@@ -30,7 +31,7 @@ package("libjpeg-turbo")
             table.insert(configs, "-DENABLE_SHARED=OFF")
             table.insert(configs, "-DENABLE_STATIC=ON")
         end
-        if package:config("vs_runtime"):startswith("MD") then
+        if package:is_plat("windows") and package:config("vs_runtime"):startswith("MD") then
             table.insert(configs, "-DWITH_CRT_DLL=ON")
         end
         if package:config("pic") ~= false then

+ 6 - 6
packages/p/pybind11/xmake.lua

@@ -3,15 +3,15 @@ package("pybind11")
     set_homepage("https://github.com/pybind/pybind11")
     set_description("Seamless operability between C++11 and Python.")
 
-    set_urls("https://github.com/pybind/pybind11/archive/v$(version).zip",
+    add_urls("https://github.com/pybind/pybind11/archive/$(version).zip",
              "https://github.com/pybind/pybind11.git")
+    add_versions("v2.5.0", "1859f121837f6c41b0c6223d617b85a63f2f72132bae3135a2aa290582d61520")
+    add_versions("v2.6.2", "0bdb5fd9616fcfa20918d043501883bf912502843d5afc5bc7329a8bceb157b3")
 
-    add_deps("python 3.x")
+    add_deps("cmake", "python 3.x")
 
-    add_versions("2.5.0", "1859f121837f6c41b0c6223d617b85a63f2f72132bae3135a2aa290582d61520")
-
-    on_install(function (package)
-        os.cp("include", package:installdir())
+    on_install("windows", "macosx", "linux", function (package)
+        import("package.tools.cmake").install(package, {"-DPYBIND11_TEST=OFF"})
     end)
 
     on_test(function (package)