[Buildroot] [PATCH 1/2] lsdldoom: new package lsdldoom

[Buildroot] [PATCH 1/2] lsdldoom: new package lsdldoom

[Hans-Christian Egtvedt]

This patch adds a new package lsdldoom, this Doom client is based on the SDL
framework. An alternative to the lxdoom package.

Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
---
 package/Config.in                                  |    1 +
 package/lsdldoom/Config.in                         |    9 ++
 .../lsdldoom/lsdldoom-1.4.4.4-fix-c-syntax.patch   |  104 ++++++++++++++++++++
 package/lsdldoom/lsdldoom.mk                       |   23 +++++
 4 files changed, 137 insertions(+), 0 deletions(-)
 create mode 100644 package/lsdldoom/Config.in
 create mode 100644 package/lsdldoom/lsdldoom-1.4.4.4-fix-c-syntax.patch
 create mode 100644 package/lsdldoom/lsdldoom.mk

diff --git a/package/Config.in b/package/Config.in
index 2941033..e23acc0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -489,6 +489,7 @@ menuconfig BR2_GAMES
 	  Support for games
 
 if BR2_GAMES
+source "package/lsdldoom/Config.in"
 source "package/lxdoom/Config.in"
 source "package/ace_of_penguins/Config.in"
 source "package/gnuchess/Config.in"
diff --git a/package/lsdldoom/Config.in b/package/lsdldoom/Config.in
new file mode 100644
index 0000000..49191fa
--- /dev/null
+++ b/package/lsdldoom/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LSDLDOOM
+	bool "lsdldoom"
+	depends on BR2_PACKAGE_SDL
+	help
+	  This is the linux version of the popular doom game using the SDL
+	  library, lsdldoom is an alternative to the lxdoom package.
+
+	  It is recommended to add the SDL_mixer package for audio support, but
+	  it is not required.
diff --git a/package/lsdldoom/lsdldoom-1.4.4.4-fix-c-syntax.patch b/package/lsdldoom/lsdldoom-1.4.4.4-fix-c-syntax.patch
new file mode 100644
index 0000000..628ef63
--- /dev/null
+++ b/package/lsdldoom/lsdldoom-1.4.4.4-fix-c-syntax.patch
@@ -0,0 +1,104 @@
+Index: lsdldoom-1.4.4.4/src/d_main.c
+===================================================================
+--- lsdldoom-1.4.4.4.orig/src/d_main.c	2008-07-21 10:33:34.000000000 +0200
++++ lsdldoom-1.4.4.4/src/d_main.c	2008-07-21 10:36:16.000000000 +0200
+@@ -230,6 +230,7 @@
+     case GS_LEVEL:
+       V_SetPalette(0); // cph - use default (basic) palette  
+     default:
++      break;
+     }
+ 
+     switch (gamestate) {
+@@ -243,6 +244,7 @@
+       D_PageDrawer();
+       break;
+     default:
++      break;
+     }
+   } else if (gametic) { // In a level
+     boolean redrawborderstuff;
+Index: lsdldoom-1.4.4.4/src/g_game.c
+===================================================================
+--- lsdldoom-1.4.4.4.orig/src/g_game.c	2008-07-21 10:33:34.000000000 +0200
++++ lsdldoom-1.4.4.4/src/g_game.c	2008-07-21 10:34:06.000000000 +0200
+@@ -875,6 +875,7 @@
+     case GS_INTERMISSION:
+       WI_End();
+     default:
++      break;
+     }
+     prevgamestate = gamestate;
+   }
+Index: lsdldoom-1.4.4.4/src/p_maputl.h
+===================================================================
+--- lsdldoom-1.4.4.4.orig/src/p_maputl.h	2008-07-21 10:33:40.000000000 +0200
++++ lsdldoom-1.4.4.4/src/p_maputl.h	2008-07-21 10:46:35.000000000 +0200
+@@ -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 *));
+ 
+Index: lsdldoom-1.4.4.4/src/r_segs.c
+===================================================================
+--- lsdldoom-1.4.4.4.orig/src/r_segs.c	2008-07-21 10:33:35.000000000 +0200
++++ lsdldoom-1.4.4.4/src/r_segs.c	2008-07-21 10:35:47.000000000 +0200
+@@ -47,9 +47,9 @@
+ // killough 1/6/98: replaced globals with statics where appropriate
+ 
+ // True if any of the segs textures might be visible.
+-static boolean  segtextured;
+-static boolean  markfloor;      // False if the back side is the same plane.
+-static boolean  markceiling;
++boolean         segtextured;
++boolean         markfloor;      // False if the back side is the same plane.
++boolean         markceiling;
+ static boolean  maskedtexture;
+ static int      toptexture;
+ static int      bottomtexture;
+@@ -65,8 +65,8 @@
+ //
+ // regular wall
+ //
+-static int      rw_x;
+-static int      rw_stopx;
++int             rw_x;
++int             rw_stopx;
+ static angle_t  rw_centerangle;
+ static fixed_t  rw_offset;
+ static fixed_t  rw_scale;
+Index: lsdldoom-1.4.4.4/src/wi_stuff.c
+===================================================================
+--- lsdldoom-1.4.4.4.orig/src/wi_stuff.c	2008-07-21 10:33:35.000000000 +0200
++++ lsdldoom-1.4.4.4/src/wi_stuff.c	2008-07-21 10:45:41.000000000 +0200
+@@ -368,7 +368,7 @@
+ static const patch_t  * frags;
+ 
+ // Time sucks.
+-static const patch_t  * time;
++static const patch_t  * witime;
+ static const patch_t  * par;
+ static const patch_t  * sucks;
+ 
+@@ -806,7 +806,7 @@
+ 
+ static void WI_drawTimeStats(int cnt_time, int cnt_total_time, int cnt_par)
+ {
+-  V_DrawMemPatch(SP_TIMEX, SP_TIMEY, FB, time, NULL, VPT_STRETCH);
++  V_DrawMemPatch(SP_TIMEX, SP_TIMEY, FB, witime, NULL, VPT_STRETCH);
+   WI_drawTime(320/2 - SP_TIMEX, SP_TIMEY, cnt_time);
+ 
+   V_DrawMemPatch(SP_TIMEX, (SP_TIMEY+200)/2, FB, total, NULL, VPT_STRETCH);
+@@ -1790,7 +1790,7 @@
+   { "WIOSTI", &items },
+   { "WIFRGS", &frags },
+   { "WICOLON",&colon },
+-  { "WITIME", &time  },
++  { "WITIME", &witime  },
+   { "WISUCKS",&sucks },
+   { "WIPAR",  &par   },
+   { "WIKILRS",&killers},
diff --git a/package/lsdldoom/lsdldoom.mk b/package/lsdldoom/lsdldoom.mk
new file mode 100644
index 0000000..464eef8
--- /dev/null
+++ b/package/lsdldoom/lsdldoom.mk
@@ -0,0 +1,23 @@
+#############################################################
+#
+# lsdldoom
+#
+#############################################################
+
+LSDLDOOM_VERSION = 1.4.4.4
+LSDLDOOM_SOURCE = lsdldoom-$(LSDLDOOM_VERSION).tar.gz
+LSDLDOOM_SITE = http://firehead.org/~jessh/lsdldoom/src
+LSDLDOOM_AUTORECONF = NO
+LSDLDOOM_INSTALL_STAGING = NO
+LSDLDOOM_INSTALL_TARGET = YES
+LSDLDOOM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+
+LSDLDOOM_MAKE_ENV = CC=$(TARGET_CC)
+
+LSDLDOOM_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) --prefix=/usr \
+		$(DISABLE_NLS)
+
+LSDLDOOM_DEPENDENCIES = sdl
+
+$(eval $(call AUTOTARGETS,package,lsdldoom))
-- 
1.5.4.3

