[Xorg_xcb_util*] Regenerate wrappers to use JLLWrappers.jl (JuliaPa…

…ckaging#2185)
visr · Nov 28, 2020 · 2987bad · 2987bad
1 parent 001197c
commit 2987bad
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 16 deletions.
diff --git a/X/Xorg_xcb_util/build_tarballs.jl b/X/Xorg_xcb_util/build_tarballs.jl
@@ -7,8 +7,8 @@ version = v"0.4.0"
 
 # Collection of sources required to build xcb-util
 sources = [
-    "https://xcb.freedesktop.org/dist/xcb-util-$(version).tar.bz2" =>
-    "46e49469cb3b594af1d33176cd7565def2be3fa8be4371d62271fabb5eae50e9",
+    ArchiveSource("https://xcb.freedesktop.org/dist/xcb-util-$(version).tar.bz2",
+                  "46e49469cb3b594af1d33176cd7565def2be3fa8be4371d62271fabb5eae50e9"),
 ]
 
 # Bash recipe for building across all platforms
@@ -32,7 +32,8 @@ products = [
 
 # Dependencies that must be installed before this package can be built
 dependencies = [
-    "Xorg_libxcb_jll"
+    BuildDependency("Xorg_xorgproto_jll"),
+    Dependency("Xorg_libxcb_jll"),
 ]
 
 # Build the tarballs, and possibly a `build.jl` as well.

diff --git a/X/Xorg_xcb_util_image/build_tarballs.jl b/X/Xorg_xcb_util_image/build_tarballs.jl
@@ -7,8 +7,8 @@ version = v"0.4.0"
 
 # Collection of sources required to build libxcb
 sources = [
-    "https://xcb.freedesktop.org/dist/xcb-util-image-$(version).tar.bz2" =>
-    "2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc",
+    ArchiveSource("https://xcb.freedesktop.org/dist/xcb-util-image-$(version).tar.bz2",
+                  "2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc"),
 ]
 
 # Bash recipe for building across all platforms
@@ -34,7 +34,8 @@ products = [
 
 # Dependencies that must be installed before this package can be built
 dependencies = [
-    "Xorg_xcb_util_jll"
+    BuildDependency("Xorg_xorgproto_jll"),
+    Dependency("Xorg_xcb_util_jll"),
 ]
 
 # Build the tarballs, and possibly a `build.jl` as well.

diff --git a/X/Xorg_xcb_util_keysyms/build_tarballs.jl b/X/Xorg_xcb_util_keysyms/build_tarballs.jl
@@ -7,8 +7,10 @@ version = v"0.4.0"
 
 # Collection of sources required to build libxcb
 sources = [
-    "https://xcb.freedesktop.org/dist/xcb-util-keysyms-$(version).tar.bz2" =>
-    "0ef8490ff1dede52b7de533158547f8b454b241aa3e4dcca369507f66f216dd9",
+    ArchiveSource("https://xcb.freedesktop.org/dist/xcb-util-keysyms-$(version).tar.bz2",
+                  "0ef8490ff1dede52b7de533158547f8b454b241aa3e4dcca369507f66f216dd9"),
+    FileSource("https://raw.githubusercontent.com/archlinux/svntogit-packages/ecd23f4fbd4d7670a182e24c29d99a6b8b817aba/trunk/LICENSE",
+               "ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9"; filename="LICENSE"),
 ]
 
 # Bash recipe for building across all platforms
@@ -22,6 +24,7 @@ update_configure_scripts
 ./configure --prefix=${prefix} --host=${target} --enable-malloc0returnsnull=no
 make -j${nproc}
 make install
+install_license ../LICENSE
 """
 
 # These are the platforms we will build for by default, unless further
@@ -34,7 +37,8 @@ products = [
 
 # Dependencies that must be installed before this package can be built
 dependencies = [
-    "Xorg_xcb_util_jll"
+    BuildDependency("Xorg_xorgproto_jll"),
+    Dependency("Xorg_xcb_util_jll"),
 ]
 
 # Build the tarballs, and possibly a `build.jl` as well.

diff --git a/X/Xorg_xcb_util_renderutil/build_tarballs.jl b/X/Xorg_xcb_util_renderutil/build_tarballs.jl
@@ -7,8 +7,8 @@ version = v"0.3.9"
 
 # Collection of sources required to build libxcb
 sources = [
-    "https://xcb.freedesktop.org/dist/xcb-util-renderutil-$(version).tar.bz2" =>
-    "c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b",
+    ArchiveSource("https://xcb.freedesktop.org/dist/xcb-util-renderutil-$(version).tar.bz2",
+                  "c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b"),
 ]
 
 # Bash recipe for building across all platforms
@@ -34,7 +34,8 @@ products = [
 
 # Dependencies that must be installed before this package can be built
 dependencies = [
-    "Xorg_xcb_util_jll"
+    BuildDependency("Xorg_xorgproto_jll"),
+    Dependency("Xorg_xcb_util_jll"),
 ]
 
 # Build the tarballs, and possibly a `build.jl` as well.

diff --git a/X/Xorg_xcb_util_wm/build_tarballs.jl b/X/Xorg_xcb_util_wm/build_tarballs.jl
@@ -7,8 +7,8 @@ version = v"0.4.1"
 
 # Collection of sources required to build libxcb
 sources = [
-    "https://xcb.freedesktop.org/dist/xcb-util-wm-$(version).tar.bz2" =>
-    "28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f",
+    ArchiveSource("https://xcb.freedesktop.org/dist/xcb-util-wm-$(version).tar.bz2",
+                  "28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f"),
 ]
 
 # Bash recipe for building across all platforms
@@ -35,7 +35,8 @@ products = [
 
 # Dependencies that must be installed before this package can be built
 dependencies = [
-    "Xorg_xcb_util_jll"
+    BuildDependency("Xorg_xorgproto_jll"),
+    Dependency("Xorg_xcb_util_jll"),
 ]
 
 # Build the tarballs, and possibly a `build.jl` as well.

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -215,7 +215,6 @@ jobs:
   cancelTimeoutInMinutes: 2
   strategy:
     matrix: $[ dependencies.generator.outputs['mtrx.projects'] ]
-    maxParallel: 1
   variables:
     projects: $[ dependencies.generator.outputs['mtrx.projects'] ]
   steps: