Bladeren bron

update cairo (#1779)

* update cairo

* update pixman

* update meson
Hoildkv 2 jaren geleden
bovenliggende
commit
2922be0fa2
3 gewijzigde bestanden met toevoegingen van 6 en 4 verwijderingen
  1. 3 2
      packages/c/cairo/xmake.lua
  2. 1 0
      packages/m/meson/xmake.lua
  3. 2 2
      packages/p/pixman/xmake.lua

+ 3 - 2
packages/c/cairo/xmake.lua

@@ -6,6 +6,7 @@ package("cairo")
     add_urls("https://gitlab.freedesktop.org/cairo/cairo/-/archive/$(version)/cairo-$(version).tar.gz")
     add_urls("https://gitlab.freedesktop.org/cairo/cairo.git")
     add_versions("1.17.6", "a2227afc15e616657341c42af9830c937c3a6bfa63661074eabef13600e8936f")
+    add_versions("1.17.8", "b4ed6d33037171d4c6594345b42d81796f335a6995fdf5638db0d306c17a0d3e")
 
     add_deps("meson", "ninja")
     add_deps("libpng", "pixman", "zlib", "freetype", "glib")
@@ -23,7 +24,7 @@ package("cairo")
     if is_plat("windows") then
         add_syslinks("gdi32", "msimg32", "user32", "ole32")
     elseif is_plat("macosx") then
-        add_frameworks("CoreGraphics", "CoreFoundation", "Foundation")
+        add_frameworks("CoreGraphics", "CoreFoundation", "CoreText", "Foundation")
     end
 
     on_load("windows", function (package)
@@ -32,7 +33,7 @@ package("cairo")
         end
     end)
 
-    on_install("windows", "macosx", "linux", function (package)
+    on_install("windows|x64", "windows|x86", "macosx", "linux", function (package)
         import("package.tools.meson")
 
         local configs = {

+ 1 - 0
packages/m/meson/xmake.lua

@@ -7,6 +7,7 @@ package("meson")
 
     add_urls("https://github.com/mesonbuild/meson/releases/download/$(version)/meson-$(version).tar.gz",
              "https://github.com/mesonbuild/meson.git")
+    add_versions("1.0.0", "aa50a4ba4557c25e7d48446abfde857957dcdf58385fffbe670ba0e8efacce05")
     add_versions("0.62.1", "a0f5caa1e70da12d5e63aa6a9504273759b891af36c8d87de381a4ed1380e845")
     add_versions("0.61.2", "0233a7f8d959079318f6052b0939c27f68a5de86ba601f25c9ee6869fb5f5889")
     add_versions("0.60.1", "5add789c953d984b500858b2851ee3d7add0460cf1a6f852f0a721af17384e13")

+ 2 - 2
packages/p/pixman/xmake.lua

@@ -6,18 +6,18 @@ package("pixman")
     add_urls("https://cairographics.org/releases/pixman-$(version).tar.gz")
     add_urls("https://gitlab.freedesktop.org/pixman/pixman.git")
     add_versions("0.40.0", "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc")
+    add_versions("0.42.2", "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e")
 
     add_deps("meson", "ninja")
 
     add_includedirs("include", "include/pixman-1")
 
-    on_install("macosx", "linux", "windows", function (package)
+    on_install("macosx", "linux", "windows|x64", "windows|x86", function (package)
         local configs = {
             "-Dopenmp=disabled",
             "-Dlibpng=disabled",
             "-Dgtk=disabled"
         }
-        table.insert(configs, "-Ddebug=" .. (package:debug() and "true" or "false"))
         table.insert(configs, "-Ddefault_library=" .. (package:config("shared") and "shared" or "static"))
         io.replace("meson.build", "subdir('test')", "", {plain = true})
         io.replace("meson.build", "subdir('demos')", "", {plain = true})