From 9431362781df7196808d6a88eff357d98d29d453 Mon Sep 17 00:00:00 2001 From: Hoildkv <42310255+xq114@users.noreply.github.com> Date: Mon, 12 Feb 2024 21:53:26 +0800 Subject: [PATCH] update pciutils, pixman and x11 libs (#3273) * update pciutils * update pixman * update libx11 * revert xtrans * disable libx11 cross on macosx * remove constraint --- .github/workflows/macos.yml | 1 + packages/l/libx11/xmake.lua | 1 + packages/l/libxext/xmake.lua | 1 + packages/l/libxrandr/xmake.lua | 5 +++-- packages/p/pciutils/xmake.lua | 1 + packages/p/pixman/xmake.lua | 10 ++++++---- packages/x/xtrans/xmake.lua | 5 +++-- 7 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index bde352bc0..ebaeec983 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -8,6 +8,7 @@ on: jobs: build: strategy: + fail-fast: false matrix: os: [macOS-latest] arch: [x86_64, arm64] diff --git a/packages/l/libx11/xmake.lua b/packages/l/libx11/xmake.lua index 0cde3c21b..b0d40b34f 100644 --- a/packages/l/libx11/xmake.lua +++ b/packages/l/libx11/xmake.lua @@ -8,6 +8,7 @@ package("libx11") add_versions("1.7.0", "c48ec61785ec68fc6a9a6aca0a9578393414fe2562e3cc9cca30234345c7b6ac") add_versions("1.7.3", "029acf61e7e760a3150716b145a58ce5052ee953e8cccc8441d4f550c420debb") add_versions("1.8.1", "d52f0a7c02a45449f37b0831d99ff936d92eb4ce8b4c97dc17a63cea79ce5a76") + add_versions("1.8.7", "793ebebf569f12c864b77401798d38814b51790fce206e01a431e5feb982e20b") if is_plat("linux") then add_syslinks("dl") diff --git a/packages/l/libxext/xmake.lua b/packages/l/libxext/xmake.lua index cbb23bc62..e1e1acbab 100644 --- a/packages/l/libxext/xmake.lua +++ b/packages/l/libxext/xmake.lua @@ -5,6 +5,7 @@ package("libxext") set_urls("https://www.x.org/archive/individual/lib/libXext-$(version).tar.gz") add_versions("1.3.5", "1a3dcda154f803be0285b46c9338515804b874b5ccc7a2b769ab7fd76f1035bd") + add_versions("1.3.6", "1a0ac5cd792a55d5d465ced8dbf403ed016c8e6d14380c0ea3646c4415496e3d") if is_plat("linux") then add_extsources("apt::libxext-dev") diff --git a/packages/l/libxrandr/xmake.lua b/packages/l/libxrandr/xmake.lua index 208722dc8..71b06189b 100644 --- a/packages/l/libxrandr/xmake.lua +++ b/packages/l/libxrandr/xmake.lua @@ -3,8 +3,9 @@ package("libxrandr") set_homepage("https://www.x.org/") set_description("X.Org: X Resize, Rotate and Reflection extension library") - set_urls("https://www.x.org/archive/individual/lib/libXrandr-$(version).tar.bz2") - add_versions("1.5.2", "8aea0ebe403d62330bb741ed595b53741acf45033d3bda1792f1d4cc3daee023") + set_urls("https://www.x.org/archive/individual/lib/libXrandr-$(version).tar.gz") + add_versions("1.5.2", "3f10813ab355e7a09f17e147d61b0ce090d898a5ea5b5519acd0ef68675dcf8e") + add_versions("1.5.4", "c72c94dc3373512ceb67f578952c5d10915b38cc9ebb0fd176a49857b8048e22") if is_plat("linux") then add_extsources("apt::libxrandr-dev") diff --git a/packages/p/pciutils/xmake.lua b/packages/p/pciutils/xmake.lua index 4e248e4e9..c5e379e64 100644 --- a/packages/p/pciutils/xmake.lua +++ b/packages/p/pciutils/xmake.lua @@ -6,6 +6,7 @@ package("pciutils") add_urls("https://mj.ucw.cz/download/linux/pci/pciutils-$(version).tar.gz") add_versions("3.7.0", "08c27e01030d1fcc700d02bc2ea66c638f58a3d150e45e58852aa82ad4160d84") + add_versions("3.10.0", "7deabe38ae5fa88a96a8c4947975cf31c591506db546e9665a10dddbf350ead0") if is_plat("macosx") then add_frameworks("IOKit") diff --git a/packages/p/pixman/xmake.lua b/packages/p/pixman/xmake.lua index de26cc5bd..1d35df61c 100644 --- a/packages/p/pixman/xmake.lua +++ b/packages/p/pixman/xmake.lua @@ -3,17 +3,19 @@ package("pixman") set_homepage("https://cairographics.org/") set_description("Low-level library for pixel manipulation.") - add_urls("https://cairographics.org/releases/pixman-$(version).tar.gz", {alias = "cairographics"}) + add_urls("https://cairographics.org/releases/pixman-$(version).tar.gz", {alias = "home"}) + add_urls("https://www.x.org/archive/individual/lib/pixman-$(version).tar.gz", {alias = "home"}) add_urls("https://gitlab.freedesktop.org/pixman/pixman/-/archive/pixman-$(version)/pixman-pixman-$(version).tar.gz", {alias = "git_release"}) add_urls("https://github.com/freedesktop/pixman/archive/refs/tags/pixman-$(version).tar.gz", {alias = "git_release"}) add_urls("https://gitlab.freedesktop.org/pixman/pixman.git") add_urls("https://github.com/freedesktop/pixman.git") add_versions("git_release:0.40.0", "3a68a28318a78fffc61603c8385bb0010c3fb23d17cd1285d36a7148c87a3b91") - add_versions("cairographics:0.40.0", "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc") + add_versions("home:0.40.0", "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc") add_versions("git_release:0.42.0", "45c6462f6d6441923d4c17d06fa50ce066f0ceff0fc84af8d342df63c1079151") - add_versions("cairographics:0.42.0", "07f74c8d95e4a43eb2b08578b37f40b7937e6c5b48597b3a0bb2c13a53f46c13") + add_versions("home:0.42.0", "07f74c8d95e4a43eb2b08578b37f40b7937e6c5b48597b3a0bb2c13a53f46c13") add_versions("git_release:0.42.2", "4191a5084bae000a61e3513b06027b6f8f559d17d61769ed9de27dfb0cec8699") - add_versions("cairographics:0.42.2", "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e") + add_versions("home:0.42.2", "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e") + add_versions("home:0.43.2", "ea79297e5418fb528d0466e8b5b91d1be88857fa3706f49777b2925a72ae9924") if is_plat("wasm") then add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) diff --git a/packages/x/xtrans/xmake.lua b/packages/x/xtrans/xmake.lua index 858b665fa..39bae6920 100644 --- a/packages/x/xtrans/xmake.lua +++ b/packages/x/xtrans/xmake.lua @@ -3,8 +3,9 @@ package("xtrans") set_homepage("https://www.x.org/") set_description("X.Org: X Network Transport layer shared code") - set_urls("https://www.x.org/archive/individual/lib/xtrans-$(version).tar.bz2") - add_versions("1.4.0", "377c4491593c417946efcd2c7600d1e62639f7a8bbca391887e2c4679807d773") + set_urls("https://www.x.org/archive/individual/lib/xtrans-$(version).tar.gz") + add_versions("1.4.0", "48ed850ce772fef1b44ca23639b0a57e38884045ed2cbb18ab137ef33ec713f9") + -- add_versions("1.5.0", "a806f8a92f879dcd0146f3f1153fdffe845f2fc0df9b1a26c19312b7b0a29c86") if is_plat("linux") then add_extsources("apt::xtrans-dev", "pacman::xtrans")