Skip to content
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

Improve --enable-glamor behaviour #295

Merged
merged 1 commit into from
Mar 14, 2024

Conversation

matt335672
Copy link
Member

See #294

This PR makes the following improvements to the xorgxrdp build process when --enable-glamor is used:-

  1. Adds $LIBDRM_CFLAGS to the include path (where required) to ensure drm_fourcc.h can be located
  2. Adds an explicit link dependency on the Xorg module libglamoregl.so to libxorgxrdp.so.
  3. Adds the Xorg module path to the RPATH for libxorgxrdp.so, so the run-time linker can find libglamoregl.so
  4. 'make check' is now added to the CI for --enable-glamor builds. On Linux this checks that all module symbols can be resolved.

Essentially this patch upstreams this patch file from Arch AUR which was created (I believe) by @jat001

@jat001, @Chocobo1 - please feel free to comment

This PR makes the following improvements to the xorgxrdp build process
when --enable-glamor is used:-

1) Adds $LIBDRM_CFLAGS to the include path (where required) to ensure
   drm_fourcc.h can be located
2) Adds an explicit link dependency on the Xorg module libglamoregl.so
   to libxorgxrdp.so.
3) Adds the Xorg module path to the RPATH for libxorgxrdp.so, so
   the run-time linker can find libglamoregl.so
3) 'make check' is now added to the CI for --enable-glamor builds.
   On Linux this checks that all module symbols can be resolved.
@matt335672 matt335672 requested a review from jsorg71 March 13, 2024 14:53
Copy link
Contributor

@jsorg71 jsorg71 left a comment

Choose a reason for hiding this comment

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

LGTM

@matt335672 matt335672 merged commit dd04d2b into neutrinolabs:devel Mar 14, 2024
8 checks passed
@matt335672 matt335672 deleted the improve_glamor_config branch March 14, 2024 10:45
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.

2 participants