[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-429-g5dc65bc
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-429-g5dc65bc
|
From: Julien B a. A. <ar...@us...> - 2013-08-31 20:34:07
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 5dc65bc35e9af70001124ea8bc5c779ef2b72b21 (commit)
via d30f5f9fe3fe96485f60844918572014d4f905c3 (commit)
via 0052d60a6e90a0365bdd583e87af2c15a73c0e36 (commit)
from ed76c44f81ac61919d599e80f1e07b03e8fd7184 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5dc65bc35e9af70001124ea8bc5c779ef2b72b21
Author: Julien Boibessot <jul...@ar...>
Date: Sat Aug 31 22:33:13 2013 +0200
[BUILDROOT][2013.05] Fixes wolf4sdl compilation
commit d30f5f9fe3fe96485f60844918572014d4f905c3
Author: Julien Boibessot <jul...@ar...>
Date: Sat Aug 31 18:00:27 2013 +0200
[BUILDROOT][2013.05] Fixes gpm package compilation
commit 0052d60a6e90a0365bdd583e87af2c15a73c0e36
Author: Julien Boibessot <jul...@ar...>
Date: Sat Aug 31 11:44:14 2013 +0200
[BUILDROOT][2013.05] Fixes slideshow package compilation
-----------------------------------------------------------------------
Summary of changes:
...ed => 034-armadeus-add-slideshow-package.patch} | 102 +++++---------------
...obefixed => 085-armadeus-add-gpm-package.patch} | 72 ++++++--------
.../107-armadeus-games-add-wolf4sdl-package.patch | 74 ++++++++++++++
.../2013.05/107-games-add_wolf4sdl.patch.tobefixed | 92 ------------------
4 files changed, 129 insertions(+), 211 deletions(-)
rename patches/buildroot/2013.05/{034-slideshow.patch.tobefixed => 034-armadeus-add-slideshow-package.patch} (73%)
rename patches/buildroot/2013.05/{085-adds_gpm_package.patch.tobefixed => 085-armadeus-add-gpm-package.patch} (77%)
create mode 100644 patches/buildroot/2013.05/107-armadeus-games-add-wolf4sdl-package.patch
delete mode 100644 patches/buildroot/2013.05/107-games-add_wolf4sdl.patch.tobefixed
diff --git a/patches/buildroot/2013.05/034-slideshow.patch.tobefixed b/patches/buildroot/2013.05/034-armadeus-add-slideshow-package.patch
similarity index 73%
rename from patches/buildroot/2013.05/034-slideshow.patch.tobefixed
rename to patches/buildroot/2013.05/034-armadeus-add-slideshow-package.patch
index 464cbb1..2770a7c 100644
--- a/patches/buildroot/2013.05/034-slideshow.patch.tobefixed
+++ b/patches/buildroot/2013.05/034-armadeus-add-slideshow-package.patch
@@ -4,20 +4,20 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot/package/Config.in
-+++ buildroot/package/Config.in
-@@ -140,6 +140,7 @@
+--- buildroot.orig/package/Config.in 2013-08-31 10:58:24.309663632 +0200
++++ buildroot/package/Config.in 2013-08-31 11:40:08.262080053 +0200
+@@ -139,6 +139,7 @@
source "package/sdl_net/Config.in"
source "package/sdl_ttf/Config.in"
source "package/sdl_gfx/Config.in"
+source "package/slideshow/Config.in"
comment "Demos"
- source "package/sdlwater/Config.in"
+ source "package/sdl_water/Config.in"
Index: buildroot/package/slideshow/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/Config.in 2012-02-21 16:44:09.000000000 +0100
++++ buildroot/package/slideshow/Config.in 2013-08-31 10:58:24.321663682 +0200
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_SLIDESHOW
+ bool "Slideshow"
@@ -30,7 +30,7 @@ Index: buildroot/package/slideshow/Config.in
Index: buildroot/package/slideshow/slideshow.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow.mk 2012-02-21 16:44:09.000000000 +0100
++++ buildroot/package/slideshow/slideshow.mk 2013-08-31 10:58:24.321663682 +0200
@@ -0,0 +1,39 @@
+#############################################################
+#
@@ -74,85 +74,31 @@ Index: buildroot/package/slideshow/slideshow.mk
Index: buildroot/package/slideshow/slideshow-01-restart-after-end.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch 2012-02-21 16:44:09.000000000 +0100
-@@ -0,0 +1,73 @@
-+--- slideshow/slideshow.cpp 2003-12-08 22:17:38.000000000 +0100
-++++ slideshow.mod/slideshow.cpp 2007-09-08 19:05:10.000000000 +0200
-+@@ -196,43 +196,48 @@
-+ SDL_FillRect(m_sdl, &rc, SDL_MapRGB(m_sdl->format, 0, 255, 0));
-+ SDL_UpdateRects(m_sdl, 1, &rc);
-+ }
-+-
-+- user_command cmd = wait_for_command();
-+-
-++
-++ user_command cmd = wait_for_command();
-++
-+ switch(cmd)
-+- {
-+- case c_quit:
-+- stop_timer();
-+- return true;
-+- case c_first_slide:
-++ {
-++ case c_quit:
-++ stop_timer();
-++ return true;
-++ case c_first_slide:
-+ stop_timer();
-+ m_image_index = 0;
-+ break;
-+ case c_last_slide:
-+- stop_timer();
-++ stop_timer();
-+ m_image_index = m_file_list->count() - 1;
-+- break;
-++ break;
-+ case c_prev_slide:
-+- stop_timer();
-++ stop_timer();
-+ if ( m_image_index > 0 )
-+ m_image_index--;
-+ break;
-+ case c_next_slide:
-+- stop_timer();
-+- // fall through
-+- case c_timer_advance:
-+- if ( m_image_index < m_file_list->count() - 1 )
-++ stop_timer();
-++ // fall through
-++ case c_timer_advance:
-++ if ( m_image_index <= m_file_list->count() - 1 )
-+ m_image_index++;
-+- break;
-+- case c_redraw:
++++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch 2013-08-31 11:37:38.645338140 +0200
+@@ -0,0 +1,19 @@
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++diff -urN slideshow-1.1/slideshow.cpp slideshow-1.1.mod/slideshow.cpp
++--- slideshow-1.1/slideshow.cpp 2013-08-31 11:35:19.932650303 +0200
+++++ slideshow-1.1.mod/slideshow.cpp 2013-08-31 11:34:48.396493925 +0200
++@@ -228,9 +228,10 @@
+ break;
-+- }
-++ case c_redraw:
-++ break;
-++ }
++ }
+
-+ // stop the auto-advance when the last picture is about to be shown
++- // stop the auto-advance when the last picture is about to be shown
+- if ( m_image_index == m_file_list->count() - 1 )
+- stop_timer();
-+- }
-+-
-++ if ( m_image_index == m_file_list->count() /*- 1*/ )
-++ {
-++ //stop_timer();
+++ // Restart from beginning when the last picture is shown
+++ if ( m_image_index == m_file_list->count() )
++ m_image_index = 0;
++ m_prev_image_index = -1;
-++ }
-++
-++ }
-++
++ }
++
+ return true;
-+ }
-+
Index: buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch 2012-02-21 16:44:09.000000000 +0100
++++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch 2013-08-31 10:58:24.321663682 +0200
@@ -0,0 +1,13 @@
+--- slideshow.org/SDLFont.cpp 2007-11-17 19:25:02.000000000 +0100
++++ slideshow/SDLFont.cpp 2007-11-17 20:06:20.000000000 +0100
@@ -170,7 +116,7 @@ Index: buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
Index: buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch 2012-02-21 16:44:09.000000000 +0100
++++ buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch 2013-08-31 10:58:24.321663682 +0200
@@ -0,0 +1,28 @@
+On recent gcc some includes are needed to have string stuff defined.
+
@@ -203,7 +149,7 @@ Index: buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_rece
Index: buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch 2012-02-21 16:44:09.000000000 +0100
++++ buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch 2013-08-31 11:41:13.326402690 +0200
@@ -0,0 +1,17 @@
+Otherwise crashes on APF27.
+
@@ -213,7 +159,7 @@ Index: buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch
+===================================================================
+--- slideshow-1.1.orig/slideshow.cpp 2011-07-02 13:19:00.000000000 +0200
++++ slideshow-1.1/slideshow.cpp 2011-07-02 13:19:17.000000000 +0200
-+@@ -416,7 +416,7 @@
++@@ -411,7 +411,7 @@
+ else
+ flags |= SDL_FULLSCREEN;
+
diff --git a/patches/buildroot/2013.05/085-adds_gpm_package.patch.tobefixed b/patches/buildroot/2013.05/085-armadeus-add-gpm-package.patch
similarity index 77%
rename from patches/buildroot/2013.05/085-adds_gpm_package.patch.tobefixed
rename to patches/buildroot/2013.05/085-armadeus-add-gpm-package.patch
index 45f43be..7dc72f4 100644
--- a/patches/buildroot/2013.05/085-adds_gpm_package.patch.tobefixed
+++ b/patches/buildroot/2013.05/085-armadeus-add-gpm-package.patch
@@ -2,10 +2,22 @@ Add GPM (General Purpose Mouse server) to Buildroot.
Signed-off-by: Julien Boibessot <jul...@ar...>
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2013-08-31 11:47:09.652169613 +0200
++++ buildroot/package/Config.in 2013-08-31 17:55:16.589692815 +0200
+@@ -208,6 +208,7 @@
+ source "package/flashbench/Config.in"
+ source "package/genext2fs/Config.in"
+ source "package/genromfs/Config.in"
++source "package/gpm/Config.in"
+ source "package/makedevs/Config.in"
+ source "package/mtd/Config.in"
+ source "package/nfs-utils/Config.in"
Index: buildroot/package/gpm/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpm/Config.in 2012-02-21 16:44:41.000000000 +0100
++++ buildroot/package/gpm/Config.in 2013-08-31 11:47:09.684169773 +0200
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_GPM
+ bool "gpm mouse server"
@@ -17,31 +29,35 @@ Index: buildroot/package/gpm/Config.in
Index: buildroot/package/gpm/gpm.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpm/gpm.mk 2012-02-21 16:44:41.000000000 +0100
-@@ -0,0 +1,18 @@
++++ buildroot/package/gpm/gpm.mk 2013-08-31 13:19:52.727755419 +0200
+@@ -0,0 +1,22 @@
+#############################################################
+#
+# General Purpose Mouse server for Linux console.
+#
+#############################################################
+
-+GPM_VERSION = 1.20.6
++GPM_VERSION = 1.20.7
+GPM_SOURCE = gpm-$(GPM_VERSION).tar.bz2
-+GPM_SITE = http://unix.schottelius.org/gpm/archives/
++GPM_SITE = http://www.nico.schottelius.org/software/gpm/archives/
++GPM_LICENSE = GPLv2
++GPM_LICENSE_FILES = COPYING
++GPM_AUTORECONF = YES
++
+GPM_INSTALL_STAGING = YES
-+GPM_INSTALL_TARGET = YES
+
-+$(eval $(autotools-package))
++define GPM_AUTOGEN_CALL
++ cd $(@D); ./autogen.sh
++endef
+
-+$(GPM_HOOK_POST_INSTALL): $(GPM_TARGET_INSTALL_TARGET)
-+ $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/sbin/gpm
-+ touch $@
++GPM_PRE_CONFIGURE_HOOKS += GPM_AUTOGEN_CALL
+
-Index: buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch
++$(eval $(autotools-package))
+Index: buildroot/package/gpm/gpm-1.20.7-removes_obsolete_functions.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch 2012-02-21 16:44:41.000000000 +0100
-@@ -0,0 +1,77 @@
++++ buildroot/package/gpm/gpm-1.20.7-removes_obsolete_functions.patch 2013-08-31 11:57:30.095246230 +0200
+@@ -0,0 +1,63 @@
+
+Replaces all "obsolete" functions (at least to compile for uClibc).
+
@@ -57,20 +73,6 @@ Index: buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch
+ ctladdr.sun_family=AF_UNIX;
+ strcpy(ctladdr.sun_path,GPM_NODE_CTL);
+ unlink(GPM_NODE_CTL);
-+diff -urN gpm-1.20.6/src/daemon/open_console.c gpm-1.20.6.mod/src/daemon/open_console.c
-+--- gpm-1.20.6/src/daemon/open_console.c 2009-02-09 10:58:53.000000000 +0100
-++++ gpm-1.20.6.mod/src/daemon/open_console.c 2009-09-25 10:33:02.000000000 +0200
-+@@ -21,7 +21,9 @@
-+
-+ #include <fcntl.h> /* open and co. */
-+ #include <sys/stat.h> /* stat() */
-+-#include <stropts.h> /* ioctl */
-++#if !(defined(__linux__))
-++# include <stropts.h> /* ioctl */
-++#endif
-+
-+ /* Linux specific (to be outsourced in gpm2 */
-+ #include <linux/serial.h> /* for serial console check */
+diff -urN gpm-1.20.6/src/daemon/processconn.c gpm-1.20.6.mod/src/daemon/processconn.c
+--- gpm-1.20.6/src/daemon/processconn.c 2009-02-09 10:58:53.000000000 +0100
++++ gpm-1.20.6.mod/src/daemon/processconn.c 2009-09-25 10:27:26.000000000 +0200
@@ -119,22 +121,10 @@ Index: buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch
+ *(param_data [param].addr.flag_p) = 0;
+ } else {
+ gpm_report (GPM_PR_WARN,"Flag value (%s) for parameter %s is invalid",
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot/package/Config.in
-+++ buildroot/package/Config.in
-@@ -209,6 +209,7 @@
- source "package/flashbench/Config.in"
- source "package/genext2fs/Config.in"
- source "package/genromfs/Config.in"
-+source "package/gpm/Config.in"
- source "package/makedevs/Config.in"
- source "package/mtd/Config.in"
- source "package/nfs-utils/Config.in"
-Index: buildroot/package/gpm/gpm-1.20.6-removes_strip_from_install.patch
+Index: buildroot/package/gpm/gpm-1.20.7-removes_strip_from_install.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpm/gpm-1.20.6-removes_strip_from_install.patch 2012-02-21 16:44:41.000000000 +0100
++++ buildroot/package/gpm/gpm-1.20.7-removes_strip_from_install.patch 2013-08-31 11:47:09.684169773 +0200
@@ -0,0 +1,30 @@
+GPM asks "install" to strip the executables while installing it.
+This doesn't seems cross-compiling friendly, so remove the option (-s) and let
diff --git a/patches/buildroot/2013.05/107-armadeus-games-add-wolf4sdl-package.patch b/patches/buildroot/2013.05/107-armadeus-games-add-wolf4sdl-package.patch
new file mode 100644
index 0000000..56dd11a
--- /dev/null
+++ b/patches/buildroot/2013.05/107-armadeus-games-add-wolf4sdl-package.patch
@@ -0,0 +1,74 @@
+Add Wolf4SDL to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/wolf4sdl/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/wolf4sdl/Config.in 2013-08-31 18:01:30.675547815 +0200
+@@ -0,0 +1,11 @@
++config BR2_PACKAGE_WOLF4SDL
++ bool "Wolf4SDL"
++ select BR2_PACKAGE_SDL
++ select BR2_PACKAGE_SDL_MIXER
++ help
++ Wolf4SDL is an open-source port of id Software's classic first-person
++ shooter Wolfenstein 3D to the cross-plattform multimedia library
++ "Simple DirectMedia Layer (SDL)". It is meant to keep the original
++ feel while taking advantage of some improvements (see README).
++
++ http://www.stud.uni-karlsruhe.de/~uvaue/chaos/main.html
+Index: buildroot/package/wolf4sdl/wolf4sdl.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/wolf4sdl/wolf4sdl.mk 2013-08-31 22:28:54.499104844 +0200
+@@ -0,0 +1,37 @@
++#############################################################
++#
++# Wolf4SDL
++#
++#############################################################
++
++WOLF4SDL_VERSION = 1.6
++WOLF4SDL_SOURCE = Wolf4SDL-$(WOLF4SDL_VERSION)-src.zip
++WOLF4SDL_SITE = http://www.alice-dsl.net/mkroll/bins/
++
++WOLF4SDL_DEPENDENCIES = sdl sdl_mixer
++
++define WOLF4SDL_EXTRACT_CMDS
++ unzip -d $(BUILD_DIR) $(DL_DIR)/$(WOLF4SDL_SOURCE)
++ mv $(BUILD_DIR)/Wolf4SDL-$(WOLF4SDL_VERSION)-src/* $(@D)
++ rmdir $(BUILD_DIR)/Wolf4SDL-$(WOLF4SDL_VERSION)-src
++endef
++
++define WOLF4SDL_BUILD_CMDS
++ $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" \
++ PREFIX="$(TARGET_DIR)/usr/local" \
++ SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \
++ -C $(@D)
++endef
++
++define WOLF4SDL_INSTALL_TARGET_CMDS
++ $(MAKE) PREFIX="$(TARGET_DIR)/usr/local" \
++ INSTALL="$(INSTALL)" \
++ INSTALL_PROGRAM="$(INSTALL) -m 775" \
++ install -C $(@D)
++endef
++
++define WOLF4SDL_CLEAN_CMDS
++ $(MAKE) -C $(@D) clean
++endef
++
++$(eval $(generic-package))
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2013-08-31 18:01:30.583547362 +0200
++++ buildroot/package/Config.in 2013-08-31 22:31:05.275753324 +0200
+@@ -108,6 +108,7 @@
+ source "package/doom-wad/Config.in"
+ source "package/rubix/Config.in"
+ source "package/sdlquake/Config.in"
++source "package/wolf4sdl/Config.in"
+ endmenu
+
+ menu "Graphic libraries and applications (graphic/text)"
diff --git a/patches/buildroot/2013.05/107-games-add_wolf4sdl.patch.tobefixed b/patches/buildroot/2013.05/107-games-add_wolf4sdl.patch.tobefixed
deleted file mode 100644
index 289870f..0000000
--- a/patches/buildroot/2013.05/107-games-add_wolf4sdl.patch.tobefixed
+++ /dev/null
@@ -1,92 +0,0 @@
-Add Wolf4SDL to BR.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/wolf4sdl/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/wolf4sdl/Config.in 2012-02-21 16:44:52.000000000 +0100
-@@ -0,0 +1,11 @@
-+config BR2_PACKAGE_WOLF4SDL
-+ bool "Wolf4SDL"
-+ select BR2_PACKAGE_SDL
-+ select BR2_PACKAGE_SDL_MIXER
-+ help
-+ Wolf4SDL is an open-source port of id Software's classic first-person
-+ shooter Wolfenstein 3D to the cross-plattform multimedia library
-+ "Simple DirectMedia Layer (SDL)". It is meant to keep the original
-+ feel while taking advantage of some improvements (see README).
-+
-+ http://www.stud.uni-karlsruhe.de/~uvaue/chaos/main.html
-Index: buildroot/package/wolf4sdl/wolf4sdl.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/wolf4sdl/wolf4sdl.mk 2012-02-21 16:44:52.000000000 +0100
-@@ -0,0 +1,55 @@
-+#############################################################
-+#
-+# Wolf4SDL
-+#
-+#############################################################
-+WOLF4SDL_VERSION = 1.6
-+WOLF4SDL_SOURCE = Wolf4SDL-$(WOLF4SDL_VERSION)-src.zip
-+WOLF4SDL_SITE = http://www.alice-dsl.net/mkroll/bins/
-+WOLF4SDL_TARGET_BIN = /usr/local/bin/wolf3d
-+WOLF4SDL_DIR = $(BUILD_DIR)/Wolf4SDL-$(WOLF4SDL_VERSION)-src
-+
-+#WOLF4SDL_INSTALL_STAGING = NO
-+#WOLF4SDL_INSTALL_TARGET = YES
-+#WOLF4SDL_DEPENDENCIES = sdl sdl_mixer
-+#$(eval $(autotools-package))
-+
-+$(DL_DIR)/$(WOLF4SDL_SOURCE):
-+ $(call DOWNLOAD,$(WOLF4SDL_SITE),$(WOLF4SDL_SOURCE))
-+
-+wolf4sdl-source: $(DL_DIR)/$(WOLF4SDL_SOURCE)
-+
-+$(WOLF4SDL_DIR)/.unpacked: $(DL_DIR)/$(WOLF4SDL_SOURCE)
-+ unzip $(DL_DIR)/$(WOLF4SDL_SOURCE) -d $(BUILD_DIR)
-+# mv $(BUILD_DIR)/Wolf4SDL-$(WOLF4SDL_VERSION)-src/* $(WOLF4SDL_DIR)
-+# rm -rf $(BUILD_DIR)/Wolf4SDL-$(WOLF4SDL_VERSION)-src
-+ touch $@
-+
-+$(WOLF4SDL_DIR)/wolf3d: $(WOLF4SDL_DIR)/.unpacked
-+ $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" PREFIX=$(TARGET_DIR)/usr/local \
-+ SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config \
-+ -C $(WOLF4SDL_DIR)
-+
-+$(TARGET_DIR)/$(WOLF4SDL_TARGET_BIN): $(WOLF4SDL_DIR)/wolf3d
-+ $(MAKE) PREFIX=$(TARGET_DIR)/usr/local \
-+ INSTALL=$(INSTALL) \
-+ INSTALL_PROGRAM="$(INSTALL) -m 775" \
-+ install -C $(WOLF4SDL_DIR)
-+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(WOLF4SDL_TARGET_BIN)
-+
-+WOLF4SDL wolf4sdl: sdl sdl_mixer $(TARGET_DIR)/$(WOLF4SDL_TARGET_BIN)
-+
-+wolf4sdl-clean:
-+ -$(MAKE) -C $(WOLF4SDL_DIR) clean
-+
-+wolf4sdl-dirclean:
-+ rm -rf $(WOLF4SDL_DIR)
-+
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(strip $(BR2_PACKAGE_WOLF4SDL)),y)
-+TARGETS+=wolf4sdl
-+endif
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in 2012-02-21 16:44:50.000000000 +0100
-+++ buildroot/package/Config.in 2012-02-21 16:44:52.000000000 +0100
-@@ -108,6 +108,7 @@
- source "package/doom-wad/Config.in"
- source "package/rubix/Config.in"
- source "package/sdlquake/Config.in"
-+source "package/wolf4sdl/Config.in"
- endmenu
-
- menu "Graphic libraries and applications (graphic/text)"
hooks/post-receive
--
armadeus
|
