-
Notifications
You must be signed in to change notification settings - Fork 7.4k
[wlroots] Add new port #11913
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
[wlroots] Add new port #11913
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
9482c96
Added wlroots port
handicraftsman 79c444a
Merge branch 'master' of https://github.com/microsoft/vcpkg
handicraftsman 53e0515
Updated ci.baseline.txt to not build wlroots for platforms other than…
handicraftsman 2b0ca9d
Updated ci.baseline.txt to not build wlroots for platforms other than…
handicraftsman 8de8335
Okay, sorry, my bad, misread documentation. wlroots ci should work now
handicraftsman 1334128
[wlroots] Wrong comment location which is nowhere warned about :shrugs:
handicraftsman 5124a92
[wlroots] Updated wlroots port according to requirements
handicraftsman db150b3
Update CONTROL
LilyWangL ba7ede1
Update ci.baseline.txt
LilyWangL File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| Source: wlroots | ||
| Version: 0.10.1 | ||
| Description: A modular Wayland compositor library | ||
| Homepage: https://github.com/swaywm/wlroots/ | ||
| Supports: linux & !(arm|windows|osx) | ||
| Build-Depends: tool-meson, pixman | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| message("wlroots currently requires the following libraries from the system package manager: | ||
| wayland | ||
| wayland-protocols | ||
| EGL | ||
| GLESv2 | ||
| libdrm | ||
| GBM | ||
| libinput | ||
| xkbcommon | ||
| udev | ||
| pixman | ||
| systemd (optional, for logind support) | ||
| elogind (optional, for logind support on systems without systemd) | ||
|
|
||
| If you choose to enable X11 support: | ||
|
|
||
| xcb | ||
| xcb-composite | ||
| xcb-xfixes | ||
| xcb-xinput | ||
| xcb-image | ||
| xcb-render | ||
| x11-xcb | ||
| xcb-errors (optional, for improved error reporting) | ||
| x11-icccm (optional, for improved Xwayland introspection)") | ||
|
|
||
| vcpkg_fail_port_install( | ||
| MESSAGE "Only Linux is supported by wlroots" | ||
| ON_ARCH x86 arm arm64 | ||
| ON_TARGET WINDOWS UWP ANDROID FREEBSD OSX | ||
| ) | ||
|
|
||
| vcpkg_from_github( | ||
| OUT_SOURCE_PATH SOURCE_PATH | ||
| REPO swaywm/wlroots | ||
| REF 0c7c562482575cacaecadcd7913ef25aeb21711f # 0.10.1 | ||
| SHA512 3b464041331e0f61386200bb89ba3c603f5bd37545bf1c3413ba2be03d684e5187466b4fa4821a701c2148191a7f933ec087bc148467f7f5b2a04c23f21a0bcf | ||
| HEAD_REF master | ||
| PATCHES use-system-wayland-data.patch | ||
| ) | ||
|
|
||
| vcpkg_configure_meson( | ||
| SOURCE_PATH ${SOURCE_PATH} | ||
| OPTIONS | ||
| --backend=ninja | ||
| "-Dvcpkg_installed_dir=${CURRENT_INSTALLED_DIR}" | ||
| ) | ||
|
|
||
| vcpkg_install_meson() | ||
|
|
||
| file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| diff --git a/meson.build b/meson.build | ||
| index 0056b8a9..8a9fac6c 100644 | ||
| --- a/meson.build | ||
| +++ b/meson.build | ||
| @@ -94,6 +94,7 @@ if cc.get_id() == 'clang' | ||
| add_project_arguments('-Wno-missing-braces', language: 'c') | ||
| endif | ||
|
|
||
| +threads = dependency('threads') | ||
| wayland_server = dependency('wayland-server', version: '>=1.16') | ||
| wayland_client = dependency('wayland-client') | ||
| wayland_egl = dependency('wayland-egl') | ||
| @@ -105,12 +106,16 @@ gbm = dependency('gbm', version: '>=17.1.0') | ||
| libinput = dependency('libinput', version: '>=1.9.0') | ||
| xkbcommon = dependency('xkbcommon') | ||
| udev = dependency('libudev') | ||
| -pixman = dependency('pixman-1') | ||
| +pixman = declare_dependency( | ||
| + link_args: ['-L' + get_option('vcpkg_installed_dir') + '/lib/', '-lpixman-1'], | ||
| + include_directories: [include_directories(get_option('vcpkg_installed_dir') + '/include/')] | ||
| +) | ||
| math = cc.find_library('m') | ||
| rt = cc.find_library('rt') | ||
|
|
||
| wlr_files = [] | ||
| wlr_deps = [ | ||
| + threads, | ||
| wayland_server, | ||
| wayland_client, | ||
| wayland_egl, | ||
| @@ -154,7 +159,7 @@ lib_wlr = library( | ||
| meson.project_name(), wlr_files, | ||
| version: '.'.join(so_version), | ||
| dependencies: wlr_deps, | ||
| - include_directories: [wlr_inc, proto_inc], | ||
| + include_directories: [wlr_inc, proto_inc, '/usr/include/libdrm/'], | ||
| install: true, | ||
| link_args : symbols_flag, | ||
| link_depends: symbols_file, | ||
| diff --git a/meson_options.txt b/meson_options.txt | ||
| index e6efd780..6b63e595 100644 | ||
| --- a/meson_options.txt | ||
| +++ b/meson_options.txt | ||
| @@ -6,3 +6,4 @@ option('xcb-icccm', type: 'feature', value: 'auto', description: 'Use xcb-icccm | ||
| option('xwayland', type: 'feature', value: 'auto', yield: true, description: 'Enable support for X11 applications') | ||
| option('x11-backend', type: 'feature', value: 'auto', description: 'Enable X11 backend') | ||
| option('examples', type: 'boolean', value: true, description: 'Build example applications') | ||
| +option('vcpkg_installed_dir', type: 'string', description: 'Path to vcpkg install prefix') | ||
| diff --git a/protocol/meson.build b/protocol/meson.build | ||
| index 1f295df0..26f1d8a1 100644 | ||
| --- a/protocol/meson.build | ||
| +++ b/protocol/meson.build | ||
| @@ -1,14 +1,6 @@ | ||
| -wl_protocol_dir = wayland_protos.get_variable(pkgconfig: 'pkgdatadir') | ||
| +wl_protocol_dir = '/usr/share/wayland-protocols/' | ||
|
|
||
| -wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true) | ||
| -if wayland_scanner_dep.found() | ||
| - wayland_scanner = find_program( | ||
| - wayland_scanner_dep.get_variable(pkgconfig: 'wayland_scanner'), | ||
| - native: true, | ||
| - ) | ||
| -else | ||
| - wayland_scanner = find_program('wayland-scanner', native: true) | ||
| -endif | ||
| +wayland_scanner = find_program('/usr/bin/wayland-scanner', native: true) | ||
|
|
||
| protocols = { | ||
| # Stable upstream protocols |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.