Conversation
1. Remove WLR_VERSION/WLR_VERSION_MAJOR/MINOR/PATCH from waylib's wconfig.h.in; WLR_HAVE_* feature macros are kept in use. 2. Drop the pkg_get_variable(WLR_VERSION_*) lines in waylib/src/server/CMakeLists.txt; WLROOTS_VERSION stays for the wlroots CMake export sanity check. 3. Remove the always-true WLR_VERSION_MINOR > 16 condition from ENABLE_VULKAN_RENDER (wlroots is pinned to 0.20). Log: No user-facing changes Influence: 1. Configure and build treeland: generated wconfig.h contains no WLR_VERSION macros 2. Build waylib standalone against waylib-wlroots.pc: feature macros stay intact 3. Verify Vulkan rendering path (ENABLE_VULKAN_RENDER) still compiles with wlroots 0.20 refactor: 移除不再需要的 WLR_VERSION 宏 1. waylib 的 wconfig.h.in 删除 WLR_VERSION/WLR_VERSION_MAJOR/MINOR/PATCH 宏,保留仍在使用的 WLR_HAVE_* feature 宏 2. 删除 waylib/src/server/CMakeLists.txt 中 pkg_get_variable(WLR_VERSION_*) 三行;WLROOTS_VERSION 保留用于 wlroots CMake export 存在性检查 3. ENABLE_VULKAN_RENDER 条件去掉恒真的 WLR_VERSION_MINOR > 16 (wlroots 锁定 0.20) Log: 无用户可见变化 Influence: 1. 配置并编译 treeland:生成的 wconfig.h 不再包含任何 WLR_VERSION 宏 2. waylib standalone 方式基于 waylib-wlroots.pc 构建:feature 宏保持完整 3. 验证 Vulkan 渲染路径(ENABLE_VULKAN_RENDER)在 wlroots 0.20 下正常编译
|
Skipping CI for Draft Pull Request. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: deepin-wm The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Reviewer's guide (collapsed on small PRs)Reviewer's GuideThis refactor removes unused wlroots version-component metadata from generated configuration and standalone CMake setup, while preserving feature macros and the WLROOTS_VERSION sanity check. Vulkan rendering now depends only on wlroots Vulkan support and Qt Vulkan availability, consistent with the pinned wlroots 0.20 dependency. Flow diagram for simplified Vulkan render capability detectionflowchart LR
W[WLR_HAVE_VULKAN_RENDERER] --> C{Qt Vulkan enabled}
Q["QT_CONFIG(vulkan)"] --> C
C -->|yes| E[ENABLE_VULKAN_RENDER]
C -->|no| D[Vulkan rendering disabled]
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
WM-528
Summary
waylib and treeland only support a pinned wlroots version (0.20), and the CMake
WLROOTS_VERSIONsanity check already covers that. TheWLR_VERSIONmacros in the generatedwconfig.hhad no remaining consumers, so they are removed:waylib/src/server/cmake/wconfig.h.in: dropWLR_VERSION/WLR_VERSION_MAJOR/MINOR/PATCH; keep theWLR_HAVE_*feature macros still used bywglobal.hetc.waylib/src/server/CMakeLists.txt: drop the threepkg_get_variable(WLR_VERSION_*)lines;WLROOTS_VERSIONstays for the wlroots CMake export sanity check.waylib/src/server/kernel/wglobal.h: drop the always-trueWLR_VERSION_MINOR > 16condition fromENABLE_VULKAN_RENDER(wlroots is pinned to 0.20).Test recommendations
cmake --preset=default+ build): the generatedwconfig.hcontains noWLR_VERSIONmacroswaylib-wlroots.pc:WLR_HAVE_*feature macros stay intactENABLE_VULKAN_RENDER) still compiles and enables with wlroots 0.20Summary by Sourcery
Remove unused wlroots version macros and rely on the pinned wlroots version for Vulkan rendering support.
Enhancements:
Build: