Force enable wayland in ci and nightly

armanofi · Jan 23, 2021 · ce396a9 · ce396a9
1 parent bcf2de2
commit ce396a9
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -61,8 +61,10 @@ jobs:
 
     - run: |
        sudo apt update
-       sudo apt install libxrandr-dev libxinerama-dev libusb-1.0-0-dev xserver-xorg-dev libswscale-dev libswresample-dev libavutil-dev libavcodec-dev libcups2-dev libpulse-dev libasound2-dev libpcsclite-dev xsltproc libxcb-cursor-dev libxcursor-dev libcairo2-dev libfaac-dev libfaad-dev libjpeg-dev libgsm1-dev ninja-build libxfixes-dev libxkbcommon-dev libwayland-dev libpam0g-dev libxdamage-dev libxcb-damage0-dev ccache libxtst-dev libfuse-dev
-       cmake -GNinja -DWITH_SERVER=ON -DWITH_SAMPLE=ON -DBUILD_TESTING=ON .
+       sudo apt install libxrandr-dev libxinerama-dev libusb-1.0-0-dev xserver-xorg-dev libswscale-dev libswresample-dev libavutil-dev libavcodec-dev libcups2-dev libpulse-dev libasound2-dev libpcsclite-dev xsltproc libxcb-cursor-dev libxcursor-dev libcairo2-dev libfaac-dev libfaad-dev libjpeg-dev libgsm1-dev ninja-build libxfixes-dev libxkbcommon-dev libwayland-dev libpam0g-dev libxdamage-dev libxcb-damage0-dev ccache libxtst-dev libfuse-dev libsystemd-dev libcairo2-dev libsoxr-dev
+       mkdir ci-build
+       cd ci-build
+       cmake -GNinja ../ci/cmake-preloads/config-linux-all.txt ..
        cmake --build .
 
     - name: Perform CodeQL Analysis

diff --git a/.travis.yml b/.travis.yml
@@ -43,12 +43,15 @@ addons:
       - libavutil-dev
       - libx264-dev
       - libxext-dev
+      - ninja-build
+      - libsystemd-dev
+      - libwayland-dev
 
 before_script:
   - ulimit -c unlimited -S 
 
 script:
   - sudo hostname travis-ci.local
-  - cmake -G "Unix Makefiles" -C ci/cmake-preloads/config-linux-all.txt -D CMAKE_BUILD_TYPE=Debug -DWITH_LIBSYSTEMD=OFF -DWITH_WAYLAND=OFF .
+  - cmake -G Ninja -C ci/cmake-preloads/config-linux-all.txt -D CMAKE_BUILD_TYPE=Debug .
   - make
   - make test
diff --git a/ci/cmake-preloads/config-linux-all.txt b/ci/cmake-preloads/config-linux-all.txt
@@ -7,6 +7,7 @@ set (WITH_PULSE ON CACHE BOOL "pulse")
 set (WITH_CHANNELS ON CACHE BOOL "channels")
 set (BUILTIN_CHANNELS ON CACHE BOOL "static channels")
 set (WITH_CUPS ON CACHE BOOL "cups")
+set (WITH_WAYLAND ON CACHE BOOL "wayland")
 set (WITH_GSSAPI ON CACHE BOOL "Kerberos support")
 set (WITH_PCSC ON CACHE BOOL "PCSC")
 set (WITH_JPEG ON CACHE BOOL "jpeg")

diff --git a/packaging/deb/freerdp-nightly/compat b/packaging/deb/freerdp-nightly/compat
@@ -1 +1 @@
-9
+10
diff --git a/packaging/deb/freerdp-nightly/rules b/packaging/deb/freerdp-nightly/rules
@@ -19,6 +19,7 @@ DEB_CMAKE_EXTRA_FLAGS :=  -DCMAKE_SKIP_RPATH=FALSE \
                           -DCHANNEL_URBDRC=ON \
                           -DCHANNEL_URBDRC_CLIENT=ON \
                           -DWITH_SERVER=ON \
+                          -DWITH_WAYLAND=ON \
                           -DWITH_CAIRO=ON \
                           -DBUILD_TESTING=OFF \
                           -DCMAKE_BUILD_TYPE=RelWithDebInfo \