Use vendored versions on 24.04

flacjacket · Jul 12, 2024 · 1bc7298 · 1bc7298
1 parent 0fe85c4
commit 1bc7298
Showing 1 changed file with 7 additions and 44 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,11 +11,7 @@ jobs:
     name: Build Wayland libraries
     runs-on: ubuntu-24.04
     env:
-      libdrm-version: "2.4.114"
-      seatd-version: "0.6.4"
-      pixman-version: "0.42.0"
       xwayland-version: "22.1.9"
-      hwdata-version: "0.364"
       wayland-version: "1.22.0"
       wayland-protocols-version: "1.32"
     strategy:
@@ -27,12 +23,16 @@ jobs:
         run: |
           sudo apt update
           sudo apt-get install -y --no-install-recommends \
-            libepoxy-dev \
+            hwdata \
+            libdrm-dev \
             libegl1-mesa-dev \
+            libepoxy-dev \
             libgbm-dev \
             libgles2-mesa-dev \
             libinput-dev \
             libpciaccess-dev \
+            libpixman-1-dev \
+            libtirpc-dev \
             libxcb-composite0-dev \
             libxcb-dri3-dev \
             libxcb-ewmh-dev \
@@ -48,6 +48,7 @@ jobs:
             libxkbcommon-dev \
             libxshmfence-dev \
             meson \
+            seatd \
             xfonts-utils \
             xserver-xorg-dev \
             ninja-build
@@ -62,27 +63,15 @@ jobs:
           wget $WAYLAND_URL
           wget $WAYLAND_PROTOCOLS_URL
           wget $XWAYLAND_URL
-          wget $LIBDRM_URL
-          wget -O seatd.tar.gz $SEATD_URL
-          wget $PIXMAN_URL
-          wget -O hwdata.tar.gz $HWDATA_URL
           wget -O wlroots.tar.gz $WLROOTS_URL
           tar -xJf wayland-${{ env.wayland-version }}.tar.xz
           tar -xJf wayland-protocols-${{ env.wayland-protocols-version }}.tar.xz
           tar -xzf xserver-xwayland-${{ env.xwayland-version }}.tar.gz
-          tar -xzf drm-libdrm-${{ env.libdrm-version }}.tar.gz
-          tar -xzf seatd.tar.gz
-          tar -xjf pixman-pixman-${{ env.pixman-version }}.tar.bz2
-          tar -xzf hwdata.tar.gz
           tar -xzf wlroots.tar.gz
         env:
           WAYLAND_URL: https://gitlab.freedesktop.org/wayland/wayland/-/releases/${{ env.wayland-version }}/downloads/wayland-${{ env.wayland-version }}.tar.xz
           WAYLAND_PROTOCOLS_URL: https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/${{ env.wayland-protocols-version }}/downloads/wayland-protocols-${{ env.wayland-protocols-version }}.tar.xz
           XWAYLAND_URL: https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-${{ env.xwayland-version }}/xserver-xwayland-${{ env.xwayland-version }}.tar.gz
-          LIBDRM_URL: https://gitlab.freedesktop.org/mesa/drm/-/archive/libdrm-${{ env.libdrm-version }}/drm-libdrm-${{ env.libdrm-version }}.tar.gz
-          SEATD_URL: https://git.sr.ht/~kennylevinsen/seatd/archive/${{ env.seatd-version }}.tar.gz
-          PIXMAN_URL: https://gitlab.freedesktop.org/pixman/pixman/-/archive/pixman-${{ env.pixman-version }}/pixman-pixman-${{ env.pixman-version }}.tar.bz2
-          HWDATA_URL: https://github.com/vcrhonek/hwdata/archive/refs/tags/v${{ env.hwdata-version }}.tar.gz
           WLROOTS_URL: https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/${{ matrix.wlroots-version }}/wlroots-${{ matrix.wlroots-version }}.tar.gz
       - name: Build wayland
         working-directory: wayland-${{ env.wayland-version }}
@@ -98,33 +87,6 @@ jobs:
           ninja -C build
           DESTDIR=~/wayland ninja -C build install
           sudo ninja -C build install
-      - name: Build libdrm
-        working-directory: drm-libdrm-${{ env.libdrm-version }}
-        run: |
-          meson build --prefix=/usr
-          ninja -C build
-          DESTDIR=~/wayland ninja -C build install
-          sudo ninja -C build install
-      - name: Build seatd
-        working-directory: seatd-${{ env.seatd-version }}
-        run: |
-          meson build --prefix=/usr
-          ninja -C build
-          DESTDIR=~/wayland ninja -C build install
-          sudo ninja -C build install
-      - name: Build pixman
-        working-directory: pixman-pixman-${{ env.pixman-version }}
-        run: |
-          meson build --prefix=/usr
-          ninja -C build
-          DESTDIR=~/wayland ninja -C build install
-          sudo ninja -C build install
-      - name: Build hwdata
-        working-directory: hwdata-${{ env.hwdata-version }}
-        run: |
-          ./configure --prefix=/usr --libdir=/lib --datadir=/usr/share
-          make
-          sudo make install
       - name: Build xwayland
         working-directory: xserver-xwayland-${{ env.xwayland-version }}
         run: |
@@ -189,6 +151,7 @@ jobs:
             libgles2-mesa-dev \
             libinput-dev \
             libpciaccess-dev \
+            libpixman-1-dev \
             libxcb-composite0-dev \
             libxcb-ewmh-dev \
             libxcb-dri3-dev \