Chiebot-Mirror
/
xmake-repo
mirror of https://github.com/xmake-io/xmake-repo.git
8
0
Fork 1
Code Issues Projects Releases Wiki Activity

update libxcb and dependencies (#3256)

Browse Source 
* update util-macros

* update xorgproto

* update libxau

* update libxdmcp

* update libpthread-stubs

* update xcb-proto

* update libxcb

* revert python changes

* fix xcb-proto

* try fix libxcb
pull/3257/head
Hoildkv 1 year ago committed by GitHub
parent d56bf6d1d7
commit 5da135732d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 61 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      packages/l/libpthread-stubs/xmake.lua
  2. 1
      packages/l/libxau/xmake.lua
  3. 67
      packages/l/libxcb/xmake.lua
  4. 5
      packages/l/libxdmcp/xmake.lua
  5. 7
      packages/u/util-macros/xmake.lua
  6. 12
      packages/x/xcb-proto/xmake.lua
  7. 1
      packages/x/xorgproto/xmake.lua

6
packages/l/libpthread-stubs/xmake.lua
Unescape View File

@ -3,8 +3,10 @@ package("libpthread-stubs")
set_homepage("https://www.x.org/")
set_description("X.Org: pthread-stubs.pc")
set_urls("https://xcb.freedesktop.org/dist/libpthread-stubs-$(version).tar.bz2")
add_versions("0.4", "e4d05911a3165d3b18321cc067fdd2f023f06436e391c6a28dff618a78d2e733")
add_urls("https://xcb.freedesktop.org/dist/libpthread-stubs-$(version).tar.gz",
"https://www.x.org/archive/individual/lib/libpthread-stubs-$(version).tar.gz")
add_versions("0.4", "50d5686b79019ccea08bcbd7b02fe5a40634abcfd4146b6e75c6420cc170e9d9")
add_versions("0.5", "593196cc746173d1e25cb54a93a87fd749952df68699aab7e02c085530e87747")
add_deps("pkg-config")

1
packages/l/libxau/xmake.lua
Unescape View File

@ -5,6 +5,7 @@ package("libxau")
set_urls("https://www.x.org/archive/individual/lib/libXau-$(version).tar.gz")
add_versions("1.0.10", "51a54da42475d4572a0b59979ec107c27dacf6c687c2b7b04e5cf989a7c7e60c")
add_versions("1.0.11", "3a321aaceb803577a4776a5efe78836eb095a9e44bbc7a465d29463e1a14f189")
if is_plat("linux") then
add_extsources("apt::libxau-dev", "pacman::libxau")

67
packages/l/libxcb/xmake.lua
Unescape View File

@ -1,40 +1,42 @@
local components = {
composite = { apt_package = "apt::libxcb-composite0-dev", default_value = true },
damage = { apt_package = "apt::libxcb-damage0-dev" , default_value = true},
dpms = { apt_package = "apt::libxcb-dpms0-dev" , default_value = true},
dri2 = { apt_package = "apt::libxcb-dri2-0-dev" , default_value = true},
dri3 = { apt_package = "apt::libxcb-dri3-dev" , default_value = true},
present = { apt_package = "apt::libxcb-present-dev" , default_value = true},
glx = { apt_package = "apt::libxcb-glx0-dev" , default_value = true},
randr = { apt_package = "apt::libxcb-randr0-dev" , default_value = true},
record = { apt_package = "apt::libxcb-record0-dev" , default_value = true},
render = { apt_package = "apt::libxcb-render0-dev" , default_value = true},
resource = { apt_package = "apt::libxcb-xrm-dev" , default_value = true},
screensaver = { apt_package = "apt::libxcb-screensaver-dev" , default_value = true},
shape = { apt_package = "apt::libxcb-shape0-dev" , default_value = true},
shm = { apt_package = "apt::libxcb-shm0-dev" , default_value = true},
sync = { apt_package = "apt::libxcb-sync0-dev" , default_value = true},
xevie = { apt_package = "apt::libxcb-xevie0-dev" , default_value = true},
["xfree86-dri"] = { apt_package = "apt::libxcb-xfreedri0-dev" , default_value = true},
xfixes = { apt_package = "apt::libxcb-xfixes0-dev" , default_value = true},
xinerama = { apt_package = "apt::libxcb-xinerama0-dev" , default_value = true},
xinput = { apt_package = "apt::libxcb-xinput-dev" , default_value = true},
xkb = { apt_package = "apt::libxcb-xkb-dev" , default_value = true},
xprint = { apt_package = "apt::libxcb-xprint0-dev" , default_value = false},
selinux = { default_value = false},
xtest = { apt_package = "apt::libxcb-xtest0-dev" , default_value = true},
xv = { apt_package = "apt::libxcb-xv0-dev" , default_value = true},
xvmc = { apt_package = "apt::libxcb-xvmc0-dev" , default_value = true},
ge = { default_value = true}
composite = {apt_package = "apt::libxcb-composite0-dev", default_value = true},
damage = {apt_package = "apt::libxcb-damage0-dev" , default_value = true},
dpms = {apt_package = "apt::libxcb-dpms0-dev" , default_value = true},
dri2 = {apt_package = "apt::libxcb-dri2-0-dev" , default_value = true},
dri3 = {apt_package = "apt::libxcb-dri3-dev" , default_value = true},
present = {apt_package = "apt::libxcb-present-dev" , default_value = true},
glx = {apt_package = "apt::libxcb-glx0-dev" , default_value = true},
randr = {apt_package = "apt::libxcb-randr0-dev" , default_value = true},
record = {apt_package = "apt::libxcb-record0-dev" , default_value = true},
render = {apt_package = "apt::libxcb-render0-dev" , default_value = true},
resource = {apt_package = "apt::libxcb-xrm-dev" , default_value = true},
screensaver = {apt_package = "apt::libxcb-screensaver-dev" , default_value = true},
shape = {apt_package = "apt::libxcb-shape0-dev" , default_value = true},
shm = {apt_package = "apt::libxcb-shm0-dev" , default_value = true},
sync = {apt_package = "apt::libxcb-sync0-dev" , default_value = true},
xevie = {apt_package = "apt::libxcb-xevie0-dev" , default_value = true},
["xfree86-dri"] = {apt_package = "apt::libxcb-xfreedri0-dev" , default_value = true},
xfixes = {apt_package = "apt::libxcb-xfixes0-dev" , default_value = true},
xinerama = {apt_package = "apt::libxcb-xinerama0-dev" , default_value = true},
xinput = {apt_package = "apt::libxcb-xinput-dev" , default_value = true},
xkb = {apt_package = "apt::libxcb-xkb-dev" , default_value = true},
xprint = {apt_package = "apt::libxcb-xprint0-dev" , default_value = false},
selinux = {default_value = false},
xtest = {apt_package = "apt::libxcb-xtest0-dev" , default_value = true},
xv = {apt_package = "apt::libxcb-xv0-dev" , default_value = true},
xvmc = {apt_package = "apt::libxcb-xvmc0-dev" , default_value = true},
ge = {default_value = true}
}
package("libxcb")
set_homepage("https://www.x.org/")
set_description("X.Org: Interface to the X Window System protocol")
set_urls("https://xcb.freedesktop.org/dist/libxcb-$(version).tar.gz")
add_urls("https://xcb.freedesktop.org/dist/libxcb-$(version).tar.gz",
"https://www.x.org/archive/individual/lib/libxcb-$(version).tar.gz")
add_versions("1.13.1", "f09a76971437780a602303170fd51b5f7474051722bc39d566a272d2c4bde1b5")
add_versions("1.14", "2c7fcddd1da34d9b238c9caeda20d3bd7486456fc50b3cc6567185dbd5b0ad02")
add_versions("1.16", "bc0f75f84b28e6496a19a1d094d7e47def861a50cb7cce5b23b62eecdc2a4479")
for name, opt in pairs(components) do
add_configs(name, {description = format("Enable %s submodule (default is %s).", name, opt.default_value), default = opt.default_value})
@ -63,7 +65,8 @@ package("libxcb")
"--disable-dependency-tracking",
"--disable-silent-rules",
"--enable-devel-docs=no",
"--with-doxygen=no"}
"--with-doxygen=no",
"PYTHON=python3"}
table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
if package:is_plat("linux") and package:config("pic") ~= false then
table.insert(configs, "--with-pic")
@ -71,7 +74,11 @@ package("libxcb")
for name, opt in pairs(components) do
table.insert(configs, format("--enable-%s=%s", name, package:config(name) and "yes" or "no"))
end
import("package.tools.autoconf").install(package, configs)
if package:is_plat("macosx") and package:is_cross() then
import("package.tools.autoconf").install(package, configs, {cflags = "-arch " .. package:arch(), shflags = "-arch " .. package:arch()})
else
import("package.tools.autoconf").install(package, configs)
end
end)
on_test(function (package)

5
packages/l/libxdmcp/xmake.lua
Unescape View File

@ -3,8 +3,9 @@ package("libxdmcp")
set_homepage("https://www.x.org/")
set_description("X.Org: X Display Manager Control Protocol library")
set_urls("https://www.x.org/archive/individual/lib/libXdmcp-$(version).tar.bz2")
add_versions("1.1.3", "20523b44aaa513e17c009e873ad7bbc301507a3224c232610ce2e099011c6529")
set_urls("https://www.x.org/archive/individual/lib/libXdmcp-$(version).tar.gz")
add_versions("1.1.3", "2ef9653d32e09d1bf1b837d0e0311024979653fe755ad3aaada8db1aa6ea180c")
add_versions("1.1.4", "55041a8ff8992ab02777478c4b19c249c0f8399f05a752cb4a1a868a9a0ccb9a")
if is_plat("linux") then
add_extsources("apt::libxdmcp-dev", "pacman::libxmdcp")

7
packages/u/util-macros/xmake.lua
Unescape View File

@ -3,10 +3,15 @@ package("util-macros")
set_homepage("https://www.x.org/")
set_description("X.Org: Set of autoconf macros used to build other xorg packages")
set_urls("https://www.x.org/archive/individual/util/util-macros-$(version).tar.gz")
add_urls("https://www.x.org/archive/individual/util/util-macros-$(version).tar.gz",
"https://xorg.freedesktop.org/archive/individual/util/util-macros-$(version).tar.gz")
add_versions("1.19.3", "624bb6c3a4613d18114a7e3849a3d70f2d7af9dc6eabeaba98060d87e3aef35b")
add_versions("1.20.0", "8daf36913d551a90fd1013cb078401375dabae021cb4713b9b256a70f00eeb74")
if is_plat("linux") then
add_extsources("apt::xutils-dev", "pkgconfig::xorg-macros")
end
add_deps("pkg-config")
on_install("macosx", "linux", function (package)

12
packages/x/xcb-proto/xmake.lua
Unescape View File

@ -3,14 +3,15 @@ package("xcb-proto")
set_homepage("https://www.x.org/")
set_description("X.Org: XML-XCB protocol descriptions for libxcb code generation")
set_urls("https://xorg.freedesktop.org/archive/individual/proto/xcb-proto-$(version).tar.gz",
add_urls("https://xorg.freedesktop.org/archive/individual/proto/xcb-proto-$(version).tar.gz",
"https://xcb.freedesktop.org/dist/xcb-proto-$(version).tar.gz")
add_versions("1.13", "0698e8f596e4c0dbad71d3dc754d95eb0edbb42df5464e0f782621216fa33ba7")
add_versions("1.14", "1c3fa23d091fb5e4f1e9bf145a902161cec00d260fabf880a7a248b02ab27031")
add_versions("1.14.1", "85cd21e9d9fbc341d0dbf11eace98d55d7db89fda724b0e598855fcddf0944fd")
add_versions("1.16.0", "d9c7f010b1105fc3858bf07b5169b2dd8e7493c6652b1fe45f3321d874f291d7")
if is_plat("macosx", "linux") then
add_deps("pkg-config", "python 3.x")
add_deps("pkg-config", "python 3.x", {kind = "binary"})
end
on_install("macosx", "linux", function (package)
@ -22,6 +23,11 @@ package("xcb-proto")
end)
on_test(function (package)
local envs = {PKG_CONFIG_PATH = path.join(package:installdir(), "lib", "pkgconfig")}
local envs
if package:version():le("1.15") then
envs = {PKG_CONFIG_PATH = path.join(package:installdir(), "lib", "pkgconfig")}
else
envs = {PKG_CONFIG_PATH = path.join(package:installdir(), "share", "pkgconfig")}
end
os.vrunv("pkg-config", {"--exists", "xcb-proto"}, {envs = envs})
end)

1
packages/x/xorgproto/xmake.lua
Unescape View File

@ -7,6 +7,7 @@ package("xorgproto")
set_urls("https://xorg.freedesktop.org/archive/individual/proto/xorgproto-$(version).tar.gz")
add_versions("2021.5", "be6ddd6590881452fdfa170c1c9ff87209a98d36155332cbf2ccbc431add86ff")
add_versions("2022.2", "da351a403d07a7006d7bdc8dcfc14ddc1b588b38fb81adab9989a8eef605757b")
add_versions("2023.2", "c791aad9b5847781175388ebe2de85cb5f024f8dabf526d5d699c4f942660cc3")
if is_plat("linux") then
add_extsources("apt::x11proto-dev", "pkgconfig::xproto")

Write Preview
Loading…
Cancel
Save