diff --git a/bdftopcf.yaml b/bdftopcf.yaml index 7c69991a41f..008f61646da 100644 --- a/bdftopcf.yaml +++ b/bdftopcf.yaml @@ -1,7 +1,7 @@ package: name: bdftopcf version: 1.1.2 - epoch: 3 + epoch: 4 description: X.org font bdftopcf copyright: - license: MIT-open-group @@ -17,20 +17,18 @@ environment: - build-base - busybox - ca-certificates-bundle - - font-xproto-dev - - fontsproto-dev + - pkgconf-dev - util-macros + - xorgproto pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: bc60be5904330faaa3ddd2aed7874bee2f29e4387c245d6787552f067eb0523a - uri: https://www.x.org/archive/individual/util/bdftopcf-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/util/bdftopcf + tag: bdftopcf-${{package.version}} + expected-commit: 0ee2c68b5d3ea3eb36f895d9dfcc4ebe1416f176 - uses: autoconf/configure - with: - opts: | - --mandir=/usr/share/man - uses: autoconf/make diff --git a/encodings.yaml b/encodings.yaml index fddb3dec9da..5d4adab8d6d 100644 --- a/encodings.yaml +++ b/encodings.yaml @@ -1,7 +1,7 @@ package: name: encodings version: 1.1.0 - epoch: 1 + epoch: 2 description: X.org font encoding files copyright: - license: LicenseRef-xorg-font-encoding @@ -15,14 +15,16 @@ environment: - build-base - busybox - ca-certificates-bundle + - font-util-dev - mkfontscale - util-macros pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 9ff13c621756cfa12e95f32ba48a5b23839e8f577d0048beda66c67dab4de975 - uri: https://www.x.org/releases/individual/font/encodings-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/font/encodings + tag: encodings-${{package.version}} + expected-commit: a7e63704951b95351096c1d96808d48d0fb7e0a8 - uses: autoconf/configure with: diff --git a/font-alias.yaml b/font-alias.yaml index 76811efc11a..66c4b25e531 100644 --- a/font-alias.yaml +++ b/font-alias.yaml @@ -2,7 +2,7 @@ package: name: font-alias version: 1.0.5 - epoch: 3 + epoch: 4 description: X.org font alias files copyright: - license: LicenseRef-xorg-font-alias @@ -16,12 +16,15 @@ environment: - build-base - busybox - ca-certificates-bundle + - font-util-dev + - util-macros pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 9f89e217bb73e0e3636a0a493fbf8b7c995156e0c53d9a0476d201b67c2d6b6e - uri: https://www.x.org/releases/individual/font/font-alias-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/font/alias + tag: font-alias-${{package.version}} + expected-commit: 05282e1160350c2340d51ac991704f7e390f8420 - uses: autoconf/configure diff --git a/font-misc-cyrillic.yaml b/font-misc-cyrillic.yaml index 8673b225f7f..ebf26417365 100644 --- a/font-misc-cyrillic.yaml +++ b/font-misc-cyrillic.yaml @@ -2,7 +2,7 @@ package: name: font-misc-cyrillic version: 1.0.4 - epoch: 3 + epoch: 4 description: X.org misc cyrillic fonts copyright: - license: LicenseRef-xorg-font-misc-cyrillic @@ -22,12 +22,14 @@ environment: - font-util-dev - fontconfig - mkfontscale + - util-macros pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 76021a7f53064001914a57fd08efae57f76b68f0a24dca8ab1b245474ee8e993 - uri: https://www.x.org/releases/individual/font/font-misc-cyrillic-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/font/misc-cyrillic + tag: font-misc-cyrillic-${{package.version}} + expected-commit: b34e4d82fecde316384876ae9315380f32234f87 - uses: autoconf/configure diff --git a/font-misc.yaml b/font-misc.yaml index 5e259bdc149..1924b2830c8 100644 --- a/font-misc.yaml +++ b/font-misc.yaml @@ -1,7 +1,7 @@ package: name: font-misc version: 1.1.3 - epoch: 2 + epoch: 3 description: X.org font misc copyright: - license: LicenseRef-xorg-font-misc @@ -19,13 +19,15 @@ environment: - font-util - font-util-dev - mkfontscale + - pkgconf-dev - util-macros pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 79abe361f58bb21ade9f565898e486300ce1cc621d5285bec26e14b6a8618fed - uri: https://www.x.org/releases/individual/font/font-misc-misc-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/font/misc-misc + tag: font-misc-misc-${{package.version}} + expected-commit: c4e2af05583764fae3d0b2aa20d5c93b031cbcbf - uses: autoconf/configure diff --git a/font-sony-misc.yaml b/font-sony-misc.yaml index 2dcd7ab4535..c72ecdb1447 100644 --- a/font-sony-misc.yaml +++ b/font-sony-misc.yaml @@ -1,7 +1,7 @@ package: name: font-sony-misc version: 1.0.4 - epoch: 1 + epoch: 2 description: X.org Sony fonts copyright: - license: HPND-sell-variant @@ -20,12 +20,14 @@ environment: - font-util-dev - fontconfig - mkfontscale + - util-macros pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: e6b09f823fccb06e0bd0b2062283b6514153323bd8a7486e9c2e3f55ab84946b - uri: https://www.x.org/releases/individual/font/font-sony-misc-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/font/sony-misc + tag: font-sony-misc-${{package.version}} + expected-commit: dea9a181f64ca0c6740de4ce23be26bc28b8df81 - uses: autoconf/configure with: diff --git a/font-util.yaml b/font-util.yaml index 56db6933514..3740dc4c7ee 100644 --- a/font-util.yaml +++ b/font-util.yaml @@ -1,7 +1,7 @@ package: name: font-util version: 1.4.1 - epoch: 3 + epoch: 4 description: X.org font utilities copyright: - license: LicenseRef-xorg-font-util @@ -19,10 +19,11 @@ environment: - util-macros pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 5c9f64123c194b150fee89049991687386e6ff36ef2af7b80ba53efaf368cc95 - uri: https://www.x.org/releases/individual/font/font-util-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/font/util + tag: font-util-${{package.version}} + expected-commit: b5ca142f81a6f14eddb23be050291d1c25514777 - uses: autoconf/configure with: diff --git a/font-xproto.yaml b/font-xproto.yaml index b390ef92034..4641389f6e9 100644 --- a/font-xproto.yaml +++ b/font-xproto.yaml @@ -1,7 +1,7 @@ package: name: font-xproto version: 7.0.31 - epoch: 4 + epoch: 5 description: X.org font xproto copyright: - license: MIT @@ -14,12 +14,16 @@ environment: - build-base - busybox - ca-certificates-bundle + - pkgconf-dev + - util-macros pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 6d755eaae27b45c5cc75529a12855fed5de5969b367ed05003944cf901ed43c7 - uri: https://www.x.org/releases/individual/proto/xproto-${{package.version}}.tar.gz + # TODO: This repository is deprecated and archived - can we drop this package? + repository: https://gitlab.freedesktop.org/xorg/proto/xproto + tag: xproto-${{package.version}} + expected-commit: f3b7b856777500113cee524dbd295fcbbce11fab - uses: autoconf/configure diff --git a/fontsproto.yaml b/fontsproto.yaml index 00be75e3221..1277a51878d 100644 --- a/fontsproto.yaml +++ b/fontsproto.yaml @@ -1,7 +1,7 @@ package: name: fontsproto version: 2.1.3 - epoch: 2 + epoch: 3 description: X.org fontsproto copyright: - license: MIT-open-group @@ -14,12 +14,16 @@ environment: - build-base - busybox - ca-certificates-bundle + - pkgconf-dev + - util-macros pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 72c44e63044b2b66f6fa112921621ecc20c71193982de4f198d9a29cda385c5e - uri: https://www.x.org/releases/individual/proto/fontsproto-${{package.version}}.tar.gz + # TODO: This repository is deprecated and archived - can we drop this package? + repository: https://gitlab.freedesktop.org/xorg/proto/fontsproto + tag: fontsproto-${{package.version}} + expected-commit: df8c05f7c0253a36589d96efa52938215eff9d4d - uses: autoconf/configure with: diff --git a/libfontenc.yaml b/libfontenc.yaml index 61c4cf1febc..10e16bf8f38 100644 --- a/libfontenc.yaml +++ b/libfontenc.yaml @@ -1,7 +1,7 @@ package: name: libfontenc version: 1.1.8 - epoch: 2 + epoch: 3 description: X11 font encoding library copyright: - license: MIT @@ -14,15 +14,19 @@ environment: - build-base - busybox - ca-certificates-bundle + - font-util-dev + - libtool + - pkgconf-dev - util-macros - xorgproto - zlib-dev pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 7b02c3d405236e0d86806b1de9d6868fe60c313628b38350b032914aa4fd14c6 - uri: https://www.x.org/releases/individual/lib/libfontenc-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/lib/libfontenc + tag: libfontenc-${{package.version}} + expected-commit: 92a85fda2acb4e14ec0b2f6d8fe3eaf2b687218c - uses: autoconf/configure with: diff --git a/libpciaccess.yaml b/libpciaccess.yaml index 618be6fcd7a..3842bd3c277 100644 --- a/libpciaccess.yaml +++ b/libpciaccess.yaml @@ -2,7 +2,7 @@ package: name: libpciaccess version: 0.18.1 - epoch: 4 + epoch: 5 description: X11 PCI access library copyright: - license: X11 @@ -20,10 +20,11 @@ environment: - util-macros pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 4af43444b38adb5545d0ed1c2ce46d9608cc47b31c2387fc5181656765a6fa76 - uri: https://www.x.org/releases/individual/lib/libpciaccess-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/lib/libpciaccess + tag: libpciaccess-${{package.version}} + expected-commit: 2ec2576cabefef1eaa5dd9307c97de2e887fc347 - runs: | meson \ diff --git a/libxaw.yaml b/libxaw.yaml index 31ba0c4d880..d20cab55ec5 100644 --- a/libxaw.yaml +++ b/libxaw.yaml @@ -1,7 +1,7 @@ package: name: libxaw version: 1.0.16 - epoch: 2 + epoch: 3 description: X Athena Widget Set copyright: - license: MIT @@ -15,18 +15,21 @@ environment: - busybox - ca-certificates-bundle - libice-dev + - libtool - libx11-dev - libxext-dev - libxmu-dev - libxpm-dev + - pkgconf-dev - util-macros - xorgproto pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 012f90adf8739f2f023d63a5fee1528949cf2aba92ef7ac1abcfc2ae9cf28798 - uri: https://www.x.org/releases/individual/lib/libXaw-${{package.version}}.tar.gz + repository: https://gitlab.freedesktop.org/xorg/lib/libxaw + tag: libXaw-${{package.version}} + expected-commit: f14ba54e9c7e415a05e33dd0b3b5f96e5de05c8b - uses: autoconf/configure with: diff --git a/libxcursor.yaml b/libxcursor.yaml index 59bfa7daba8..9f3992ee523 100644 --- a/libxcursor.yaml +++ b/libxcursor.yaml @@ -1,7 +1,7 @@ package: name: libxcursor version: 1.2.3 - epoch: 2 + epoch: 3 description: X cursor management library copyright: - license: MIT @@ -14,17 +14,20 @@ environment: - build-base - busybox - ca-certificates-bundle + - libtool - libx11-dev - libxfixes-dev - libxrender-dev + - pkgconf-dev - util-macros - xorgproto pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: fde9402dd4cfe79da71e2d96bb980afc5e6ff4f8a7d74c159e1966afb2b2c2c0 - uri: https://www.x.org/releases/individual/lib/libXcursor-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/lib/libxcursor + tag: libXcursor-${{package.version}} + expected-commit: 8ae6cf61b18ecddf26f72a07bbfbd1ea9f022c36 - uses: autoconf/configure diff --git a/libxcvt.yaml b/libxcvt.yaml index 2d541d00f33..f52253b240e 100644 --- a/libxcvt.yaml +++ b/libxcvt.yaml @@ -1,7 +1,7 @@ package: name: libxcvt version: 0.1.3 - epoch: 2 + epoch: 3 description: "VESA CVT standard timing modeline generation library & utility" copyright: - license: MIT @@ -14,10 +14,11 @@ environment: - meson pipeline: - - uses: fetch + - uses: git-checkout with: - uri: https://www.x.org/releases/individual/lib/libxcvt-${{package.version}}.tar.xz - expected-sha256: a929998a8767de7dfa36d6da4751cdbeef34ed630714f2f4a767b351f2442e01 + repository: https://gitlab.freedesktop.org/xorg/lib/libxcvt + tag: libxcvt-${{package.version}} + expected-commit: dd8631c61465cc0de5e476c7a98e56528d62b163 - uses: meson/configure diff --git a/libxdamage.yaml b/libxdamage.yaml index 67288260dd4..f54fee30447 100644 --- a/libxdamage.yaml +++ b/libxdamage.yaml @@ -1,7 +1,7 @@ package: name: libxdamage version: 1.1.6 - epoch: 3 + epoch: 4 description: X11 damaged region extension library copyright: - license: MIT @@ -14,16 +14,19 @@ environment: - build-base - busybox - ca-certificates-bundle + - libtool - libx11-dev - libxfixes-dev + - pkgconf-dev - util-macros - xorgproto pipeline: - - uses: fetch + - uses: git-checkout with: - uri: https://www.x.org/releases/individual/lib/libXdamage-${{package.version}}.tar.xz - expected-sha512: 624dcefa1c79064569df952892f7f1351dc19ad338ce73d1a57041e406cb3e18abe531bab352b93d1f0f5c9b5c6b2652cc84a8f1fbfcbba648343812695a8acb + repository: https://gitlab.freedesktop.org/xorg/lib/libxdamage + tag: libXdamage-${{package.version}} + expected-commit: 1f20df4fd7c132f55e924dc5ec3f270cd54704d0 - uses: autoconf/configure with: diff --git a/libxfixes.yaml b/libxfixes.yaml index d4f67c6f014..212c2da87d5 100644 --- a/libxfixes.yaml +++ b/libxfixes.yaml @@ -1,7 +1,7 @@ package: name: libxfixes version: "6.0.2" - epoch: 0 + epoch: 1 description: X11 miscellaneous 'fixes' extension library copyright: - license: MIT @@ -14,15 +14,18 @@ environment: - build-base - busybox - ca-certificates-bundle + - libtool - libx11-dev + - pkgconf-dev - util-macros - xorgproto pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 041331b8e6e36038b3bf836785b6b175ec8515f964c9e4e3316b3bfed0f53ac7 - uri: https://www.x.org/releases/individual/lib/libXfixes-${{package.version}}.tar.gz + repository: https://gitlab.freedesktop.org/xorg/lib/libxfixes + tag: libXfixes-${{package.version}} + expected-commit: 70d5b0e37f8a759f3dbc218f22954347ceed094a - uses: autoconf/configure diff --git a/libxfont.yaml b/libxfont.yaml index 792cc0ac357..6602e169bd7 100644 --- a/libxfont.yaml +++ b/libxfont.yaml @@ -1,7 +1,7 @@ package: name: libxfont version: 2.0.7 - epoch: 3 + epoch: 4 description: "X font handling library for server & utilities" copyright: - license: BSD-4-Clause @@ -15,13 +15,17 @@ environment: - busybox - freetype-dev - libfontenc-dev + - libtool + - pkgconf-dev + - util-macros - zlib-dev pipeline: - - uses: fetch + - uses: git-checkout with: - uri: https://www.x.org/releases/individual/lib/libXfont2-${{package.version}}.tar.xz - expected-sha256: 8b7b82fdeba48769b69433e8e3fbb984a5f6bf368b0d5f47abeec49de3e58efb + repository: https://gitlab.freedesktop.org/xorg/lib/libxfont + tag: libXfont2-${{package.version}} + expected-commit: 2c2e44c94ef17ecd5003a173237b57b315e28d93 - uses: autoconf/configure diff --git a/libxft.yaml b/libxft.yaml index 8bccf21b604..e9b4e61d7c5 100644 --- a/libxft.yaml +++ b/libxft.yaml @@ -1,7 +1,7 @@ package: name: libxft version: "2.3.9" - epoch: 1 + epoch: 2 description: FreeType-based font drawing library for X copyright: - license: MIT @@ -17,16 +17,19 @@ environment: - expat-dev - fontconfig-dev - freetype-dev + - libtool - libxrender-dev + - pkgconf-dev - util-macros - xorgproto - zlib-dev pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 60a25b78945ed6932635b3bb1899a517d31df7456e69867ffba27f89ff3976f5 - uri: https://www.x.org/releases/individual/lib/libXft-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/lib/libxft + tag: libXft-${{package.version}} + expected-commit: f4805c8645914cbdcfd42e71051ba3f8fc664ef5 - uses: autoconf/configure with: diff --git a/libxinerama.yaml b/libxinerama.yaml index 06ea224b318..604b912f04a 100644 --- a/libxinerama.yaml +++ b/libxinerama.yaml @@ -1,7 +1,7 @@ package: name: libxinerama version: 1.1.5 - epoch: 3 + epoch: 4 description: X11 Xinerama extension library copyright: - license: MIT @@ -14,16 +14,19 @@ environment: - build-base - busybox - ca-certificates-bundle + - libtool - libx11-dev - libxext-dev + - pkgconf-dev - util-macros - xorgproto pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 5094d1f0fcc1828cb1696d0d39d9e866ae32520c54d01f618f1a3c1e30c2085c - uri: https://www.x.org/releases/individual/lib/libXinerama-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/lib/libxinerama + tag: libXinerama-${{package.version}} + expected-commit: 71dfee64feb84f907016940263b235a61c9e8960 - uses: autoconf/configure diff --git a/libxkb.yaml b/libxkb.yaml index ff6aed71752..1e654bcbfbe 100644 --- a/libxkb.yaml +++ b/libxkb.yaml @@ -1,7 +1,8 @@ +# TODO: Misnamed duplicate of libxkbfile - should be dropped/merged? package: name: libxkb version: 1.1.3 - epoch: 2 + epoch: 3 description: "X11 keyboard file manipulation library" copyright: - license: MIT @@ -12,21 +13,20 @@ environment: - build-base - busybox - ca-certificates-bundle + - libtool - libx11-dev + - pkgconf-dev + - util-macros - wolfi-base pipeline: - - uses: fetch + - uses: git-checkout with: - uri: https://www.x.org/releases/individual/lib/libxkbfile-${{package.version}}.tar.xz - expected-sha256: a9b63eea997abb9ee6a8b4fbb515831c841f471af845a09de443b28003874bec - - - runs: | - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc + repository: https://gitlab.freedesktop.org/xorg/lib/libxkbfile + tag: libxkbfile-${{package.version}} + expected-commit: 39a5f8e67615f443e76146769d5f5f9abc5ebd2f + + - uses: autoconf/configure - uses: autoconf/make diff --git a/libxkbfile.yaml b/libxkbfile.yaml index 82335f773e2..9b7829cff18 100644 --- a/libxkbfile.yaml +++ b/libxkbfile.yaml @@ -1,7 +1,7 @@ package: name: libxkbfile version: 1.1.3 - epoch: 2 + epoch: 3 description: X11 keyboard file manipulation library copyright: - license: MIT @@ -14,14 +14,17 @@ environment: - build-base - busybox - ca-certificates-bundle + - libtool - libx11-dev + - pkgconf-dev - util-macros pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha512: d80ac41f6fa3a1ffad77ea1f8f9d9542f0bd210d74b263802bc6e6c1594fe325b27f42b5454aeeb36352518963b1ed1fdbbad95d7db3690b2e36d54742b7c236 - uri: https://www.x.org/releases/individual/lib/libxkbfile-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/lib/libxkbfile + tag: libxkbfile-${{package.version}} + expected-commit: 39a5f8e67615f443e76146769d5f5f9abc5ebd2f - uses: autoconf/configure diff --git a/libxmu.yaml b/libxmu.yaml index d9624433141..0ad1dc456b9 100644 --- a/libxmu.yaml +++ b/libxmu.yaml @@ -1,7 +1,7 @@ package: name: libxmu version: 1.2.1 - epoch: 2 + epoch: 3 description: X11 miscellaneous micro-utility library copyright: - license: MIT @@ -16,18 +16,21 @@ environment: - ca-certificates-bundle - libice-dev - libsm-dev + - libtool - libx11-dev - libxext-dev - libxt-dev + - pkgconf-dev - util-linux-dev - util-macros - xmlto pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: fcb27793248a39e5fcc5b9c4aec40cc0734b3ca76aac3d7d1c264e7f7e14e8b2 - uri: https://www.x.org/releases/individual/lib/libXmu-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/lib/libxmu + tag: libXmu-${{package.version}} + expected-commit: 792f80402ee06ce69bca3a8f2a84295999c3a170 - uses: autoconf/configure with: diff --git a/libxrandr.yaml b/libxrandr.yaml index ee2e8ac1374..e11cff14aac 100644 --- a/libxrandr.yaml +++ b/libxrandr.yaml @@ -1,7 +1,7 @@ package: name: libxrandr version: 1.5.4 - epoch: 3 + epoch: 4 description: X11 RandR extension library copyright: - license: MIT @@ -14,17 +14,20 @@ environment: - build-base - busybox - ca-certificates-bundle + - libtool - libx11-dev - libxext-dev - libxrender-dev + - pkgconf-dev - util-macros - xorgproto pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: c72c94dc3373512ceb67f578952c5d10915b38cc9ebb0fd176a49857b8048e22 - uri: https://www.x.org/releases/individual/lib/libXrandr-${{package.version}}.tar.gz + repository: https://gitlab.freedesktop.org/xorg/lib/libxrandr + tag: libXrandr-${{package.version}} + expected-commit: 512bf0b15b5597c721ff8c61083616ca9040fa72 - uses: autoconf/configure diff --git a/libxscrnsaver.yaml b/libxscrnsaver.yaml index 615f040c90e..8be04a2ab83 100644 --- a/libxscrnsaver.yaml +++ b/libxscrnsaver.yaml @@ -1,7 +1,7 @@ package: name: libxscrnsaver version: "1.2.5" - epoch: 0 + epoch: 1 description: X.Org screen saver extension copyright: - license: MIT @@ -14,16 +14,19 @@ environment: - build-base - busybox - ca-certificates-bundle + - libtool - libx11-dev - libxext-dev + - pkgconf-dev - util-macros - xorgproto pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 5057365f847253e0e275871441e10ff7846c8322a5d88e1e187d326de1cd8d00 - uri: https://www.x.org/releases/individual/lib/libXScrnSaver-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/lib/libxscrnsaver + tag: libXScrnSaver-${{package.version}} + expected-commit: 60c957ba8a727d01b376da0142aef7e18aa86fe1 - uses: autoconf/configure diff --git a/libxshmfence.yaml b/libxshmfence.yaml index 8014f3650c9..0071e014094 100644 --- a/libxshmfence.yaml +++ b/libxshmfence.yaml @@ -2,7 +2,7 @@ package: name: libxshmfence version: 1.3.3 - epoch: 1 + epoch: 2 description: X11 shared memory fences copyright: - license: MIT @@ -15,24 +15,25 @@ environment: - build-base - busybox - ca-certificates-bundle + - libtool - linux-headers + - pkgconf-dev - util-macros - xorgproto pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: d4a4df096aba96fea02c029ee3a44e11a47eb7f7213c1a729be83e85ec3fde10 - uri: https://www.x.org/releases/individual/lib/libxshmfence-${{package.version}}.tar.xz - - - runs: | - CFLAGS="$CFLAGS -flto=auto" \ - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --disable-static \ - --enable-futex \ + repository: https://gitlab.freedesktop.org/xorg/lib/libxshmfence + tag: libxshmfence-${{package.version}} + expected-commit: 89f064748554e11832a3ec783945e1f4c7fe846e + + - uses: autoconf/configure + with: + opts: | + --disable-static \ + --enable-futex \ + CFLAGS="-flto=auto" - uses: autoconf/make diff --git a/libxss.yaml b/libxss.yaml index 51483343763..285fa7dd25d 100644 --- a/libxss.yaml +++ b/libxss.yaml @@ -1,7 +1,8 @@ +# TODO: Duplicate of libxscrnsaver - should be dropped/merged? package: name: libxss version: "1.2.5" - epoch: 0 + epoch: 1 description: "Xlib-based X11 Screen Saver extension client library" copyright: - license: XFree86-1.1 @@ -11,19 +12,20 @@ environment: packages: - build-base - busybox + - libtool - libx11-dev - libxext-dev + - pkgconf-dev + - util-macros pipeline: - - uses: fetch + - uses: git-checkout with: - uri: https://www.x.org/releases/individual/lib/libXScrnSaver-${{package.version}}.tar.xz - expected-sha256: 5057365f847253e0e275871441e10ff7846c8322a5d88e1e187d326de1cd8d00 + repository: https://gitlab.freedesktop.org/xorg/lib/libxscrnsaver + tag: libXScrnSaver-${{package.version}} + expected-commit: 60c957ba8a727d01b376da0142aef7e18aa86fe1 - uses: autoconf/configure - with: - opts: | - --mandir=/usr/share/man - uses: autoconf/make diff --git a/libxv.yaml b/libxv.yaml index a9f28c75169..236afd3d89d 100644 --- a/libxv.yaml +++ b/libxv.yaml @@ -1,7 +1,7 @@ package: name: libxv version: 1.0.13 - epoch: 2 + epoch: 3 description: "X11 Video extension library" copyright: - license: MIT @@ -13,28 +13,28 @@ environment: - build-base - busybox - ca-certificates-bundle + - libtool - libx11-dev - libxext-dev + - pkgconf-dev - util-macros - wolfi-base - xorgproto pipeline: - - uses: fetch + - uses: git-checkout with: - uri: https://www.x.org/releases/individual/lib/libXv-${{package.version}}.tar.xz - expected-sha512: 80d7a11e6415fbe0fc50c3c2a1abf8f0f2ec38446c9c8d88ff48875cd94b8949cb1028f2ab37476c4b25cbd7eac34dde9132dd998c4e04ea576b95ae411ba946 + repository: https://gitlab.freedesktop.org/xorg/lib/libxv + tag: libXv-${{package.version}} + expected-commit: e1cde54538060c4fd3a3d02e3d2e2b7e5da7bff9 + + - uses: autoconf/configure + + - uses: autoconf/make + + - uses: autoconf/make-install - runs: | - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make - make DESTDIR="${{targets.destdir}}" install install -D -m644 COPYING "${{targets.destdir}}"/usr/share/licenses/${{package.name}}/COPYING - uses: strip diff --git a/libxxf86vm.yaml b/libxxf86vm.yaml index b1589b2effc..e39274b87ab 100644 --- a/libxxf86vm.yaml +++ b/libxxf86vm.yaml @@ -2,7 +2,7 @@ package: name: libxxf86vm version: 1.1.6 - epoch: 1 + epoch: 2 description: X11 XFree86 video mode extension library copyright: - license: MIT @@ -15,16 +15,19 @@ environment: - build-base - busybox - ca-certificates-bundle + - libtool - libx11-dev - libxext-dev + - pkgconf-dev - util-macros - xorgproto pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 96af414c73ce1d5449ad04be7f9f27fa8330f844b6dda843ef22e3e1befb3ee3 - uri: https://www.x.org/releases/individual/lib/libXxf86vm-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/lib/libxxf86vm + tag: libXxf86vm-${{package.version}} + expected-commit: 4f7497ee3b0deb0418ce48dcd862fd6c23e20064 - uses: autoconf/configure diff --git a/mkfontscale.yaml b/mkfontscale.yaml index 04b33cb58a8..c4e3d74180c 100644 --- a/mkfontscale.yaml +++ b/mkfontscale.yaml @@ -1,7 +1,7 @@ package: name: mkfontscale version: 1.2.3 - epoch: 2 + epoch: 3 description: Scalable font index generator for X copyright: - license: MIT @@ -26,15 +26,17 @@ environment: - ca-certificates-bundle - freetype-dev - libfontenc-dev + - pkgconf-dev - util-macros - xorgproto - zlib-dev pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 2921cdc344f1acee04bcd6ea1e29565c1308263006e134a9ee38cf9c9d6fe75e - uri: https://www.x.org/releases/individual/app/mkfontscale-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/app/mkfontscale + tag: mkfontscale-${{package.version}} + expected-commit: bcfa27aeef3a9eb720e6b48e3fb8a4c2813fef52 - uses: autoconf/configure diff --git a/pixman.yaml b/pixman.yaml index 196585f36b1..fb8246f908c 100644 --- a/pixman.yaml +++ b/pixman.yaml @@ -1,7 +1,7 @@ package: name: pixman version: "0.46.4" - epoch: 0 + epoch: 1 description: Low-level pixel manipulation library copyright: - license: MIT @@ -18,10 +18,11 @@ environment: - meson pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: a098c33924754ad43f981b740f6d576c70f9ed1006e12221b1845431ebce1239 - uri: https://www.x.org/releases/individual/lib/pixman-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/pixman/pixman + tag: pixman-${{package.version}} + expected-commit: 9cc163c9da0fb4da430641715313d95a6ec466d9 - runs: | export LDFLAGS="$LDFLAGS -Wl,-z,stack-size=2097152" diff --git a/util-macros.yaml b/util-macros.yaml index 8e293c4dca7..56f93e96708 100644 --- a/util-macros.yaml +++ b/util-macros.yaml @@ -1,7 +1,7 @@ package: name: util-macros version: 1.20.2 - epoch: 1 + epoch: 2 description: X.Org Autotools macros copyright: - license: MIT @@ -16,10 +16,11 @@ environment: - ca-certificates-bundle pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: f642f8964d81acdf06653fdf9dbc210c43ce4bd308bd644a8d573148d0ced76b - uri: https://www.x.org/releases/individual/util/util-macros-${{package.version}}.tar.gz + repository: https://gitlab.freedesktop.org/xorg/util/macros + tag: util-macros-${{package.version}} + expected-commit: a9d71e3fd8e6758b70be31c586921bbbcd2a8449 - uses: autoconf/configure diff --git a/xauth.yaml b/xauth.yaml index 670b048d266..4ffdb7598e7 100644 --- a/xauth.yaml +++ b/xauth.yaml @@ -1,7 +1,7 @@ package: name: xauth version: "1.1.4" - epoch: 1 + epoch: 2 description: X.Org authorization settings program copyright: - license: MIT-open-group @@ -18,13 +18,15 @@ environment: - libxau-dev - libxext-dev - libxmu-dev + - pkgconf-dev - util-macros pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: e9318141464ad7b4dc0f8564a580f0d20f977c85a388cc40d5a766206151c690 - uri: https://www.x.org/releases/individual/app/xauth-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/app/xauth + tag: xauth-${{package.version}} + expected-commit: f71ca21cf1ab840e9664b7c3e99c229bd977a6a4 - uses: autoconf/configure diff --git a/xbitmaps.yaml b/xbitmaps.yaml index acf7a3c8a16..be1562dc7dd 100644 --- a/xbitmaps.yaml +++ b/xbitmaps.yaml @@ -1,7 +1,7 @@ package: name: xbitmaps version: 1.1.3 - epoch: 3 + epoch: 4 description: X.org header files with bitmaps copyright: - license: MIT @@ -17,10 +17,11 @@ environment: - util-macros pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: ad6cad54887832a17d86c2ccfc5e52a1dfab090f8307b152c78b0e1529cd0f7a - uri: https://www.x.org/releases/individual/data/xbitmaps-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/data/bitmaps + tag: xbitmaps-${{package.version}} + expected-commit: aed8d7ced841f9c5af757bf24e5488828d5c77e6 - uses: autoconf/configure diff --git a/xinit.yaml b/xinit.yaml index b0115588078..415fcb11f19 100644 --- a/xinit.yaml +++ b/xinit.yaml @@ -2,7 +2,7 @@ package: name: xinit version: "1.4.4" - epoch: 1 + epoch: 2 description: X.Org initialisation program copyright: - license: MIT @@ -17,16 +17,18 @@ environment: - ca-certificates-bundle - libx11-dev - mcookie + - pkgconf-dev - util-macros - xauth - xmodmap - xrdb pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 40a47c7a164c7f981ce3787b4b37f7e411fb43231dcde543d70094075dacfef9 - uri: https://www.x.org/releases/individual/app/xinit-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/app/xinit + tag: xinit-${{package.version}} + expected-commit: cfa71d44248562f22f2d92732c5e493e89061569 - uses: autoconf/configure diff --git a/xkbcomp.yaml b/xkbcomp.yaml index a74168cf043..faed3f7a1b2 100644 --- a/xkbcomp.yaml +++ b/xkbcomp.yaml @@ -1,7 +1,7 @@ package: name: xkbcomp version: "1.5.0" - epoch: 0 + epoch: 1 description: "XKB keyboard description compiler" copyright: - license: MIT @@ -9,22 +9,22 @@ package: environment: contents: packages: + - bison - build-base - busybox - libx11-dev - libxkbfile-dev + - pkgconf-dev - util-macros pipeline: - - uses: fetch + - uses: git-checkout with: - uri: https://www.x.org/releases/individual/app/xkbcomp-${{package.version}}.tar.xz - expected-sha256: 2ac31f26600776db6d9cd79b3fcd272263faebac7eb85fb2f33c7141b8486060 + repository: https://gitlab.freedesktop.org/xorg/app/xkbcomp + tag: xkbcomp-${{package.version}} + expected-commit: 2c7789785981ad1fce3858c726615b49293f7de0 - uses: autoconf/configure - with: - opts: | - --mandir=/usr/share/man - uses: autoconf/make diff --git a/xmodmap.yaml b/xmodmap.yaml index 516255ccc0b..59a504e14c4 100644 --- a/xmodmap.yaml +++ b/xmodmap.yaml @@ -2,7 +2,7 @@ package: name: xmodmap version: 1.0.11 - epoch: 2 + epoch: 3 description: Utility for modifying keymaps and pointer button mappings in X copyright: - license: MIT @@ -16,13 +16,15 @@ environment: - busybox - ca-certificates-bundle - libx11-dev + - pkgconf-dev - util-macros pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: c4fac9df448b98ac5a1620f364e74ed5f7084baae0d09123700f34d4b63cb5d8 - uri: https://www.x.org/releases/individual/app/xmodmap-${{package.version}}.tar.gz + repository: https://gitlab.freedesktop.org/xorg/app/xmodmap + tag: xmodmap-${{package.version}} + expected-commit: 5579ae02a6b44f3072955f3e2f3249d2bd1201e4 - uses: autoconf/configure diff --git a/xorg-server.yaml b/xorg-server.yaml index 92b98ae2d3c..46f7b81ce56 100644 --- a/xorg-server.yaml +++ b/xorg-server.yaml @@ -1,7 +1,7 @@ package: name: xorg-server version: "21.1.21" - epoch: 0 + epoch: 1 description: "X Server" copyright: - license: SGI-B-2.0 @@ -27,12 +27,14 @@ environment: - build-base - busybox - dbus-dev + - font-util-dev - freetype-dev - libdrm - libdrm-dev - libepoxy-dev - libfontenc-dev - libpciaccess-dev + - libtool - libx11-dev - libxcvt-dev - libxext-dev @@ -47,14 +49,17 @@ environment: - mesa-libgallium - openssl-dev - pixman-dev + - pkgconf-dev - systemd-dev + - util-macros - zlib-dev pipeline: - - uses: fetch + - uses: git-checkout with: - uri: https://www.x.org/releases/individual/xserver/xorg-server-${{package.version}}.tar.xz - expected-sha256: c0cbe5545b3f645bae6024b830d1d1154a956350683a4e52b2fff5b0fa1ab519 + repository: https://gitlab.freedesktop.org/xorg/xserver + tag: xorg-server-${{package.version}} + expected-commit: 312a25c65c8a918fea2cc77abd0db07ec0fc421c - uses: autoconf/configure with: diff --git a/xprop.yaml b/xprop.yaml index e5eb6827e92..e590292e5c9 100644 --- a/xprop.yaml +++ b/xprop.yaml @@ -1,7 +1,7 @@ package: name: xprop version: 1.2.8 - epoch: 1 + epoch: 2 description: Property displayer for X copyright: - license: MIT @@ -14,13 +14,15 @@ environment: - build-base - busybox - libx11-dev + - pkgconf-dev - util-macros pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: d689e2adb7ef7b439f6469b51cda8a7daefc83243854c2a3b8f84d0f029d67ee - uri: https://www.x.org/archive/individual/app/xprop-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/app/xprop + tag: xprop-${{package.version}} + expected-commit: a6906a8a067bbfaf2f4a47af1521a85340461714 - uses: autoconf/configure diff --git a/xrdb.yaml b/xrdb.yaml index b51b5e56880..66336cdd1d6 100644 --- a/xrdb.yaml +++ b/xrdb.yaml @@ -2,7 +2,7 @@ package: name: xrdb version: 1.2.2 - epoch: 2 + epoch: 3 description: X server resource database utility copyright: - license: MIT @@ -17,13 +17,15 @@ environment: - ca-certificates-bundle - libx11-dev - libxmu-dev + - pkgconf-dev - util-macros pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 31f5fcab231b38f255b00b066cf7ea3b496df712c9eb2d0d50c670b63e5033f4 - uri: https://www.x.org/releases/individual/app/xrdb-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/app/xrdb + tag: xrdb-${{package.version}} + expected-commit: ff688ceacaddb8e2f345caadfe33e408d97782a0 - uses: autoconf/configure with: diff --git a/xset.yaml b/xset.yaml index 96934d070d0..5fb4c1d82e5 100644 --- a/xset.yaml +++ b/xset.yaml @@ -1,7 +1,7 @@ package: name: xset version: 1.2.5 - epoch: 2 + epoch: 3 description: X.Org xset application copyright: - license: MIT @@ -16,13 +16,15 @@ environment: - libx11-dev - libxext-dev - libxmu-dev + - pkgconf-dev - util-macros pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 9f692d55635b3862cd63633b1222a87680ec283c7a8e8ed6dd698a3147f75e2f - uri: https://www.x.org/releases/individual/app/xset-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/app/xset + tag: xset-${{package.version}} + expected-commit: fca58c426ef4eef0c000bfa2758e82e1d1b170e2 - uses: autoconf/configure diff --git a/xtrans.yaml b/xtrans.yaml index 8980c534232..53d69e6bb71 100644 --- a/xtrans.yaml +++ b/xtrans.yaml @@ -1,7 +1,7 @@ package: name: xtrans version: "1.6.0" - epoch: 0 + epoch: 1 description: X transport library copyright: - license: MIT @@ -14,14 +14,16 @@ environment: - build-base - busybox - ca-certificates-bundle + - pkgconf-dev - util-macros - xmlto pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: faafea166bf2451a173d9d593352940ec6404145c5d1da5c213423ce4d359e92 - uri: https://www.x.org/releases/individual/lib/xtrans-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/lib/libxtrans + tag: xtrans-${{package.version}} + expected-commit: cf05ba4a10c90da2c63805a5375e983b174e28b0 - uses: autoconf/configure