update fribidi, meson and ninja (#1240)

* update fribidi

* update meson and ninja

* improve cairo and pixman

packages/c/cairo/patches/2021.10.07/macosx.patch

@@ -1,39 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 3c261d0ff..5f98981e9 100644
---- a/meson.build
-+++ b/meson.build
-@@ -192,6 +192,9 @@ test_deps = []
- internal_deps = []
- extra_link_args = []
- 
-+thread_dep = dependency('threads')
-+deps += [thread_dep]
-+
- if host_machine.endian() == 'big'
-   conf.set('WORDS_BIGENDIAN', 1)
- endif
-diff --git a/util/cairo-script/meson.build b/util/cairo-script/meson.build
-index 653c19d33..9f90bc8b5 100644
---- a/util/cairo-script/meson.build
-+++ b/util/cairo-script/meson.build
-@@ -46,17 +46,20 @@ pkgmod.generate(libcairoscript,
- meson.override_dependency('cairo-script-interpreter', libcairoscript_dep)
- 
- csi_replay_exe = executable('csi-replay', csi_replay_sources,
-+  c_args: pthread_c_args,
-   include_directories: [incbase],
-   dependencies: deps + [libcairo_dep, libcairoscript_dep],
- )
- 
- csi_exec_exe = executable('csi-exec', csi_exec_sources,
-+  c_args: pthread_c_args,
-   include_directories: [incbase],
-   dependencies: deps + [libcairo_dep, libcairoscript_dep],
- )
- 
- if feature_conf.get('CAIRO_HAS_SCRIPT_SURFACE', 0) == 1 and conf.get('HAVE_LIBGEN_H', 0) == 1
-   csi_trace_exe = executable('csi-trace', csi_trace_sources,
-+    c_args: pthread_c_args,
-     include_directories: [incbase],
-     dependencies: deps + [libcairo_dep, libcairoscript_dep],
-   )

packages/c/cairo/xmake.lua

@@ -3,26 +3,25 @@ package("cairo")
     set_homepage("https://cairographics.org/")
     set_description("Vector graphics library with cross-device output support.")
 
-    add_urls("https://gitlab.freedesktop.org/cairo/cairo/-/archive/a04786b9330109ce54bf7f65c7068281419cec6a/cairo-a04786b9330109ce54bf7f65c7068281419cec6a.tar.gz")
-    add_versions("2021.10.07", "8fc7e374a2de1d975171b58c7d43e4d430a28da082c0536ad6e2b178a9863d03")
+    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_deps("meson", "ninja")
-    add_deps("libpng", "pixman", "zlib", "freetype", "expat", "glib")
+    add_deps("libpng", "pixman", "zlib", "freetype", "glib")
     if is_plat("windows") then
         add_deps("pkgconf")
     end
 
     add_includedirs("include", "include/cairo")
 
-    add_patches("2021.10.07", path.join(os.scriptdir(), "patches", "2021.10.07", "macosx.patch"), "8f47e272eb9112e0592b2fcf816fe225c6540a9298dbddc38543ae2fc9fe4e6d")
-
     if is_plat("linux", "macosx") then
         add_syslinks("pthread")
         add_deps("fontconfig")
     end
 
     if is_plat("windows") then
-        add_syslinks("gdi32", "msimg32", "user32")
+        add_syslinks("gdi32", "msimg32", "user32", "ole32")
     elseif is_plat("macosx") then
         add_frameworks("CoreGraphics", "CoreFoundation", "Foundation")
     end
@@ -34,11 +33,18 @@ package("cairo")
     end)
 
     on_install("windows", "macosx", "linux", function (package)
+        import("package.tools.meson")
+
         local configs = {
+            "--wrap-mode=nopromote",
             "-Dtests=disabled",
             "-Dgtk_doc=false",
             "-Dfreetype=enabled",
-            "-Dgtk2-utils=disabled"}
+            "-Dgtk2-utils=disabled",
+            "-Dpng=enabled",
+            "-Dzlib=enabled",
+            "-Dglib=enabled"
+        }
         if package:is_plat("macosx") or package:is_plat("linux") then
             table.insert(configs, "-Dfontconfig=enabled")
         else
@@ -48,11 +54,13 @@ package("cairo")
         table.insert(configs, "-Ddefault_library=" .. (package:config("shared") and "shared" or "static"))
         io.replace("meson.build", "subdir('fuzzing')", "", {plain = true})
         io.replace("meson.build", "subdir('docs')", "", {plain = true})
-        io.replace("meson.build", "fallback: ['fontconfig', 'fontconfig_dep'],", "", {plain = true})
-        io.replace("meson.build", "'CoreFoundation'", "'CoreFoundation', 'Foundation'", {plain = true})
         io.replace("meson.build", "subdir('util')", "", {plain = true})
-
-        import("package.tools.meson").install(package, configs)
+        io.replace("meson.build", "'CoreFoundation'", "'CoreFoundation', 'Foundation'", {plain = true})
+        local envs = meson.buildenvs(package)
+        if package:is_plat("windows") then
+            envs.PATH = package:dep("pkgconf"):installdir("bin") .. path.envsep() .. envs.PATH
+        end
+        meson.install(package, configs, {envs = envs})
     end)
 
     on_test(function (package)

packages/f/fribidi/xmake.lua

@@ -7,6 +7,7 @@ package("fribidi")
     add_urls("https://github.com/fribidi/fribidi/releases/download/v$(version)/fribidi-$(version).tar.xz")
     add_versions("1.0.10", "7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01")
     add_versions("1.0.11", "30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d")
+    add_versions("1.0.12", "0cd233f97fc8c67bb3ac27ce8440def5d3ffacf516765b91c2cc654498293495")
 
     if is_plat("windows") then
         add_deps("meson", "ninja")

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("0.62.1", "a0f5caa1e70da12d5e63aa6a9504273759b891af36c8d87de381a4ed1380e845")
     add_versions("0.61.2", "0233a7f8d959079318f6052b0939c27f68a5de86ba601f25c9ee6869fb5f5889")
     add_versions("0.60.1", "5add789c953d984b500858b2851ee3d7add0460cf1a6f852f0a721af17384e13")
     add_versions("0.59.2", "13dee549a7ba758b7e33ce7719f28d1d337a98d10d378a4779ccc996f5a2fc49")

packages/n/ninja/xmake.lua

@@ -9,17 +9,20 @@ package("ninja")
         add_versions("1.9.0", "2d70010633ddaacc3af4ffbd21e22fae90d158674a09e132e06424ba3ab036e9")
         add_versions("1.10.1", "5d1211ea003ec9760ad7f5d313ebf0b659d4ffafa221187d2b4444bc03714a33")
         add_versions("1.10.2", "bbde850d247d2737c5764c927d1071cbb1f1957dcabda4a130fa8547c12c695f")
+        add_versions("1.11.0", "d0ee3da143211aa447e750085876c9b9d7bcdd637ab5b2c5b41349c617f22f3b")
     elseif is_host("macosx") then
         set_urls("https://github.com/ninja-build/ninja/releases/download/v$(version)/ninja-mac.zip")
         add_versions("1.9.0", "26d32a79f786cca1004750f59e545199bf110e21e300d3c2424c1fddd78f28ab")
         add_versions("1.10.1", "0bd650190d4405c15894055e349d9b59d5690b0389551d757c5ed2d3841972d1")
         add_versions("1.10.2", "6fa359f491fac7e5185273c6421a000eea6a2f0febf0ac03ac900bd4d80ed2a5")
+        add_versions("1.11.0", "21915277db59756bfc61f6f281c1f5e3897760b63776fd3d360f77dd7364137f")
     elseif is_host("linux") then
         add_urls("https://github.com/ninja-build/ninja/archive/v$(version).tar.gz",
                  "https://github.com/ninja-build/ninja.git")
         add_versions("1.9.0", "5d7ec75828f8d3fd1a0c2f31b5b0cea780cdfe1031359228c428c1a48bfcd5b9")
         add_versions("1.10.1", "a6b6f7ac360d4aabd54e299cc1d8fa7b234cd81b9401693da21221c62569a23e")
         add_versions("1.10.2", "ce35865411f0490368a8fc383f29071de6690cbadc27704734978221f25e2bed")
+        add_versions("1.11.0", "3c6ba2e66400fe3f1ae83deb4b235faf3137ec20bd5b08c29bfc368db143e4c6")
     end
 
     on_load("linux", function (package)

packages/p/pixman/xmake.lua

@@ -3,8 +3,9 @@ package("pixman")
     set_homepage("https://cairographics.org/")
     set_description("Low-level library for pixel manipulation.")
 
-    add_urls("https://gitlab.freedesktop.org/pixman/pixman/-/archive/eadb82866b0f6a326a61c36f60e5c2be8f7479af/pixman-eadb82866b0f6a326a61c36f60e5c2be8f7479af.tar.gz")
-    add_versions("2021.12.17", "6dba7bc2d921082aa3bb4922fd19e6ce43d2ba8990549d1ea1596bec41d4461c")
+    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_deps("meson", "ninja")
 
@@ -12,12 +13,14 @@ package("pixman")
 
     on_install("macosx", "linux", "windows", function (package)
         local configs = {
-            "-Dtests=disabled",
             "-Dopenmp=disabled",
             "-Dlibpng=disabled",
-            "-Dgtk=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})
         import("package.tools.meson").install(package, configs)
     end)