Skip to content

Commit 844ec5c

Browse files
committed
chore: use wayland-protocols git
1 parent 81c1421 commit 844ec5c

File tree

2 files changed

+29
-4
lines changed

2 files changed

+29
-4
lines changed

.github/workflows/build.yml

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,36 @@ jobs:
1818

1919
- name: Install deps
2020
run: |
21-
sudo apt install wayland-utils \
22-
wayland-protocols libwayland-dev \
23-
libpixman-1-dev libjxl-dev libpng-dev
21+
sudo apt install wayland-utils graphviz \
22+
libpixman-1-dev libjxl-dev libpng-dev meson
23+
24+
- name: Install libpng16
25+
run: |
26+
curl https://unlimited.dl.sourceforge.net/project/libpng/libpng16/1.6.54/libpng-1.6.54.tar.xz?viasf=1 -o libpng.tar.xz
27+
xz -d libpng.tar.xz
28+
tar xf libpng.tar
29+
cd libpng-1.6.54
30+
./configure --prefix=/usr
31+
make check
32+
sudo make install
33+
34+
- name: Install wayland
35+
run: |
36+
git clone https://gitlab.freedesktop.org/wayland/wayland.git
37+
cd wayland
38+
meson setup build --buildtype=release --prefix=/usr -Dtests=false -Ddocumentation=false
39+
sudo ninja -C build install
40+
41+
- name: Install wayland-protocols
42+
run: |
43+
git clone https://gitlab.freedesktop.org/wayland/wayland-protocols.git
44+
cd wayland-protocols
45+
meson setup build --buildtype=release --prefix=/usr/local
46+
sudo ninja -C build install
2447
2548
- name: Build
2649
run: |
50+
export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
51+
export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
2752
v run build.vsh
2853
v -prod .

build.vsh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ if arguments().contains('clean') {
4545
program_installed('pkg-config')
4646
program_installed('wayland-scanner')
4747
48-
pkg_installed('wayland-protocols', 1.37)
48+
pkg_installed('wayland-protocols', 1.41)
4949
pkg_installed('wayland-client', none)
5050
pkg_installed('pixman-1', none)
5151
pkg_installed('libjxl', none)

0 commit comments

Comments
 (0)