From 6d18ff7cfdf93af8cf2f9f3c8f02be2ac5ede91a Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 8 Sep 2017 00:03:19 -0700 Subject: [cmake] require glx when using vdpau --- cmake/platform/linux/x11.cmake | 4 ++-- cmake/scripts/linux/ArchSetup.cmake | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/platform/linux/x11.cmake b/cmake/platform/linux/x11.cmake index edea24de48..656fd66572 100644 --- a/cmake/platform/linux/x11.cmake +++ b/cmake/platform/linux/x11.cmake @@ -1,2 +1,2 @@ -set(PLATFORM_REQUIRED_DEPS OpenGl EGL X XRandR LibDRM GLX) -set(PLATFORM_OPTIONAL_DEPS VAAPI VDPAU) +set(PLATFORM_REQUIRED_DEPS OpenGl EGL X XRandR LibDRM) +set(PLATFORM_OPTIONAL_DEPS VAAPI VDPAU GLX) diff --git a/cmake/scripts/linux/ArchSetup.cmake b/cmake/scripts/linux/ArchSetup.cmake index 74018d0e76..fb350f88f9 100644 --- a/cmake/scripts/linux/ArchSetup.cmake +++ b/cmake/scripts/linux/ArchSetup.cmake @@ -80,3 +80,7 @@ if(ENABLE_GBM) set(ENABLE_VDPAU OFF CACHE BOOL "Disabling VDPAU" FORCE) set(ENABLE_VAAPI OFF CACHE BOOL "Disabling VAAPI" FORCE) endif() + +if(ENABLE_VDPAU) + set(ENABLE_GLX ON CACHE BOOL "Enabling GLX" FORCE) +endif() -- cgit v1.2.3