From e87effa464611cecf28dfced70cbe491a08fe99d Mon Sep 17 00:00:00 2001
From: Hoildkv <42310255+xq114@users.noreply.github.com>
Date: Tue, 17 Aug 2021 16:33:28 +0800
Subject: [PATCH] add extsources to some x.org libs (#573)

* add extsources to some x.org libs

* fix fontconfig

* revert version
---
 packages/f/fontconfig/xmake.lua   | 1 +
 packages/l/libffi/xmake.lua       | 4 ++++
 packages/l/libxau/xmake.lua       | 4 ++++
 packages/l/libxcb/xmake.lua       | 4 ++++
 packages/l/libxcursor/xmake.lua   | 4 ++++
 packages/l/libxdamage/xmake.lua   | 4 ++++
 packages/l/libxdmcp/xmake.lua     | 4 ++++
 packages/l/libxext/xmake.lua      | 4 ++++
 packages/l/libxfixes/xmake.lua    | 4 ++++
 packages/l/libxft/xmake.lua       | 4 ++++
 packages/l/libxi/xmake.lua        | 4 ++++
 packages/l/libxinerama/xmake.lua  | 4 ++++
 packages/l/libxkbcommon/xmake.lua | 4 ++++
 packages/l/libxmu/xmake.lua       | 4 ++++
 packages/l/libxpm/xmake.lua       | 4 ++++
 packages/l/libxrandr/xmake.lua    | 4 ++++
 packages/l/libxrender/xmake.lua   | 4 ++++
 packages/l/libxshmfence/xmake.lua | 4 ++++
 packages/l/libxt/xmake.lua        | 4 ++++
 packages/l/libxtst/xmake.lua      | 4 ++++
 packages/l/libxv/xmake.lua        | 4 ++++
 packages/l/libxvmc/xmake.lua      | 4 ++++
 packages/l/libxxf86vm/xmake.lua   | 4 ++++
 packages/w/wayland/xmake.lua      | 4 ++++
 packages/x/xorgproto/xmake.lua    | 4 ++++
 packages/x/xtrans/xmake.lua       | 4 ++++
 26 files changed, 101 insertions(+)

diff --git a/packages/f/fontconfig/xmake.lua b/packages/f/fontconfig/xmake.lua
index 5d7fef14f..0ded471e1 100644
--- a/packages/f/fontconfig/xmake.lua
+++ b/packages/f/fontconfig/xmake.lua
@@ -8,6 +8,7 @@ package("fontconfig")
     add_versions("2.13.93", "0f302a18ee52dde0793fe38b266bf269dfe6e0c0ae140e30d72c6cca5dc08db5")
 
     add_deps("pkg-config", "freetype >=2.9", "expat")
+    add_deps("python 3.x", {kind = "binary"})
     if is_plat("macosx") then
         add_deps("gettext")
     else
diff --git a/packages/l/libffi/xmake.lua b/packages/l/libffi/xmake.lua
index d821e03bf..3655c60cf 100644
--- a/packages/l/libffi/xmake.lua
+++ b/packages/l/libffi/xmake.lua
@@ -9,6 +9,10 @@ package("libffi")
     add_versions("3.2.1", "d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37")
     add_versions("3.3", "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056")
 
+    if is_plat("linux") then
+        add_extsources("apt::libffi-dev")
+    end
+
     on_load(function (package)
         if package:gitref() then
             package:add("deps", "autoconf", "automake", "libtool")
diff --git a/packages/l/libxau/xmake.lua b/packages/l/libxau/xmake.lua
index 32cb6a588..d209c6861 100644
--- a/packages/l/libxau/xmake.lua
+++ b/packages/l/libxau/xmake.lua
@@ -6,6 +6,10 @@ package("libxau")
     set_urls("https://www.x.org/archive/individual/lib/libXau-$(version).tar.bz2")
     add_versions("1.0.9", "ccf8cbf0dbf676faa2ea0a6d64bcc3b6746064722b606c8c52917ed00dcb73ec")
 
+    if is_plat("linux") then
+        add_extsources("apt::libxau-dev")
+    end
+
     if is_plat("macosx", "linux") then
         add_deps("pkg-config", "util-macros", "xorgproto")
     end
diff --git a/packages/l/libxcb/xmake.lua b/packages/l/libxcb/xmake.lua
index 673f3e6b4..5385702fb 100644
--- a/packages/l/libxcb/xmake.lua
+++ b/packages/l/libxcb/xmake.lua
@@ -7,6 +7,10 @@ package("libxcb")
     add_versions("1.13.1", "f09a76971437780a602303170fd51b5f7474051722bc39d566a272d2c4bde1b5")
     add_versions("1.14", "2c7fcddd1da34d9b238c9caeda20d3bd7486456fc50b3cc6567185dbd5b0ad02")
 
+    if is_plat("linux") then
+        add_extsources("apt::libxcb1-dev")
+    end
+
     if is_plat("macosx", "linux") then
         add_deps("pkg-config", "python 3.x", {kind = "binary"})
         add_deps("xcb-proto", "libpthread-stubs", "libxau", "libxdmcp")
diff --git a/packages/l/libxcursor/xmake.lua b/packages/l/libxcursor/xmake.lua
index f4723ca06..c3372e35b 100644
--- a/packages/l/libxcursor/xmake.lua
+++ b/packages/l/libxcursor/xmake.lua
@@ -6,6 +6,10 @@ package("libxcursor")
     set_urls("https://www.x.org/archive/individual/lib/libXcursor-$(version).tar.bz2")
     add_versions("1.2.0", "3ad3e9f8251094af6fe8cb4afcf63e28df504d46bfa5a5529db74a505d628782")
 
+    if is_plat("linux") then
+        add_extsources("apt::libxcursor-dev")
+    end
+
     if is_plat("macosx", "linux") then
         add_deps("pkg-config", "util-macros", "libx11", "libxfixes", "libxrender")
     end
diff --git a/packages/l/libxdamage/xmake.lua b/packages/l/libxdamage/xmake.lua
index 703e836f7..198317179 100644
--- a/packages/l/libxdamage/xmake.lua
+++ b/packages/l/libxdamage/xmake.lua
@@ -6,6 +6,10 @@ package("libxdamage")
     set_urls("https://www.x.org/archive/individual/lib/libXdamage-$(version).tar.bz2")
     add_versions("1.1.5", "b734068643cac3b5f3d2c8279dd366b5bf28c7219d9e9d8717e1383995e0ea45")
 
+    if is_plat("linux") then
+        add_extsources("apt::libxdamage-dev")
+    end
+
     if is_plat("macosx", "linux") then
         add_deps("pkg-config", "libx11", "libxfixes", "xorgproto")
     end
diff --git a/packages/l/libxdmcp/xmake.lua b/packages/l/libxdmcp/xmake.lua
index 58d4c8f7b..5f7a067c3 100644
--- a/packages/l/libxdmcp/xmake.lua
+++ b/packages/l/libxdmcp/xmake.lua
@@ -6,6 +6,10 @@ package("libxdmcp")
     set_urls("https://www.x.org/archive/individual/lib/libXdmcp-$(version).tar.bz2")
     add_versions("1.1.3", "20523b44aaa513e17c009e873ad7bbc301507a3224c232610ce2e099011c6529")
 
+    if is_plat("linux") then
+        add_extsources("apt::libxdmcp-dev")
+    end
+
     if is_plat("macosx", "linux") then
         add_deps("pkg-config", "xorgproto")
     end
diff --git a/packages/l/libxext/xmake.lua b/packages/l/libxext/xmake.lua
index dcf46b111..e97965763 100644
--- a/packages/l/libxext/xmake.lua
+++ b/packages/l/libxext/xmake.lua
@@ -6,6 +6,10 @@ package("libxext")
     set_urls("https://www.x.org/archive/individual/lib/libXext-$(version).tar.bz2")
     add_versions("1.3.4", "59ad6fcce98deaecc14d39a672cf218ca37aba617c9a0f691cac3bcd28edf82b")
 
+    if is_plat("linux") then
+        add_extsources("apt::libxext-dev")
+    end
+
     if is_plat("macosx", "linux") then
         add_deps("pkg-config", "libx11", "xorgproto")
     end
diff --git a/packages/l/libxfixes/xmake.lua b/packages/l/libxfixes/xmake.lua
index 7b1be947e..e45c311a9 100644
--- a/packages/l/libxfixes/xmake.lua
+++ b/packages/l/libxfixes/xmake.lua
@@ -6,6 +6,10 @@ package("libxfixes")
     set_urls("https://www.x.org/archive/individual/lib/libXfixes-$(version).tar.bz2")
     add_versions("5.0.3", "de1cd33aff226e08cefd0e6759341c2c8e8c9faf8ce9ac6ec38d43e287b22ad6")
 
+    if is_plat("linux") then
+        add_extsources("apt::libxfixes-dev")
+    end
+
     if is_plat("macosx", "linux") then
         add_deps("pkg-config", "libx11", "xorgproto")
     end
diff --git a/packages/l/libxft/xmake.lua b/packages/l/libxft/xmake.lua
index bda7db190..be0a116c2 100644
--- a/packages/l/libxft/xmake.lua
+++ b/packages/l/libxft/xmake.lua
@@ -7,6 +7,10 @@ package("libxft")
     set_urls("https://www.x.org/archive/individual/lib/libXft-$(version).tar.bz2")
     add_versions("2.3.3", "225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216")
 
+    if is_plat("linux") then
+        add_extsources("apt::libxft-dev")
+    end
+
     if is_plat("macosx", "linux") then
         add_deps("pkg-config", "fontconfig", "libxrender")
     end
diff --git a/packages/l/libxi/xmake.lua b/packages/l/libxi/xmake.lua
index b4bb4522a..41d6e0b7e 100644
--- a/packages/l/libxi/xmake.lua
+++ b/packages/l/libxi/xmake.lua
@@ -6,6 +6,10 @@ package("libxi")
     set_urls("https://www.x.org/archive/individual/lib/libXi-$(version).tar.bz2")
     add_versions("1.7.10", "36a30d8f6383a72e7ce060298b4b181fd298bc3a135c8e201b7ca847f5f81061")
 
+    if is_plat("linux") then
+        add_extsources("apt::libxi-dev")
+    end
+
     if is_plat("macosx", "linux") then
         add_deps("pkg-config", "libx11", "libxext", "libxfixes", "xorgproto")
     end
diff --git a/packages/l/libxinerama/xmake.lua b/packages/l/libxinerama/xmake.lua
index 373956ba4..2439d7211 100644
--- a/packages/l/libxinerama/xmake.lua
+++ b/packages/l/libxinerama/xmake.lua
@@ -6,6 +6,10 @@ package("libxinerama")
     set_urls("https://www.x.org/archive/individual/lib/libXinerama-$(version).tar.bz2")
     add_versions("1.1.4", "0008dbd7ecf717e1e507eed1856ab0d9cf946d03201b85d5dcf61489bb02d720")
 
+    if is_plat("linux") then
+        add_extsources("apt::libxinerama-dev")
+    end
+
     if is_plat("macosx", "linux") then
         add_deps("pkg-config", "libx11", "libxext", "xorgproto")
     end
diff --git a/packages/l/libxkbcommon/xmake.lua b/packages/l/libxkbcommon/xmake.lua
index 1174c9cc4..0d90932ed 100644
--- a/packages/l/libxkbcommon/xmake.lua
+++ b/packages/l/libxkbcommon/xmake.lua
@@ -8,6 +8,10 @@ package("libxkbcommon")
              "https://github.com/xkbcommon.git")
     add_versions("1.0.3", "5d10a57ab65daad7d975926166770eca1d2c899131ab96c23845df1c42da5c31")
 
+    if is_plat("linux") then
+        add_extsources("apt::libxkbcommon-dev")
+    end
+
     add_configs("x11", {description = "Switch backend to X11 (default is wayland).", default = false, type = "boolean"})
     on_load("linux", function (package)
         if package:config("x11") then
diff --git a/packages/l/libxmu/xmake.lua b/packages/l/libxmu/xmake.lua
index bb74975f1..3381095eb 100644
--- a/packages/l/libxmu/xmake.lua
+++ b/packages/l/libxmu/xmake.lua
@@ -6,6 +6,10 @@ package("libxmu")
     add_urls("https://www.x.org/archive/individual/lib/libXmu-$(version).tar.gz")
     add_versions("1.1.3", "5bd9d4ed1ceaac9ea023d86bf1c1632cd3b172dce4a193a72a94e1d9df87a62e")
 
+    if is_plat("linux") then
+        add_extsources("apt::libxmu-dev")
+    end
+
     add_deps("libxt", "libxext")
 
     on_install("macosx", "linux", function (package)
diff --git a/packages/l/libxpm/xmake.lua b/packages/l/libxpm/xmake.lua
index 204a70479..ad66cbbf7 100644
--- a/packages/l/libxpm/xmake.lua
+++ b/packages/l/libxpm/xmake.lua
@@ -6,6 +6,10 @@ package("libxpm")
     add_urls("https://www.x.org/archive/individual/lib/libXpm-$(version).tar.gz")
     add_versions("3.5.13", "e3dfb0fb8c1f127432f2a498c7856b37ce78a61e8da73f1aab165a73dd97ad00")
 
+    if is_plat("linux") then
+        add_extsources("apt::libxpm-dev")
+    end
+
     add_deps("libx11", "xorgproto", "gettext")
 
     on_install("macosx", "linux", function (package)
diff --git a/packages/l/libxrandr/xmake.lua b/packages/l/libxrandr/xmake.lua
index b21f80287..78ced94f2 100644
--- a/packages/l/libxrandr/xmake.lua
+++ b/packages/l/libxrandr/xmake.lua
@@ -6,6 +6,10 @@ package("libxrandr")
     set_urls("https://www.x.org/archive/individual/lib/libXrandr-$(version).tar.bz2")
     add_versions("1.5.2", "8aea0ebe403d62330bb741ed595b53741acf45033d3bda1792f1d4cc3daee023")
 
+    if is_plat("linux") then
+        add_extsources("apt::libxrandr-dev")
+    end
+
     if is_plat("macosx", "linux") then
         add_deps("pkg-config", "libx11", "libxext", "libxrender", "xorgproto")
     end
diff --git a/packages/l/libxrender/xmake.lua b/packages/l/libxrender/xmake.lua
index 05b4d0c8f..48db37fef 100644
--- a/packages/l/libxrender/xmake.lua
+++ b/packages/l/libxrender/xmake.lua
@@ -6,6 +6,10 @@ package("libxrender")
     set_urls("https://www.x.org/archive/individual/lib/libXrender-$(version).tar.bz2")
     add_versions("0.9.10", "c06d5979f86e64cabbde57c223938db0b939dff49fdb5a793a1d3d0396650949")
 
+    if is_plat("linux") then
+        add_extsources("apt::libxrender-dev")
+    end
+
     if is_plat("macosx", "linux") then
         add_deps("pkg-config", "libx11", "xorgproto")
     end
diff --git a/packages/l/libxshmfence/xmake.lua b/packages/l/libxshmfence/xmake.lua
index 370885780..3e0021c42 100644
--- a/packages/l/libxshmfence/xmake.lua
+++ b/packages/l/libxshmfence/xmake.lua
@@ -6,6 +6,10 @@ package("libxshmfence")
     set_urls("https://www.x.org/archive/individual/lib/libxshmfence-$(version).tar.bz2")
     add_versions("1.3", "b884300d26a14961a076fbebc762a39831cb75f92bed5ccf9836345b459220c7")
 
+    if is_plat("linux") then
+        add_extsources("apt::libxshmfence-dev")
+    end
+
     if is_plat("macosx", "linux") then
         add_deps("pkg-config", "xorgproto")
     end
diff --git a/packages/l/libxt/xmake.lua b/packages/l/libxt/xmake.lua
index daa769c1c..967d9905c 100644
--- a/packages/l/libxt/xmake.lua
+++ b/packages/l/libxt/xmake.lua
@@ -6,6 +6,10 @@ package("libxt")
     add_urls("https://www.x.org/archive/individual/lib/libXt-$(version).tar.gz")
     add_versions("1.2.1", "6da1bfa9dd0ed87430a5ce95b129485086394df308998ebe34d98e378e3dfb33")
 
+    if is_plat("linux") then
+        add_extsources("apt::libxt-dev")
+    end
+
     add_deps("libx11", "libsm")
 
     on_install("macosx", "linux", function (package)
diff --git a/packages/l/libxtst/xmake.lua b/packages/l/libxtst/xmake.lua
index ce4ec1b8c..401171585 100644
--- a/packages/l/libxtst/xmake.lua
+++ b/packages/l/libxtst/xmake.lua
@@ -7,6 +7,10 @@ package("libxtst")
     set_urls("https://www.x.org/archive/individual/lib/libXtst-$(version).tar.bz2")
     add_versions("1.2.3", "4655498a1b8e844e3d6f21f3b2c4e2b571effb5fd83199d428a6ba7ea4bf5204")
 
+    if is_plat("linux") then
+        add_extsources("apt::libxtst-dev")
+    end
+
     if is_plat("macosx", "linux") then
         add_deps("pkg-config", "util-macros", "libxi", "xorgproto")
     end
diff --git a/packages/l/libxv/xmake.lua b/packages/l/libxv/xmake.lua
index 85711f0ac..d1e674b20 100644
--- a/packages/l/libxv/xmake.lua
+++ b/packages/l/libxv/xmake.lua
@@ -6,6 +6,10 @@ package("libxv")
     set_urls("https://www.x.org/archive/individual/lib/libXv-$(version).tar.bz2")
     add_versions("1.0.11", "d26c13eac99ac4504c532e8e76a1c8e4bd526471eb8a0a4ff2a88db60cb0b088")
 
+    if is_plat("linux") then
+        add_extsources("apt::libxv-dev")
+    end
+
     if is_plat("macosx", "linux") then
         add_deps("pkg-config", "libx11", "libxext", "xorgproto")
     end
diff --git a/packages/l/libxvmc/xmake.lua b/packages/l/libxvmc/xmake.lua
index 8e188fe0a..4d1ca3f46 100644
--- a/packages/l/libxvmc/xmake.lua
+++ b/packages/l/libxvmc/xmake.lua
@@ -6,6 +6,10 @@ package("libxvmc")
     set_urls("https://www.x.org/archive/individual/lib/libXvMC-$(version).tar.bz2")
     add_versions("1.0.12", "6b3da7977b3f7eaf4f0ac6470ab1e562298d82c4e79077765787963ab7966dcd")
 
+    if is_plat("linux") then
+        add_extsources("apt::libxvmc-dev")
+    end
+
     if is_plat("macosx", "linux") then
         add_deps("pkg-config", "util-macros", "libx11", "libxext", "libxv", "xorgproto")
     end
diff --git a/packages/l/libxxf86vm/xmake.lua b/packages/l/libxxf86vm/xmake.lua
index 6113f3bb2..c86e5ac32 100644
--- a/packages/l/libxxf86vm/xmake.lua
+++ b/packages/l/libxxf86vm/xmake.lua
@@ -6,6 +6,10 @@ package("libxxf86vm")
     set_urls("https://www.x.org/archive/individual/lib/libXxf86vm-$(version).tar.bz2")
     add_versions("1.1.4", "afee27f93c5f31c0ad582852c0fb36d50e4de7cd585fcf655e278a633d85cd57")
 
+    if is_plat("linux") then
+        add_extsources("apt::libxxf86vm-dev")
+    end
+
     if is_plat("macosx", "linux") then
         add_deps("pkg-config", "libx11", "libxext", "xorgproto")
     end
diff --git a/packages/w/wayland/xmake.lua b/packages/w/wayland/xmake.lua
index a20859231..ebe7470bd 100644
--- a/packages/w/wayland/xmake.lua
+++ b/packages/w/wayland/xmake.lua
@@ -11,6 +11,10 @@ package("wayland")
     add_resources("1.18.0", "protocols", "https://wayland.freedesktop.org/releases/wayland-protocols-1.20.tar.xz", "9782b7a1a863d82d7c92478497d13c758f52e7da4f197aa16443f73de77e4de7")
     add_resources("1.19.0", "protocols", "https://wayland.freedesktop.org/releases/wayland-protocols-1.21.tar.xz", "b99945842d8be18817c26ee77dafa157883af89268e15f4a5a1a1ff3ffa4cde5")
 
+    if is_plat("linux") then
+        add_extsources("apt::libwayland-dev")
+    end
+
     add_deps("meson", "libxml2", "libffi", "expat", "bison")
     on_install("linux", function (package)
 
diff --git a/packages/x/xorgproto/xmake.lua b/packages/x/xorgproto/xmake.lua
index 68ff787a3..33eea4242 100644
--- a/packages/x/xorgproto/xmake.lua
+++ b/packages/x/xorgproto/xmake.lua
@@ -7,6 +7,10 @@ package("xorgproto")
     add_versions("2019.2", "46ecd0156c561d41e8aa87ce79340910cdf38373b759e737fcbba5df508e7b8e")
     add_versions("2021.3", "4c732b14fc7c7db64306374d9e8386d6172edbb93f587614df1938b9d9b9d737")
 
+    if is_plat("linux") then
+        add_extsources("apt::x11proto-dev")
+    end
+
     if is_plat("macosx", "linux") then
         add_deps("pkg-config", "util-macros")
     end
diff --git a/packages/x/xtrans/xmake.lua b/packages/x/xtrans/xmake.lua
index 9da99d255..3da70e64e 100644
--- a/packages/x/xtrans/xmake.lua
+++ b/packages/x/xtrans/xmake.lua
@@ -6,6 +6,10 @@ package("xtrans")
     set_urls("https://www.x.org/archive/individual/lib/xtrans-$(version).tar.bz2")
     add_versions("1.4.0", "377c4491593c417946efcd2c7600d1e62639f7a8bbca391887e2c4679807d773")
 
+    if is_plat("linux") then
+        add_extsources("apt::xtrans-dev")
+    end
+
     if is_plat("macosx", "linux") then
         add_deps("pkg-config", "util-macros", "xorgproto")
     end