Skip to contentSkip to conversation

lsdldoom: new package lsdldoom

PATCH New Hans-Christian Egtvedt 3 participants 8 messages Jul 21, 2008 – Jul 24, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 lsdldoom: new package lsdldoom

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

---
 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
package/Config.in +1 -0
index 2941033..e23acc0 100644
@@ -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"
package/lsdldoom/Config.in new file +9 -0
new file mode 100644
index 0000000..49191fa
@@ -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.
package/lsdldoom/lsdldoom-1.4.4.4-fix-c-syntax.patch new file +104 -0

104 lines not on this page · raw message

package/lsdldoom/lsdldoom.mk new file +23 -0
new file mode 100644
index 0000000..464eef8
@@ -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))
Signature · 1 line
1.5.4.3
#1 lore raw

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

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.

---
 package/lxdoom/Config.in     |    8 +++++---
 package/lxdoom/lxdoom-wad.mk |   10 +++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)
package/lxdoom/Config.in +5 -3
index 892e45c..4775781 100644
@@ -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
package/lxdoom/lxdoom-wad.mk +5 -5
index 41b8ed8..4e38574 100644
@@ -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
 
 #############################################################
 #
Signature · 1 line
1.5.4.3
#2 lore raw

PATCH 1/2 lsdldoom: new package lsdldoom

In reply to Hans-Christian Egtvedt
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Hans-Christian" == Hans-Christian Egtvedt <[email protected]> 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?

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/2 lsdldoom: new package lsdldoom

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

Quoted 7 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"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.

Quoted 9 lines

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

#4 lore raw

PATCH 1/2 lsdldoom: new package lsdldoom

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"John" == John Voltz <[email protected]> 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.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 1/2 lsdldoom: new package lsdldoom

In reply to Peter Korsgaard
Quoted 8 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Hans-Christian" == Hans-Christian Egtvedt <[email protected]> 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.

Signature · 2 lines
With kind regards,
Hans-Christian Egtvedt, Applications Engineer
#6 lore raw

PATCH 1/2 lsdldoom: new package lsdldoom

Quoted 7 lines · Hans-Christian Egtvedt
Quoted 6 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Hans-Christian" == Hans-Christian Egtvedt <[email protected]> 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.

Quoted 6 lines
Quoted 2 lines

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.

Signature · 2 lines
With kind regards,
Hans-Christian Egtvedt, Applications Engineer
#7 lore raw

PATCH 1/2 lsdldoom: new package lsdldoom

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Hans-Christian" == Hans-Christian Egtvedt <[email protected]> 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.

Signature · 1 line
Bye, Peter Korsgaard