From 0ea6fdcaff8e2b07e30cf76f9876a448d90c57d3 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 15 Jan 2005 09:12:46 +0000 Subject: [PATCH] Clean up ebuild: add games.eclass support, fix stupid paths, and fix gcc errors #77846 by Pinky. Package-Manager: portage-2.0.51-r13 --- games-fps/lsdldoom/ChangeLog | 10 +++- games-fps/lsdldoom/files/1.4.4.4-gcc34.patch | 42 +++++++++++++++ .../lsdldoom/files/1.4.4.4-gentoo-paths.patch | 39 ++++++++++++++ games-fps/lsdldoom/files/lsdldoom | 2 - games-fps/lsdldoom/lsdldoom-1.4.4.4.ebuild | 52 ++++++++++--------- 5 files changed, 117 insertions(+), 28 deletions(-) create mode 100644 games-fps/lsdldoom/files/1.4.4.4-gcc34.patch create mode 100644 games-fps/lsdldoom/files/1.4.4.4-gentoo-paths.patch delete mode 100644 games-fps/lsdldoom/files/lsdldoom diff --git a/games-fps/lsdldoom/ChangeLog b/games-fps/lsdldoom/ChangeLog index b16b917b9cc0..abc610b00e04 100644 --- a/games-fps/lsdldoom/ChangeLog +++ b/games-fps/lsdldoom/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for games-fps/lsdldoom -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/lsdldoom/ChangeLog,v 1.6 2004/12/29 00:04:45 ciaranm Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/lsdldoom/ChangeLog,v 1.7 2005/01/15 09:12:46 vapier Exp $ + + 15 Jan 2005; Mike Frysinger + +files/1.4.4.4-gcc34.patch, +files/1.4.4.4-gentoo-paths.patch, + lsdldoom-1.4.4.4.ebuild: + Clean up ebuild: add games.eclass support, fix stupid paths, and fix gcc + errors #77846 by Pinky. 29 Dec 2004; Ciaran McCreesh : Change encoding to UTF-8 for GLEP 31 compliance diff --git a/games-fps/lsdldoom/files/1.4.4.4-gcc34.patch b/games-fps/lsdldoom/files/1.4.4.4-gcc34.patch new file mode 100644 index 000000000000..988905f84931 --- /dev/null +++ b/games-fps/lsdldoom/files/1.4.4.4-gcc34.patch @@ -0,0 +1,42 @@ +diff -ur lsdldoom-1.4.4.4.orig/src/d_main.c lsdldoom-1.4.4.4/src/d_main.c +--- lsdldoom-1.4.4.4.orig/src/d_main.c 2005-01-15 02:38:13.077626072 -0500 ++++ lsdldoom-1.4.4.4/src/d_main.c 2005-01-15 02:39:41.646161608 -0500 +@@ -230,6 +230,7 @@ + case GS_LEVEL: + V_SetPalette(0); // cph - use default (basic) palette + default: ++; + } + + switch (gamestate) { +@@ -243,6 +244,7 @@ + D_PageDrawer(); + break; + default: ++; + } + } else if (gametic) { // In a level + boolean redrawborderstuff; +diff -ur lsdldoom-1.4.4.4.orig/src/g_game.c lsdldoom-1.4.4.4/src/g_game.c +--- lsdldoom-1.4.4.4.orig/src/g_game.c 2005-01-15 02:38:13.043631240 -0500 ++++ lsdldoom-1.4.4.4/src/g_game.c 2005-01-15 02:38:13.260598256 -0500 +@@ -875,6 +875,7 @@ + case GS_INTERMISSION: + WI_End(); + default: ++; + } + prevgamestate = gamestate; + } +diff -ur lsdldoom-1.4.4.4.orig/src/p_maputl.h lsdldoom-1.4.4.4/src/p_maputl.h +--- lsdldoom-1.4.4.4.orig/src/p_maputl.h 2005-01-15 02:38:13.044631088 -0500 ++++ lsdldoom-1.4.4.4/src/p_maputl.h 2005-01-15 02:40:35.526970480 -0500 +@@ -82,7 +82,7 @@ + void P_SetThingPosition(mobj_t *thing); + boolean P_BlockLinesIterator (int x, int y, boolean func(line_t *)); + boolean P_BlockThingsIterator(int x, int y, boolean func(mobj_t *)); +-boolean ThingIsOnLine(const mobj_t *t, const line_t *l); /* killough 3/15/98 */ ++boolean CONSTFUNC ThingIsOnLine(const mobj_t *t, const line_t *l); /* killough 3/15/98 */ + boolean P_PathTraverse(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2, + int flags, boolean trav(intercept_t *)); + diff --git a/games-fps/lsdldoom/files/1.4.4.4-gentoo-paths.patch b/games-fps/lsdldoom/files/1.4.4.4-gentoo-paths.patch new file mode 100644 index 000000000000..a180b96046cf --- /dev/null +++ b/games-fps/lsdldoom/files/1.4.4.4-gentoo-paths.patch @@ -0,0 +1,39 @@ +--- lsdldoom-1.4.4.4.orig/configure 2005-01-15 03:08:57.000000000 -0500 ++++ lsdldoom-1.4.4.4/configure 2005-01-15 03:18:34.814466112 -0500 +@@ -2445,6 +2445,6 @@ +-gamesdir=$prefix/games ++gamesdir=$bindir + exp_gamesdir=`eval "echo $gamesdir"` + exp_datadir=`eval "echo $datadir"` +-waddir=$exp_datadir/games/doom ++waddir=$exp_datadir/doom-data + cat >> confdefs.h < build failure + # cpu-opt -> just adds -mcpu crap to CFLAGS + ac_cv_lib_SDL_mixer_Mix_LoadMUS=no \ + egamesconf \ + --disable-i386-asm \ + --disable-cpu-opt \ || die - make || die + emake || die } src_install() { - dobin "${FILESDIR}/lsdldoom" - exeinto /usr/share/doom - doexe src/lsdldoom src/lxdoom-game-server - insinto /usr/share/doom/ - doins doom1.wad data/*.wad - doman doc/boom.cfg.5 doc/lsdldoom.6 doc/lxdoom-game-server.6 - dodoc AUTHORS ChangeLog INSTALL NEWS README doc/*.txt + make install DESTDIR="${D}" || die + prepalldocs + dodoc ChangeLog + prepgamesdirs } -- 2.26.2