summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /games-fps/lsdldoom
downloadgentoo-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-fps/lsdldoom')
-rw-r--r--games-fps/lsdldoom/Manifest2
-rw-r--r--games-fps/lsdldoom/files/1.4.4.4-gcc34.patch42
-rw-r--r--games-fps/lsdldoom/files/1.4.4.4-gentoo-paths.patch39
-rw-r--r--games-fps/lsdldoom/files/lsdldoom-1.4.4.4-gcc41.patch14
-rw-r--r--games-fps/lsdldoom/files/lsdldoom-1.4.4.4-keys.patch11
-rw-r--r--games-fps/lsdldoom/files/lsdldoom-1.5-paths.patch64
-rw-r--r--games-fps/lsdldoom/lsdldoom-1.4.4.4-r1.ebuild51
-rw-r--r--games-fps/lsdldoom/lsdldoom-1.5.ebuild39
-rw-r--r--games-fps/lsdldoom/metadata.xml10
9 files changed, 272 insertions, 0 deletions
diff --git a/games-fps/lsdldoom/Manifest b/games-fps/lsdldoom/Manifest
new file mode 100644
index 000000000000..12036431825f
--- /dev/null
+++ b/games-fps/lsdldoom/Manifest
@@ -0,0 +1,2 @@
+DIST lsdldoom-1.4.4.4.tar.gz 916884 SHA256 6c29560a3a87b351f81717bd79c2cff124df0e68b807a7a365af15317a47d83c
+DIST lsdldoom-1.5.tar.gz 1227060 SHA256 2e780775a1f31e3ee30e3d02b7f6b35409ec986fbfec07139b19ab48bdcf3ed8
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 <<EOF
+ #define DOOMWADDIR "$waddir"
+--- lsdldoom-1.4.4.4.orig/src/Makefile.in 2005-01-15 03:08:57.000000000 -0500
++++ lsdldoom-1.4.4.4/src/Makefile.in 2005-01-15 03:19:19.298703480 -0500
+@@ -86,3 +86,3 @@
+-gamesdir = $(prefix)/games
++gamesdir = $(bindir)
+ EXTRA_PROGRAMS = lsdldoom lxdoom-game-server
+ games_PROGRAMS = @BUILD_SDLDOOM@ @BUILD_SERVER@
+--- lsdldoom-1.4.4.4.orig/doc/Makefile.in 2005-01-15 03:20:25.252676952 -0500
++++ lsdldoom-1.4.4.4/doc/Makefile.in 2005-01-15 03:23:34.686878576 -0500
+@@ -85,3 +85,3 @@
+
+-docdir = $(prefix)/share/doc/@PACKAGE@
++docdir = /usr/share/doc/$(PF)
+ man_MANS = lsdldoom.6 boom.cfg.5 lxdoom-game-server.6
+--- lsdldoom-1.4.4.4.orig/data/Makefile.in 2005-01-15 03:20:25.261675584 -0500
++++ lsdldoom-1.4.4.4/data/Makefile.in 2005-01-15 03:24:29.704514624 -0500
+@@ -85,3 +85,3 @@
+
+-waddir = $(datadir)/games/doom
++waddir = $(datadir)/doom-data
+ wad_DATA = boomlump.wad
+--- lsdldoom-1.4.4.4.orig/Makefile.in 2005-01-15 03:29:34.329204632 -0500
++++ lsdldoom-1.4.4.4/Makefile.in 2005-01-15 03:31:30.359565336 -0500
+@@ -85,3 +85,3 @@
+
+-docdir = $(prefix)/share/doc/@PACKAGE@
++docdir = /usr/share/doc/$(PF)
+ SUBDIRS = doc data src
diff --git a/games-fps/lsdldoom/files/lsdldoom-1.4.4.4-gcc41.patch b/games-fps/lsdldoom/files/lsdldoom-1.4.4.4-gcc41.patch
new file mode 100644
index 000000000000..6c0ce7dc3b52
--- /dev/null
+++ b/games-fps/lsdldoom/files/lsdldoom-1.4.4.4-gcc41.patch
@@ -0,0 +1,14 @@
+--- src/r_bsp.h.old 2006-05-06 02:07:04.000000000 +0200
++++ src/r_bsp.h 2006-05-06 02:08:48.000000000 +0200
+@@ -41,11 +41,6 @@
+ extern line_t *linedef;
+ extern sector_t *frontsector;
+ extern sector_t *backsector;
+-extern int rw_x;
+-extern int rw_stopx;
+-extern boolean segtextured;
+-extern boolean markfloor; /* false if the back side is the same plane */
+-extern boolean markceiling;
+
+ /* old code -- killough:
+ * extern drawseg_t drawsegs[MAXDRAWSEGS];
diff --git a/games-fps/lsdldoom/files/lsdldoom-1.4.4.4-keys.patch b/games-fps/lsdldoom/files/lsdldoom-1.4.4.4-keys.patch
new file mode 100644
index 000000000000..0c356a9fadcf
--- /dev/null
+++ b/games-fps/lsdldoom/files/lsdldoom-1.4.4.4-keys.patch
@@ -0,0 +1,11 @@
+--- src/g_game.c
++++ src/g_game.c
+@@ -200,7 +200,7 @@
+ #define TURBOTHRESHOLD 0x32
+ #define SLOWTURNTICS 6
+ #define QUICKREVERSE 32768 // 180 degree reverse // phares
+-#define NUMKEYS 256
++#define NUMKEYS 512
+
+ fixed_t forwardmove[2] = {0x19, 0x32};
+ fixed_t sidemove[2] = {0x18, 0x28};
diff --git a/games-fps/lsdldoom/files/lsdldoom-1.5-paths.patch b/games-fps/lsdldoom/files/lsdldoom-1.5-paths.patch
new file mode 100644
index 000000000000..686e3450a620
--- /dev/null
+++ b/games-fps/lsdldoom/files/lsdldoom-1.5-paths.patch
@@ -0,0 +1,64 @@
+diff -urN lsdldoom-1.5.orig//Makefile.in lsdldoom-1.5/Makefile.in
+--- lsdldoom-1.5.orig//Makefile.in 2011-10-23 22:17:01.582705152 -0700
++++ lsdldoom-1.5/Makefile.in 2011-10-23 22:18:00.846237242 -0700
+@@ -209,7 +209,7 @@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-docdir = $(prefix)/share/doc/@PACKAGE@
++docdir = /usr/share/doc/$(PF)
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+diff -urN lsdldoom-1.5.orig//configure lsdldoom-1.5/configure
+--- lsdldoom-1.5.orig//configure 2011-10-23 22:17:01.544700322 -0700
++++ lsdldoom-1.5/configure 2011-10-23 22:18:00.829235080 -0700
+@@ -5689,10 +5689,10 @@
+ then exec_prefix=$prefix
+ fi
+
+-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 <<_ACEOF
+ #define DOOMWADDIR "$waddir"
+ _ACEOF
+diff -urN lsdldoom-1.5.orig//data/Makefile.in lsdldoom-1.5/data/Makefile.in
+--- lsdldoom-1.5.orig//data/Makefile.in 2011-10-23 22:17:01.634711762 -0700
++++ lsdldoom-1.5/data/Makefile.in 2011-10-23 22:18:00.844236988 -0700
+@@ -188,7 +188,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-waddir = $(datadir)/games/doom
++waddir = $(datadir)/doom-data
+ wad_DATA = boomlump.wad
+ EXTRA_DIST = boomlump.wad
+ all: all-am
+diff -urN lsdldoom-1.5.orig//doc/Makefile.in lsdldoom-1.5/doc/Makefile.in
+--- lsdldoom-1.5.orig//doc/Makefile.in 2011-10-23 22:17:00.348548297 -0700
++++ lsdldoom-1.5/doc/Makefile.in 2011-10-23 22:18:00.840236480 -0700
+@@ -158,7 +158,7 @@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-docdir = $(prefix)/share/doc/@PACKAGE@
++docdir = /usr/share/doc/$(PF)
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+diff -urN lsdldoom-1.5.orig//src/Makefile.in lsdldoom-1.5/src/Makefile.in
+--- lsdldoom-1.5.orig//src/Makefile.in 2011-10-23 22:17:01.041636386 -0700
++++ lsdldoom-1.5/src/Makefile.in 2011-10-23 22:18:00.835235845 -0700
+@@ -242,7 +242,7 @@
+ # Process this file with automake to produce Makefile.in
+ #
+ #
+-gamesdir = $(prefix)/games
++gamesdir = $(bindir)
+ games_PROGRAMS = @BUILD_SDLDOOM@ @BUILD_SERVER@
+ @I386_ASM_FALSE@ASMS =
+ @I386_ASM_TRUE@ASMS = drawspan.S drawcol.S drawasm.h
diff --git a/games-fps/lsdldoom/lsdldoom-1.4.4.4-r1.ebuild b/games-fps/lsdldoom/lsdldoom-1.4.4.4-r1.ebuild
new file mode 100644
index 000000000000..d28f17bb2013
--- /dev/null
+++ b/games-fps/lsdldoom/lsdldoom-1.4.4.4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils games
+
+DESCRIPTION="Port of ID's doom to SDL"
+HOMEPAGE="http://firehead.org/~jessh/lsdldoom/"
+SRC_URI="http://www.lbjhs.net/~jessh/lsdldoom/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="sparc x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl
+ media-libs/sdl-net
+ !games-fps/prboom
+ games-fps/doom-data"
+
+src_unpack() {
+ unpack ${A}
+ cp -r "${S}"{,.orig}
+ cd "${S}"
+ epatch \
+ "${FILESDIR}"/${PV}-gentoo-paths.patch \
+ "${FILESDIR}"/${P}-gcc41.patch \
+ "${FILESDIR}"/${P}-keys.patch \
+ "${FILESDIR}"/${PV}-gcc34.patch #77846
+}
+
+src_compile() {
+ # The SDL_mixer implementation is VERY broken ...
+ # it relies on internal function calls rather than
+ # the exported API ... bad programmer !
+ # i386-asm -> 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
+ emake || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ prepalldocs
+ dodoc ChangeLog
+ prepgamesdirs
+}
diff --git a/games-fps/lsdldoom/lsdldoom-1.5.ebuild b/games-fps/lsdldoom/lsdldoom-1.5.ebuild
new file mode 100644
index 000000000000..04d4f9b96268
--- /dev/null
+++ b/games-fps/lsdldoom/lsdldoom-1.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils games
+
+DESCRIPTION="Port of ID's doom to SDL"
+HOMEPAGE="http://jesshaas.com/lsdldoom/"
+SRC_URI="http://jesshaas.com/lsdldoom/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="arm ppc x86"
+IUSE="+net +shareware freedoom"
+
+DEPEND="media-libs/libsdl[video]
+ media-libs/sdl-mixer
+ net? ( media-libs/sdl-net )"
+RDEPEND="${DEPEND}
+ shareware? ( games-fps/doom-data )
+ freedoom? ( games-fps/freedoom )"
+
+PATCHES=( "${FILESDIR}"/${P}-paths.patch )
+
+src_configure() {
+ # cpu-opt -> just adds -mcpu crap to CFLAGS
+ egamesconf \
+ --disable-dependency-tracking \
+ --disable-cpu-opt \
+ $(use_enable net net-game)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ prepalldocs
+ dodoc ChangeLog
+ prepgamesdirs
+}
diff --git a/games-fps/lsdldoom/metadata.xml b/games-fps/lsdldoom/metadata.xml
new file mode 100644
index 000000000000..26853b0e7729
--- /dev/null
+++ b/games-fps/lsdldoom/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+<use>
+ <flag name='net'>Enables network game support</flag>
+ <flag name='shareware'>Install <pkg>games-fps/doom-data</pkg> for shareware wad file</flag>
+ <flag name='freedoom'>Install <pkg>games-fps/freedoom</pkg> wad file</flag>
+</use>
+</pkgmetadata>