svn commit: r389758 - head/emulators/dolphin-emu/files
Raphael Kubo da Costa
rakuco at FreeBSD.org
Mon Jun 15 22:09:15 UTC 2015
Author: rakuco
Date: Mon Jun 15 22:09:14 2015
New Revision: 389758
URL: https://svnweb.freebsd.org/changeset/ports/389758
Log:
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.
Added:
head/emulators/dolphin-emu/files/patch-git_148ce85b (contents, props changed)
Added: head/emulators/dolphin-emu/files/patch-git_148ce85b
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/dolphin-emu/files/patch-git_148ce85b Mon Jun 15 22:09:14 2015 (r389758)
@@ -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 <alucryd at gmail.com>
+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)
More information about the svn-ports-all
mailing list