Skip to content

x11: add x11 and xrandr headers correctly#1869

Merged
charles-lunarg merged 1 commit intoKhronosGroup:mainfrom
06393993:main
Feb 25, 2026
Merged

x11: add x11 and xrandr headers correctly#1869
charles-lunarg merged 1 commit intoKhronosGroup:mainfrom
06393993:main

Conversation

@06393993
Copy link
Contributor

x11 depends on xorgproto headers. Use X11_INCLUDE_DIRS populated by pkg_check_modules properly add the xproto headers to the include search path, because X11_INCLUDE_DIRS also takes care of the transitive dependencies, while the original includedir variable doesn't.

The same applies to the xrandr headers.

x11 depends on xorgproto headers. Use `X11_INCLUDE_DIRS` populated by pkg_check_modules properly add
the xproto headers to the include search path, because `X11_INCLUDE_DIRS` also takes care of the
transitive dependencies, while the original `includedir` variable doesn't.

The same applies to the xrandr headers.
@ci-tester-lunarg
Copy link

Author 06393993 not on autobuild list. Waiting for curator authorization before starting CI build.

1 similar comment
@ci-tester-lunarg
Copy link

Author 06393993 not on autobuild list. Waiting for curator authorization before starting CI build.

@CLAassistant
Copy link

CLAassistant commented Feb 25, 2026

CLA assistant check
All committers have signed the CLA.

@06393993
Copy link
Contributor Author

06393993 commented Feb 25, 2026

I know that BUILD.md requires libx11-xcb-dev, libxkbcommon-dev, and libxrandr-dev should be installed globally, which should put all the necessary headers under the same global system include folder, but in our build system, we install those packages from source, and install all packages under different folders which means adding libx11's header won't automatically include xproto's header.

I am just wondering if the upstream could accept this PR so that we don't diverge from the upstream. Thanks.

@ci-tester-lunarg
Copy link

CI Vulkan-Loader build queued with queue ID 660865.

Copy link
Collaborator

@charles-lunarg charles-lunarg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As long as CI is happy, this seems like a no brainer.

@ci-tester-lunarg
Copy link

CI Vulkan-Loader build # 3435 running.

@ci-tester-lunarg
Copy link

CI Vulkan-Loader build # 3435 passed.

@charles-lunarg charles-lunarg merged commit b525c30 into KhronosGroup:main Feb 25, 2026
45 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants