[Armadeus-commitlog] armadeus branch, master, updated. latestrelease-39-gd578dd6

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  d578dd6cff8bcd072cd9f540296237ec5d3724bd (commit)
       via  c6e8e0cad50a52b0ca64091746b5ac771ce4790c (commit)
      from  64628b619814e078f5f0d4117b618bff3f24e4db (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 d578dd6cff8bcd072cd9f540296237ec5d3724bd
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Aug 24 13:06:58 2009 +0200

    [BUILDROOT] Add Quake package (patch)

commit c6e8e0cad50a52b0ca64091746b5ac771ce4790c
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Aug 24 12:37:22 2009 +0200

    [LINUX] Makes LQ057 LCD works on APF27 (Freescale framebuffer)

-----------------------------------------------------------------------

Summary of changes:
 ...-apf27-armadeus-add_LQO57_to_mxcfb_modedb.patch |   18 +-
 ...-armadeus-add_LW700AT9003_to_mxcfb_modedb.patch |   10 +-
 patches/buildroot/081-adds_quake_package.patch     |  157 ++++++++++++++++++++
 3 files changed, 171 insertions(+), 14 deletions(-)
 create mode 100644 patches/buildroot/081-adds_quake_package.patch

diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286-apf27-armadeus-add_LQO57_to_mxcfb_modedb.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286-apf27-armadeus-add_LQO57_to_mxcfb_modedb.patch
index b00d3b4..4395f5e 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286-apf27-armadeus-add_LQO57_to_mxcfb_modedb.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286-apf27-armadeus-add_LQO57_to_mxcfb_modedb.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.29/drivers/video/mxc/mxcfb_modedb.c
+Index: linux-2.6.29.4/drivers/video/mxc/mxcfb_modedb.c
 ===================================================================
---- linux-2.6.29.orig/drivers/video/mxc/mxcfb_modedb.c	2009-03-31 10:57:25.000000000 +0200
-+++ linux-2.6.29/drivers/video/mxc/mxcfb_modedb.c	2009-03-31 10:57:32.000000000 +0200
+--- linux-2.6.29.4.orig/drivers/video/mxc/mxcfb_modedb.c	2009-08-24 12:02:28.000000000 +0200
++++ linux-2.6.29.4/drivers/video/mxc/mxcfb_modedb.c	2009-08-24 12:17:54.000000000 +0200
 @@ -88,6 +88,19 @@
  		.vmode = FB_VMODE_NONINTERLACED,
  		.flag = 0,
@@ -11,12 +11,12 @@ Index: linux-2.6.29/drivers/video/mxc/mxcfb_modedb.c
 +		.refresh = 60,
 +		.xres = 320,
 +		.yres = 240,
-+		.pixclock = 111111, /* picoS */
-+		.left_margin = 52, .right_margin = 28, /* at least 3 & 1 */
-+		.upper_margin = 2, .lower_margin = 3,
-+		.hsync_len = 0, .vsync_len = 7,
-+		.sync = FB_SYNC_CLK_IDLE_EN,
-+		.vmode = FB_VMODE_NONINTERLACED, /* TO CHECK !! */
++		.pixclock = 158730, /* picoS -> 6,3MHz */
++		.left_margin = 52, .right_margin = 28, /* at least 3 & 1 */ /* 320 + 52 + 28 = 400 */
++		.upper_margin = 3, .lower_margin = 3, /* 240 + 5 + 3 + 3 = 251 */
++		.hsync_len = 96, .vsync_len = 5,
++		.sync = FB_SYNC_CLK_IDLE_EN | FB_SYNC_OE_ACT_HIGH | FB_SYNC_CLK_INVERT,
++		.vmode = FB_VMODE_NONINTERLACED,
 +		.flag = 0,
 +	},
  };
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286b-apf27-armadeus-add_LW700AT9003_to_mxcfb_modedb.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286b-apf27-armadeus-add_LW700AT9003_to_mxcfb_modedb.patch
index 93d4aaa..e256f83 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286b-apf27-armadeus-add_LW700AT9003_to_mxcfb_modedb.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286b-apf27-armadeus-add_LW700AT9003_to_mxcfb_modedb.patch
@@ -1,9 +1,9 @@
-Index: linux-2.6.29/drivers/video/mxc/mxcfb_modedb.c
+Index: linux-2.6.29.4/drivers/video/mxc/mxcfb_modedb.c
 ===================================================================
