Skip to content

Commit d981eae

Browse files
authored
[Actions][Linux] Add more client libs to be built, fix a compile warning (#323)
* Add a warning suppression to graphics buffer * Enable compositor client and graphics buffer options * Update ThunderClientLibraries workflow to use development branch * Add libgbm-dev package for 32 and 64-bit builds * Update package list for 32-bit architecture Added 'libdrm-dev:i386' package for 32-bit architecture support. * Add libegl-dev package to Linux build template * Add libgles2-mesa-dev package for 32-bit builds * Update ThunderClientLibraries workflow to use master branch
1 parent 1413f9d commit d981eae

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

.github/workflows/Linux build template.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ jobs:
4343
export DEBIAN_FRONTEND=noninteractive
4444
PKGS="python3-venv python3-pip build-essential cmake ninja-build libusb-1.0-0-dev"
4545
if [ "${{ matrix.architecture }}" = "32" ]; then
46-
PKGS="$PKGS zlib1g-dev:i386 libssl-dev:i386 libsbc-dev:i386 gcc-13-multilib g++-13-multilib"
46+
PKGS="$PKGS zlib1g-dev:i386 libssl-dev:i386 libsbc-dev:i386 gcc-13-multilib g++-13-multilib libgbm-dev:i386 libdrm-dev:i386 libegl-dev:i386 libgles2-mesa-dev:i386"
4747
else
48-
PKGS="$PKGS zlib1g-dev libssl-dev libsbc-dev"
48+
PKGS="$PKGS zlib1g-dev libssl-dev libsbc-dev libgbm-dev libdrm-dev libegl-dev libgles2-mesa-dev"
4949
fi
5050
for attempt in {1..4}; do
5151
if sudo apt-get install -y --no-install-recommends $PKGS; then
@@ -94,7 +94,7 @@ jobs:
9494
- name: Build ThunderClientLibraries
9595
run: |
9696
source venv/bin/activate
97-
${{matrix.architecture == '32' && 'export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig:$PKG_CONFIG_PATH' || ':'}}
97+
${{matrix.architecture == '32' && 'export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig:$PKG_CONFIG_PATH' || 'PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH'}}
9898
cmake -G Ninja -S ThunderClientLibraries -B ${{matrix.build_type}}/build/ThunderClientLibraries \
9999
-DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \
100100
-DCMAKE_C_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \
@@ -103,10 +103,13 @@ jobs:
103103
-DBLUETOOTHAUDIOSINK=ON \
104104
-DBLUETOOTHAUDIOSOURCE=ON \
105105
-DCDMI=ON \
106+
-DCOMPOSITORCLIENT=ON \
107+
-DPLUGIN_COMPOSITOR_IMPLEMENTATION=Mesa \
106108
-DCRYPTOGRAPHY=ON \
107109
-DCRYPTOGRAPHY_IMPLEMENTATION="OpenSSL" \
108110
-DDEVICEINFO=ON \
109111
-DDISPLAYINFO=ON \
112+
-DGRAPHICSBUFFER=ON \
110113
-DLOCALTRACER=ON \
111114
-DSECURITYAGENT=ON \
112115
-DPLAYERINFO=ON \

Source/graphicsbuffer/example/main.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,9 @@ int main(int argc, const char* argv[])
348348
while (planes->Next() == true) {
349349
int fd = planes->Descriptor();
350350
printf("Writing to [%d]:\n", fd);
351+
PUSH_WARNING(DISABLE_WARNING_UNUSED_RESULT)
351352
::write(fd, "Hello World !!!\n", 16);
353+
POP_WARNING()
352354
::fsync(fd);
353355
}
354356
}

0 commit comments

Comments
 (0)