mr_bones_ 15/05/13 16:57:34 Modified: megaglest-3.9.1-cmake.patch Added: megaglest-3.11.1-cmake.patch Log: add patch from Michael Palimaka to fix building with newer cmake (bug #548488) (Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.2 games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch?r1=1.1&r2=1.2 Index: megaglest-3.9.1-cmake.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- megaglest-3.9.1-cmake.patch 27 Jan 2014 00:57:20 -0000 1.1 +++ megaglest-3.9.1-cmake.patch 13 May 2015 16:57:34 -0000 1.2 @@ -16,3 +16,31 @@ DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH}) ELSE() +From e463986ba1f40210b40eff34c4aac727c7f2e571 Mon Sep 17 00:00:00 2001 +From: Michael Palimaka <[email protected]> +Date: Wed, 13 May 2015 04:22:45 +1000 +Subject: [PATCH] Fix build with >=cmake-3.2. + +The FindOpenGL module no longer pulls in X11 libraries. +--- + source/shared_lib/CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt +index 3da563e..e5a06fc 100644 +--- a/source/shared_lib/CMakeLists.txt ++++ b/source/shared_lib/CMakeLists.txt +@@ -95,6 +95,10 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST + SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY}) + ENDIF() + ++ IF(UNIX) ++ FIND_PACKAGE(X11 REQUIRED) ++ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${X11_LIBRARIES}) ++ ENDIF() + + IF(WANT_XERCES) + FIND_PACKAGE(XercesC REQUIRED) +-- +2.3.6 + 1.3 games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch?r1=1.2&r2=1.3
