Browse Source

Update freetype and use cmake on Linux/macosx (#1367)

* Update freetype and use cmake on Linux/macosx

* Temporary enable all platforms
Jérôme Leclercq 3 years ago
parent
commit
57aa0bef60
1 changed files with 3 additions and 25 deletions
  1. 3 25
      packages/f/freetype/xmake.lua

+ 3 - 25
packages/f/freetype/xmake.lua

@@ -6,6 +6,7 @@ package("freetype")
     set_urls("https://downloads.sourceforge.net/project/freetype/freetype2/$(version)/freetype-$(version).tar.gz",
              "https://download.savannah.gnu.org/releases/freetype/freetype-$(version).tar.gz",
              "https://gitlab.freedesktop.org/freetype/freetype.git")
+    add_versions("2.12.1", "efe71fd4b8246f1b0b1b9bfca13cfff1c9ad85930340c27df469733bbb620938")
     add_versions("2.11.1", "f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b")
     add_versions("2.11.0", "a45c6b403413abd5706f3582f04c8339d26397c4304b78fa552f2215df64101f")
     add_versions("2.10.4", "5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac")
@@ -30,11 +31,7 @@ package("freetype")
     add_configs("woff2", {description = "Use Brotli library to support decompressing WOFF2 fonts", default = false, type = "boolean"})
     add_configs("zlib", {description = "Support reading gzip-compressed font files", default = false, type = "boolean"})
 
-    if is_plat("windows", "mingw") then
-        add_deps("cmake")
-    else
-        add_deps("pkg-config")
-    end
+    add_deps("cmake")
 
     add_includedirs("include/freetype2")
 
@@ -51,7 +48,7 @@ package("freetype")
         add_dep("woff2", "brotli")
     end)
 
-    on_install("windows", "mingw", function (package)
+    on_install(function (package)
         local configs = {"-DCMAKE_INSTALL_LIBDIR=lib"}
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
@@ -81,25 +78,6 @@ package("freetype")
         import("package.tools.cmake").install(package, configs)
     end)
 
-    on_install("linux", "macosx", function (package)
-        io.gsub("builds/unix/configure", "libbrotlidec", "brotli")
-        local configs = { "--enable-freetype-config",
-                          "--without-harfbuzz"}
-        table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
-        table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
-        local function add_dep(conf, name)
-            table.insert(configs, "--with-" .. (name or conf) .. "=" .. (package:config(conf) and "yes" or "no"))
-        end
-        add_dep("bzip2")
-        add_dep("png")
-        add_dep("woff2", "brotli")
-        add_dep("zlib")
-        if package:config("pic") ~= false then
-            table.insert(configs, "--with-pic")
-        end
-        import("package.tools.autoconf").install(package, configs)
-    end)
-
     on_test(function (package)
         assert(package:has_cfuncs("FT_Init_FreeType", {includes = {"ft2build.h", "freetype/freetype.h"}}))
     end)