diff options
Diffstat (limited to 'games-strategy/megaglest/files')
3 files changed, 0 insertions, 112 deletions
diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch b/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch deleted file mode 100644 index 527671246e98..000000000000 --- a/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e463986ba1f40210b40eff34c4aac727c7f2e571 Mon Sep 17 00:00:00 2001 -From: Michael Palimaka <kensington@gentoo.org> -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 - diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch deleted file mode 100644 index 112e734c6efb..000000000000 --- a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/source/shared_lib/sources/platform/posix/socket.cpp b/source/shared_lib/sources/platform/posix/socket.cpp -index a5d4b92..cb8ceb4 100644 ---- a/source/shared_lib/sources/platform/posix/socket.cpp -+++ b/source/shared_lib/sources/platform/posix/socket.cpp -@@ -2563,9 +2563,15 @@ int UPNP_Tools::upnp_init(void *param) { - const char *upnp_minissdpdsock = NULL; - int upnp_sameport = 0; - int upnp_ipv6 = 0; -+ unsigned char upnp_ttl = 2; - int upnp_error = 0; - --#ifndef MINIUPNPC_VERSION_PRE1_6 -+#if (MINIUPNPC_API_VERSION >= 14) -+ devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, upnp_ttl, &upnp_error); -+ -+ if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"UPnP discover returned upnp_error = %d.\n",upnp_error); -+ if(SystemFlags::VERBOSE_MODE_ENABLED) printf("UPnP discover returned upnp_error = %d.\n",upnp_error); -+#elif (MINIUPNPC_API_VERSION >= 8) - devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error); - - if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"UPnP discover returned upnp_error = %d.\n",upnp_error); diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch b/games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch deleted file mode 100644 index 2586a561956b..000000000000 --- a/games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch +++ /dev/null @@ -1,63 +0,0 @@ -commit 754a6eb9f81a4a40a2a0102ffe1bfdbba734b36a -Author: hasufell <hasufell@gentoo.org> -Date: Mon Nov 18 21:54:54 2013 +0100 - - fix static build - -diff --git a/mk/cmake/Modules/FindOGG.cmake b/mk/cmake/Modules/FindOGG.cmake -index 2a026cc..8ca8a23 100644 ---- a/mk/cmake/Modules/FindOGG.cmake -+++ b/mk/cmake/Modules/FindOGG.cmake -@@ -19,11 +19,11 @@ - - FIND_PATH(OGG_INCLUDE_DIR ogg/ogg.h) - --#IF (OGG_STATIC AND NOT OGG_LIBRARY) --# FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a ogg) --#ELSE() -- FIND_LIBRARY(OGG_LIBRARY NAMES ogg) --#ENDIF() -+IF (OGG_STATIC AND NOT OGG_LIBRARY) -+ FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a) -+ELSE() -+ FIND_LIBRARY(OGG_LIBRARY NAMES libogg.so) -+ENDIF() - - #IF (OGG_STATIC AND NOT VORBIS_LIBRARY) - # FIND_LIBRARY(VORBIS_LIBRARY NAMES libvorbis.a vorbis) ---- a/mk/cmake/Modules/FindXercesC.cmake -+++ b/mk/cmake/Modules/FindXercesC.cmake -@@ -83,6 +83,9 @@ - /usr/lib - /usr/local/lib - ) -+ -+ FIND_LIBRARY(ICUUC_LIBRARY NAMES libicuuc.a) -+ FIND_LIBRARY(ICUDATA_LIBRARY NAMES libicudata.a) - - IF (XERCESC_INCLUDE AND XERCESC_LIBRARY) - MESSAGE(STATUS "Found static Xerces-C lib [${XERCESC_LIBRARY}]") -@@ -90,7 +93,7 @@ - - IF(UNIX AND NOT APPLE) - #SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY} -Bdynamic -licuuc -licudata") -- SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY}") -+ SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY} ${ICUUC_LIBRARY} ${ICUDATA_LIBRARY}") - ENDIF() - ENDIF() - ENDIF() ---- a/mk/cmake/Modules/FindFriBiDi.cmake -+++ b/mk/cmake/Modules/FindFriBiDi.cmake -@@ -28,9 +28,9 @@ - SET(FRIBIDI_NAMES ${FRIBIDI_NAMES} fribidi libfribidi) - - OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF) --IF(WANT_STATIC_LIBS) -- SET(FRIBIDI_NAMES fribidi.a libfribidi.a ${FRIBIDI_NAMES}) --ENDIF() -+#IF(WANT_STATIC_LIBS) -+# SET(FRIBIDI_NAMES fribidi.a libfribidi.a ${FRIBIDI_NAMES}) -+#ENDIF() - - MESSAGE(STATUS "** Searching for library names: [${FRIBIDI_NAMES}] ...") - |