Explorar o código

add libpaper (#621)

* fix magnum-integration with imgui

* add libpaper

* improve libpaper
Hoildkv %!s(int64=4) %!d(string=hai) anos
pai
achega
2b1cb74b28

+ 3 - 0
packages/i/imgui/xmake.lua

@@ -5,6 +5,7 @@ package("imgui")
 
     add_urls("https://github.com/ocornut/imgui/archive/$(version).tar.gz",
              "https://github.com/ocornut/imgui.git")
+    add_versions("v1.84.2", "35cb5ca0fb42cb77604d4f908553f6ef3346ceec4fcd0189675bdfb764f62b9b")
     add_versions("v1.84.1", "292ab54cfc328c80d63a3315a242a4785d7c1cf7689fbb3d70da39b34db071ea")
     add_versions("v1.83-docking", "80b5fb51edba2fd3dea76ec3e88153e2492243d1")
     add_versions("v1.83", "ccf3e54b8d1fa30dd35682fc4f50f5d2fe340b8e29e08de71287d0452d8cc3ff")
@@ -45,6 +46,7 @@ package("imgui")
             end
             xmake_lua = format([[
                 add_rules("mode.debug", "mode.release")
+                add_rules("utils.install.cmake_importfiles")
                 add_requires(%s)
                 target("imgui")
                     set_kind("static")
@@ -61,6 +63,7 @@ package("imgui")
         else
             xmake_lua = [[
                 add_rules("mode.debug", "mode.release")
+                add_rules("utils.install.cmake_importfiles")
                 target("imgui")
                     set_kind("static")
                     add_files("*.cpp")

+ 32 - 0
packages/l/libpaper/xmake.lua

@@ -0,0 +1,32 @@
+package("libpaper")
+
+    set_homepage("https://packages.debian.org/unstable/libs/libpaper1")
+    set_description("library for handling paper characteristics")
+    set_license("GPL-2.0")
+
+    add_urls("http://deb.debian.org/debian/pool/main/libp/libpaper/libpaper_$(version).tar.gz")
+    add_versions("1.1.28", "c8bb946ec93d3c2c72bbb1d7257e90172a22a44a07a07fb6b802a5bb2c95fddc")
+
+    if is_plat("linux") then
+        add_extsources("apt::libpaper-dev")
+    end
+    add_deps("automake", "autoconf", "libtool")
+    on_install("macosx", "linux", function (package)
+        local configs = {}
+        table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
+        table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
+        if package:config("pic") ~= false then
+            table.insert(configs, "--with-pic")
+        end
+        local libtool = package:dep("libtool")
+        if libtool then
+            os.vrunv("autoreconf", {"--install", "-I" .. libtool:installdir("share", "aclocal")})
+        else
+            os.vrunv("autoreconf", {"--install"})
+        end
+        import("package.tools.autoconf").install(package, configs)
+    end)
+
+    on_test(function (package)
+        assert(package:has_cfuncs("paperinfo", {includes = "paper.h"}))
+    end)

+ 1 - 1
packages/m/magnum-integration/xmake.lua

@@ -8,7 +8,7 @@ package("magnum-integration")
              "https://github.com/mosra/magnum-integration.git")
     add_versions("v2020.06", "8e5d7ffc9df300eb9fac9cff24e74d40f9a13f5e952bd3185fb002d4d6ac38ed")
 
-    local intergrations = {"bullet", "dart", "eigen", "glm", "imgui", "ovr"}
+    local integrations = {"bullet", "dart", "eigen", "glm", "imgui", "ovr"}
     for _, integration in ipairs(integrations) do
         add_configs(integration, {description = "Build " .. integration .. " integration library.", default = false, type = "boolean"})
     end