Skip to content

Add missing libdrm dependency to Wayland backend #4063

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

Add missing libdrm dependency to Wayland backend #4063

wants to merge 1 commit into from

Conversation

chewi
Copy link
Contributor

@chewi chewi commented Jul 10, 2025

Description

wayland.cpp makes use of libdrm, so it should be pulled in as a dependency. The build fails otherwise.

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@ReenigneArcher
Copy link
Member

Maybe we should just fail if DRM is OFF and WAYLAND is ON?

Sunshine/cmake/compile_definitions/linux.cmake

Lines 88 to 103 in feac806

# drm
if(${SUNSHINE_ENABLE_DRM})
find_package(LIBDRM REQUIRED)
find_package(LIBCAP REQUIRED)
else()
set(LIBDRM_FOUND OFF)
set(LIBCAP_FOUND OFF)
endif()
if(LIBDRM_FOUND AND LIBCAP_FOUND)
add_compile_definitions(SUNSHINE_BUILD_DRM)
include_directories(SYSTEM ${LIBDRM_INCLUDE_DIRS} ${LIBCAP_INCLUDE_DIRS})
list(APPEND PLATFORM_LIBRARIES ${LIBDRM_LIBRARIES} ${LIBCAP_LIBRARIES})
list(APPEND PLATFORM_TARGET_FILES
"${CMAKE_SOURCE_DIR}/src/platform/linux/kmsgrab.cpp")
list(APPEND SUNSHINE_DEFINITIONS EGL_NO_X11=1)
endif()

@chewi
Copy link
Contributor Author

chewi commented Jul 11, 2025

I thought that, but it's about as much code either way. I figured I might as well give Gentoo users what they're asking for. Also, the DRM backend additionally requires libcap.

@ReenigneArcher ReenigneArcher mentioned this pull request Jul 12, 2025
Merged
10 tasks
@ReenigneArcher
Copy link
Member

@chewi, thank you for the PR! I ended going an alternate route in #4070 which wouldn't result in duplicated includes or platform libraries.

@chewi chewi deleted the wayland-libdrm branch July 13, 2025 08:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@chewi @ReenigneArcher