improve a batch of x.org libraries (#984)

* improve a batch of x.org libraries

* update pcl

* improve libcurl

packages/l/libcurl/xmake.lua

@@ -82,7 +82,6 @@ package("libcurl")
     on_install("macosx", "linux", "iphoneos", "mingw@macosx", "cross", function (package)
         local configs = {"--disable-silent-rules",
                          "--disable-dependency-tracking",
-                         "--without-ca-bundle",
                          "--without-hyper",
                          "--without-libpsl",
                          "--without-libgsasl",

packages/l/libx11/xmake.lua

@@ -3,16 +3,20 @@ package("libx11")
     set_homepage("https://www.x.org/")
     set_description("X.Org: Core X11 protocol client library")
 
-    set_urls("https://www.x.org/archive/individual/lib/libX11-$(version).tar.bz2")
-    add_versions("1.6.9", "9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1")
-    add_versions("1.7.0", "36c8f93b6595437c8cfbc9f08618bcb3041cbd303e140a0013f88e4c2977cb54")
+    set_urls("https://www.x.org/archive/individual/lib/libX11-$(version).tar.gz")
+    add_versions("1.6.9", "b8c0930a9b25de15f3d773288cacd5e2f0a4158e194935615c52aeceafd1107b")
+    add_versions("1.7.0", "c48ec61785ec68fc6a9a6aca0a9578393414fe2562e3cc9cca30234345c7b6ac")
+    add_versions("1.7.3", "029acf61e7e760a3150716b145a58ce5052ee953e8cccc8441d4f550c420debb")
 
     if is_plat("linux") then
+        add_syslinks("dl")
         add_extsources("apt::libx11-dev", "pacman::libx11")
     elseif is_plat("macosx") then
         add_extsources("brew::libx11")
     end
 
+    add_configs("shared", {description = "Build shared library.", default = true, type = "boolean"})
+
     if is_plat("macosx", "linux") then
         add_deps("pkg-config", "util-macros", "xtrans", "libxcb", "xorgproto")
     end
@@ -33,6 +37,11 @@ package("libx11")
                          "--enable-loadable-i18n",
                          "--enable-xthreads",
                          "--enable-specs=no"}
+        table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
+        table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
+        if package:config("pic") then
+            table.insert(configs, "--with-pic")
+        end
         import("package.tools.autoconf").install(package, configs)
     end)
 

packages/l/libxau/xmake.lua

@@ -19,6 +19,11 @@ package("libxau")
                          "--localstatedir=" .. package:installdir("var"),
                          "--disable-dependency-tracking",
                          "--disable-silent-rules"}
+        table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
+        table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
+        if package:config("pic") then
+            table.insert(configs, "--with-pic")
+        end
         import("package.tools.autoconf").install(package, configs)
     end)
 

packages/l/libxcursor/xmake.lua

@@ -19,6 +19,11 @@ package("libxcursor")
                          "--localstatedir=" .. package:installdir("var"),
                          "--disable-dependency-tracking",
                          "--disable-silent-rules"}
+        table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
+        table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
+        if package:config("pic") then
+            table.insert(configs, "--with-pic")
+        end
         import("package.tools.autoconf").install(package, configs)
     end)
 

packages/l/libxdamage/xmake.lua

@@ -19,6 +19,11 @@ package("libxdamage")
                          "--localstatedir=" .. package:installdir("var"),
                          "--disable-dependency-tracking",
                          "--disable-silent-rules"}
+        table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
+        table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
+        if package:config("pic") then
+            table.insert(configs, "--with-pic")
+        end
         import("package.tools.autoconf").install(package, configs)
     end)
 

packages/l/libxdmcp/xmake.lua

@@ -20,6 +20,11 @@ package("libxdmcp")
                          "--disable-dependency-tracking",
                          "--disable-silent-rules",
                          "--enable-docs=no"}
+        table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
+        table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
+        if package:config("pic") then
+            table.insert(configs, "--with-pic")
+        end
         import("package.tools.autoconf").install(package, configs)
     end)
 

packages/l/libxext/xmake.lua

@@ -20,6 +20,11 @@ package("libxext")
                          "--disable-dependency-tracking",
                          "--disable-silent-rules",
                          "--enable-specs=no"}
+        table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
+        table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
+        if package:config("pic") then
+            table.insert(configs, "--with-pic")
+        end
         import("package.tools.autoconf").install(package, configs)
     end)
 

packages/l/libxfixes/xmake.lua

@@ -19,6 +19,11 @@ package("libxfixes")
                          "--localstatedir=" .. package:installdir("var"),
                          "--disable-dependency-tracking",
                          "--disable-silent-rules"}
+        table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
+        table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
+        if package:config("pic") then
+            table.insert(configs, "--with-pic")
+        end
         import("package.tools.autoconf").install(package, configs)
     end)
 

packages/l/libxft/xmake.lua

@@ -20,6 +20,11 @@ package("libxft")
                          "--localstatedir=" .. package:installdir("var"),
                          "--disable-dependency-tracking",
                          "--disable-silent-rules"}
+        table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
+        table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
+        if package:config("pic") then
+            table.insert(configs, "--with-pic")
+        end
         import("package.tools.autoconf").install(package, configs)
     end)
 

packages/l/libxi/xmake.lua

@@ -5,6 +5,7 @@ package("libxi")
 
     set_urls("https://www.x.org/archive/individual/lib/libXi-$(version).tar.bz2")
     add_versions("1.7.10", "36a30d8f6383a72e7ce060298b4b181fd298bc3a135c8e201b7ca847f5f81061")
+    add_versions("1.8", "2ed181446a61c7337576467870bc5336fc9e222a281122d96c4d39a3298bba00")
 
     if is_plat("linux") then
         add_extsources("apt::libxi-dev")
@@ -21,6 +22,11 @@ package("libxi")
                          "--disable-silent-rules",
                          "--enable-docs=no",
                          "--enable-specs=no"}
+        table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
+        table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
+        if package:config("pic") then
+            table.insert(configs, "--with-pic")
+        end
         import("package.tools.autoconf").install(package, configs)
     end)
 

packages/l/libxinerama/xmake.lua

@@ -19,6 +19,11 @@ package("libxinerama")
                          "--localstatedir=" .. package:installdir("var"),
                          "--disable-dependency-tracking",
                          "--disable-silent-rules"}
+        table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
+        table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
+        if package:config("pic") then
+            table.insert(configs, "--with-pic")
+        end
         import("package.tools.autoconf").install(package, configs)
     end)
 

packages/l/libxkbcommon/xmake.lua

@@ -30,13 +30,12 @@ package("libxkbcommon")
     on_install("linux", function (package)
         package:addenv("PATH", "bin")
         local configs = {
-          "-Denable-docs=false", 
-          "-Dc_link_args=-lm", 
-          "-Dxkb-config-root=/usr/share/X11/xkb", 
-          "-Dx-locale-root=/usr/share/X11/locale", 
-          "--libdir=lib",
-          format("-Denable-x11=%s", package:config("x11")),
-          format("-Denable-wayland=%s", package:config("wayland")),
+            "-Denable-docs=false",
+            "-Dc_link_args=-lm",
+            "-Dxkb-config-root=/usr/share/X11/xkb",
+            "-Dx-locale-root=/usr/share/X11/locale",
+            format("-Denable-x11=%s", package:config("x11")),
+            format("-Denable-wayland=%s", package:config("wayland"))
         }
 
         import("package.tools.meson").install(package, configs)

packages/l/libxmu/xmake.lua

@@ -13,7 +13,16 @@ package("libxmu")
     add_deps("libxt", "libxext")
 
     on_install("macosx", "linux", function (package)
-        import("package.tools.autoconf").install(package)
+        local configs = {"--sysconfdir=" .. package:installdir("etc"),
+                         "--localstatedir=" .. package:installdir("var"),
+                         "--disable-dependency-tracking",
+                         "--disable-silent-rules"}
+        table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
+        table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
+        if package:config("pic") then
+            table.insert(configs, "--with-pic")
+        end
+        import("package.tools.autoconf").install(package, configs)
     end)
 
     on_test(function (package)

packages/l/libxpm/xmake.lua

@@ -11,9 +11,17 @@ package("libxpm")
     end
 
     add_deps("libx11", "xorgproto", "gettext")
-
     on_install("macosx", "linux", function (package)
-        import("package.tools.autoconf").install(package)
+        local configs = {"--sysconfdir=" .. package:installdir("etc"),
+                         "--localstatedir=" .. package:installdir("var"),
+                         "--disable-dependency-tracking",
+                         "--disable-silent-rules"}
+        table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
+        table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
+        if package:config("pic") then
+            table.insert(configs, "--with-pic")
+        end
+        import("package.tools.autoconf").install(package, configs)
     end)
 
     on_test(function (package)

packages/l/libxrandr/xmake.lua

@@ -19,6 +19,11 @@ package("libxrandr")
                          "--localstatedir=" .. package:installdir("var"),
                          "--disable-dependency-tracking",
                          "--disable-silent-rules"}
+        table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
+        table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
+        if package:config("pic") then
+            table.insert(configs, "--with-pic")
+        end
         import("package.tools.autoconf").install(package, configs)
     end)
 

packages/l/libxrender/xmake.lua

@@ -19,6 +19,11 @@ package("libxrender")
                          "--localstatedir=" .. package:installdir("var"),
                          "--disable-dependency-tracking",
                          "--disable-silent-rules"}
