diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /games-strategy/megaglest/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'games-strategy/megaglest/files')
4 files changed, 200 insertions, 0 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 new file mode 100644 index 000000000000..527671246e98 --- /dev/null +++ b/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch @@ -0,0 +1,28 @@ +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-static-build.patch b/games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch new file mode 100644 index 000000000000..2586a561956b --- /dev/null +++ b/games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch @@ -0,0 +1,63 @@ +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}] ...") + diff --git a/games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch b/games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch new file mode 100644 index 000000000000..c7801466f5ca --- /dev/null +++ b/games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch @@ -0,0 +1,46 @@ +From: Julian Ospald <hasufell@gentoo.org> +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() + +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.9.1-static-build.patch b/games-strategy/megaglest/files/megaglest-3.9.1-static-build.patch new file mode 100644 index 000000000000..2586a561956b --- /dev/null +++ b/games-strategy/megaglest/files/megaglest-3.9.1-static-build.patch @@ -0,0 +1,63 @@ +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}] ...") + |