From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- games-strategy/ufo-ai/Manifest | 3 + games-strategy/ufo-ai/files/ufo-ai-2.4-anon.patch | 17 +++ .../ufo-ai/files/ufo-ai-2.4-locale.patch | 15 +++ .../ufo-ai/files/ufo-ai-2.4-mathlib.patch | 29 +++++ games-strategy/ufo-ai/metadata.xml | 11 ++ games-strategy/ufo-ai/ufo-ai-2.4.ebuild | 119 +++++++++++++++++++++ 6 files changed, 194 insertions(+) create mode 100644 games-strategy/ufo-ai/Manifest create mode 100644 games-strategy/ufo-ai/files/ufo-ai-2.4-anon.patch create mode 100644 games-strategy/ufo-ai/files/ufo-ai-2.4-locale.patch create mode 100644 games-strategy/ufo-ai/files/ufo-ai-2.4-mathlib.patch create mode 100644 games-strategy/ufo-ai/metadata.xml create mode 100644 games-strategy/ufo-ai/ufo-ai-2.4.ebuild (limited to 'games-strategy/ufo-ai') diff --git a/games-strategy/ufo-ai/Manifest b/games-strategy/ufo-ai/Manifest new file mode 100644 index 000000000000..6f19f0d848ef --- /dev/null +++ b/games-strategy/ufo-ai/Manifest @@ -0,0 +1,3 @@ +DIST 1maps.pk3 242016 SHA256 8cdb8c231c0ba98900d97012b62c5cef72ab5710fe3f087e534496a66f7b0e4e SHA512 9615b365e590dceb82362e7cd683980e15401a3b5a2b359a33c7ed2a4c51e5328efb352618cc48f46971a2ced1717276b5270ca6bf6d2bc7fc2b2238030eb3ae WHIRLPOOL 8e798ffeaa83609114fd239ea8f379ee54fa6038735a09bd3abe3076073e92b44e7fa867c893d597577da462b4e583fb0a2bba7cd2014a9f4b4bb8ef04b377e6 +DIST ufoai-2.4-data.tar 937062400 SHA256 6bb322fc0362781d07439799de32c677884cef7c96fcf17dd87c62cc108030b7 SHA512 471eab2f62cad144fe9966317d48c408fba19de0c33cf7414918b502c723b722af38a025f808848698d9a06ffc10fb0faac145dd01dcd3d321547c87da1c6246 WHIRLPOOL 139251bdbd76f86cb38175eb9c14149ea0cab6bbcb04e2dba7351cdb5b0e21bdfd231e350c0af4f52379d0c5bee91f0512422a7eb9f6339eb6a07170d64fec0c +DIST ufoai-2.4-source.tar.bz2 16875353 SHA256 254a61b770f141374d57e5c2589048be9298d0a920e914c6e72c2b98255bb94f SHA512 3f9d0df7392f50c201464c81e42435f860df97d5d7a2ef53bb9a05d2b2fc645a1130baaf16fc34818b88bb07b8cf83283f7479d685cbd3caf80ea7522e13c56f WHIRLPOOL 0e68149ab2b3eeffb7134e65cc29de9cecf60dc89c965958a0d669c2d22462d05b89b0a81a3225ebbd7e47015fc63697cbad365136706f4853f9c1e690b0667d diff --git a/games-strategy/ufo-ai/files/ufo-ai-2.4-anon.patch b/games-strategy/ufo-ai/files/ufo-ai-2.4-anon.patch new file mode 100644 index 000000000000..53f07261bb7e --- /dev/null +++ b/games-strategy/ufo-ai/files/ufo-ai-2.4-anon.patch @@ -0,0 +1,17 @@ +--- src/tools/radiant/radiant/camera/CameraSettings.h.old 2014-10-22 08:30:35.690248415 +0200 ++++ src/tools/radiant/radiant/camera/CameraSettings.h 2014-10-22 08:31:12.329900302 +0200 +@@ -16,13 +16,13 @@ + const std::string RKEY_ENABLE_FARCLIP = "user/ui/camera/enableCubicClipping"; + const std::string RKEY_DRAWMODE = "user/ui/camera/drawMode"; + const std::string RKEY_SOLID_SELECTION_BOXES = "user/ui/xyview/solidSelectionBoxes"; ++} + + enum CameraDrawMode + { + drawWire, drawSolid, drawTexture + }; + +-} + /* greebo: This is the home of all the camera settings. As this class derives + * from a RegistryKeyObserver, it can be connected to the according registry keys + * and gets notified if any of the observed keys are changed.*/ diff --git a/games-strategy/ufo-ai/files/ufo-ai-2.4-locale.patch b/games-strategy/ufo-ai/files/ufo-ai-2.4-locale.patch new file mode 100644 index 000000000000..632e0d4fdc0d --- /dev/null +++ b/games-strategy/ufo-ai/files/ufo-ai-2.4-locale.patch @@ -0,0 +1,15 @@ +diff -urN ufoai-2.4-source.old//src/client/cl_main.c ufoai-2.4-source/src/client/cl_main.c +--- ufoai-2.4-source.old//src/client/cl_main.c 2012-05-01 10:59:51.720868619 +0200 ++++ ufoai-2.4-source/src/client/cl_main.c 2012-05-01 11:00:57.235869759 +0200 +@@ -1180,7 +1180,11 @@ + if (fs_i18ndir->string[0] != '\0') + Q_strncpyz(languagePath, fs_i18ndir->string, sizeof(languagePath)); + else ++#ifdef LOCALEDIR ++ Q_strncpyz(languagePath, LOCALEDIR, sizeof(languagePath)); ++#else + Com_sprintf(languagePath, sizeof(languagePath), "%s/"BASEDIRNAME"/i18n/", FS_GetCwd()); ++#endif + Com_DPrintf(DEBUG_CLIENT, "...using mo files from %s\n", languagePath); + bindtextdomain(TEXT_DOMAIN, languagePath); + bind_textdomain_codeset(TEXT_DOMAIN, "UTF-8"); diff --git a/games-strategy/ufo-ai/files/ufo-ai-2.4-mathlib.patch b/games-strategy/ufo-ai/files/ufo-ai-2.4-mathlib.patch new file mode 100644 index 000000000000..72fd81038fb6 --- /dev/null +++ b/games-strategy/ufo-ai/files/ufo-ai-2.4-mathlib.patch @@ -0,0 +1,29 @@ +http://bugs.gentoo.org/509928 + +src/common/common.c:261: error: undefined reference to 'sincos' +src/shared/mathlib.c:476: error: undefined reference to '__acosf_finite' +[ ... snip ... ] +collect2: error: ld returned 1 exit status + +--- build/modules/ufo.mk ++++ build/modules/ufo.mk +@@ -9,7 +9,7 @@ + $(TARGET)_LINKER := $(CC) + $(TARGET)_FILE := $(TARGET)$(EXE_EXT) + $(TARGET)_CFLAGS += -DCOMPILE_UFO $(BFD_CFLAGS) $(SDL_CFLAGS) $(SDL_TTF_CFLAGS) $(SDL_MIXER_CFLAGS) $(CURL_CFLAGS) $(THEORA_CFLAGS) $(XVID_CFLAGS) $(VORBIS_CFLAGS) $(OGG_CFLAGS) $(MXML_CFLAGS) +-$(TARGET)_LDFLAGS += -lpng -ljpeg $(BFD_LIBS) $(INTL_LIBS) $(SDL_TTF_LIBS) $(SDL_MIXER_LIBS) $(OPENGL_LIBS) $(SDL_LIBS) $(CURL_LIBS) $(THEORA_LIBS) $(XVID_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(MXML_LIBS) $(SO_LIBS) -lz ++$(TARGET)_LDFLAGS += -lpng -ljpeg $(BFD_LIBS) $(INTL_LIBS) $(SDL_TTF_LIBS) $(SDL_MIXER_LIBS) $(OPENGL_LIBS) $(SDL_LIBS) $(CURL_LIBS) $(THEORA_LIBS) $(XVID_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(MXML_LIBS) $(SO_LIBS) -lz -lm + + $(TARGET)_SRCS = \ + client/cl_console.c \ +--- build/modules/testall.mk ++++ build/modules/testall.mk +@@ -9,7 +9,7 @@ + $(TARGET)_LINKER := $(CC) + $(TARGET)_FILE := $(TARGET)$(EXE_EXT) + $(TARGET)_CFLAGS += -DCOMPILE_UFO -DHARD_LINKED_GAME -DCOMPILE_UNITTESTS $(BFD_CFLAGS) $(SDL_CFLAGS) $(CURL_CFLAGS) $(OGG_CFLAGS) $(MXML_CFLAGS) +-$(TARGET)_LDFLAGS += -lcunit -lpng -ljpeg $(BFD_LIBS) $(INTL_LIBS) $(SDL_TTF_LIBS) $(SDL_MIXER_LIBS) $(OPENGL_LIBS) $(SDL_LIBS) $(CURL_LIBS) $(THEORA_LIBS) $(XVID_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(MXML_LIBS) $(SO_LIBS) -lz ++$(TARGET)_LDFLAGS += -lcunit -lpng -ljpeg $(BFD_LIBS) $(INTL_LIBS) $(SDL_TTF_LIBS) $(SDL_MIXER_LIBS) $(OPENGL_LIBS) $(SDL_LIBS) $(CURL_LIBS) $(THEORA_LIBS) $(XVID_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(MXML_LIBS) $(SO_LIBS) -lz -lm + + $(TARGET)_SRCS = \ + tests/test_all.c \ diff --git a/games-strategy/ufo-ai/metadata.xml b/games-strategy/ufo-ai/metadata.xml new file mode 100644 index 000000000000..b7362ac28a4f --- /dev/null +++ b/games-strategy/ufo-ai/metadata.xml @@ -0,0 +1,11 @@ + + + + games + + Build map editor + + + ufoai + + diff --git a/games-strategy/ufo-ai/ufo-ai-2.4.ebuild b/games-strategy/ufo-ai/ufo-ai-2.4.ebuild new file mode 100644 index 000000000000..4c3c9fe064d2 --- /dev/null +++ b/games-strategy/ufo-ai/ufo-ai-2.4.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils flag-o-matic games + +MY_P=${P/o-a/oa} + +DESCRIPTION="UFO: Alien Invasion - X-COM inspired strategy game" +HOMEPAGE="http://ufoai.sourceforge.net/" +SRC_URI="mirror://sourceforge/ufoai/${MY_P}-source.tar.bz2 + mirror://sourceforge/ufoai/${MY_P}-data.tar + http://mattn.ninex.info/1maps.pk3" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc x86" +IUSE="debug dedicated editor" + +# Dependencies and more instructions can be found here: +# http://ufoai.ninex.info/wiki/index.php/Compile_for_Linux +DEPEND="!dedicated? ( + virtual/opengl + virtual/glu + media-libs/libsdl + media-libs/sdl-image[jpeg,png] + media-libs/sdl-ttf + media-libs/sdl-mixer + virtual/jpeg + media-libs/libpng:0 + media-libs/libogg + media-libs/libvorbis + x11-proto/xf86vidmodeproto + ) + net-misc/curl + sys-devel/gettext + sys-libs/zlib + editor? ( + dev-libs/libxml2 + virtual/jpeg + media-libs/openal + x11-libs/gtkglext + x11-libs/gtksourceview:2.0 + )" + +S=${WORKDIR}/${MY_P}-source + +src_prepare() { + if has_version '>=sys-libs/zlib-1.2.5.1-r1' ; then + sed -i -e '1i#define OF(x) x' src/common/ioapi.h || die + fi + + # don't try to use the system mini-xml + sed -i -e '/mxml/d' configure || die + + epatch \ + "${FILESDIR}"/${P}-mathlib.patch \ + "${FILESDIR}"/${P}-anon.patch \ + "${FILESDIR}"/${P}-locale.patch + + cp "${DISTDIR}"/1maps.pk3 "${WORKDIR}"/base/ || die + mv "${WORKDIR}"/base/ "${S}"/ || die +} + +src_configure() { + # they are special and provide hand batched configure file + local myconf=" + --disable-dependency-tracking + $(use_enable !debug release) + $(use_enable editor ufo2map) + $(use_enable editor uforadiant) + --enable-ufoded + --bindir="${GAMES_BINDIR}" + --libdir="$(games_get_libdir)" + --datadir="${GAMES_DATADIR}/${PN/-}" + --localedir="${EPREFIX}/usr/share/locale/" + --prefix="${GAMES_PREFIX}" + " + echo "./configure ${myconf}" + ./configure ${myconf} || die +} + +src_compile() { + emake + emake lang + + if use editor; then + emake uforadiant + fi +} + +src_install() { + newicon src/ports/linux/ufo.png ${PN}.png + dobin ufoded + make_desktop_entry ufoded "UFO: Alien Invasion Server" ${PN} + if ! use dedicated; then + dobin ufo + make_desktop_entry ufo "UFO: Alien Invasion" ${PN} + fi + + if use editor; then + dobin ufo2map ufomodel + fi + + # install data + insinto "${GAMES_DATADIR}"/${PN/-} + doins -r base + rm -rf "${ED}/${GAMES_DATADIR}/${PN/-}/base/game.so" + dogameslib base/game.so + + # move translations where they belong + dodir "${GAMES_DATADIR_BASE}/locale" + mv "${ED}/${GAMES_DATADIR}/${PN/-}/base/i18n/"* \ + "${ED}/${GAMES_DATADIR_BASE}/locale/" || die + rm -rf "${ED}/${GAMES_DATADIR}/${PN/-}/base/i18n/" || die + + prepgamesdirs +} -- cgit v1.2.3-65-gdbad