+        table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
+        table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
+        if package:config("pic") then
+            table.insert(configs, "--with-pic")
+        end
         import("package.tools.autoconf").install(package, configs)
     end)
 

packages/l/libxt/xmake.lua

@@ -13,7 +13,16 @@ package("libxt")
     add_deps("libx11", "libsm")
 
     on_install("macosx", "linux", function (package)
-        import("package.tools.autoconf").install(package)
+        local configs = {"--sysconfdir=" .. package:installdir("etc"),
+                         "--localstatedir=" .. package:installdir("var"),
+                         "--disable-dependency-tracking",
+                         "--disable-silent-rules"}
+        table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
+        table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
+        if package:config("pic") then
+            table.insert(configs, "--with-pic")
+        end
+        import("package.tools.autoconf").install(package, configs)
     end)
 
     on_test(function (package)

packages/p/pcl/xmake.lua

@@ -7,6 +7,7 @@ package("pcl")
     add_urls("https://github.com/PointCloudLibrary/pcl/archive/refs/tags/pcl-$(version).tar.gz",
              "https://github.com/PointCloudLibrary/pcl.git")
     add_versions("1.12.0", "21dfa9a268de9675c1f94d54d9402e4e02120a0aa4215d064436c52b7d5bd48f")
+    add_versions("1.12.1", "dc0ac26f094eafa7b26c3653838494cc0a012bd1bdc1f1b0dc79b16c2de0125a")
 
     add_configs("vtk", {description = "Build with vtk.", default = false, type = "boolean"})
     add_configs("cuda", {description = "Build with cuda.", default = false, type = "boolean"})
@@ -26,11 +27,13 @@ package("pcl")
     end)
 
     on_install("windows", "linux", "macosx", function (package)
-        io.replace("CMakeLists.txt", "add_compile_options(/bigobj)", "add_compile_options(/bigobj)\nadd_compile_options(/EHsc)", {plain = true})
+        io.replace("CMakeLists.txt", "set(CMAKE_CXX_FLAGS_DEFAULT \"/DWIN32 /D_WINDOWS /W3 /GR /EHsc\")", "set(CMAKE_CXX_FLAGS_DEFAULT \" /DWIN32 /D_WINDOWS /W3 /GR /EHsc\")\nstring(APPEND CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS_DEFAULT})", {plain = true})
         io.replace("CMakeLists.txt", "find_package%(FLANN 1.- REQUIRED%)", "find_package(flann CONFIG REQUIRED)")
-        io.replace("cmake/pcl_options.cmake", "set(CMAKE_FIND_LIBRARY_SUFFIXES", "#set(CMAKE_FIND_LIBRARY_SUFFIXES", {plain = true})
+        if package:version():le("1.12.0") then
+            io.replace("cmake/pcl_options.cmake", "set(CMAKE_FIND_LIBRARY_SUFFIXES", "#set(CMAKE_FIND_LIBRARY_SUFFIXES", {plain = true})
+        end
 
-        local configs = {"-DWITH_OPENGL=OFF", "-DWITH_PCAP=OFF", "-DWITH_QT=OFF", "-DBoost_USE_STATIC_LIBS=ON"}
+        local configs = {"-DWITH_OPENGL=OFF", "-DWITH_PCAP=OFF", "-DWITH_QT=OFF", "-DBoost_USE_STATIC_LIBS=ON", "-DPCL_ALLOW_BOTH_SHARED_AND_STATIC_DEPENDENCIES=ON"}
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DPCL_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
         table.insert(configs, "-DWITH_VTK=" .. (package:config("vtk") and "ON" or "OFF"))

packages/x/xorgproto/xmake.lua

@@ -1,11 +1,13 @@
 package("xorgproto")
 
+    set_kind("library", {headeronly = true})
     set_homepage("https://www.x.org/")
     set_description("X.Org: Protocol Headers")
 
     set_urls("https://xorg.freedesktop.org/archive/individual/proto/xorgproto-$(version).tar.bz2")
     add_versions("2019.2", "46ecd0156c561d41e8aa87ce79340910cdf38373b759e737fcbba5df508e7b8e")
     add_versions("2021.3", "4c732b14fc7c7db64306374d9e8386d6172edbb93f587614df1938b9d9b9d737")
+    add_versions("2021.5", "aa2f663b8dbd632960b24f7477aa07d901210057f6ab1a1db5158732569ca015")
 
     if is_plat("linux") then
         add_extsources("apt::x11proto-dev", "pkgconfig::xproto")