Skip to content

Fix disabling X11 support#1307

Open
ulmus-scott wants to merge 5 commits intoMythTV:masterfrom
ulmus-scott:x11
Open

Fix disabling X11 support#1307
ulmus-scott wants to merge 5 commits intoMythTV:masterfrom
ulmus-scott:x11

Conversation

@ulmus-scott
Copy link
Contributor

This cleans up a few remnants left from my prior CMake changes to setting the C++ standard and including mythconfig.h and then fixes building with X11 disabled when VDPAU is present and not explicitly disabled.

The configure dependencies could be done with a longer list, but this minimal change was sufficient.

@linuxdude42 This is what I meant on IRC regarding the CMake files.

Checklist

These are set in SetCompilerOptions.cmake, which also
includes CompilerCaching.cmake.

I don't think the CMake files in the platform directory
need to set this for their `dummy.cpp`s, but I have kept
them setting the standard versions.
This extra include directory is no longer needed.
…s.cmake

MythFindPackages.cmake is left with code regarding the
embedded external libraries and optional MythTV components
that mostly don't perform any checks other than is it enabled.

The APPLE section is needed before the FireWire check,
so I didn't want to move those.
The build failed to link if VDPAU was not also disabled,
so make VDPAU depend on X11 since VDPAU always uses X11.

Also, make the VAAPI backend support depend on X11 and libdrm
being enabled.
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.

1 participant