Chiebot-Mirror
/
xmake-repo
mirror of https://github.com/xmake-io/xmake-repo.git
8
0
Fork 1
Code Issues Projects Releases Wiki Activity

update some packages (#992)

Browse Source 
* update openblas

* update glad, imath, lvgl, openexr, pegtl

* update lyra, cgal

* update imgui

* fix cgal
pull/995/head
Hoildkv 3 years ago committed by GitHub
parent d71b9ea56e
commit e16a426748
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 23 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      packages/c/cgal/xmake.lua
  2. 1
      packages/g/glad/xmake.lua
  3. 1
      packages/i/imath/xmake.lua
  4. 6
      packages/i/imgui/xmake.lua
  5. 9
      packages/l/lvgl/xmake.lua
  6. 3
      packages/l/lyra/xmake.lua
  7. 3
      packages/o/openblas/xmake.lua
  8. 1
      packages/o/openexr/xmake.lua
  9. 1
      packages/p/pegtl/xmake.lua

5
packages/c/cgal/xmake.lua
Unescape View File

@ -8,6 +8,7 @@ package("cgal")
add_versions("5.1.1", "ceca7ea896505941878f6c1fb7a7ae86653fdd9b3d87b276da72227f173a9cd2")
add_versions("5.2.1", "ccdea67db79153417504f50c534cea3bb6b0e9754e7f32fb753fc19005114db0")
add_versions("5.3", "49ccfb6b72a78d03ab026c6502099ba9358cf604d9d1f51c33e90b314635fe35")
add_versions("5.4", "dbca692666866df5979ef14264570b85a00f21cb77a9f9420ec0823ce8fae473")
add_configs("header_only", {description = "Use header only version.", default = true, type = "boolean"})
@ -33,7 +34,9 @@ package("cgal")
end)
on_install("windows", "macosx", "linux", function (package)
io.gsub("CMakeLists.txt", "install%(DIRECTORY.-%/demo%/.-%/demo%/.-%)", "")
if package:version():le("5.3") then
io.gsub("CMakeLists.txt", "install%(DIRECTORY.-%/demo%/.-%/demo%/.-%)", "")
end
local configs = {"-DBUILD_TESTING=OFF", "-DBUILD_DOC=OFF"}
table.insert(configs, "-DCGAL_HEADER_ONLY=" .. (package:config("header_only") and "ON" or "OFF"))
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))

1
packages/g/glad/xmake.lua
Unescape View File

@ -7,6 +7,7 @@ package("glad")
add_urls("https://github.com/Dav1dde/glad/archive/$(version).tar.gz",
"https://github.com/Dav1dde/glad.git")
add_versions("v0.1.34", "4be2900ff76ac71a2aab7a8be301eb4c0338491c7e205693435b09aad4969ecd")
add_versions("v0.1.36", "8470ed1b0e9fbe88e10c34770505c8a1dc8ccb78cadcf673331aaf5224f963d2")
if is_plat("linux") then
add_syslinks("dl")

1
packages/i/imath/xmake.lua
Unescape View File

@ -10,6 +10,7 @@ package("imath")
add_versions("v3.1.1", "a63fe91d8d0917acdc31b0c9344b1d7dbc74bf42de3e3ef5ec982386324b9ea4")
add_versions("v3.1.2", "f21350efdcc763e23bffd4ded9bbf822e630c15ece6b0697e2fcb42737c08c2d")
add_versions("v3.1.3", "0bf7ec51162c4d17a4c5b850fb3f6f7a195cff9fa71f4da7735f74d7b5124320")
add_versions("v3.1.4", "fcca5fbb37d375a252bacd8a29935569bdc28b888f01ef1d9299ca0c9e87c17a")
on_load(function (package)
if not package.is_built or package:is_built() then

6
packages/i/imgui/xmake.lua
Unescape View File

@ -2,10 +2,11 @@ package("imgui")
set_homepage("https://github.com/ocornut/imgui")
set_description("Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies")
set_license("MIT")
add_urls("https://github.com/ocornut/imgui/archive/$(version).tar.gz",
"https://github.com/ocornut/imgui.git")
add_versions("v1.87", "b54ceb35bda38766e36b87c25edf7a1cd8fd2cb8c485b245aedca6fb85645a20")
add_versions("v1.86", "6ba6ae8425a19bc52c5e067702c48b70e4403cd339cba02073a462730a63e825")
add_versions("v1.85-docking", "dc8c3618e8f8e2dada23daa1aa237626af341fd8")
add_versions("v1.85", "7ed49d1f4573004fa725a70642aaddd3e06bb57fcfe1c1a49ac6574a3e895a77")
@ -55,7 +56,6 @@ package("imgui")
target("imgui")
set_kind("static")
add_files("*.cpp", "backends/imgui_impl_glfw.cpp", "backends/imgui_impl_opengl3.cpp")
add_defines("IMGUI_IMPL_OPENGL_LOADER_GLAD")
add_packages(%s)
add_includedirs(".")
add_headerfiles("*.h", {prefixdir = "imgui"})
@ -63,6 +63,8 @@ package("imgui")
]], pkgs, pkgs)
if package:version():ge("1.84") then
xmake_lua = xmake_lua .. "add_headerfiles(\"backends/imgui_impl_opengl3_loader.h\")\n"
else
xmake_lua = xmake_lua .. "add_defines(\"IMGUI_IMPL_OPENGL_LOADER_GLAD\")\n"
end
else
xmake_lua = [[

9
packages/l/lvgl/xmake.lua
Unescape View File

@ -7,6 +7,7 @@ package("lvgl")
add_urls("https://github.com/lvgl/lvgl/archive/refs/tags/$(version).tar.gz",
"https://github.com/lvgl/lvgl.git")
add_versions("v8.0.2", "7136edd6c968b60f0554130c6903f16870fa26cda11a2290bc86d09d7138a6b4")
add_versions("v8.2.0", "dd1cb1955ded3789c99e2dee7ac367393e87b5870cbce6b88930e378c3e91829")
add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})
add_configs("color_depth", {description = "Set color depth.", default = "32", type = "string", values = {"1", "8", "16", "32"}})
@ -19,13 +20,15 @@ package("lvgl")
io.replace("src/lv_conf.h", "#define LV_BUILD_EXAMPLES -1", "#define LV_BUILD_EXAMPLES 0")
io.replace("src/lv_conf.h", "#define LV_COLOR_DEPTH -16", "#define LV_COLOR_DEPTH " .. package:config("color_depth"))
io.replace("src/lv_conf.h", "#define LV_USE_LOG -0", "#define LV_USE_LOG " .. (package:config("use_log") and "1" or "0"))
io.replace("CMakeLists.txt", "add_library(lvgl STATIC ${SOURCES})", "add_library(lvgl STATIC ${SOURCES})\ninstall(TARGETS lvgl)\ninstall(FILES lvgl.h DESTINATION include)\ninstall(DIRECTORY src DESTINATION include FILES_MATCHING PATTERN \"*.h\")", {plain = true})
io.replace("CMakeLists.txt", "if(ESP_PLATFORM)", "cmake_minimum_required(VERSION 3.15)\nif(ESP_PLATFORM)", {plain = true})
if package:version():le("8.1.0") then
io.replace("CMakeLists.txt", "add_library(lvgl STATIC ${SOURCES})", "add_library(lvgl STATIC ${SOURCES})\ninstall(TARGETS lvgl)\ninstall(FILES lvgl.h DESTINATION include/lvgl)\ninstall(DIRECTORY src DESTINATION include/lvgl FILES_MATCHING PATTERN \"*.h\")", {plain = true})
io.replace("CMakeLists.txt", "if(ESP_PLATFORM)", "cmake_minimum_required(VERSION 3.15)\nif(ESP_PLATFORM)", {plain = true})
end
local configs = {}
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
import("package.tools.cmake").install(package, configs)
end)
on_test(function (package)
assert(package:has_cfuncs("lv_version_info", {includes = "lvgl.h"}))
assert(package:has_cfuncs("lv_version_info", {includes = "lvgl/lvgl.h"}))
end)

