[dolphin-emu] 02/02: Include FindX11 manually to fix build with CMake 3.2

[James Cowgill]

This is an automated email from the git hooks/post-receive script.

jcowgill-guest pushed a commit to branch master-tentative
in repository dolphin-emu.

commit fc0db33860e8db03dcce3a8c4bfe6b0ee67cdedb
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Sat May 30 16:02:44 2015 +0100

    Include FindX11 manually to fix build with CMake 3.2
---
 debian/patches/10_include_findx11.patch | 18 ++++++++++++++++++
 debian/patches/series                   |  1 +
 2 files changed, 19 insertions(+)

diff --git a/debian/patches/10_include_findx11.patch b/debian/patches/10_include_findx11.patch
new file mode 100644
index 0000000..15cc1cc
--- /dev/null
+++ b/debian/patches/10_include_findx11.patch
@@ -0,0 +1,18 @@
+Description: Include FindX11.cmake manually after changes in CMake 3.2
+Author: James Cowgill <james410 at cowgill.org.uk>
+Forwarded: not-needed
+Applied-Upstream: https://github.com/dolphin-emu/dolphin/commit/148ce85b26925e38ced2f196475086eb7884fb62
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -413,8 +413,7 @@ if(NOT ANDROID)
+ 			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)
diff --git a/debian/patches/series b/debian/patches/series
index 7a0e760..1c9a272 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 07_cmake-sfml-fixes.patch
 08_sfml-use-2.1.patch
 09_arm-use-gl.patch
+10_include_findx11.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dolphin-emu.git