| 1 |
hasufell 14/01/27 00:57:20 |
| 2 |
|
| 3 |
Added: megaglest-3.9.1-static-build.patch |
| 4 |
megaglest-3.9.1-cmake.patch |
| 5 |
Log: |
| 6 |
version bump |
| 7 |
|
| 8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, RepoMan options: --ignore-arches, signed Manifest commit with key E73C35B3) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 games-strategy/megaglest/files/megaglest-3.9.1-static-build.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/megaglest/files/megaglest-3.9.1-static-build.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/megaglest/files/megaglest-3.9.1-static-build.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: megaglest-3.9.1-static-build.patch |
| 17 |
=================================================================== |
| 18 |
commit 754a6eb9f81a4a40a2a0102ffe1bfdbba734b36a |
| 19 |
Author: hasufell <hasufell@g.o> |
| 20 |
Date: Mon Nov 18 21:54:54 2013 +0100 |
| 21 |
|
| 22 |
fix static build |
| 23 |
|
| 24 |
diff --git a/mk/cmake/Modules/FindOGG.cmake b/mk/cmake/Modules/FindOGG.cmake |
| 25 |
index 2a026cc..8ca8a23 100644 |
| 26 |
--- a/mk/cmake/Modules/FindOGG.cmake |
| 27 |
+++ b/mk/cmake/Modules/FindOGG.cmake |
| 28 |
@@ -19,11 +19,11 @@ |
| 29 |
|
| 30 |
FIND_PATH(OGG_INCLUDE_DIR ogg/ogg.h) |
| 31 |
|
| 32 |
-#IF (OGG_STATIC AND NOT OGG_LIBRARY) |
| 33 |
-# FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a ogg) |
| 34 |
-#ELSE() |
| 35 |
- FIND_LIBRARY(OGG_LIBRARY NAMES ogg) |
| 36 |
-#ENDIF() |
| 37 |
+IF (OGG_STATIC AND NOT OGG_LIBRARY) |
| 38 |
+ FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a) |
| 39 |
+ELSE() |
| 40 |
+ FIND_LIBRARY(OGG_LIBRARY NAMES libogg.so) |
| 41 |
+ENDIF() |
| 42 |
|
| 43 |
#IF (OGG_STATIC AND NOT VORBIS_LIBRARY) |
| 44 |
# FIND_LIBRARY(VORBIS_LIBRARY NAMES libvorbis.a vorbis) |
| 45 |
--- a/mk/cmake/Modules/FindXercesC.cmake |
| 46 |
+++ b/mk/cmake/Modules/FindXercesC.cmake |
| 47 |
@@ -83,6 +83,9 @@ |
| 48 |
/usr/lib |
| 49 |
/usr/local/lib |
| 50 |
) |
| 51 |
+ |
| 52 |
+ FIND_LIBRARY(ICUUC_LIBRARY NAMES libicuuc.a) |
| 53 |
+ FIND_LIBRARY(ICUDATA_LIBRARY NAMES libicudata.a) |
| 54 |
|
| 55 |
IF (XERCESC_INCLUDE AND XERCESC_LIBRARY) |
| 56 |
MESSAGE(STATUS "Found static Xerces-C lib [${XERCESC_LIBRARY}]") |
| 57 |
@@ -90,7 +93,7 @@ |
| 58 |
|
| 59 |
IF(UNIX AND NOT APPLE) |
| 60 |
#SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY} -Bdynamic -licuuc -licudata") |
| 61 |
- SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY}") |
| 62 |
+ SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY} ${ICUUC_LIBRARY} ${ICUDATA_LIBRARY}") |
| 63 |
ENDIF() |
| 64 |
ENDIF() |
| 65 |
ENDIF() |
| 66 |
--- a/mk/cmake/Modules/FindFriBiDi.cmake |
| 67 |
+++ b/mk/cmake/Modules/FindFriBiDi.cmake |
| 68 |
@@ -28,9 +28,9 @@ |
| 69 |
SET(FRIBIDI_NAMES ${FRIBIDI_NAMES} fribidi libfribidi) |
| 70 |
|
| 71 |
OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF) |
| 72 |
-IF(WANT_STATIC_LIBS) |
| 73 |
- SET(FRIBIDI_NAMES fribidi.a libfribidi.a ${FRIBIDI_NAMES}) |
| 74 |
-ENDIF() |
| 75 |
+#IF(WANT_STATIC_LIBS) |
| 76 |
+# SET(FRIBIDI_NAMES fribidi.a libfribidi.a ${FRIBIDI_NAMES}) |
| 77 |
+#ENDIF() |
| 78 |
|
| 79 |
MESSAGE(STATUS "** Searching for library names: [${FRIBIDI_NAMES}] ...") |
| 80 |
|
| 81 |
|
| 82 |
|
| 83 |
|
| 84 |
1.1 games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch |
| 85 |
|
| 86 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch?rev=1.1&view=markup |
| 87 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch?rev=1.1&content-type=text/plain |
| 88 |
|
| 89 |
Index: megaglest-3.9.1-cmake.patch |
| 90 |
=================================================================== |
| 91 |
From: Julian Ospald <hasufell@g.o> |
| 92 |
Date: Mon Jan 27 00:46:56 UTC 2014 |
| 93 |
Subject: fix installation |
| 94 |
|
| 95 |
--- megaglest-source-3.9.1.tar.xz/source/glest_game/CMakeLists.txt |
| 96 |
+++ megaglest-source-3.9.1.tar.xz/source/glest_game/CMakeLists.txt |
| 97 |
@@ -310,9 +310,9 @@ |
| 98 |
"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.png" |
| 99 |
"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.xpm" |
| 100 |
"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.bmp" |
| 101 |
- "${PROJECT_SOURCE_DIR}/data/glest_game/editor.ico" |
| 102 |
+ "${PROJECT_SOURCE_DIR}/editor.ico" |
| 103 |
"${PROJECT_SOURCE_DIR}/mk/linux/glest.ico" |
| 104 |
- "${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico" |
| 105 |
+ "${PROJECT_SOURCE_DIR}/g3dviewer.ico" |
| 106 |
DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH}) |
| 107 |
ELSE() |
Archives