mr_bones_ 15/05/10 04:30:53
Added: megaglest-3.11.1-cmake.patch
megaglest-3.11.1-static-build.patch
Log:
version bump
(Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.1 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.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch?rev=1.1&content-type=text/plain
Index: megaglest-3.11.1-cmake.patch
===================================================================
From: Julian Ospald <[email protected]>
Date: Mon Jan 27 00:46:56 UTC 2014
Subject: fix installation
--- megaglest-source-3.9.1.tar.xz/source/glest_game/CMakeLists.txt
+++ megaglest-source-3.9.1.tar.xz/source/glest_game/CMakeLists.txt
@@ -310,9 +310,9 @@
"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.png"
"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.xpm"
"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.bmp"
- "${PROJECT_SOURCE_DIR}/data/glest_game/editor.ico"
+ "${PROJECT_SOURCE_DIR}/editor.ico"
"${PROJECT_SOURCE_DIR}/mk/linux/glest.ico"
- "${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico"
+ "${PROJECT_SOURCE_DIR}/g3dviewer.ico"
DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
ELSE()
1.1
games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch?rev=1.1&content-type=text/plain
Index: megaglest-3.11.1-static-build.patch
===================================================================
commit 754a6eb9f81a4a40a2a0102ffe1bfdbba734b36a
Author: hasufell <[email protected]>
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}] ...")