---- linux-2.6.29.orig/drivers/video/mxc/mxcfb_modedb.c	2009-03-31 10:57:25.000000000 +0200
-+++ linux-2.6.29/drivers/video/mxc/mxcfb_modedb.c	2009-03-31 10:57:32.000000000 +0200
-@@ -101,6 +101,19 @@ const struct fb_videomode mxcfb_modedb[]
- 		.vmode = FB_VMODE_NONINTERLACED, /* TO CHECK !! */
+--- linux-2.6.29.4.orig/drivers/video/mxc/mxcfb_modedb.c	2009-08-24 12:17:54.000000000 +0200
++++ linux-2.6.29.4/drivers/video/mxc/mxcfb_modedb.c	2009-08-24 12:27:52.000000000 +0200
+@@ -101,6 +101,19 @@
+ 		.vmode = FB_VMODE_NONINTERLACED,
  		.flag = 0,
  	},
 +        [7] = {
diff --git a/patches/buildroot/081-adds_quake_package.patch b/patches/buildroot/081-adds_quake_package.patch
new file mode 100644
index 0000000..940748d
--- /dev/null
+++ b/patches/buildroot/081-adds_quake_package.patch
@@ -0,0 +1,157 @@
+
+This patch adds Quake packages to buildroot:
+* Quake engine itself (SDL port)
+* a shareware data file (PAK/WAD) to test the engine
+
+It is inspired of OpenEmbedded work.
+
+sdlquake.mk could be simplier if a target FOO_HOOK_POST_INSTALL was
+existing in Makefile.autotools.in.
+
+Still searching a way to apply sdlquake-1.0.9-no-x86-asm.patch on all arch
+EXCEPT x86.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/games/sdlquake/sdlquake.mk
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/games/sdlquake/sdlquake.mk	2009-08-16 14:43:40.000000000 +0200
+@@ -0,0 +1,31 @@
++#############################################################
++#
++# Quake 1 (SDL_Port)
++#
++#############################################################
++
++SDLQUAKE_VERSION = 1.0.9
++SDLQUAKE_SOURCE = sdlquake-$(SDLQUAKE_VERSION).tar.gz
++SDLQUAKE_SITE = http://www.libsdl.org/projects/quake/src/
++#SDLQUAKE_AUTORECONF = NO
++SDLQUAKE_INSTALL_STAGING = NO
++SDLQUAKE_INSTALL_TARGET = YES
++
++SDLQUAKE_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
++		--build=$(GNU_HOST_NAME) --prefix=/usr --sysconfdir=/etc
++
++SDLQUAKE_DEPENDENCIES = uclibc sdl sdl_mixer SDL_net
++
++$(eval $(call AUTOTARGETS,package/games,sdlquake))
++
++NAMEVER = $($(PKG)_NAME)-$($(PKG)_VERSION)
++$(SDLQUAKE_TARGET_PATCH):
++	$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)")
++	toolchain/patch-kernel.sh $($(PKG)_DIR) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1;
++	(cd $(SDLQUAKE_DIR); \
++	touch INSTALL NEWS README AUTHORS ChangeLog; \
++	echo "AC_PROG_CC" >> configure.in; \
++	aclocal; \
++	autoconf; \
++	automake --add-missing;)
++	touch $@
+Index: buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm	2009-08-16 13:37:00.000000000 +0200
+@@ -0,0 +1,35 @@
++--- /tmp/Makefile.am	2008-08-11 20:31:09.000000000 +0200
+++++ sdlquake-1.0.9/Makefile.am	2008-08-11 20:55:00.263198000 +0200
++@@ -33,7 +33,6 @@
++ 	crc.h			\
++ 	cvar.c			\
++ 	cvar.h			\
++-	d_copy.S		\
++ 	d_edge.c		\
++ 	d_fill.c		\
++ 	d_iface.h		\
++@@ -48,7 +47,6 @@
++ 	d_sprite.c		\
++ 	d_surf.c		\
++ 	d_zpoint.c		\
++-	dosasm.S		\
++ 	dosisms.h		\
++ 	draw.c			\
++ 	draw.h			\
++@@ -103,7 +101,6 @@
++ 	r_sprite.c		\
++ 	r_surf.c		\
++ 	r_vars.c		\
++-	r_varsa.S		\
++ 	render.h		\
++ 	resource.h		\
++ 	sbar.c			\
++@@ -136,7 +133,7 @@
++ 	world.h			\
++ 	zone.c			\
++ 	zone.h			\
++-	$(X86_SRCS) $(NONX86_SRCS)
+++	$(NONX86_SRCS)
++ 
++ X86_SRCS =			\
++ 	snd_mixa.S		\
+Index: buildroot/package/games/sdlquake/Config.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/games/sdlquake/Config.in	2009-08-16 14:51:17.000000000 +0200
+@@ -0,0 +1,10 @@
++config BR2_PACKAGE_SDLQUAKE
++	bool "sdlquake"
++	select BR2_PACKAGE_SDL
++	select BR2_PACKAGE_SDL_MIXER
++	select BR2_PACKAGE_SDL_NET
++	help
++	  sdlquake is a port of ID Software's popular Quake 3-D shooter game.
++	  (Not supported by ID Software)
++
++	  http://www.libsdl.org/projects/quake/
+Index: buildroot/package/games/quake-pak/quake-pak.mk
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/games/quake-pak/quake-pak.mk	2009-08-16 15:50:54.000000000 +0200
+@@ -0,0 +1,34 @@
++#############################################################
++#
++# Quake shareware data files (PAK/WAD)
++#
++#############################################################
++
++QUAKE_PAK_VERSION = 1.0.6
++QUAKE_PAK_SOURCE = quakesw-$(QUAKE_PAK_VERSION).tar.gz
++QUAKE_PAK_SITE = http://www.libsdl.org/projects/quake/data/
++QUAKE_PAK_CAT = $(ZCAT)
++QUAKE_PAK_TARGET_DIR = $(TARGET_DIR)/usr/share/games/quake/
++
++$(DL_DIR)/$(QUAKE_PAK_SOURCE):
++	 $(WGET) -P $(DL_DIR) $(QUAKE_PAK_SITE)/$(QUAKE_PAK_SOURCE)
++
++quake-pak-source: $(DL_DIR)/$(QUAKE_PAK_SOURCE)
++
++$(QUAKE_PAK_TARGET_DIR)/id1/pak0.pak: $(DL_DIR)/$(QUAKE_PAK_SOURCE)
++	mkdir -p $(QUAKE_PAK_TARGET_DIR)
++	$(QUAKE_PAK_CAT) $(DL_DIR)/$(QUAKE_PAK_SOURCE) | tar -C $(QUAKE_PAK_TARGET_DIR) $(TAR_OPTIONS) -
++
++quake-pak: $(QUAKE_PAK_TARGET_DIR)/id1/pak0.pak
++
++quake-pak-dirclean:
++	rm -rf $(QUAKE_PAK_TARGET_DIR)/id1/
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_QUAKE_PAK)),y)
++TARGETS+=quake-pak
++endif
+Index: buildroot/package/games/quake-pak/Config.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/games/quake-pak/Config.in	2009-08-16 15:46:54.000000000 +0200
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_QUAKE_PAK
++	bool "shareware Quake PAK/WAD file"
++	depends on BR2_PACKAGE_SDLQUAKE
++	help
++	  This will install the shareware pak/wad data file for the Quake game.
++
++	  The file will be placed in the /usr/share/games/quake/ directory.


hooks/post-receive
-- 
armadeus


