* [Buildroot] [PATCH v2 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic
@ 2008-07-29 6:46 Hans-Christian Egtvedt
2008-07-29 6:46 ` [Buildroot] [PATCH v2 2/5] SDL_net: add new package SDL_net Hans-Christian Egtvedt
2008-08-12 11:18 ` [Buildroot] [PATCH v2 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic Hans-Christian Egtvedt
0 siblings, 2 replies; 6+ messages in thread
From: Hans-Christian Egtvedt @ 2008-07-29 6:46 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 | 14 ++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package/lxdoom/Config.in b/package/lxdoom/Config.in
index 892e45c..087183d 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 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..6a4dfc8 100644
--- a/package/lxdoom/lxdoom-wad.mk
+++ b/package/lxdoom/lxdoom-wad.mk
@@ -3,7 +3,6 @@
# lxdoom-wad
#
#############################################################
-
LXDOOM_WAD_VERSION = 1.8
LXDOOM_WAD_SOURCE = doom-$(LXDOOM_WAD_VERSION).wad.gz
LXDOOM_WAD_SITE = ftp://ftp.idsoftware.com/idstuff/doom/
@@ -13,16 +12,15 @@ $(DL_DIR)/$(LXDOOM_WAD_SOURCE):
$(WGET) -P $(DL_DIR) $(LXDOOM_WAD_SITE)/$(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)
+ $(INSTALL) -D $(DL_DIR)/$(LXDOOM_WAD_SOURCE) $(LXDOOM_WAD_DIR)/$(LXDOOM_WAD_SOURCE)
+ $(ZCAT) $(LXDOOM_WAD_DIR)/$(LXDOOM_WAD_SOURCE) > \
+ $(LXDOOM_WAD_DIR)/doom-$(LXDOOM_WAD_VERSION).wad
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
+ $(INSTALL) -D $(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] 6+ messages in thread
* [Buildroot] [PATCH v2 2/5] SDL_net: add new package SDL_net
2008-07-29 6:46 [Buildroot] [PATCH v2 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic Hans-Christian Egtvedt
@ 2008-07-29 6:46 ` Hans-Christian Egtvedt
2008-07-29 6:46 ` [Buildroot] [PATCH v2 3/5] PrBoom: add new package PrBoom Hans-Christian Egtvedt
2008-08-12 11:18 ` [Buildroot] [PATCH v2 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic Hans-Christian Egtvedt
1 sibling, 1 reply; 6+ messages in thread
From: Hans-Christian Egtvedt @ 2008-07-29 6:46 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 | 20 ++++++++++++++++++++
3 files changed, 29 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..144d02d
--- /dev/null
+++ b/package/sdl_net/sdl_net.mk
@@ -0,0 +1,20 @@
+#############################################################
+#
+# SDL_net: network addon for SDL
+#
+#############################################################
+SDL_NET_VERSION:=1.2.7
+SDL_NET_SITE:=http://www.libsdl.org/projects/SDL_net/release
+
+SDL_NET_CONF_OPT = --localstatedir=/var \
+ --with-sdl-prefix=$(STAGING_DIR)/usr \
+ --with-sdl-exec-prefix=$(STAGING_DIR)/usr
+
+SDL_NET_INSTALL_STAGING = YES
+SDL_NET_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install
+
+SDL_NET_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+
+SDL_NET_DEPENDENCIES = sdl
+
+$(eval $(call AUTOTARGETS,package,SDL_net))
--
1.5.4.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v2 3/5] PrBoom: add new package PrBoom
2008-07-29 6:46 ` [Buildroot] [PATCH v2 2/5] SDL_net: add new package SDL_net Hans-Christian Egtvedt
@ 2008-07-29 6:46 ` Hans-Christian Egtvedt
2008-07-29 6:46 ` [Buildroot] [PATCH v2 4/5] lxdoom-wad: enable kconfig entry for PrBoom package Hans-Christian Egtvedt
0 siblings, 1 reply; 6+ messages in thread
From: Hans-Christian Egtvedt @ 2008-07-29 6:46 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 | 50 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 62 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..1a5354a
--- /dev/null
+++ b/package/prboom/prboom.mk
@@ -0,0 +1,50 @@
+#############################################################
+#
+# PrBoom
+#
+#############################################################
+PRBOOM_VERSION:=2.4.7
+
+PRBOOM_DEPENDENCIES = sdl SDL_net sdl_mixer
+
+$(eval $(call AUTOTARGETS,package,prboom))
+
+$(PRBOOM_TARGET_EXTRACT):
+ $(ZCAT) $(DL_DIR)/$(PRBOOM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(CONFIG_UPDATE) $(PRBOOM_DIR)/autotools
+ touch $@
+
+$(PRBOOM_TARGET_CONFIGURE):
+ (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_TARGET_INSTALL_TARGET):
+ $(INSTALL) -D $(PRBOOM_DIR)/src/prboom $(TARGET_DIR)/usr/games/prboom
+ $(INSTALL) -D $(PRBOOM_DIR)/src/prboom-game-server $(TARGET_DIR)/usr/games/prboom-game-server
+ $(INSTALL) -D $(PRBOOM_DIR)/data/prboom.wad $(TARGET_DIR)/usr/share/games/doom/prboom.wad
+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/games/prboom
+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/games/prboom-game-server
+
+$(PRBOOM_TARGET_CLEAN):
+ rm -rf $(TARGET_DIR)/usr/share/games/doom/prboom.wad
+ rm -rf $(TARGET_DIR)/usr/games/prboom-game-server
+ rm -rf $(TARGET_DIR)/usr/games/prboom
+ -$(MAKE) -C $(PRBOOM_DIR) clean
--
1.5.4.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v2 4/5] lxdoom-wad: enable kconfig entry for PrBoom package
2008-07-29 6:46 ` [Buildroot] [PATCH v2 3/5] PrBoom: add new package PrBoom Hans-Christian Egtvedt
@ 2008-07-29 6:46 ` Hans-Christian Egtvedt
2008-07-29 6:46 ` [Buildroot] [PATCH v2 5/5] lxdoom: make package depend on X11 server Hans-Christian Egtvedt
0 siblings, 1 reply; 6+ messages in thread
From: Hans-Christian Egtvedt @ 2008-07-29 6:46 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 087183d..5970e18 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 shareware wad data file for the doom game.
--
1.5.4.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v2 5/5] lxdoom: make package depend on X11 server
2008-07-29 6:46 ` [Buildroot] [PATCH v2 4/5] lxdoom-wad: enable kconfig entry for PrBoom package Hans-Christian Egtvedt
@ 2008-07-29 6:46 ` Hans-Christian Egtvedt
0 siblings, 0 replies; 6+ messages in thread
From: Hans-Christian Egtvedt @ 2008-07-29 6:46 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 5970e18..97980d2 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] 6+ messages in thread
* [Buildroot] [PATCH v2 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic
2008-07-29 6:46 [Buildroot] [PATCH v2 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic Hans-Christian Egtvedt
2008-07-29 6:46 ` [Buildroot] [PATCH v2 2/5] SDL_net: add new package SDL_net Hans-Christian Egtvedt
@ 2008-08-12 11:18 ` Hans-Christian Egtvedt
1 sibling, 0 replies; 6+ messages in thread
From: Hans-Christian Egtvedt @ 2008-08-12 11:18 UTC (permalink / raw)
To: buildroot
Bump (and the 4 other patches in this chain)
On Tue, 2008-07-29 at 08:46 +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.
>
> 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 | 14 ++++++--------
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/package/lxdoom/Config.in b/package/lxdoom/Config.in
> index 892e45c..087183d 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 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..6a4dfc8 100644
> --- a/package/lxdoom/lxdoom-wad.mk
> +++ b/package/lxdoom/lxdoom-wad.mk
> @@ -3,7 +3,6 @@
> # lxdoom-wad
> #
> #############################################################
> -
> LXDOOM_WAD_VERSION = 1.8
> LXDOOM_WAD_SOURCE = doom-$(LXDOOM_WAD_VERSION).wad.gz
> LXDOOM_WAD_SITE = ftp://ftp.idsoftware.com/idstuff/doom/
> @@ -13,16 +12,15 @@ $(DL_DIR)/$(LXDOOM_WAD_SOURCE):
> $(WGET) -P $(DL_DIR) $(LXDOOM_WAD_SITE)/$(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)
> + $(INSTALL) -D $(DL_DIR)/$(LXDOOM_WAD_SOURCE) $(LXDOOM_WAD_DIR)/$(LXDOOM_WAD_SOURCE)
> + $(ZCAT) $(LXDOOM_WAD_DIR)/$(LXDOOM_WAD_SOURCE) > \
> + $(LXDOOM_WAD_DIR)/doom-$(LXDOOM_WAD_VERSION).wad
> 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
> + $(INSTALL) -D $(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
>
> #############################################################
> #
--
With kind regards,
Hans-Christian Egtvedt, Applications Engineer
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-08-12 11:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-29 6:46 [Buildroot] [PATCH v2 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic Hans-Christian Egtvedt
2008-07-29 6:46 ` [Buildroot] [PATCH v2 2/5] SDL_net: add new package SDL_net Hans-Christian Egtvedt
2008-07-29 6:46 ` [Buildroot] [PATCH v2 3/5] PrBoom: add new package PrBoom Hans-Christian Egtvedt
2008-07-29 6:46 ` [Buildroot] [PATCH v2 4/5] lxdoom-wad: enable kconfig entry for PrBoom package Hans-Christian Egtvedt
2008-07-29 6:46 ` [Buildroot] [PATCH v2 5/5] lxdoom: make package depend on X11 server Hans-Christian Egtvedt
2008-08-12 11:18 ` [Buildroot] [PATCH v2 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic Hans-Christian Egtvedt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox