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

PATCH Superseded Hans-Christian Egtvedt 3 participants 11 messages Jul 24, 2008

Share & tools

Hans-Christian Egtvedt

author

2008-07-24 13:21 UTC #0 lore raw

PATCH 1/5 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.

Signed-off-by Hans-Christian Egtvedt <[email protected]>

---
 package/lxdoom/Config.in     |    6 ++++--
 package/lxdoom/lxdoom-wad.mk |   10 +++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

package/lxdoom/Config.in +4 -2

index 892e45c..3b318e1 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"
+	bool "doom shareware wad file"
 	depends on BR2_PACKAGE_LXDOOM
 	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

Hans-Christian Egtvedt

author

2008-07-24 13:21 UTC #1 lore raw

PATCH 2/5 SDL_net: add new package SDL_net

This patch adds a new package SDL_net. SDL_net is a small, low-level, cross-platform network library, that can be used with the Simple DirectMedia Layer library (SDL).

http://www.libsdl.org/projects/SDL_net/

Signed-off-by Hans-Christian Egtvedt <[email protected]>

---
 package/Config.in          |    1 +
 package/sdl_net/Config.in  |    8 +++++
 package/sdl_net/sdl_net.mk |   66 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 0 deletions(-)
 create mode 100644 package/sdl_net/Config.in
 create mode 100644 package/sdl_net/sdl_net.mk

package/Config.in +1 -0

index 2941033..e07d9e3 100644
@@ -349,6 +349,7 @@ source "package/libungif/Config.in"
 source "package/sdl/Config.in"
 source "package/sdl_image/Config.in"
 source "package/sdl_mixer/Config.in"
+source "package/sdl_net/Config.in"
 source "package/sdl_ttf/Config.in"
 source "package/tiff/Config.in"

package/sdl_net/Config.in new file +8 -0

new file mode 100644
index 0000000..2001d23
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_SDL_NET
+	bool "SDL_net"
+	depends on BR2_PACKAGE_SDL
+	help
+	  SDL_net is a small, low-level, cross-platform network library, that
+	  can be used with the Simple DirectMedia Layer library (SDL).
+
+	  http://www.libsdl.org/projects/SDL_net/

package/sdl_net/sdl_net.mk new file +66 -0

66 lines not on this page · raw message

Signature · 1 line

1.5.4.3

Hans-Christian Egtvedt

author

2008-07-24 13:21 UTC #2 lore raw

PATCH 3/5 PrBoom: add new package PrBoom

This patch adds a new package PrBoom. PrBoom is a Doom and Doom ][ client which uses the SDL library for graphics, sound and network. It also supports OpenGL, but this has not been enabled in this package since few embedded platforms support OpenGL.

PrBoom allows you to play the good old game on newer hardware. It even supports higher resolution and better rendring, while still keeping the old style alive.

http://prboom.sourceforge.net/

Signed-off-by Hans-Christian Egtvedt <[email protected]>

---
 package/Config.in        |    1 +
 package/prboom/Config.in |   11 +++++++
 package/prboom/prboom.mk |   76 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+), 0 deletions(-)
 create mode 100644 package/prboom/Config.in
 create mode 100644 package/prboom/prboom.mk

package/Config.in +1 -0

index e07d9e3..51e4eda 100644
@@ -491,6 +491,7 @@ menuconfig BR2_GAMES
 
 if BR2_GAMES
 source "package/lxdoom/Config.in"
+source "package/prboom/Config.in"
 source "package/ace_of_penguins/Config.in"
 source "package/gnuchess/Config.in"
 source "package/xboard/Config.in"

package/prboom/Config.in new file +11 -0

new file mode 100644
index 0000000..2835929
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_PRBOOM
+	bool "PrBoom"
+	select BR2_PACKAGE_SDL
+	select BR2_PACKAGE_SDL_MIXER
+	select BR2_PACKAGE_SDL_NET
+	help
+	  PrBoom is a Doom client which allows you to play the good old game on
+	  newer hardware. It even supports higher resolution and better
+	  rendring, while still keeping the old style alive.
+
+	  http://prboom.sourceforge.net/

package/prboom/prboom.mk new file +76 -0

76 lines not on this page · raw message

Signature · 1 line

1.5.4.3

Hans-Christian Egtvedt

author

2008-07-24 13:21 UTC #3 lore raw

PATCH 4/5 lxdoom-wad: enable kconfig entry for PrBoom package