3
packages/l/lyra/xmake.lua
Unescape View File

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

3
packages/o/openblas/xmake.lua
Unescape View File

@ -11,11 +11,13 @@ package("openblas")
add_versions("0.3.15", "afc029572a84820596fe81f1faeb909ada5bab27d091285fdd80bc2a8231f4a6")
add_versions("0.3.17", "85b650e6519371b80c1fc10cbaa74af671df9215a53c5d11c64e758396f030ef")
add_versions("0.3.18", "767757039c354b6625c497a856c362546c1b1e7400278ffb40e3b9bf731f3b27")
add_versions("0.3.19", "d85b09d80bbb40442d608fa60353ccec5f112cebeccd805c0e139057e26d1795")
elseif is_arch("x86") then
add_urls("https://github.com/xianyi/OpenBLAS/releases/download/v$(version)/OpenBLAS-$(version)-x86.zip")
add_versions("0.3.15", "bcde933737b477813eaac290de5cb8756d3b42199e8ef5f44b23ae5f06fe0834")
add_versions("0.3.17", "8258a9a22075280fb02b65447ea77d9439a0097711e220fc4ae8f92927f32273")
add_versions("0.3.18", "c24ecd6e5f561de3861bf714b35e0957a27ee0e03ab4d2867d08377892daf66e")
add_versions("0.3.19", "478cbaeb9364b4681a7c982626e637a5a936514a45e12b6f0caddbcb9483b795")
end
add_configs("shared", {description = "Build shared library.", default = true, type = "boolean", readonly = true})
@ -26,6 +28,7 @@ package("openblas")
add_versions("0.3.15", "30a99dec977594b387a17f49904523e6bc8dd88bd247266e83485803759e4bbe")
add_versions("0.3.17", "df2934fa33d04fd84d839ca698280df55c690c86a5a1133b3f7266fce1de279f")
add_versions("0.3.18", "1632c1e8cca62d8bed064b37747e331a1796fc46f688626337362bf0d16aeadb")
add_versions("0.3.19", "947f51bfe50c2a0749304fbe373e00e7637600b0a47b78a51382aeb30ca08562")
add_configs("fortran", {description = "Compile with fortran enabled.", default = is_plat("linux"), type = "boolean"})
add_configs("openmp", {description = "Compile with OpenMP enabled.", default = not is_plat("macosx"), type = "boolean"})

1
packages/o/openexr/xmake.lua
Unescape View File

@ -11,6 +11,7 @@ package("openexr")
add_versions("3.1.0", "8c2ff765368a28e8210af741ddf91506cef40f1ed0f1a08b6b73bb3a7faf8d93")
add_versions("3.1.1", "045254e201c0f87d1d1a4b2b5815c4ae54845af2e6ec0ab88e979b5fdb30a86e")
add_versions("3.1.3", "6f70a624d1321319d8269a911c4032f24950cde52e76f46e9ecbebfcb762f28c")
add_versions("3.1.4", "cb019c3c69ada47fe340f7fa6c8b863ca0515804dc60bdb25c942c1da886930b")
add_deps("cmake")
add_deps("zlib")

1
packages/p/pegtl/xmake.lua
Unescape View File

@ -8,6 +8,7 @@ package("pegtl")
add_urls("https://github.com/taocpp/PEGTL/archive/refs/tags/$(version).tar.gz",
"https://github.com/taocpp/PEGTL.git")
add_versions("3.2.2", "c6616275e78c618c016b79054eed0a0bdf4c1934f830d3ab33d3c3dac7320b03")
add_versions("3.2.5", "4ecefe4151b14684a944dde57e68c98e00224e5fea055c263e1bfbed24a99827")
add_deps("cmake")
on_install("windows", "macosx", "linux", "mingw", function (package)

Write Preview
Loading…
Cancel
Save