[Buildroot] [PATCH 2/2] lxdoom-wad: make installation of Doom shareware wad file be more generic

[Hans-Christian Egtvedt]

This patch will let the user install the Doom shareware wad file if lxdoom or
lsdldoom is selected. The wad file will also be installed into
/usr/share/games/doom directory, since the client will search this directory
when starting.

The Makefile rule has also been altered to depend on the installed wad file, so
it will be multiple project safe.

Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
---
 package/lxdoom/Config.in     |    8 +++++---
 package/lxdoom/lxdoom-wad.mk |   10 +++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/package/lxdoom/Config.in b/package/lxdoom/Config.in
index 892e45c..4775781 100644
--- a/package/lxdoom/Config.in
+++ b/package/lxdoom/Config.in
@@ -3,7 +3,9 @@ config BR2_PACKAGE_LXDOOM
 	help
 	  This is the linux version of the popular doom game.
 config BR2_PACKAGE_LXDOOM_WAD
-	bool "lxdoom-wad"
-	depends on BR2_PACKAGE_LXDOOM
+	bool "doom shareware wad file"
+	depends on BR2_PACKAGE_LXDOOM || BR2_PACKAGE_LSDLDOOM
 	help
-	  This is the shareware wad data files for the doom game.
+	  This will install the the shareware wad data file for the doom game.
+
+	  The wad file will be placed in /usr/share/games/doom/doom1.wad
diff --git a/package/lxdoom/lxdoom-wad.mk b/package/lxdoom/lxdoom-wad.mk
index 41b8ed8..4e38574 100644
--- a/package/lxdoom/lxdoom-wad.mk
+++ b/package/lxdoom/lxdoom-wad.mk
@@ -15,14 +15,14 @@ $(DL_DIR)/$(LXDOOM_WAD_SOURCE):
 $(LXDOOM_WAD_DIR)/.unpacked: $(DL_DIR)/$(LXDOOM_WAD_SOURCE)
 	mkdir -p $(LXDOOM_WAD_DIR)
 	cp -f $(DL_DIR)/$(LXDOOM_WAD_SOURCE) $(LXDOOM_WAD_DIR)
-	gunzip -d $(LXDOOM_WAD_DIR)/$(LXDOOM_WAD_SOURCE) 
+	gunzip -d $(LXDOOM_WAD_DIR)/$(LXDOOM_WAD_SOURCE)
 	touch $@
 
-$(LXDOOM_WAD_DIR)/.installed: $(LXDOOM_WAD_DIR)/.unpacked
-	cp -f $(LXDOOM_WAD_DIR)/* $(TARGET_DIR)/usr/games
-	touch $@
+$(TARGET_DIR)/usr/share/games/doom/doom1.wad: $(LXDOOM_WAD_DIR)/.unpacked
+	mkdir -p $(TARGET_DIR)/usr/share/games/doom
+	cp -f $(LXDOOM_WAD_DIR)/doom-$(LXDOOM_WAD_VERSION).wad $@
 
-lxdoom-wad: lxdoom $(LXDOOM_WAD_DIR)/.installed
+lxdoom-wad: uclibc $(TARGET_DIR)/usr/share/games/doom/doom1.wad
 
 #############################################################
 #
-- 
1.5.4.3

[Buildroot] [PATCH 1/2] lsdldoom: new package lsdldoom

[Peter Korsgaard]

>>>>> "Hans-Christian" == Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> writes:

 Hans-Christian> This patch adds a new package lsdldoom, this Doom
 Hans-Christian> client is based on the SDL framework. An alternative
 Hans-Christian> to the lxdoom package.

Couldn't we just standardize on prboom instead of N doom variants?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/2] lsdldoom: new package lsdldoom

[John Voltz]

If I remember right, for some reason I was not able to get prboom to build
for AVR32 (or it had some ridiculous dependencies). This was awhile ago when
I did it, so I could be mistaken, that's why I settled on lxdoom.

John


On Mon, Jul 21, 2008 at 1:23 PM, Peter Korsgaard <jacmet@uclibc.org> wrote:

> >>>>> "Hans-Christian" == Hans-Christian Egtvedt <
> hans-christian.egtvedt at atmel.com> writes:
>
>  Hans-Christian> This patch adds a new package lsdldoom, this Doom
>  Hans-Christian> client is based on the SDL framework. An alternative
>  Hans-Christian> to the lxdoom package.
>
> Couldn't we just standardize on prboom instead of N doom variants?
>
> --
> Bye, Peter Korsgaard
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://busybox.net/lists/buildroot/attachments/20080721/8acd44c9/attachment.htm 

[Buildroot] [PATCH 1/2] lsdldoom: new package lsdldoom

[Peter Korsgaard]

>>>>> "John" == John Voltz <john.voltz@gmail.com> writes:

 John> If I remember right, for some reason I was not able to get
 John> prboom to build for AVR32 (or it had some ridiculous
 John> dependencies). This was awhile ago when I did it, so I could be
 John> mistaken, that's why I settled on lxdoom.

Ok, it just seems like a lot of churn for such an old game. We have
plenty of problems supporting the packages we already have without
adding a bunch of variantions of each thing.

But ok, I don't really feel strongly about it.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/2] lsdldoom: new package lsdldoom

[Hans-Christian Egtvedt]

On Mon, 2008-07-21 at 19:23 +0200, Peter Korsgaard wrote:
> >>>>> "Hans-Christian" == Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> writes:
> 
>  Hans-Christian> This patch adds a new package lsdldoom, this Doom
>  Hans-Christian> client is based on the SDL framework. An alternative
>  Hans-Christian> to the lxdoom package.
> 
> Couldn't we just standardize on prboom instead of N doom variants?
> 

I'll see what I can figure out of prboom. It would be nice to have one
client usable with SDL and also usable with X.

-- 
With kind regards,
Hans-Christian Egtvedt, Applications Engineer

[Buildroot] [PATCH 1/2] lsdldoom: new package lsdldoom

[Hans-Christian Egtvedt]

On Tue, 2008-07-22 at 08:00 +0200, Hans-Christian Egtvedt wrote:
> On Mon, 2008-07-21 at 19:23 +0200, Peter Korsgaard wrote:
> > >>>>> "Hans-Christian" == Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> writes:
> > 
> >  Hans-Christian> This patch adds a new package lsdldoom, this Doom
> >  Hans-Christian> client is based on the SDL framework. An alternative
> >  Hans-Christian> to the lxdoom package.
> > 
> > Couldn't we just standardize on prboom instead of N doom variants?
> > 
> 
> I'll see what I can figure out of prboom. It would be nice to have one
> client usable with SDL and also usable with X.
> 

prboom works fine, at least on AVR32. My main question is if we should
replace lxdoom (and the lsdldoom I submitted earlier) with prboom.

prboom links against SDL, and SDL can again be linked against
framebuffer, DirectFB, Qtopia and X11. Should be good enough for
everybody?

prboom is also fairly updated, last release was in 2006, in opposite to
lxdoom and lsdldoom which had the last release back in 2000.

I have not tested the network mode, but it compiles.

I at least prefer prboom above lsdldoom for targets without X11, so
either way I would like it added.

-- 
With kind regards,
Hans-Christian Egtvedt, Applications Engineer

[Buildroot] [PATCH 1/2] lsdldoom: new package lsdldoom

[Peter Korsgaard]

>>>>> "Hans-Christian" == Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> writes:

 Hans-Christian> I at least prefer prboom above lsdldoom for targets
 Hans-Christian> without X11, so either way I would like it added.

+1.

-- 
Bye, Peter Korsgaard