This patch will let the user install the Doom shareware wad file if PrBoom is selected.

Signed-off-by Hans-Christian Egtvedt <[email protected]>

---
 package/lxdoom/Config.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

package/lxdoom/Config.in +1 -1

index 3b318e1..e3c9be8 100644
@@ -4,7 +4,7 @@ config BR2_PACKAGE_LXDOOM
 	  This is the linux version of the popular doom game.
 config BR2_PACKAGE_LXDOOM_WAD
 	bool "doom shareware wad file"
-	depends on BR2_PACKAGE_LXDOOM
+	depends on BR2_PACKAGE_LXDOOM || BR2_PACKAGE_PRBOOM
 	help
 	  This will install the the shareware wad data file for the doom game.

Signature · 1 line

1.5.4.3

Hans-Christian Egtvedt

author

2008-07-24 13:21 UTC #4 lore raw

PATCH 5/5 lxdoom: make package depend on X11 server

lxdoom depends on a X11 server to be built, this patch will only show lxdoom if a X11 server is selected and add xserver_xorg-server to the dependency list.

Signed-off-by Hans-Christian Egtvedt <[email protected]>

---
 package/lxdoom/Config.in |    2 ++
 package/lxdoom/lxdoom.mk |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

package/lxdoom/Config.in +2 -0

index e3c9be8..4e0d804 100644
@@ -1,7 +1,9 @@
 config BR2_PACKAGE_LXDOOM
 	bool "lxdoom"
+	depends on BR2_PACKAGE_XSERVER_xorg || BR2_PACKAGE_XSERVER_tinyx
 	help
 	  This is the linux version of the popular doom game.
+
 config BR2_PACKAGE_LXDOOM_WAD
 	bool "doom shareware wad file"
 	depends on BR2_PACKAGE_LXDOOM || BR2_PACKAGE_PRBOOM

package/lxdoom/lxdoom.mk +2 -2

index b79fa66..9444656 100644
@@ -17,6 +17,6 @@ LXDOOM_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
 		--includedir=/usr/include --enable-shared \
 		$(DISABLE_NLS)
 
-LXDOOM_DEPENDENCIES = uclibc  
+LXDOOM_DEPENDENCIES = xserver_xorg-server
 
-$(eval $(call AUTOTARGETS,package,lxdoom))
\ No newline at end of file
+$(eval $(call AUTOTARGETS,package,lxdoom))

Signature · 1 line

1.5.4.3

Hans-Christian Egtvedt

author

2008-07-24 13:23 UTC #5 lore raw

PATCH 5/5 lxdoom: make package depend on X11 server

Quoted 3 lines · Hans-Christian Egtvedt

lxdoom depends on a X11 server to be built, this patch will only show lxdoom if a X11 server is selected and add xserver_xorg-server to the dependency list.

For the record, I have no idea how the X11 server stuff is working, so I added the code on an assumption of how it works.

Signature · 2 lines

With kind regards,
Hans-Christian Egtvedt, Applications Engineer

Bernhard Fischer

2008-07-24 14:37 UTC #6 lore raw

PATCH 5/5 lxdoom: make package depend on X11 server

Quoted 7 lines · Hans-Christian Egtvedt

Quoted 3 lines · Hans-Christian Egtvedt
lxdoom depends on a X11 server to be built, this patch will only show lxdoom if a X11 server is selected and add xserver_xorg-server to the dependency list.
For the record, I have no idea how the X11 server stuff is working, so I added the code on an assumption of how it works.

my doom doesn't need an xserver. YMMV :P

Bernhard Fischer

2008-07-24 14:35 UTC #7 lore raw

PATCH 3/5 PrBoom: add new package PrBoom

In reply to Hans-Christian Egtvedt

package/prboom/prboom.mk

Quoted 6 lines · Hans-Christian Egtvedt

This patch adds a new package PrBoom. PrBoom is a Doom and Doom ][ client which
package/prboom/prboom.mk new file +0 -1
new file mode 100644
index 0000000..5fec883
--- /dev/null

please use Makefile.autotools.in

Bernhard Fischer

2008-07-24 14:35 UTC #8 lore raw

PATCH 2/5 SDL_net: add new package SDL_net

In reply to Hans-Christian Egtvedt

package/sdl_net/sdl_net.mk

Quoted 10 lines · Hans-Christian Egtvedt

This patch adds a new package SDL_net. SDL_net is a small, low-level, cross-platform network library, that can be used with the Simple DirectMedia Layer library (SDL).
package/sdl_net/Config.in new file +1 -0
+	  http://www.libsdl.org/projects/SDL_net/
package/sdl_net/sdl_net.mk new file +0 -1
new file mode 100644
index 0000000..a0108f3
--- /dev/null

please use Makefile.autotools.in

Bernhard Fischer

2008-07-24 14:33 UTC #9 lore raw

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

In reply to Hans-Christian Egtvedt

Quoted 4 lines · 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.

weeeeh
http://www.ggi-project.org/screenshots.html

Quoted 22 lines

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 <[email protected]>
---
package/lxdoom/Config.in | 6 ++++--
package/lxdoom/lxdoom-wad.mk | 10 +++++-----
2 files changed, 9 insertions(+), 7 deletions(-)
package/lxdoom/Config.in +0 -0
index 892e45c..3b318e1 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
package/lxdoom/Config.in +1 -1
-	bool "lxdoom-wad"
+	bool "doom shareware wad file"
depends on BR2_PACKAGE_LXDOOM
help

package/lxdoom/Config.in config BR2_PACKAGE_LXDOOM · line 9

Quoted 2 lines

package/lxdoom/Config.in +1 -1

-	  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 the the contains a surplus the ;)

package/lxdoom/lxdoom-wad.mk $(DL_DIR)/$(LXDOOM_WAD_SOURCE): · line 18

Quoted 12 lines

package/lxdoom/Config.in +2 -0

+
+	  The wad file will be placed in /usr/share/games/doom/doom1.wad

package/lxdoom/lxdoom-wad.mk +1 -1

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)

no. There is no gunzip. So who added this stuff? I'm 100% sure that when i left there were no hardcoded decompressors in there. You should listen to what user say (resp. configure).

package/lxdoom/lxdoom-wad.mk $(DL_DIR)/$(LXDOOM_WAD_SOURCE): · line 23

Quoted 8 lines

package/lxdoom/lxdoom-wad.mk +3 -3

 	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 $@

$(INSTALL) -D $(LXDOOM_WAD_DIR)/doom-$(LXDOOM_WAD_VERSION).wad $@

It's not only shorter but also avoiding broken cp and mkdir implementations and is IMO the preferred way to copy stuff.

Peter Korsgaard

2008-07-24 14:45 UTC #10 lore raw

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

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bernhard" == Bernhard Fischer <[email protected]> writes:

Hi,

Quoted 3 lines

package/lxdoom/lxdoom-wad.mk $(DL_DIR)/$(LXDOOM_WAD_SOURCE): · line 18
Quoted 3 lines
cp -f $(DL_DIR)/$(LXDOOM_WAD_SOURCE) $(LXDOOM_WAD_DIR)
package/lxdoom/lxdoom-wad.mk +1 -1
-	gunzip -d $(LXDOOM_WAD_DIR)/$(LXDOOM_WAD_SOURCE) 
+	gunzip -d $(LXDOOM_WAD_DIR)/$(LXDOOM_WAD_SOURCE)

Bernhard> no. There is no gunzip. So who added this stuff? I'm 100% Bernhard> sure that when i left there were no hardcoded decompressors Bernhard> in there. You should listen to what user say Bernhard> (resp. configure).

Yes, $(ZCAT) is what you want.

Quoted 3 lines

package/lxdoom/lxdoom-wad.mk $(DL_DIR)/$(LXDOOM_WAD_SOURCE): · line 23
Quoted 3 lines
+$(TARGET_DIR)/usr/share/games/doom/doom1.wad: $(LXDOOM_WAD_DIR)/.unpacked
package/lxdoom/lxdoom-wad.mk +2 -0
+	mkdir -p $(TARGET_DIR)/usr/share/games/doom
+	cp -f $(LXDOOM_WAD_DIR)/doom-$(LXDOOM_WAD_VERSION).wad $@

Bernhard> $(INSTALL) -D $(LXDOOM_WAD_DIR)/doom-$(LXDOOM_WAD_VERSION).wad $@

Yes, as long as you don't try to do it with symlinks (E.G. like what you have with .so files) as install then resolves the symlinks and you end up with multiple copies in your rootfs.

.. Like I recently learned the hard way (22862) ;)

Signature · 1 line

Bye, Peter Korsgaard