From 0da7cc1caaee75af34aa12281f1f73500b02aac7 Mon Sep 17 00:00:00 2001 From: matt335672 <30179339+matt335672@users.noreply.github.com> Date: Wed, 30 Mar 2022 09:51:47 +0100 Subject: Add glamor to CI --- .github/workflows/build.yml | 8 ++++++++ scripts/install_xorgxrdp_build_dependencies_with_apt.sh | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7f4d30b..ee5d534 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,6 +27,10 @@ jobs: CONF_FLAGS: --without-simd name_extra: Without simd + - CC: gcc + CONF_FLAGS: --enable-glamor + name_extra: With glamor + - CC: gcc CONF_FLAGS: --host=i686-linux CFLAGS: -m32 @@ -44,6 +48,10 @@ jobs: CONF_FLAGS: --without-simd name_extra: Without simd + - CC: clang + CONF_FLAGS: --enable-glamor + name_extra: With glamor + - CC: clang CONF_FLAGS: --host=i686-linux CFLAGS: -m32 diff --git a/scripts/install_xorgxrdp_build_dependencies_with_apt.sh b/scripts/install_xorgxrdp_build_dependencies_with_apt.sh index 1346a28..ce4ffc4 100755 --- a/scripts/install_xorgxrdp_build_dependencies_with_apt.sh +++ b/scripts/install_xorgxrdp_build_dependencies_with_apt.sh @@ -21,6 +21,13 @@ PACKAGES=" \ nasm \ " +# Additional packages for glamor build +PACKAGES="$PACKAGES \ + libgbm-dev \ + libepoxy-dev \ + libegl1-mesa-dev \ + " + case "$ARCH" in amd64) -- cgit v1.2.3