mirrors/cage
1
0
Fork 0
mirror of https://github.com/cage-kiosk/cage.git synced 2025-10-29 05:40:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: drop xwayland option

Browse source 
This is unnecessary because Xwayland logic doesn't bring in new
dependencies. We can just compile in our Xwayland-related code
when wlroots has been built with Xwayland support.

See this Sway patch: https://github.com/swaywm/sway/pull/8165
This commit is contained in:
Simon Ser 2024-07-08 19:13:11 +02:00
parent e7d8780f46
commit d3fb99d665
4 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/main.yml vendored
View file

@ -37,7 +37,7 @@ jobs:
# TODO: use --fatal-meson-warnings when on wlroots 0.15.0 # TODO: use --fatal-meson-warnings when on wlroots 0.15.0
- name: Compile Cage (XWayland=${{ matrix.xwayland }}) - name: Compile Cage (XWayland=${{ matrix.xwayland }})
run: | run: |
meson build-${{ matrix.CC }}-${{matrix.xwayland }} -Dxwayland=${{ matrix.xwayland }} meson build-${{ matrix.CC }}-${{matrix.xwayland }} -Dwlroots:xwayland=${{ matrix.xwayland }}
ninja -C build-${{ matrix.CC }}-${{matrix.xwayland }} ninja -C build-${{ matrix.CC }}-${{matrix.xwayland }}
format: format:
@ -54,7 +54,7 @@ jobs:
run: git clone https://gitlab.freedesktop.org/wlroots/wlroots.git subprojects/wlroots -b 0.17 run: git clone https://gitlab.freedesktop.org/wlroots/wlroots.git subprojects/wlroots -b 0.17
- name: Check for formatting changes - name: Check for formatting changes
run: | run: |
meson build-clang-format -Dxwayland=enabled meson build-clang-format -Dwlroots:xwayland=enabled
ninja -C build-clang-format clang-format-check ninja -C build-clang-format clang-format-check
scan-build: scan-build:
@ -73,5 +73,5 @@ jobs:
run: git clone https://gitlab.freedesktop.org/wlroots/wlroots.git subprojects/wlroots -b 0.17 run: git clone https://gitlab.freedesktop.org/wlroots/wlroots.git subprojects/wlroots -b 0.17
- name: Run scan-build - name: Run scan-build
run: | run: |
meson build-scan-build -Dxwayland=enabled meson build-scan-build -Dwlroots:xwayland=enabled
ninja -C build-scan-build scan-build ninja -C build-scan-build scan-build

8
README.md
View file

@ -34,11 +34,9 @@ $ ninja -C build
By default, this builds a debug build. To build a release build, use `meson By default, this builds a debug build. To build a release build, use `meson
build --buildtype=release`. build --buildtype=release`.
Cage comes with compile-time support for XWayland. To enable this, Cage comes with compile-time support for XWayland. To enable this, make sure
first make sure that your version of wlroots is compiled with this that your version of wlroots is compiled with this option. Note that you'll
option. Then, add `-Dxwayland=true` to the `meson` command above. Note need to have the XWayland binary installed on your system for this to work.
that you'll need to have the XWayland binary installed on your system
for this to work.
You can run Cage by running `./build/cage APPLICATION`. If you run it from You can run Cage by running `./build/cage APPLICATION`. If you run it from
within an existing X11 or Wayland session, it will open in a virtual output as within an existing X11 or Wayland session, it will open in a virtual output as

10
meson.build
View file

@ -64,15 +64,7 @@ server_protos = declare_dependency(
sources: server_protos_headers, sources: server_protos_headers,
) )
if not get_option('xwayland').disabled() have_xwayland = wlroots.get_variable(pkgconfig: 'have_xwayland', internal: 'have_xwayland') == 'true'
wlroots_has_xwayland = wlroots.get_variable(pkgconfig: 'have_xwayland', internal: 'have_xwayland') == 'true'
if get_option('xwayland').enabled() and not wlroots_has_xwayland
error('Cannot build Cage with XWayland support: wlroots has been built without it')
endif
have_xwayland = true
else
have_xwayland = false
endif
version = '@0@'.format(meson.project_version()) version = '@0@'.format(meson.project_version())
git = find_program('git', native: true, required: false) git = find_program('git', native: true, required: false)

1
meson_options.txt
View file

@ -1,2 +1 @@
option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages') option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages')
option('xwayland', type: 'feature', value: 'auto', description: 'Enable support for X11 applications')