From 4830f27a40323fe859dc166337a2b861877b7121 Mon Sep 17 00:00:00 2001 From: manuel Date: Mon, 1 Jan 2018 13:40:09 +0100 Subject: sync with upstream --- cmake/platform/linux/gbm.cmake | 2 +- cmake/platform/linux/imx.cmake | 1 - cmake/platform/linux/x11.cmake | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 cmake/platform/linux/imx.cmake (limited to 'cmake/platform/linux') diff --git a/cmake/platform/linux/gbm.cmake b/cmake/platform/linux/gbm.cmake index 616cefb..6a9165a 100644 --- a/cmake/platform/linux/gbm.cmake +++ b/cmake/platform/linux/gbm.cmake @@ -1,2 +1,2 @@ set(PLATFORM_REQUIRED_DEPS OpenGLES EGL GBM LibDRM) -set(PLATFORM_OPTIONAL_DEPS VAAPI OpenGLES3) +set(PLATFORM_OPTIONAL_DEPS VAAPI) diff --git a/cmake/platform/linux/imx.cmake b/cmake/platform/linux/imx.cmake deleted file mode 100644 index c0c7196..0000000 --- a/cmake/platform/linux/imx.cmake +++ /dev/null @@ -1 +0,0 @@ -set(PLATFORM_REQUIRED_DEPS OpenGLES EGL IMX) diff --git a/cmake/platform/linux/x11.cmake b/cmake/platform/linux/x11.cmake index edea24d..656fd66 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) -- cgit v1.2.3