* [Buildroot] [PATCH 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic
@ 2008-07-24 13:21 Hans-Christian Egtvedt
2008-07-24 13:21 ` [Buildroot] [PATCH 2/5] SDL_net: add new package SDL_net Hans-Christian Egtvedt
2008-07-24 14:33 ` [Buildroot] [PATCH 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic Bernhard Fischer
0 siblings, 2 replies; 11+ messages in thread
From: Hans-Christian Egtvedt @ 2008-07-24 13:21 UTC (permalink / raw)
To: buildroot
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 | 6 ++++--
package/lxdoom/lxdoom-wad.mk | 10 +++++-----
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/package/lxdoom/Config.in b/package/lxdoom/Config.in
index 892e45c..3b318e1 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"
+ 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
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
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 2/5] SDL_net: add new package SDL_net
2008-07-24 13:21 [Buildroot] [PATCH 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic Hans-Christian Egtvedt
@ 2008-07-24 13:21 ` Hans-Christian Egtvedt
2008-07-24 13:21 ` [Buildroot] [PATCH 3/5] PrBoom: add new package PrBoom Hans-Christian Egtvedt
2008-07-24 14:35 ` [Buildroot] [PATCH 2/5] SDL_net: add new package SDL_net Bernhard Fischer
2008-07-24 14:33 ` [Buildroot] [PATCH 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic Bernhard Fischer
1 sibling, 2 replies; 11+ messages in thread
From: Hans-Christian Egtvedt @ 2008-07-24 13:21 UTC (permalink / raw)
To: buildroot
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 <hans-christian.egtvedt@atmel.com>
---
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
diff --git a/package/Config.in b/package/Config.in
index 2941033..e07d9e3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/sdl_net/Config.in b/package/sdl_net/Config.in
new file mode 100644
index 0000000..2001d23
--- /dev/null
+++ b/package/sdl_net/Config.in
@@ -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/
diff --git a/package/sdl_net/sdl_net.mk b/package/sdl_net/sdl_net.mk
new file mode 100644
index 0000000..a0108f3
--- /dev/null
+++ b/package/sdl_net/sdl_net.mk
@@ -0,0 +1,66 @@
+#############################################################
+#
+# SDL_net: network addon for SDL
+#
+#############################################################
+SDL_NET_VERSION:=1.2.7
+SDL_NET_SOURCE:=SDL_net-$(SDL_NET_VERSION).tar.gz
+SDL_NET_SITE:=http://www.libsdl.org/projects/SDL_net/release
+SDL_NET_CAT:=$(ZCAT)
+SDL_NET_DIR:=$(BUILD_DIR)/SDL_net-$(SDL_NET_VERSION)
+
+$(DL_DIR)/$(SDL_NET_SOURCE):
+ $(WGET) -P $(DL_DIR) $(SDL_NET_SITE)/$(SDL_NET_SOURCE)
+
+sdl_net-source: $(DL_DIR)/$(SDL_NET_SOURCE)
+
+$(SDL_NET_DIR)/.unpacked: $(DL_DIR)/$(SDL_NET_SOURCE)
+ $(SDL_NET_CAT) $(DL_DIR)/$(SDL_NET_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(CONFIG_UPDATE) $(SDL_NET_DIR)
+ touch $@
+
+$(SDL_NET_DIR)/.configured: $(SDL_NET_DIR)/.unpacked
+ (cd $(SDL_NET_DIR); rm -rf config.cache; \
+ $(TARGET_CONFIGURE_OPTS) \
+ $(TARGET_CONFIGURE_ARGS) \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --prefix=$(STAGING_DIR)/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-sdl-prefix=$(STAGING_DIR)/usr \
+ --with-sdl-exec-prefix=$(STAGING_DIR)/usr \
+ )
+ touch $@
+
+$(SDL_NET_DIR)/.compiled: $(SDL_NET_DIR)/.configured
+ $(MAKE) -C $(SDL_NET_DIR)
+ touch $@
+
+$(STAGING_DIR)/usr/lib/libSDL_net.so: $(SDL_NET_DIR)/.compiled
+ $(MAKE) -C $(SDL_NET_DIR) install
+
+$(TARGET_DIR)/usr/lib/libSDL_net.so: $(STAGING_DIR)/usr/lib/libSDL_net.so
+ cp -dpf $(STAGING_DIR)/usr/lib/libSDL_net*.so* $(TARGET_DIR)/usr/lib/
+ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libSDL_net.so
+
+SDL_NET sdl_net: sdl $(TARGET_DIR)/usr/lib/libSDL_net.so
+
+sdl_net-clean:
+ rm -f $(TARGET_DIR)/usr/lib/libSDL_net*.so*
+ -$(MAKE) -C $(SDL_NET_DIR) uninstall
+ -$(MAKE) -C $(SDL_NET_DIR) clean
+
+sdl_net-dirclean:
+ rm -rf $(SDL_NET_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_SDL_NET)),y)
+TARGETS+=sdl_net
+endif
--
1.5.4.3
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 3/5] PrBoom: add new package PrBoom
2008-07-24 13:21 ` [Buildroot] [PATCH 2/5] SDL_net: add new package SDL_net Hans-Christian Egtvedt
@ 2008-07-24 13:21 ` Hans-Christian Egtvedt
2008-07-24 13:21 ` [Buildroot] [PATCH 4/5] lxdoom-wad: enable kconfig entry for PrBoom package Hans-Christian Egtvedt
2008-07-24 14:35 ` [Buildroot] [PATCH 3/5] PrBoom: add new package PrBoom Bernhard Fischer
2008-07-24 14:35 ` [Buildroot] [PATCH 2/5] SDL_net: add new package SDL_net Bernhard Fischer
1 sibling, 2 replies; 11+ messages in thread
From: Hans-Christian Egtvedt @ 2008-07-24 13:21 UTC (permalink / raw)
To: buildroot
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 <hans-christian.egtvedt@atmel.com>
---
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
diff --git a/package/Config.in b/package/Config.in
index e07d9e3..51e4eda 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/prboom/Config.in b/package/prboom/Config.in
new file mode 100644
index 0000000..2835929
--- /dev/null
+++ b/package/prboom/Config.in
@@ -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/
diff --git a/package/prboom/prboom.mk b/package/prboom/prboom.mk
new file mode 100644
index 0000000..5fec883
--- /dev/null
+++ b/package/prboom/prboom.mk
@@ -0,0 +1,76 @@
+#############################################################
+#
+# PrBoom
+#
+#############################################################
+PRBOOM_VERSION:=2.4.7
+PRBOOM_SOURCE:=prboom-$(PRBOOM_VERSION).tar.gz
+PRBOOM_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/prboom
+PRBOOM_CAT:=zcat
+PRBOOM_DIR:=$(BUILD_DIR)/prboom-$(PRBOOM_VERSION)
+DOOM_SITE:=ftp://ftp.idsoftware.com/idstuff/doom
+PRBOOM_DATA:=doom-1.8.wad.gz
+
+$(DL_DIR)/$(PRBOOM_SOURCE):
+ $(WGET) -P $(DL_DIR) $(PRBOOM_SITE)/$(PRBOOM_SOURCE)
+
+prboom-source: $(DL_DIR)/$(PRBOOM_SOURCE)
+
+$(PRBOOM_DIR)/.unpacked: $(DL_DIR)/$(PRBOOM_SOURCE)
+ $(PRBOOM_CAT) $(DL_DIR)/$(PRBOOM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(CONFIG_UPDATE) $(PRBOOM_DIR)/autotools
+ touch $@
+
+$(PRBOOM_DIR)/.configured: $(PRBOOM_DIR)/.unpacked
+ (cd $(PRBOOM_DIR); \
+ $(TARGET_CONFIGURE_ARGS) \
+ $(TARGET_CONFIGURE_OPTS) \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --prefix=/usr \
+ --oldincludedir=$(STAGING_DIR)/usr/include \
+ --with-sdl-prefix=$(STAGING_DIR)/usr \
+ --with-sdl-exec-prefix=$(STAGING_DIR)/usr \
+ --disable-cpu-opt \
+ --disable-sdltest \
+ --disable-gl \
+ --without-x \
+ )
+ifeq ($(BR2_ENDIAN),"BIG")
+ $(SED) 's,.*#undef WORDS_BIGENDIAN.*,#define WORDS_BIGENDIAN 1,g' $(PRBOOM_DIR)/config.h
+endif
+ touch $@
+
+$(PRBOOM_DIR)/src/prboom: $(PRBOOM_DIR)/.configured
+ $(MAKE) -C $(PRBOOM_DIR)
+
+$(TARGET_DIR)/usr/games/prboom: $(PRBOOM_DIR)/src/prboom
+ mkdir -p $(TARGET_DIR)/usr/games
+ mkdir -p $(TARGET_DIR)/usr/share/games/doom
+ cp -dpf $(PRBOOM_DIR)/src/prboom $@
+ cp -dpf $(PRBOOM_DIR)/src/prboom-game-server $(TARGET_DIR)/usr/games/
+ cp -dpf $(PRBOOM_DIR)/data/prboom.wad $(TARGET_DIR)/usr/share/games/doom/
+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/games/prboom-game-server
+
+prboom: sdl sdl_net sdl_mixer $(TARGET_DIR)/usr/games/prboom
+
+prboom-clean:
+ $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(PRBOOM_DIR) uninstall
+ rm -rf $(TARGET_DIR)/usr/share/games/doom/
+ rm -rf $(TARGET_DIR)/usr/games/
+ -$(MAKE) -C $(PRBOOM_DIR) clean
+
+prboom-dirclean:
+ rm -rf $(PRBOOM_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_PRBOOM)),y)
+TARGETS+=prboom
+endif
--
1.5.4.3
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 4/5] lxdoom-wad: enable kconfig entry for PrBoom package
2008-07-24 13:21 ` [Buildroot] [PATCH 3/5] PrBoom: add new package PrBoom Hans-Christian Egtvedt
@ 2008-07-24 13:21 ` Hans-Christian Egtvedt
2008-07-24 13:21 ` [Buildroot] [PATCH 5/5] lxdoom: make package depend on X11 server Hans-Christian Egtvedt
2008-07-24 14:35 ` [Buildroot] [PATCH 3/5] PrBoom: add new package PrBoom Bernhard Fischer
1 sibling, 1 reply; 11+ messages in thread
From: Hans-Christian Egtvedt @ 2008-07-24 13:21 UTC (permalink / raw)
To: buildroot
This patch will let the user install the Doom shareware wad file if PrBoom is
selected.
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
---
package/lxdoom/Config.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/lxdoom/Config.in b/package/lxdoom/Config.in
index 3b318e1..e3c9be8 100644
--- a/package/lxdoom/Config.in
+++ b/package/lxdoom/Config.in
@@ -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.
--
1.5.4.3
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 5/5] lxdoom: make package depend on X11 server
2008-07-24 13:21 ` [Buildroot] [PATCH 4/5] lxdoom-wad: enable kconfig entry for PrBoom package Hans-Christian Egtvedt
@ 2008-07-24 13:21 ` Hans-Christian Egtvedt
2008-07-24 13:23 ` Hans-Christian Egtvedt
0 siblings, 1 reply; 11+ messages in thread
From: Hans-Christian Egtvedt @ 2008-07-24 13:21 UTC (permalink / raw)
To: buildroot
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 <hans-christian.egtvedt@atmel.com>
---
package/lxdoom/Config.in | 2 ++
package/lxdoom/lxdoom.mk | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/package/lxdoom/Config.in b/package/lxdoom/Config.in
index e3c9be8..4e0d804 100644
--- a/package/lxdoom/Config.in
+++ b/package/lxdoom/Config.in
@@ -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
diff --git a/package/lxdoom/lxdoom.mk b/package/lxdoom/lxdoom.mk
index b79fa66..9444656 100644
--- a/package/lxdoom/lxdoom.mk
+++ b/package/lxdoom/lxdoom.mk
@@ -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))
--
1.5.4.3
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 5/5] lxdoom: make package depend on X11 server
2008-07-24 13:21 ` [Buildroot] [PATCH 5/5] lxdoom: make package depend on X11 server Hans-Christian Egtvedt
@ 2008-07-24 13:23 ` Hans-Christian Egtvedt
2008-07-24 14:37 ` Bernhard Fischer
0 siblings, 1 reply; 11+ messages in thread
From: Hans-Christian Egtvedt @ 2008-07-24 13:23 UTC (permalink / raw)
To: buildroot
On Thu, 2008-07-24 at 15:21 +0200, Hans-Christian Egtvedt wrote:
> 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.
<snipp patch>
--
With kind regards,
Hans-Christian Egtvedt, Applications Engineer
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic
2008-07-24 13:21 [Buildroot] [PATCH 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic Hans-Christian Egtvedt
2008-07-24 13:21 ` [Buildroot] [PATCH 2/5] SDL_net: add new package SDL_net Hans-Christian Egtvedt
@ 2008-07-24 14:33 ` Bernhard Fischer
2008-07-24 14:45 ` Peter Korsgaard
1 sibling, 1 reply; 11+ messages in thread
From: Bernhard Fischer @ 2008-07-24 14:33 UTC (permalink / raw)
To: buildroot
On Thu, Jul 24, 2008 at 03:21:53PM +0200, Hans-Christian Egtvedt wrote:
>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
>
>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 | 6 ++++--
> package/lxdoom/lxdoom-wad.mk | 10 +++++-----
> 2 files changed, 9 insertions(+), 7 deletions(-)
>
>diff --git a/package/lxdoom/Config.in b/package/lxdoom/Config.in
>index 892e45c..3b318e1 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"
>+ 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 the the contains a surplus the ;)
>+
>+ 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)
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).
> 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.
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 2/5] SDL_net: add new package SDL_net
2008-07-24 13:21 ` [Buildroot] [PATCH 2/5] SDL_net: add new package SDL_net Hans-Christian Egtvedt
2008-07-24 13:21 ` [Buildroot] [PATCH 3/5] PrBoom: add new package PrBoom Hans-Christian Egtvedt
@ 2008-07-24 14:35 ` Bernhard Fischer
1 sibling, 0 replies; 11+ messages in thread
From: Bernhard Fischer @ 2008-07-24 14:35 UTC (permalink / raw)
To: buildroot
On Thu, Jul 24, 2008 at 03:21:54PM +0200, Hans-Christian Egtvedt wrote:
>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/
>diff --git a/package/sdl_net/sdl_net.mk b/package/sdl_net/sdl_net.mk
>new file mode 100644
>index 0000000..a0108f3
>--- /dev/null
please use Makefile.autotools.in
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 3/5] PrBoom: add new package PrBoom
2008-07-24 13:21 ` [Buildroot] [PATCH 3/5] PrBoom: add new package PrBoom Hans-Christian Egtvedt
2008-07-24 13:21 ` [Buildroot] [PATCH 4/5] lxdoom-wad: enable kconfig entry for PrBoom package Hans-Christian Egtvedt
@ 2008-07-24 14:35 ` Bernhard Fischer
1 sibling, 0 replies; 11+ messages in thread
From: Bernhard Fischer @ 2008-07-24 14:35 UTC (permalink / raw)
To: buildroot
On Thu, Jul 24, 2008 at 03:21:55PM +0200, Hans-Christian Egtvedt wrote:
>This patch adds a new package PrBoom. PrBoom is a Doom and Doom ][ client which
>diff --git a/package/prboom/prboom.mk b/package/prboom/prboom.mk
>new file mode 100644
>index 0000000..5fec883
>--- /dev/null
please use Makefile.autotools.in
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 5/5] lxdoom: make package depend on X11 server
2008-07-24 13:23 ` Hans-Christian Egtvedt
@ 2008-07-24 14:37 ` Bernhard Fischer
0 siblings, 0 replies; 11+ messages in thread
From: Bernhard Fischer @ 2008-07-24 14:37 UTC (permalink / raw)
To: buildroot
On Thu, Jul 24, 2008 at 03:23:40PM +0200, Hans-Christian Egtvedt wrote:
>On Thu, 2008-07-24 at 15:21 +0200, Hans-Christian Egtvedt wrote:
>> 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
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic
2008-07-24 14:33 ` [Buildroot] [PATCH 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic Bernhard Fischer
@ 2008-07-24 14:45 ` Peter Korsgaard
0 siblings, 0 replies; 11+ messages in thread
From: Peter Korsgaard @ 2008-07-24 14:45 UTC (permalink / raw)
To: buildroot
>>>>> "Bernhard" == Bernhard Fischer <rep.dot.nop@gmail.com> writes:
Hi,
>> 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)
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.
>> +$(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 $@
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) ;)
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2008-07-24 14:45 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-24 13:21 [Buildroot] [PATCH 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic Hans-Christian Egtvedt
2008-07-24 13:21 ` [Buildroot] [PATCH 2/5] SDL_net: add new package SDL_net Hans-Christian Egtvedt
2008-07-24 13:21 ` [Buildroot] [PATCH 3/5] PrBoom: add new package PrBoom Hans-Christian Egtvedt
2008-07-24 13:21 ` [Buildroot] [PATCH 4/5] lxdoom-wad: enable kconfig entry for PrBoom package Hans-Christian Egtvedt
2008-07-24 13:21 ` [Buildroot] [PATCH 5/5] lxdoom: make package depend on X11 server Hans-Christian Egtvedt
2008-07-24 13:23 ` Hans-Christian Egtvedt
2008-07-24 14:37 ` Bernhard Fischer
2008-07-24 14:35 ` [Buildroot] [PATCH 3/5] PrBoom: add new package PrBoom Bernhard Fischer
2008-07-24 14:35 ` [Buildroot] [PATCH 2/5] SDL_net: add new package SDL_net Bernhard Fischer
2008-07-24 14:33 ` [Buildroot] [PATCH 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic Bernhard Fischer
2008-07-24 14:45 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox