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/freeorion | |
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/freeorion')
5 files changed, 205 insertions, 0 deletions
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest new file mode 100644 index 000000000000..4fb80bb88ea8 --- /dev/null +++ b/games-strategy/freeorion/Manifest @@ -0,0 +1 @@ +DIST freeorion-0.4.5_pre.tar.bz2 141068240 SHA256 a3d326a1fa05327cf23b14ef08672c0199fc08df15bb3679f579575115172b4a SHA512 33dc4a89264ccf8f146021d8b9dabc51f11e7869a5323effb7a783800db77f37ed27880c60c483dd83ea62bc9ea84872f53c25b4571ccdf13dc594bcb368b903 WHIRLPOOL 1229aefdc22b95c38e71a94f493026230e750948c37544f636d1a43030b96d487307a7a1885bb32d4ae697bc64f431b97323cb647eca516d3363898120528d0d diff --git a/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.57.patch b/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.57.patch new file mode 100644 index 000000000000..73e9b4b568a4 --- /dev/null +++ b/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.57.patch @@ -0,0 +1,32 @@ +From d963b4883c9be2911d791e7daa3ed0f495bc5181 Mon Sep 17 00:00:00 2001 +From: Dilvish-fo <dilvish.fo@gmail.com> +Date: Sat, 11 Apr 2015 10:25:55 -0700 +Subject: [PATCH] work-around for a boost 1.57 bug (missing a shard_ptr + serialization include) + +--- + util/Process.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/util/Process.h b/util/Process.h +index ff72445..f9927cc 100644 +--- a/util/Process.h ++++ b/util/Process.h +@@ -3,12 +3,16 @@ + #define _Process_h_ + + // HACK: The following two includes work around a bug in boost 1.56, +-// which uses them without including. They can be removed once the bug is gone. ++// which uses them without including. + #include <boost/version.hpp> + #if BOOST_VERSION == 105600 + #include <boost/serialization/singleton.hpp> // This + #include <boost/serialization/extended_type_info.hpp> //This + #endif ++// HACK: For a similar boost 1.57 bug ++#if BOOST_VERSION == 105700 ++#include <boost/serialization/type_info_implementation.hpp> // This ++#endif + + #include <boost/serialization/shared_ptr.hpp> + diff --git a/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.58.patch b/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.58.patch new file mode 100644 index 000000000000..3044c81eb28f --- /dev/null +++ b/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.58.patch @@ -0,0 +1,57 @@ +From 8cb623ceecaf00e29f273225eb37602e26e1a6d0 Mon Sep 17 00:00:00 2001 +From: Dilvish-fo <dilvish.fo@gmail.com> +Date: Sat, 6 Jun 2015 08:04:56 -0700 +Subject: [PATCH] workarounds for missing includes with boost 1.58 + +--- + util/Process.h | 6 ++++++ + util/Serialize.ipp | 9 ++++++++- + 2 files changed, 14 insertions(+), 1 deletion(-) + +diff --git a/util/Process.h b/util/Process.h +index f9927cc..25cec56 100644 +--- a/util/Process.h ++++ b/util/Process.h +@@ -14,6 +14,12 @@ + #include <boost/serialization/type_info_implementation.hpp> // This + #endif + ++#if BOOST_VERSION == 105800 ++// HACK: The following two includes work around a bug in boost 1.58 ++#include <boost/serialization/type_info_implementation.hpp> ++#include <boost/archive/basic_archive.hpp> ++#endif ++ + #include <boost/serialization/shared_ptr.hpp> + + #include <vector> +diff --git a/util/Serialize.ipp b/util/Serialize.ipp +index b4027b2..c3c87db 100644 +--- a/util/Serialize.ipp ++++ b/util/Serialize.ipp +@@ -1,17 +1,24 @@ ++// -*- C++ -*- + #if defined(_MSC_VER) && defined(int64_t) + #undef int64_t + #endif + + #include <boost/static_assert.hpp> + #include <boost/detail/endian.hpp> ++#include <boost/version.hpp> + + #if BOOST_VERSION == 105600 + // HACK: The following two includes work around a bug in boost 1.56, +-// which uses them without including. They can be removed once the bug is gone. + #include <boost/serialization/singleton.hpp> // This + #include <boost/serialization/extended_type_info.hpp> //This + #endif + ++#if BOOST_VERSION == 105800 ++// HACK: The following two includes work around a bug in boost 1.58 ++#include <boost/serialization/type_info_implementation.hpp> ++#include <boost/archive/basic_archive.hpp> ++#endif ++ + #include <boost/serialization/export.hpp> + #include <boost/serialization/deque.hpp> + #include <boost/serialization/list.hpp> diff --git a/games-strategy/freeorion/freeorion-0.4.5_pre.ebuild b/games-strategy/freeorion/freeorion-0.4.5_pre.ebuild new file mode 100644 index 000000000000..66e982968d7c --- /dev/null +++ b/games-strategy/freeorion/freeorion-0.4.5_pre.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +inherit cmake-utils python-any-r1 games + +DESCRIPTION="A free turn-based space empire and galactic conquest game" +HOMEPAGE="http://www.freeorion.org" +SRC_URI="http://dev.gentoo.org/~tomka/files/${P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="cg" + +# Needs it's own version of GG(dev-games/gigi) which it ships. +# The split version dev-games/gigi is not used anymore as of 0.4.3 +RDEPEND=" + !dev-games/gigi + media-libs/libsdl2 + >=dev-libs/boost-1.47[python] + media-libs/freealut + media-libs/glew + media-libs/libogg + media-libs/libsdl[X,opengl,video] + media-libs/libvorbis + media-libs/openal + sci-physics/bullet + sys-libs/zlib + virtual/opengl" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + virtual/pkgconfig" + +CMAKE_USE_DIR="${S}" +CMAKE_VERBOSE="1" + +pkg_setup() { + # build system is using FindPythonLibs.cmake which needs python:2 + python-any-r1_pkg_setup + games_pkg_setup +} + +src_prepare() { + + epatch "${FILESDIR}/${P}-boost-1.57.patch" + epatch "${FILESDIR}/${P}-boost-1.58.patch" + + # parse subdir sets -O3 + sed -e "s:-O3::" -i parse/CMakeLists.txt + + # set revision for display in game -- update on bump! + sed -i -e 's/???/8051/' CMakeLists.txt +} + +src_configure() { + local mycmakeargs=( + -DRELEASE_COMPILE_FLAGS="" + -DCMAKE_SKIP_RPATH=ON + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_install() { + # data files + rm "${CMAKE_USE_DIR}"/default/COPYING || die + insinto "${GAMES_DATADIR}"/${PN} + doins -r "${CMAKE_USE_DIR}"/default || die + + # bin + dogamesbin "${CMAKE_BUILD_DIR}"/${PN}{ca,d} || die + newgamesbin "${CMAKE_BUILD_DIR}"/${PN} ${PN}.bin || die + games_make_wrapper ${PN} \ + "${GAMES_BINDIR}/${PN}.bin --resource-dir ${GAMES_DATADIR}/${PN}/default" \ + "${GAMES_DATADIR}/${PN}" + + # lib + dogameslib "${CMAKE_BUILD_DIR}"/libfreeorion{common,parse}.so || die + dogameslib "${CMAKE_BUILD_DIR}"/libGiGi*.so || die + + # other + dodoc "${CMAKE_USE_DIR}"/changelog.txt || die + newicon "${CMAKE_USE_DIR}"/default/data/art/icons/FO_Icon_32x32.png \ + ${PN}.png || die + make_desktop_entry ${PN} ${PN} ${PN} + + # permissions + prepgamesdirs +} diff --git a/games-strategy/freeorion/metadata.xml b/games-strategy/freeorion/metadata.xml new file mode 100644 index 000000000000..5c66c093895c --- /dev/null +++ b/games-strategy/freeorion/metadata.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>tomka@gentoo.org</email> + <name>Thomas Kahle</name> + </maintainer> + <use> + <flag name="cg">Add support for NVIDIA toolkit plugin</flag> + </use> +<longdescription lang="en"> + FreeOrion is a free, open source, turn-based space empire and + galactic conquest (4X) computer game being designed and built by the + FreeOrion project. FreeOrion is inspired by the tradition of the + Master of Orion games, but is not a clone or remake of that series + or any other game. +</longdescription> +</pkgmetadata> |