Try a cross-compiler port to lsdldoom

7 files changed, 219 insertions, 0 deletions

diff --git a/games-fps/lsdldoom/Manifest b/games-fps/lsdldoom/Manifest
new file mode 100644
index 0000000..7bc178b
--- /dev/null
+++ b/games-fps/lsdldoom/Manifest
@@ -0,0 +1,7 @@
+AUX 1.4.4.4-gcc34.patch 1612 SHA256 4bfa669686cb6930f7c40e84c8460cbea40f92a24833b23a21868d1b86e231ec SHA512 81d9f74661efade42afec32cdfb1f77c1532d96315775bfb0b516861aee347664fd2dcf766b4b8517032ef83226b7b843ba88a2cca9bb0e7057e50239829ad69 WHIRLPOOL 9ff0abb962bc9a59edaa7909175d65adaf520d205e5df50ba02282dfce9633aada8c1fb13c8dc45a0084502dbc9d90999c0e98592ecc3745da2c516ac6efdd8b
+AUX 1.4.4.4-gentoo-paths.patch 1525 SHA256 cfa4df317d36283a6823f98012daa8578bf4ff9e712257a11272a1d24a2b8561 SHA512 b634d206b5832483c30ada46f678f67477548c212e260beb3d01d162d26954010440f10dee14fdc76eda9d76f4c72ab6fe5609d9832d7b2ef84cc320a349e61e WHIRLPOOL 57ca3bb0f7f42bcf3eeb6fe18320a68011cd158d573891f1ce422b9cfa1659c823731277d2ee44ecb2b5d41c39d7c0aca0941bc51f8ed6f195f8baa4cf716c8a
+AUX lsdldoom-1.4.4.4-gcc41.patch 477 SHA256 18f5c1d5fe98bcf97a81a4c02171beeccae34b29f0eca3b2f352677468e710b8 SHA512 9210574ca11b2a3ad5afef4edf82d36c20c1cd54bd939600ef5769f29bb3458f9daa23df043abf51bf619515c595d0aaf21b429a4296060f4dc5e5ad53837976 WHIRLPOOL dd28e58531f5504c4144fed54a63f6e8f2f88efa9cffca32b04835bcbbc77dacf0faad43f780c89fe193ffac435174a2179ff31c2fcbe96eb291a73d3a005423
+AUX lsdldoom-1.4.4.4-keys.patch 316 SHA256 b7ef13e74e5bfea1b31c32c19f9eaafa6f39147a0179620e7d652e849a5bd049 SHA512 710312eeb11de8d14e27e19261934ba53ed14b3fe62f8a9b6e84984ccbf073de8eb8a30e9da7bd98887716e003115feaca3a2324f5fdccfcde477a613d22c9be WHIRLPOOL 829d1aada5115f610731c62a7f78e8a4187f6905eccba762d385bf43a83940d8f8fabd67e255187b1cd2cdb63483b55083539e1e19470e0ef5044507f7e2b840
+AUX lsdldoom-1.5-paths.patch 2315 SHA256 1802d087e060618d9b99ac2d23a501b831631c90d20e6950710e286e7859fcd6 SHA512 c1222ed33816ddd4aa9101ca55a8d70f9913320736f6b50a80e95ff6ee721fd794509aeb2196e8480ea469d7ed45686402f32df6592fa75bf4c55d296592564d WHIRLPOOL ab03f210d8a425953836e553004249789e864b400c2910341d9031c824eeeafdfb44ad631fda2a6fd24c90dc0dd03fd2b3df80fdd17c959e6631ec1199157b40
+DIST lsdldoom-1.5.tar.gz 1227060 SHA256 2e780775a1f31e3ee30e3d02b7f6b35409ec986fbfec07139b19ab48bdcf3ed8 SHA512 49d68040c312e8a27b452eb54acb1a4197dee157678de9e902cc2f17a38e621c5980eadf9c78e1945b9d5fb863dd1bdbdcd08c1c5e50971ee73857b7b3e47e33 WHIRLPOOL c36dfef22ee496652c5fd92d3a47b69e10eafa8c621984968881579e1c9e3db8bc9840e86bbb1e8c790d0f242c318787729b21627e431b3b8761a7ca269d653f
+EBUILD lsdldoom-1.5.ebuild 1113 SHA256 268b9ad8b8a091d5ac098bd9e983723e4dca5b666c404fd22b10438c9512a39a SHA512 531a021ebfbd5fdcffbff4092e59404c8edf369ae96ac37b4918333fcb9818781f089d65bb468ae97e0c5caf26f2dbee93906caa150505ee98d98ec6b944edbc WHIRLPOOL b88376d5b0a95f985577eb428e7a5f5544968828e9c81d122ee20448dd6fce3de19e0e06d7a814e26573dbb1150a98e03a2bb23af679bc3a683885fef015190b
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 0000000..988905f
--- /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 0000000..a180b96
--- /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 0000000..6c0ce7d
--- /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 0000000..0c356a9
--- /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 0000000..686e345
--- /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.5.ebuild b/games-fps/lsdldoom/lsdldoom-1.5.ebuild
new file mode 100644
index 0000000..8422797
--- /dev/null
+++ b/games-fps/lsdldoom/lsdldoom-1.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/lsdldoom/lsdldoom-1.5.ebuild,v 1.4 2013/02/25 02:43:31 vapier Exp $
+
+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 \
+                --with-sdl-prefix=${ROOT}${EPREFIX}/usr \
+                --with-sdl-exec-prefix=${EPREFIX}/usr \
+                --disable-sdltest \
+		$(use_enable net net-game)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	prepalldocs
+	dodoc ChangeLog
+	prepgamesdirs
+}