Skip to content

Commit d7aa39b

Browse files
committed
Build wayland+protocols on manylinux
1 parent 21ec575 commit d7aa39b

File tree

7 files changed

+41
-5
lines changed

7 files changed

+41
-5
lines changed

buildconfig/manylinux-build/README.rst

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,5 @@ TODO
172172

173173
Maybe these need adding?
174174

175-
- wayland, https://wayland.freedesktop.org/building.html http://www.linuxfromscratch.org/blfs/view/svn/general/wayland-protocols.html
175+
- audio resampling for SDL: libsamplerate (handles samplerate conversions better)
176176
- vulkan, via mesa?
177-
- xinput,
178-
- xrandr,
179-

buildconfig/manylinux-build/docker_base/Dockerfile-aarch64

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ RUN ["bash", "/libffi_build/build-libffi.sh"]
5050
ADD libxml2 /libxml2_build/
5151
RUN ["bash", "/libxml2_build/build-libxml2.sh"]
5252

53+
ADD wayland /wayland_build/
54+
RUN ["bash", "/wayland_build/build-wayland.sh"]
55+
5356
#ADD zlib-ng /zlib-ng_build/
5457
#RUN ["bash", "/zlib-ng_build/build-zlib-ng.sh"]
5558

buildconfig/manylinux-build/docker_base/Dockerfile-i686

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ RUN ["linux32", "bash", "/libffi_build/build-libffi.sh"]
5050
ADD libxml2 /libxml2_build/
5151
RUN ["linux32", "bash", "/libxml2_build/build-libxml2.sh"]
5252

53+
ADD wayland /wayland_build/
54+
RUN ["linux32", "bash", "/wayland_build/build-wayland.sh"]
55+
5356
#ADD zlib-ng /zlib-ng_build/
5457
#RUN ["linux32", "bash", "/zlib-ng_build/build-zlib-ng.sh"]
5558

buildconfig/manylinux-build/docker_base/Dockerfile-x86_64

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ RUN ["bash", "/libffi_build/build-libffi.sh"]
5050
ADD libxml2 /libxml2_build/
5151
RUN ["bash", "/libxml2_build/build-libxml2.sh"]
5252

53+
ADD wayland /wayland_build/
54+
RUN ["bash", "/wayland_build/build-wayland.sh"]
55+
5356
#ADD zlib-ng /zlib-ng_build/
5457
#RUN ["bash", "/zlib-ng_build/build-zlib-ng.sh"]
5558

buildconfig/manylinux-build/docker_base/pkg-config/build-pkg-config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ cd $(dirname `readlink -f "$0"`)
1313
COMPILED_PKGCONFIG_DIRS=$(pkg-config --variable pc_path pkg-config)
1414

1515
# append path(s) where other installs put .pc files
16-
COMPILED_PKGCONFIG_DIRS="$PG_DEP_PREFIX/lib/pkgconfig:${COMPILED_PKGCONFIG_DIRS}"
16+
COMPILED_PKGCONFIG_DIRS="$PG_DEP_PREFIX/lib/pkgconfig:$PG_DEP_PREFIX/share/pkgconfig:${COMPILED_PKGCONFIG_DIRS}"
1717

1818
PKGCONFIG=pkg-config-0.29.2
1919

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#!/bin/bash
2+
set -e -x
3+
4+
cd $(dirname `readlink -f "$0"`)
5+
6+
WAYLAND_VER=1.21.0
7+
WAYLAND_PROT_VER=1.31
8+
9+
WAYLAND="wayland-$WAYLAND_VER"
10+
WAYLAND_PROT="wayland-protocols-$WAYLAND_PROT_VER"
11+
12+
curl -sL --retry 10 https://gitlab.freedesktop.org/wayland/wayland/-/archive/$WAYLAND_VER/$WAYLAND.tar.gz > $WAYLAND.tar.gz
13+
curl -sL --retry 10 https://gitlab.freedesktop.org/wayland/wayland-protocols/-/archive/$WAYLAND_PROT_VER/$WAYLAND_PROT.tar.gz > $WAYLAND_PROT.tar.gz
14+
15+
sha512sum -c wayland.sha512sum
16+
17+
tar xzf $WAYLAND.tar.gz
18+
cd $WAYLAND
19+
20+
meson build/ $PG_BASE_MESON_FLAGS -Ddocumentation=false -Dtests=false
21+
ninja -C build/ install
22+
23+
cd ..
24+
tar xzf $WAYLAND_PROT.tar.gz
25+
cd $WAYLAND_PROT
26+
27+
meson build/ $PG_BASE_MESON_FLAGS -Dtests=false
28+
ninja -C build/ install
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
856378c43c43c1a1ff2a047055ac6e8d7bb2b0bd44bd5a96c0ebd5c8b97a10482367b81d56ed49774ae1fffda0fa18cfb9110ffcb4da413ecf97d1fe6d7f35dd wayland-1.21.0.tar.gz
2+
cb0d38fada64832f8f7c71c1fcdd16fc3013cd81ac7146edbc4361328c9e5f02e31e0ba3b5219e85103fdc35aee49d54f9be537594d3618c5fb27de7375f84e1 wayland-protocols-1.31.tar.gz

0 commit comments

Comments
 (0)