From a9fef3fd7eafa14b7aa8abfaeaf26b22bec18c20 Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Mon, 15 Jun 2015 22:09:14 +0000 Subject: [PATCH] Add upstream commit to find X11 directly. Fixes the build with the upcoming CMake 3.2 update, since its FindOpenGL.cmake does not check for X11 anymore. --- .../dolphin-emu/files/patch-git_148ce85b | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 emulators/dolphin-emu/files/patch-git_148ce85b diff --git a/emulators/dolphin-emu/files/patch-git_148ce85b b/emulators/dolphin-emu/files/patch-git_148ce85b new file mode 100644 index 000000000000..c71d2e2253ac --- /dev/null +++ b/emulators/dolphin-emu/files/patch-git_148ce85b @@ -0,0 +1,20 @@ +Required for CMake 3.2 to work, precisely because FindOpenGL.cmake does not +check for X11 anymore. + +commit 148ce85b26925e38ced2f196475086eb7884fb62 +Author: Maxime Gauduin +Date: Fri Mar 13 12:58:08 2015 +0100 + + Include the FindX11 module +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -415,8 +445,7 @@ + add_definitions(-DHAVE_WAYLAND=0) + endif(USE_WAYLAND AND WAYLAND_FOUND) + +- # Note: We do not need to explicitly check for X11 as it is done in the cmake +- # FindOpenGL module on linux. ++ include(FindX11) + if(USE_X11 AND X11_FOUND) + set(USE_X11 1) + add_definitions(-DHAVE_X11=1)