From 7cf9552af5d22f81962ad6c79dad88671bbf67b4 Mon Sep 17 00:00:00 2001 From: BtbN Date: Mon, 3 Jan 2022 22:28:08 +0100 Subject: [PATCH] Use cgit for freedesktop clones to work around broken gitlab --- .github/workflows/build.yml | 2 +- scripts.d/10-xorg-macros.sh | 2 +- scripts.d/45-pulseaudio.sh | 2 +- scripts.d/45-x11/10-xcbproto.sh | 2 +- scripts.d/45-x11/10-xproto.sh | 2 +- scripts.d/45-x11/10-xtrans.sh | 2 +- scripts.d/45-x11/20-libxau.sh | 2 +- scripts.d/45-x11/30-libxcb.sh | 2 +- scripts.d/45-x11/40-libx11.sh | 2 +- scripts.d/45-x11/50-libxext.sh | 2 +- scripts.d/45-x11/50-libxfixes.sh | 2 +- scripts.d/45-x11/50-libxi.sh | 2 +- scripts.d/45-x11/50-libxinerama.sh | 2 +- scripts.d/45-x11/50-libxrender.sh | 2 +- scripts.d/45-x11/50-libxscrnsaver.sh | 2 +- scripts.d/45-x11/50-libxxf86vm.sh | 2 +- scripts.d/45-x11/60-libglvnd.sh | 2 +- scripts.d/45-x11/60-libxcursor.sh | 2 +- scripts.d/45-x11/60-libxrandr.sh | 2 +- scripts.d/45-x11/60-libxv.sh | 2 +- scripts.d/50-vaapi/30-libpciaccess.sh | 2 +- scripts.d/50-vaapi/40-libdrm.sh | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4325f74..2f13eb4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,7 +86,7 @@ jobs: strategy: fail-fast: false matrix: - target: [win64] + target: [win64,linux64] variant: [gpl,lgpl,gpl 4.4,lgpl 4.4,gpl-shared,lgpl-shared,gpl-shared 4.4,lgpl-shared 4.4] steps: - name: Checkout diff --git a/scripts.d/10-xorg-macros.sh b/scripts.d/10-xorg-macros.sh index 328b9e5..9db35f0 100755 --- a/scripts.d/10-xorg-macros.sh +++ b/scripts.d/10-xorg-macros.sh @@ -1,6 +1,6 @@ #!/bin/bash -XORGMACROS_REPO="https://gitlab.freedesktop.org/xorg/util/macros.git" +XORGMACROS_REPO="https://cgit.freedesktop.org/xorg/util/macros.git" XORGMACROS_COMMIT="b8766308d2f78bc572abe5198007cf7aeec9b761" ffbuild_enabled() { diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh index 25104be..d3b0e1c 100755 --- a/scripts.d/45-pulseaudio.sh +++ b/scripts.d/45-pulseaudio.sh @@ -1,6 +1,6 @@ #!/bin/bash -PULSEAUDIO_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git" +PULSEAUDIO_REPO="https://cgit.freedesktop.org/pulseaudio/pulseaudio.git" PULSEAUDIO_COMMIT="bc3a07dd4f4cd62166c214085cced42d5a2ae2a8" ffbuild_enabled() { diff --git a/scripts.d/45-x11/10-xcbproto.sh b/scripts.d/45-x11/10-xcbproto.sh index 70d2d01..e0cffb8 100755 --- a/scripts.d/45-x11/10-xcbproto.sh +++ b/scripts.d/45-x11/10-xcbproto.sh @@ -1,6 +1,6 @@ #!/bin/bash -XCBPROTO_REPO="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git" +XCBPROTO_REPO="https://cgit.freedesktop.org/xorg/proto/xcbproto.git" XCBPROTO_COMMIT="70ca65fa35c3760661b090bc4b2601daa7a099b8" ffbuild_enabled() { diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh index 7296e92..4eb39fb 100755 --- a/scripts.d/45-x11/10-xproto.sh +++ b/scripts.d/45-x11/10-xproto.sh @@ -1,6 +1,6 @@ #!/bin/bash -XPROTO_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git" +XPROTO_REPO="https://cgit.freedesktop.org/xorg/proto/xorgproto.git" XPROTO_COMMIT="914d8f5e0f469cd0416364dd008e9eea752bf703" ffbuild_enabled() { diff --git a/scripts.d/45-x11/10-xtrans.sh b/scripts.d/45-x11/10-xtrans.sh index bb72f3f..b445671 100755 --- a/scripts.d/45-x11/10-xtrans.sh +++ b/scripts.d/45-x11/10-xtrans.sh @@ -1,6 +1,6 @@ #!/bin/bash -LIBXTRANS_REPO="https://gitlab.freedesktop.org/xorg/lib/libxtrans.git" +LIBXTRANS_REPO="https://cgit.freedesktop.org/xorg/lib/libxtrans.git" LIBXTRANS_COMMIT="3b5df889f58a99980a35a7b4a18eb4e7d2abeac4" ffbuild_enabled() { diff --git a/scripts.d/45-x11/20-libxau.sh b/scripts.d/45-x11/20-libxau.sh index 17c2acc..389c183 100755 --- a/scripts.d/45-x11/20-libxau.sh +++ b/scripts.d/45-x11/20-libxau.sh @@ -1,6 +1,6 @@ #!/bin/bash -LIBXAU_REPO="https://gitlab.freedesktop.org/xorg/lib/libxau.git" +LIBXAU_REPO="https://cgit.freedesktop.org/xorg/lib/libxau.git" LIBXAU_COMMIT="d9443b2c57b512cfb250b35707378654d86c7dea" ffbuild_enabled() { diff --git a/scripts.d/45-x11/30-libxcb.sh b/scripts.d/45-x11/30-libxcb.sh index c554e50..41486de 100755 --- a/scripts.d/45-x11/30-libxcb.sh +++ b/scripts.d/45-x11/30-libxcb.sh @@ -1,6 +1,6 @@ #!/bin/bash -LIBXCB_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git" +LIBXCB_REPO="https://cgit.freedesktop.org/xorg/lib/libxcb.git" LIBXCB_COMMIT="43fbf03e549bf6da8d1d8522e0ceddc4d49c37c6" ffbuild_enabled() { diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh index 408a30f..2f36080 100755 --- a/scripts.d/45-x11/40-libx11.sh +++ b/scripts.d/45-x11/40-libx11.sh @@ -1,6 +1,6 @@ #!/bin/bash -LIBX11_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git" +LIBX11_REPO="https://cgit.freedesktop.org/xorg/lib/libx11.git" LIBX11_COMMIT="4c96f3567a8d045ee57b886fddc9618b71282530" ffbuild_enabled() { diff --git a/scripts.d/45-x11/50-libxext.sh b/scripts.d/45-x11/50-libxext.sh index 77d5bad..dc67d11 100755 --- a/scripts.d/45-x11/50-libxext.sh +++ b/scripts.d/45-x11/50-libxext.sh @@ -1,6 +1,6 @@ #!/bin/bash -LIBXEXT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxext.git" +LIBXEXT_REPO="https://cgit.freedesktop.org/xorg/lib/libxext.git" LIBXEXT_COMMIT="47904063048fa6ef6e8e16219ddef4d14d5d9a4b" ffbuild_enabled() { diff --git a/scripts.d/45-x11/50-libxfixes.sh b/scripts.d/45-x11/50-libxfixes.sh index 693f3dd..b9b2e91 100755 --- a/scripts.d/45-x11/50-libxfixes.sh +++ b/scripts.d/45-x11/50-libxfixes.sh @@ -1,6 +1,6 @@ #!/bin/bash -LIBXFIXES_REPO="https://gitlab.freedesktop.org/xorg/lib/libxfixes.git" +LIBXFIXES_REPO="https://cgit.freedesktop.org/xorg/lib/libxfixes.git" LIBXFIXES_COMMIT="6fe3bd64dd82f704ed91478acb4c99ab5c00be16" ffbuild_enabled() { diff --git a/scripts.d/45-x11/50-libxi.sh b/scripts.d/45-x11/50-libxi.sh index 4ba520a..349bb25 100755 --- a/scripts.d/45-x11/50-libxi.sh +++ b/scripts.d/45-x11/50-libxi.sh @@ -1,6 +1,6 @@ #!/bin/bash -LIBXI_REPO="https://gitlab.freedesktop.org/xorg/lib/libxi.git" +LIBXI_REPO="https://cgit.freedesktop.org/xorg/lib/libxi.git" LIBXI_COMMIT="f24d7f43ab4d97203e60677a3d42e11dbc80c8b4" ffbuild_enabled() { diff --git a/scripts.d/45-x11/50-libxinerama.sh b/scripts.d/45-x11/50-libxinerama.sh index 9483165..2009684 100755 --- a/scripts.d/45-x11/50-libxinerama.sh +++ b/scripts.d/45-x11/50-libxinerama.sh @@ -1,6 +1,6 @@ #!/bin/bash -LIBXINERAMA_REPO="https://gitlab.freedesktop.org/xorg/lib/libxinerama.git" +LIBXINERAMA_REPO="https://cgit.freedesktop.org/xorg/lib/libxinerama.git" LIBXINERAMA_COMMIT="c5187f076d16601c15c59c5a2f05c0513d9f042b" ffbuild_enabled() { diff --git a/scripts.d/45-x11/50-libxrender.sh b/scripts.d/45-x11/50-libxrender.sh index e4ac8af..02ae3da 100755 --- a/scripts.d/45-x11/50-libxrender.sh +++ b/scripts.d/45-x11/50-libxrender.sh @@ -1,6 +1,6 @@ #!/bin/bash -LIBXRENDER_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrender.git" +LIBXRENDER_REPO="https://cgit.freedesktop.org/xorg/lib/libxrender.git" LIBXRENDER_COMMIT="bce0618839fc33f44edd8b5498b8e33d167806ff" ffbuild_enabled() { diff --git a/scripts.d/45-x11/50-libxscrnsaver.sh b/scripts.d/45-x11/50-libxscrnsaver.sh index 5b37c50..627a082 100755 --- a/scripts.d/45-x11/50-libxscrnsaver.sh +++ b/scripts.d/45-x11/50-libxscrnsaver.sh @@ -1,6 +1,6 @@ #!/bin/bash -LIBXSCRNSAVER_REPO="https://gitlab.freedesktop.org/xorg/lib/libxscrnsaver.git" +LIBXSCRNSAVER_REPO="https://cgit.freedesktop.org/xorg/lib/libxscrnsaver.git" LIBXSCRNSAVER_COMMIT="aa9fd5061d0a8832480ad0c1acc9d2e864e807f4" ffbuild_enabled() { diff --git a/scripts.d/45-x11/50-libxxf86vm.sh b/scripts.d/45-x11/50-libxxf86vm.sh index 147573f..652b51a 100755 --- a/scripts.d/45-x11/50-libxxf86vm.sh +++ b/scripts.d/45-x11/50-libxxf86vm.sh @@ -1,6 +1,6 @@ #!/bin/bash -LIBXXF86VM_REPO="https://gitlab.freedesktop.org/xorg/lib/libxxf86vm.git" +LIBXXF86VM_REPO="https://cgit.freedesktop.org/xorg/lib/libxxf86vm.git" LIBXXF86VM_COMMIT="7f43cd2a905e7b93b83c9ce81dabb768f6fa2bc7" ffbuild_enabled() { diff --git a/scripts.d/45-x11/60-libglvnd.sh b/scripts.d/45-x11/60-libglvnd.sh index c726ac0..89c175f 100755 --- a/scripts.d/45-x11/60-libglvnd.sh +++ b/scripts.d/45-x11/60-libglvnd.sh @@ -1,6 +1,6 @@ #!/bin/bash -GLVND_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git" +GLVND_REPO="https://cgit.freedesktop.org/glvnd/libglvnd.git" GLVND_COMMIT="8f3c5b17a21e2222ab3e5fd38870b915815aca49" ffbuild_enabled() { diff --git a/scripts.d/45-x11/60-libxcursor.sh b/scripts.d/45-x11/60-libxcursor.sh index d79bdb5..fa9fd2e 100755 --- a/scripts.d/45-x11/60-libxcursor.sh +++ b/scripts.d/45-x11/60-libxcursor.sh @@ -1,6 +1,6 @@ #!/bin/bash -LIBXCURSOR_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcursor.git" +LIBXCURSOR_REPO="https://cgit.freedesktop.org/xorg/lib/libxcursor.git" LIBXCURSOR_COMMIT="801925839d26e7c8d942c5e02c4897652ead26c8" ffbuild_enabled() { diff --git a/scripts.d/45-x11/60-libxrandr.sh b/scripts.d/45-x11/60-libxrandr.sh index bc159c1..96b2723 100755 --- a/scripts.d/45-x11/60-libxrandr.sh +++ b/scripts.d/45-x11/60-libxrandr.sh @@ -1,6 +1,6 @@ #!/bin/bash -LIBXRANDR_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrandr.git" +LIBXRANDR_REPO="https://cgit.freedesktop.org/xorg/lib/libxrandr.git" LIBXRANDR_COMMIT="55dcda4518eda8ae03ef25ea29d3c994ad71eb0a" ffbuild_enabled() { diff --git a/scripts.d/45-x11/60-libxv.sh b/scripts.d/45-x11/60-libxv.sh index 1648a2e..351f4f0 100755 --- a/scripts.d/45-x11/60-libxv.sh +++ b/scripts.d/45-x11/60-libxv.sh @@ -1,6 +1,6 @@ #!/bin/bash -LIBXV_REPO="https://gitlab.freedesktop.org/xorg/lib/libxv.git" +LIBXV_REPO="https://cgit.freedesktop.org/xorg/lib/libxv.git" LIBXV_COMMIT="03a6f599d060591a9a7cd8558bd2143a1c7c70d7" ffbuild_enabled() { diff --git a/scripts.d/50-vaapi/30-libpciaccess.sh b/scripts.d/50-vaapi/30-libpciaccess.sh index c623beb..0443e08 100755 --- a/scripts.d/50-vaapi/30-libpciaccess.sh +++ b/scripts.d/50-vaapi/30-libpciaccess.sh @@ -1,6 +1,6 @@ #!/bin/bash -LIBPCIACCESS_REPO="https://gitlab.freedesktop.org/xorg/lib/libpciaccess.git" +LIBPCIACCESS_REPO="https://cgit.freedesktop.org/xorg/lib/libpciaccess.git" LIBPCIACCESS_COMMIT="9c01fdd7c02d8b9b5003e659ebca0b3643bd47c4" ffbuild_enabled() { diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh index e8e78ba..ec6884d 100755 --- a/scripts.d/50-vaapi/40-libdrm.sh +++ b/scripts.d/50-vaapi/40-libdrm.sh @@ -1,6 +1,6 @@ #!/bin/bash -LIBDRM_REPO="https://gitlab.freedesktop.org/mesa/drm.git" +LIBDRM_REPO="https://cgit.freedesktop.org/mesa/drm.git" LIBDRM_COMMIT="440e2d7a34de5c839c4d6d758b21b1bc359255d5" ffbuild_enabled() {