Commit 3bdc10f842c3eba74b9837caa21339a68a19efbe
2022-07-30T19:41:48
Update the list of required Ubuntu packages, and add Ubuntu 22.04 workflows
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 68b5cd7..118b9ea 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,8 +17,10 @@ jobs:
platform:
- { name: Windows (mingw32), os: windows-latest, shell: 'msys2 {0}', msystem: mingw32, msys-env: mingw-w64-i686, cc: gcc }
- { name: Windows (mingw64+clang), os: windows-latest, shell: 'msys2 {0}', msystem: mingw64, msys-env: mingw-w64-x86_64, cc: clang }
- - { name: Linux (CMake), os: ubuntu-20.04, shell: sh }
- - { name: Linux (autotools), os: ubuntu-20.04, shell: sh, autotools: true }
+ - { name: Ubuntu 20.04 (CMake), os: ubuntu-20.04, shell: sh }
+ - { name: Ubuntu 20.04 (autotools), os: ubuntu-20.04, shell: sh, autotools: true }
+ - { name: Ubuntu 22.04 (CMake), os: ubuntu-22.04, shell: sh }
+ - { name: Ubuntu 22.04 (autotools), os: ubuntu-22.04, shell: sh, autotools: true }
- { name: MacOS (CMake), os: macos-latest, shell: sh, cmake: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"' }
- { name: MacOS (autotools), os: macos-latest, shell: sh, autotools: true }
@@ -49,48 +51,18 @@ jobs:
if: runner.os == 'Linux'
run: |
sudo apt-get update
- sudo apt-get install \
- autoconf \
- gnome-desktop-testing \
- wayland-protocols \
- pkg-config \
- ninja-build \
- libasound2-dev \
- libdbus-1-dev \
- libegl1-mesa-dev \
- libgl1-mesa-dev \
- libgles2-mesa-dev \
- libglu1-mesa-dev \
- libibus-1.0-dev \
- libpulse-dev \
- libsdl2-2.0-0 \
- libsndio-dev \
- libudev-dev \
- libwayland-dev \
- libwayland-client++0 \
- wayland-scanner++ \
- libwayland-cursor++0 \
- libx11-dev \
- libxcursor-dev \
- libxext-dev \
- libxi-dev \
- libxinerama-dev \
- libxkbcommon-dev \
- libxrandr-dev \
- libxss-dev \
- libxt-dev \
- libxv-dev \
- libxxf86vm-dev \
- libdrm-dev \
- libgbm-dev\
- libpulse-dev \
- libpango1.0-dev
- sudo apt install meson
- git clone --depth 1 https://gitlab.gnome.org/jadahl/libdecor.git --branch 0.1.0
- cd libdecor
- meson build --buildtype release -Ddemo=false -Ddbus=disabled
- ninja -v -C build
- sudo meson install -C build
+ sudo apt-get install build-essential git make autoconf automake libtool \
+ pkg-config cmake ninja-build gnome-desktop-testing libasound2-dev libpulse-dev \
+ libaudio-dev libjack-dev libsndio-dev libsamplerate0-dev libx11-dev libxext-dev \
+ libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libwayland-dev \
+ libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \
+ libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev
+
+ - name: Setup extra Ubuntu 22.04 dependencies
+ if: matrix.platform.os == 'ubuntu-22.04'
+ run: |
+ sudo apt-get install libpipewire-0.3-dev libdecor-0-dev
+
- name: Setup Macos dependencies
if: runner.os == 'macOS'
run: |
diff --git a/docs/README-linux.md b/docs/README-linux.md
index d440dee..4634ecd 100644
--- a/docs/README-linux.md
+++ b/docs/README-linux.md
@@ -12,15 +12,16 @@ default configuration parameters.
Build Dependencies
--------------------------------------------------------------------------------
-Ubuntu 20.04, all available features enabled:
-
- sudo apt-get install build-essential git make cmake autoconf automake \
- libtool pkg-config libasound2-dev libpulse-dev libaudio-dev libjack-dev \
- libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev \
- libxss-dev libgl1-mesa-dev libdbus-1-dev \
- libudev-dev libgles2-mesa-dev libegl1-mesa-dev libibus-1.0-dev \
- fcitx-libs-dev libsamplerate0-dev libsndio-dev libwayland-dev \
- libxkbcommon-dev libdrm-dev libgbm-dev
+Ubuntu 18.04, all available features enabled:
+
+ sudo apt-get install build-essential git make autoconf automake libtool \
+ pkg-config cmake ninja-build gnome-desktop-testing libasound2-dev libpulse-dev \
+ libaudio-dev libjack-dev libsndio-dev libsamplerate0-dev libx11-dev libxext-dev \
+ libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libwayland-dev \
+ libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \
+ libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev
+
+Ubuntu 22.04+ can also add `libpipewire-0.3-dev libdecor-0-dev` to that command line.
Fedora 35, all available features enabled: