[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-471-gef58652
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-471-gef58652
|
From: Julien B a. A. <ar...@us...> - 2010-06-18 22:05:41
|
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 ef58652cc9738a5bdea9f4dc3b4ef23a5749fd25 (commit)
via 46c3155bdb7b3dde626a0f107b7d129a7f6c6bc0 (commit)
via 18be2dda99ca96fca68977cdd2107c674088396c (commit)
from b14d420100ab929d961751acea5f4366c227867f (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 ef58652cc9738a5bdea9f4dc3b4ef23a5749fd25
Author: Julien Boibessot <jul...@ar...>
Date: Sat Jun 19 00:05:20 2010 +0200
[BUILDROOT] move fbtest package as patch against BR
commit 46c3155bdb7b3dde626a0f107b7d129a7f6c6bc0
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 18 23:38:19 2010 +0200
[BUILDROOT] move fbgrab package as patch against BR
commit 18be2dda99ca96fca68977cdd2107c674088396c
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 18 21:43:00 2010 +0200
[BUILDROOT] move allegro package as patch against BR
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/.gitignore | 3 -
buildroot/package/allegro/Config.in | 15 --
buildroot/package/allegro/allegro.mk | 75 -----------
buildroot/package/fbgrab/Config.in | 10 --
buildroot/package/fbgrab/fbgrab-1.0.patch | 21 ---
buildroot/package/fbgrab/fbgrab.mk | 48 -------
buildroot/package/fbtest/Config.in | 7 -
buildroot/package/fbtest/fbtest.mk | 51 -------
.../fbtest-20041102-1-exe-target-name-change.patch | 11 --
.../patches/fbtest-20041102-1-page-mask.patch | 36 -----
.../fbtest-20041102-1-pnmtohex-libs-depends.patch | 11 --
patches/buildroot/018-allegro.patch | 106 ++++++++++++++-
patches/buildroot/041-fbgrab.patch | 94 +++++++++++++-
patches/buildroot/119-fbtest-add_package.patch | 141 ++++++++++++++++++++
patches/buildroot/2010.05/018-allegro.patch | 102 ++++++++++++++
patches/buildroot/2010.05/041-fbgrab.patch | 90 +++++++++++++
.../buildroot/2010.05/119-fbtest-add_package.patch | 141 ++++++++++++++++++++
patches/buildroot/2010.05/cleanup_buildroot.sh | 3 +
patches/buildroot/cleanup_buildroot.sh | 5 +-
19 files changed, 677 insertions(+), 293 deletions(-)
delete mode 100644 buildroot/package/allegro/Config.in
delete mode 100644 buildroot/package/allegro/allegro.mk
delete mode 100644 buildroot/package/fbgrab/Config.in
delete mode 100644 buildroot/package/fbgrab/fbgrab-1.0.patch
delete mode 100644 buildroot/package/fbgrab/fbgrab.mk
delete mode 100644 buildroot/package/fbtest/Config.in
delete mode 100644 buildroot/package/fbtest/fbtest.mk
delete mode 100644 buildroot/package/fbtest/patches/fbtest-20041102-1-exe-target-name-change.patch
delete mode 100644 buildroot/package/fbtest/patches/fbtest-20041102-1-page-mask.patch
delete mode 100644 buildroot/package/fbtest/patches/fbtest-20041102-1-pnmtohex-libs-depends.patch
create mode 100644 patches/buildroot/119-fbtest-add_package.patch
create mode 100644 patches/buildroot/2010.05/119-fbtest-add_package.patch
diff --git a/buildroot/package/.gitignore b/buildroot/package/.gitignore
index b60d8b2..d5fbcf6 100644
--- a/buildroot/package/.gitignore
+++ b/buildroot/package/.gitignore
@@ -9,10 +9,7 @@
/buildroot-libtool.patch
# except:
-!/allegro/
!/armadeus/
!/bluez/
-!/fbgrab/
-!/fbtest/
!/mtd/
!/xenomai/
diff --git a/buildroot/package/allegro/Config.in b/buildroot/package/allegro/Config.in
deleted file mode 100644
index 8791e44..0000000
--- a/buildroot/package/allegro/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-config BR2_PACKAGE_ALLEGRO
- bool "Allegro"
- default n
- help
-
- Allegro is a game programming library for C/C++ developers
- distributed freely and supporting the following platforms:
- DOS, Unix (Linux, FreeBSD, Irix, Solaris, Darwin), Windows, QNX,
- BeOS and MacOS X.
- It provides many functions for graphics, sounds, player input
- (keyboard, mouse and joystick) and timers. It also provides fixed and
- floating point mathematical functions, 3d functions, file management
- functions, compressed datafile and a GUI.
-
- http://alleg.sourceforge.net/
diff --git a/buildroot/package/allegro/allegro.mk b/buildroot/package/allegro/allegro.mk
deleted file mode 100644
index 52e213f..0000000
--- a/buildroot/package/allegro/allegro.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#############################################################
-#
-# Allegro: a game programming library
-#
-#############################################################
-ALLEGRO_VERSION:=4.2.1
-ALLEGRO_SOURCE:=allegro-$(ALLEGRO_VERSION).tar.gz
-ALLEGRO_SITE:=http://downloads.sourceforge.net/alleg
-ALLEGRO_CAT:=zcat
-ALLEGRO_DIR:=$(BUILD_DIR)/allegro-$(ALLEGRO_VERSION)
-
-$(DL_DIR)/$(ALLEGRO_SOURCE):
- $(WGET) -P $(DL_DIR) $(ALLEGRO_SITE)/$(ALLEGRO_SOURCE)
-
-allegro-source: $(DL_DIR)/$(ALLEGRO_SOURCE)
-
-$(ALLEGRO_DIR)/.unpacked: $(DL_DIR)/$(ALLEGRO_SOURCE)
- $(ALLEGRO_CAT) $(DL_DIR)/$(ALLEGRO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $@
-
-$(ALLEGRO_DIR)/.configured: $(ALLEGRO_DIR)/.unpacked
- (cd $(ALLEGRO_DIR); \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
- LDFLAGS="$(TARGET_LDFLAGS)" \
- CROSSCOMPILE=1 \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --without-svgalib \
- --enable-modules=no \
- --enable-static=yes \
- --enable-shared=no \
- --disable-asm \
- --disable-mmx \
- --disable-sse \
- --disable-color24 \
- --disable-color32 \
- --without-x );
- touch $@
-# allegro doesn't seem to build as shared library
-# --disable-color24 \
-# --disable-color32 \
-
-$(ALLEGRO_DIR)/lib/unix/liballeg.a: $(ALLEGRO_DIR)/.configured
- $(MAKE) -C $(ALLEGRO_DIR) CROSSCOMPILE=1
- touch $@
-
-#$(STAGING_DIR)/usr/lib/liballeg.so: $(ALLEGRO_DIR)/lib/unix/liballeg.a
-# $(MAKE) -C $(ALLEGRO_DIR) install
-# touch -c $@
-#
-# $(TARGET_DIR)/usr/lib/liballeg.so.so: $(STAGING_DIR)/usr/lib/liballeg.so
-# cp -dpf $(STAGING_DIR)/usr/lib/liballeg*.so* $(TARGET_DIR)/usr/lib/
-# -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/liballeg.so
-
-ALLEGRO allegro: $(ALLEGRO_DIR)/lib/unix/liballeg.a
-
-allegro-clean:
- $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(ALLEGRO_DIR) uninstall
- -$(MAKE) -C $(ALLEGRO_DIR) clean
-
-allegro-dirclean:
- rm -rf $(ALLEGRO_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_ALLEGRO)),y)
-TARGETS+=allegro
-endif
diff --git a/buildroot/package/fbgrab/Config.in b/buildroot/package/fbgrab/Config.in
deleted file mode 100644
index fec378d..0000000
--- a/buildroot/package/fbgrab/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_FBGRAB
- bool "fbgrab"
- default n
- help
- FBGrab is a framebuffer screenshot program,
- capturing the linux framebuffer and converting
- it to a png-picture.
-
- http://hem.bredband.net/gmogmo/fbgrab/
-
diff --git a/buildroot/package/fbgrab/fbgrab-1.0.patch b/buildroot/package/fbgrab/fbgrab-1.0.patch
deleted file mode 100644
index 9a80caa..0000000
--- a/buildroot/package/fbgrab/fbgrab-1.0.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN fbgrab-1.0/Makefile fbgrab-1.0.mod/Makefile
---- fbgrab-1.0/Makefile 2002-03-20 20:49:06.000000000 +0100
-+++ fbgrab-1.0.mod/Makefile 2008-06-06 21:42:56.000000000 +0200
-@@ -4,8 +4,8 @@
- ###
-
- fbgrab: fbgrab.c
-- splint +posixlib fbgrab.c
-- gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab
-+ #splint +posixlib fbgrab.c
-+ $(CC) -Wall fbgrab.c -lpng -lz -o fbgrab
-
- install:
- strip fbgrab
-@@ -13,4 +13,4 @@
- install fbgrab.1.man /usr/man/man1/fbgrab.1
-
- clean:
-- rm -f fbgrab *~ \#*\#
-\ Pas de fin de ligne à la fin du fichier.
-+ rm -f fbgrab *~ \#*\#
diff --git a/buildroot/package/fbgrab/fbgrab.mk b/buildroot/package/fbgrab/fbgrab.mk
deleted file mode 100644
index dc520f5..0000000
--- a/buildroot/package/fbgrab/fbgrab.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#############################################################
-#
-# FBGRAB
-#
-#############################################################
-FBGRAB_VERSION:=1.0
-FBGRAB_SOURCE:=fbgrab-$(FBGRAB_VERSION).tar.gz
-FBGRAB_SITE:=http://hem.bredband.net/gmogmo/fbgrab/
-FBGRAB_DIR:=$(BUILD_DIR)/fbgrab-$(FBGRAB_VERSION)
-FBGRAB_CAT:=$(ZCAT)
-FBGRAB_BINARY:=fbgrab
-FBGRAB_TARGET_BINARY:=usr/bin/$(FBGRAB_BINARY)
-
-$(DL_DIR)/$(FBGRAB_SOURCE):
- $(WGET) -P $(DL_DIR) $(FBGRAB_SITE)/$(FBGRAB_SOURCE)
-
-$(FBGRAB_DIR)/.unpacked: $(DL_DIR)/$(FBGRAB_SOURCE)
- $(FBGRAB_CAT) $(DL_DIR)/$(FBGRAB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(FBGRAB_DIR) package/fbgrab/ fbgrab-$(FBGRAB_VERSION)\*.patch\*
- touch $@
-
-$(FBGRAB_DIR)/$(FBGRAB_BINARY): $(FBGRAB_DIR)/.unpacked
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(FBGRAB_DIR)
- touch -c $@
-
-$(TARGET_DIR)/$(FBGRAB_TARGET_BINARY): $(FBGRAB_DIR)/$(FBGRAB_BINARY)
- $(INSTALL) -m 755 $(FBGRAB_DIR)/$(FBGRAB_BINARY) $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
- touch -c $@
-
-fbgrab: libpng zlib $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
-
-fbgrab-clean:
- rm -f $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
- -$(MAKE) -C $(FBGRAB_DIR) clean
-
-fbgrab-dirclean:
- rm -rf $(FBGRAB_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_FBGRAB)),y)
-TARGETS+=fbgrab
-endif
-
diff --git a/buildroot/package/fbtest/Config.in b/buildroot/package/fbtest/Config.in
deleted file mode 100644
index 14dd671..0000000
--- a/buildroot/package/fbtest/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_FBTEST
- bool "fbtest"
- help
- Fbtest is a collection of tests for the frame buffer device.
- All tests are gathered inside the same executable.
-
- http://linux-fbdev.cvs.sourceforge.net/viewvc/linux-fbdev/fbtest/
diff --git a/buildroot/package/fbtest/fbtest.mk b/buildroot/package/fbtest/fbtest.mk
deleted file mode 100644
index 3b917a3..0000000
--- a/buildroot/package/fbtest/fbtest.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#############################################################
-#
-# fbtest
-#
-#############################################################
-FBTEST_VERSION:=20041102-1
-FBTEST_SOURCE:=fbtest-$(FBTEST_VERSION).tar.gz
-FBTEST_SITE:=http://www.pengutronix.de/software/ptxdist/temporary-src/
-FBTEST_DIR:=$(BUILD_DIR)/fbtest-$(FBTEST_VERSION)
-FBTEST_CAT:=$(ZCAT)
-FBTEST_BINARY:=fbtest
-FBTEST_TARGET_BINARY:=usr/bin/$(FBTEST_BINARY)
-
-$(DL_DIR)/$(FBTEST_SOURCE):
- $(WGET) -P $(DL_DIR) $(FBTEST_SITE)/$(FBTEST_SOURCE)
-
-$(FBTEST_DIR)/.unpacked: $(DL_DIR)/$(FBTEST_SOURCE)
- $(FBTEST_CAT) $(DL_DIR)/$(FBTEST_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(FBTEST_DIR) package/fbtest/patches/ \
- fbtest-$(FBTEST_VERSION)\*.patch \
- fbtest-$(FBTEST_VERSION)\*.patch.$(ARCH)
- touch $@
-
-$(FBTEST_DIR)/$(FBTEST_BINARY): $(FBTEST_DIR)/.unpacked
- $(MAKE1) ARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) -C $(FBTEST_DIR)
- touch -c $@
-
-$(TARGET_DIR)/$(FBTEST_TARGET_BINARY): $(FBTEST_DIR)/$(FBTEST_BINARY)
- $(INSTALL) -m 755 $(FBTEST_DIR)/$(FBTEST_BINARY) $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
- touch -c $@
-
-fbtest: uclibc $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
-
-fbtest-source: $(DL_DIR)/$(FBTEST_SOURCE)
-
-fbtest-clean:
- rm -f $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
- -$(MAKE) -C $(FBTEST_DIR) clean
-
-fbtest-dirclean:
- rm -rf $(FBTEST_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_FBTEST)),y)
-TARGETS+=fbtest
-endif
diff --git a/buildroot/package/fbtest/patches/fbtest-20041102-1-exe-target-name-change.patch b/buildroot/package/fbtest/patches/fbtest-20041102-1-exe-target-name-change.patch
deleted file mode 100644
index bd3fa50..0000000
--- a/buildroot/package/fbtest/patches/fbtest-20041102-1-exe-target-name-change.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fbtest-20041102-1.org/Makefile 2009-05-21 10:16:05.000000000 +0200
-+++ fbtest-20041102-1/Makefile 2009-05-21 10:17:47.000000000 +0200
-@@ -1,7 +1,7 @@
-
- TOPDIR = .
-
--TARGET = $(CROSS_COMPILE)fbtest
-+TARGET = fbtest
-
- OBJS += drawops/drawops.o fonts/fonts.o images/images.o visops/visops.o \
- tests/tests.o
diff --git a/buildroot/package/fbtest/patches/fbtest-20041102-1-page-mask.patch b/buildroot/package/fbtest/patches/fbtest-20041102-1-page-mask.patch
deleted file mode 100644
index 59c52fc..0000000
--- a/buildroot/package/fbtest/patches/fbtest-20041102-1-page-mask.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- fbtest-20041102-1.org/fb.c 2003-04-04 14:07:55.000000000 +0200
-+++ fbtest-20041102-1/fb.c 2009-05-20 10:32:32.000000000 +0200
-@@ -19,7 +19,6 @@
- #include <sys/stat.h>
- #include <unistd.h>
-
--#include <asm/page.h>
-
- #include "types.h"
- #include "fb.h"
-@@ -179,6 +179,7 @@
- void fb_map(void)
- {
- caddr_t addr;
-+ unsigned long PAGE_MASK = ~(sysconf(_SC_PAGE_SIZE)-1);
-
- Debug("fb_map()\n");
- fb_start = (unsigned long)fb_fix.smem_start & PAGE_MASK;
-@@ -189,7 +190,7 @@
- addr = mmap(NULL, fb_len, PROT_READ | PROT_WRITE, MAP_SHARED, fb_fd, 0);
- if (addr == (caddr_t)-1)
- Fatal("mmap smem: %s\n", strerror(errno));
-- fb = addr+fb_offset;
-+ fb = (u8*)(addr+fb_offset);
- }
-
-
-@@ -199,6 +200,8 @@
-
- void fb_unmap(void)
- {
-+ unsigned long PAGE_MASK = ~(sysconf(_SC_PAGE_SIZE)-1);
-+
- Debug("fb_unmap()\n");
- if (munmap((caddr_t)((unsigned long)fb & PAGE_MASK), fb_len) == -1)
- Fatal("munmap smem: %s\n", strerror(errno));
diff --git a/buildroot/package/fbtest/patches/fbtest-20041102-1-pnmtohex-libs-depends.patch b/buildroot/package/fbtest/patches/fbtest-20041102-1-pnmtohex-libs-depends.patch
deleted file mode 100644
index 000b7d2..0000000
--- a/buildroot/package/fbtest/patches/fbtest-20041102-1-pnmtohex-libs-depends.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fbtest-20041102-1.org/pnmtohex/Makefile 2004-11-02 09:43:02.000000000 +0100
-+++ fbtest-20041102-1/pnmtohex/Makefile 2005-11-16 22:24:08.406157582 +0100
-@@ -3,7 +3,7 @@ TOPDIR = ..
-
- HOST_TARGET = pnmtohex
-
--LIBS += -lnetpnm -lnetpbm -lnetpgm -lnetppm
-+LIBS += -lnetpbm -lm
-
- include $(TOPDIR)/Rules.make
-
diff --git a/patches/buildroot/018-allegro.patch b/patches/buildroot/018-allegro.patch
index 0beb789..c2d4fd1 100644
--- a/patches/buildroot/018-allegro.patch
+++ b/patches/buildroot/018-allegro.patch
@@ -1,7 +1,11 @@
+Add allegro package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-01-25 10:04:00.000000000 +0100
-+++ buildroot/package/Config.in 2010-01-25 10:04:02.000000000 +0100
+--- buildroot.orig/package/Config.in 2010-06-18 21:05:19.000000000 +0200
++++ buildroot/package/Config.in 2010-06-18 21:12:09.000000000 +0200
@@ -311,6 +311,7 @@
source "package/dialog/Config.in"
@@ -10,3 +14,101 @@ Index: buildroot/package/Config.in
source "package/directfb/Config.in"
source "package/directfb-examples/Config.in"
source "package/fbdump/Config.in"
+Index: buildroot/package/allegro/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/allegro/Config.in 2010-06-18 21:14:34.000000000 +0200
+@@ -0,0 +1,13 @@
++config BR2_PACKAGE_ALLEGRO
++ bool "Allegro"
++ help
++ Allegro is a game programming library for C/C++ developers
++ distributed freely and supporting the following platforms:
++ DOS, Unix (Linux, FreeBSD, Irix, Solaris, Darwin), Windows, QNX,
++ BeOS and MacOS X.
++ It provides many functions for graphics, sounds, player input
++ (keyboard, mouse and joystick) and timers. It also provides fixed and
++ floating point mathematical functions, 3d functions, file management
++ functions, compressed datafile and a GUI.
++
++ http://alleg.sourceforge.net/
+Index: buildroot/package/allegro/allegro.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/allegro/allegro.mk 2010-06-18 21:28:35.000000000 +0200
+@@ -0,0 +1,75 @@
++#############################################################
++#
++# Allegro: a game programming library
++#
++#############################################################
++ALLEGRO_VERSION:=4.2.1
++ALLEGRO_SOURCE:=allegro-$(ALLEGRO_VERSION).tar.gz
++ALLEGRO_SITE:=http://downloads.sourceforge.net/alleg
++ALLEGRO_CAT:=zcat
++ALLEGRO_DIR:=$(BUILD_DIR)/allegro-$(ALLEGRO_VERSION)
++
++$(DL_DIR)/$(ALLEGRO_SOURCE):
++ $(call DOWNLOAD,$(ALLEGRO_SITE),$(ALLEGRO_SOURCE))
++
++allegro-source: $(DL_DIR)/$(ALLEGRO_SOURCE)
++
++$(ALLEGRO_DIR)/.unpacked: $(DL_DIR)/$(ALLEGRO_SOURCE)
++ $(ALLEGRO_CAT) $(DL_DIR)/$(ALLEGRO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ touch $@
++
++$(ALLEGRO_DIR)/.configured: $(ALLEGRO_DIR)/.unpacked
++ (cd $(ALLEGRO_DIR); \
++ $(TARGET_CONFIGURE_OPTS) \
++ CFLAGS="$(TARGET_CFLAGS)" \
++ LDFLAGS="$(TARGET_LDFLAGS)" \
++ CROSSCOMPILE=1 \
++ ./configure \
++ --target=$(GNU_TARGET_NAME) \
++ --host=$(GNU_TARGET_NAME) \
++ --build=$(GNU_HOST_NAME) \
++ --prefix=/usr \
++ --without-svgalib \
++ --enable-modules=no \
++ --enable-static=yes \
++ --enable-shared=no \
++ --disable-asm \
++ --disable-mmx \
++ --disable-sse \
++ --disable-color24 \
++ --disable-color32 \
++ --without-x );
++ touch $@
++# allegro doesn't seem to build as shared library
++# --disable-color24 \
++# --disable-color32 \
++
++$(ALLEGRO_DIR)/lib/unix/liballeg.a: $(ALLEGRO_DIR)/.configured
++ $(MAKE) -C $(ALLEGRO_DIR) CROSSCOMPILE=1
++ touch $@
++
++#$(STAGING_DIR)/usr/lib/liballeg.so: $(ALLEGRO_DIR)/lib/unix/liballeg.a
++# $(MAKE) -C $(ALLEGRO_DIR) install
++# touch -c $@
++#
++# $(TARGET_DIR)/usr/lib/liballeg.so.so: $(STAGING_DIR)/usr/lib/liballeg.so
++# cp -dpf $(STAGING_DIR)/usr/lib/liballeg*.so* $(TARGET_DIR)/usr/lib/
++# -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/liballeg.so
++
++ALLEGRO allegro: $(ALLEGRO_DIR)/lib/unix/liballeg.a
++
++allegro-clean:
++ $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(ALLEGRO_DIR) uninstall
++ -$(MAKE) -C $(ALLEGRO_DIR) clean
++
++allegro-dirclean:
++ rm -rf $(ALLEGRO_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_ALLEGRO)),y)
++TARGETS+=allegro
++endif
diff --git a/patches/buildroot/041-fbgrab.patch b/patches/buildroot/041-fbgrab.patch
index 6f61b0b..ad04088 100644
--- a/patches/buildroot/041-fbgrab.patch
+++ b/patches/buildroot/041-fbgrab.patch
@@ -1,7 +1,11 @@
+Add fbgrab package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-01-25 10:04:25.000000000 +0100
-+++ buildroot/package/Config.in 2010-01-25 10:05:15.000000000 +0100
+--- buildroot.orig/package/Config.in 2010-06-18 22:47:05.000000000 +0200
++++ buildroot/package/Config.in 2010-06-18 23:09:39.000000000 +0200
@@ -338,6 +338,7 @@
comment "--> May be broken in busybox"
source "package/fbv/Config.in"
@@ -10,3 +14,89 @@ Index: buildroot/package/Config.in
comment "other GUIs"
source "package/qte/Config.in"
+Index: buildroot/package/fbgrab/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbgrab/Config.in 2010-06-18 23:13:05.000000000 +0200
+@@ -0,0 +1,9 @@
++config BR2_PACKAGE_FBGRAB
++ bool "fbgrab"
++ select BR2_PACKAGE_LIBPNG
++ select BR2_PACKAGE_ZLIB
++ help
++ FBGrab is a framebuffer screenshot program, capturing the Linux
++ framebuffer and converting it to a png-picture.
++
++ http://hem.bredband.net/gmogmo/fbgrab/
+Index: buildroot/package/fbgrab/fbgrab.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbgrab/fbgrab.mk 2010-06-18 23:02:49.000000000 +0200
+@@ -0,0 +1,48 @@
++#############################################################
++#
++# FBGRAB
++#
++#############################################################
++FBGRAB_VERSION:=1.0
++FBGRAB_SOURCE:=fbgrab-$(FBGRAB_VERSION).tar.gz
++FBGRAB_SITE:=http://hem.bredband.net/gmogmo/fbgrab/
++FBGRAB_DIR:=$(BUILD_DIR)/fbgrab-$(FBGRAB_VERSION)
++FBGRAB_CAT:=$(ZCAT)
++FBGRAB_BINARY:=fbgrab
++FBGRAB_TARGET_BINARY:=usr/bin/$(FBGRAB_BINARY)
++
++$(DL_DIR)/$(FBGRAB_SOURCE):
++ $(call DOWNLOAD,$(FBGRAB_SITE),$(FBGRAB_SOURCE))
++
++$(FBGRAB_DIR)/.unpacked: $(DL_DIR)/$(FBGRAB_SOURCE)
++ $(FBGRAB_CAT) $(DL_DIR)/$(FBGRAB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ toolchain/patch-kernel.sh $(FBGRAB_DIR) package/fbgrab/ fbgrab-$(FBGRAB_VERSION)\*.patch\*
++ touch $@
++
++$(FBGRAB_DIR)/$(FBGRAB_BINARY): $(FBGRAB_DIR)/.unpacked
++ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(FBGRAB_DIR)
++ touch -c $@
++
++$(TARGET_DIR)/$(FBGRAB_TARGET_BINARY): $(FBGRAB_DIR)/$(FBGRAB_BINARY)
++ $(INSTALL) -m 755 $(FBGRAB_DIR)/$(FBGRAB_BINARY) $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
++ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
++ touch -c $@
++
++fbgrab: libpng zlib $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
++
++fbgrab-clean:
++ rm -f $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
++ -$(MAKE) -C $(FBGRAB_DIR) clean
++
++fbgrab-dirclean:
++ rm -rf $(FBGRAB_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_FBGRAB)),y)
++TARGETS+=fbgrab
++endif
++
+Index: buildroot/package/fbgrab/fbgrab-1.0-make_it_cross-compile.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbgrab/fbgrab-1.0-make_it_cross-compile.patch 2010-06-18 23:07:20.000000000 +0200
+@@ -0,0 +1,14 @@
++diff -urN fbgrab-1.0/Makefile fbgrab-1.0.mod/Makefile
++--- fbgrab-1.0/Makefile 2002-03-20 20:49:06.000000000 +0100
+++++ fbgrab-1.0.mod/Makefile 2008-06-06 21:42:56.000000000 +0200
++@@ -4,8 +4,8 @@
++ ###
++
++ fbgrab: fbgrab.c
++- splint +posixlib fbgrab.c
++- gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab
+++ #splint +posixlib fbgrab.c
+++ $(CC) -Wall fbgrab.c -lpng -lz -o fbgrab
++
++ install:
++ strip fbgrab
diff --git a/patches/buildroot/119-fbtest-add_package.patch b/patches/buildroot/119-fbtest-add_package.patch
new file mode 100644
index 0000000..5ddfb1e
--- /dev/null
+++ b/patches/buildroot/119-fbtest-add_package.patch
@@ -0,0 +1,141 @@
+Add fbtest package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-18 23:44:05.000000000 +0200
++++ buildroot/package/Config.in 2010-06-18 23:49:19.000000000 +0200
+@@ -344,6 +344,7 @@
+ comment "--> May be broken in busybox"
+ source "package/fbv/Config.in"
+ source "package/fbset/Config.in"
++source "package/fbtest/Config.in"
+ source "package/fbgrab/Config.in"
+
+ comment "other GUIs"
+Index: buildroot/package/fbtest/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbtest/Config.in 2010-06-18 23:51:27.000000000 +0200
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_FBTEST
++ bool "fbtest"
++ help
++ Fbtest is a collection of tests for the framebuffer device.
++ All tests are gathered inside the same executable.
++
++ http://linux-fbdev.cvs.sourceforge.net/viewvc/linux-fbdev/fbtest/
+Index: buildroot/package/fbtest/fbtest.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbtest/fbtest.mk 2010-06-18 23:56:39.000000000 +0200
+@@ -0,0 +1,51 @@
++#############################################################
++#
++# fbtest
++#
++#############################################################
++FBTEST_VERSION:=20041102-1
++FBTEST_SOURCE:=fbtest-$(FBTEST_VERSION).tar.gz
++FBTEST_SITE:=http://www.pengutronix.de/software/ptxdist/temporary-src/
++FBTEST_DIR:=$(BUILD_DIR)/fbtest-$(FBTEST_VERSION)
++FBTEST_CAT:=$(ZCAT)
++FBTEST_BINARY:=fbtest
++FBTEST_TARGET_BINARY:=usr/bin/$(FBTEST_BINARY)
++
++$(DL_DIR)/$(FBTEST_SOURCE):
++ $(call DOWNLOAD,$(FBTEST_SITE),$(FBTEST_SOURCE))
++
++$(FBTEST_DIR)/.unpacked: $(DL_DIR)/$(FBTEST_SOURCE)
++ $(FBTEST_CAT) $(DL_DIR)/$(FBTEST_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ toolchain/patch-kernel.sh $(FBTEST_DIR) package/fbtest/ \
++ fbtest-$(FBTEST_VERSION)\*.patch \
++ fbtest-$(FBTEST_VERSION)\*.patch.$(ARCH)
++ touch $@
++
++$(FBTEST_DIR)/$(FBTEST_BINARY): $(FBTEST_DIR)/.unpacked
++ $(MAKE1) ARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) -C $(FBTEST_DIR)
++ touch -c $@
++
++$(TARGET_DIR)/$(FBTEST_TARGET_BINARY): $(FBTEST_DIR)/$(FBTEST_BINARY)
++ $(INSTALL) -m 755 $(FBTEST_DIR)/$(FBTEST_BINARY) $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
++ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
++ touch -c $@
++
++fbtest: $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
++
++fbtest-source: $(DL_DIR)/$(FBTEST_SOURCE)
++
++fbtest-clean:
++ rm -f $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
++ -$(MAKE) -C $(FBTEST_DIR) clean
++
++fbtest-dirclean:
++ rm -rf $(FBTEST_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_FBTEST)),y)
++TARGETS+=fbtest
++endif
+Index: buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch 2010-06-18 23:56:15.000000000 +0200
+@@ -0,0 +1,36 @@
++--- fbtest-20041102-1.org/fb.c 2003-04-04 14:07:55.000000000 +0200
+++++ fbtest-20041102-1/fb.c 2009-05-20 10:32:32.000000000 +0200
++@@ -19,7 +19,6 @@
++ #include <sys/stat.h>
++ #include <unistd.h>
++
++-#include <asm/page.h>
++
++ #include "types.h"
++ #include "fb.h"
++@@ -179,6 +179,7 @@
++ void fb_map(void)
++ {
++ caddr_t addr;
+++ unsigned long PAGE_MASK = ~(sysconf(_SC_PAGE_SIZE)-1);
++
++ Debug("fb_map()\n");
++ fb_start = (unsigned long)fb_fix.smem_start & PAGE_MASK;
++@@ -189,7 +190,7 @@
++ addr = mmap(NULL, fb_len, PROT_READ | PROT_WRITE, MAP_SHARED, fb_fd, 0);
++ if (addr == (caddr_t)-1)
++ Fatal("mmap smem: %s\n", strerror(errno));
++- fb = addr+fb_offset;
+++ fb = (u8*)(addr+fb_offset);
++ }
++
++
++@@ -199,6 +200,8 @@
++
++ void fb_unmap(void)
++ {
+++ unsigned long PAGE_MASK = ~(sysconf(_SC_PAGE_SIZE)-1);
+++
++ Debug("fb_unmap()\n");
++ if (munmap((caddr_t)((unsigned long)fb & PAGE_MASK), fb_len) == -1)
++ Fatal("munmap smem: %s\n", strerror(errno));
+Index: buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch 2010-06-19 00:01:03.000000000 +0200
+@@ -0,0 +1,11 @@
++--- fbtest-20041102-1.org/Makefile 2009-05-21 10:16:05.000000000 +0200
+++++ fbtest-20041102-1/Makefile 2009-05-21 10:17:47.000000000 +0200
++@@ -1,7 +1,7 @@
++
++ TOPDIR = .
++
++-TARGET = $(CROSS_COMPILE)fbtest
+++TARGET = fbtest
++
++ OBJS += drawops/drawops.o fonts/fonts.o images/images.o visops/visops.o \
++ tests/tests.o
diff --git a/patches/buildroot/2010.05/018-allegro.patch b/patches/buildroot/2010.05/018-allegro.patch
index 27462c5..2629af3 100644
--- a/patches/buildroot/2010.05/018-allegro.patch
+++ b/patches/buildroot/2010.05/018-allegro.patch
@@ -1,3 +1,7 @@
+Add allegro package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in 2010-06-17 16:45:46.000000000 +0200
@@ -10,3 +14,101 @@ Index: buildroot/package/Config.in
source "package/directfb/Config.in"
source "package/directfb-examples/Config.in"
source "package/divine/Config.in"
+Index: buildroot/package/allegro/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/allegro/Config.in 2010-06-18 21:14:34.000000000 +0200
+@@ -0,0 +1,13 @@
++config BR2_PACKAGE_ALLEGRO
++ bool "Allegro"
++ help
++ Allegro is a game programming library for C/C++ developers
++ distributed freely and supporting the following platforms:
++ DOS, Unix (Linux, FreeBSD, Irix, Solaris, Darwin), Windows, QNX,
++ BeOS and MacOS X.
++ It provides many functions for graphics, sounds, player input
++ (keyboard, mouse and joystick) and timers. It also provides fixed and
++ floating point mathematical functions, 3d functions, file management
++ functions, compressed datafile and a GUI.
++
++ http://alleg.sourceforge.net/
+Index: buildroot/package/allegro/allegro.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/allegro/allegro.mk 2010-06-18 21:28:35.000000000 +0200
+@@ -0,0 +1,75 @@
++#############################################################
++#
++# Allegro: a game programming library
++#
++#############################################################
++ALLEGRO_VERSION:=4.2.1
++ALLEGRO_SOURCE:=allegro-$(ALLEGRO_VERSION).tar.gz
++ALLEGRO_SITE:=http://downloads.sourceforge.net/alleg
++ALLEGRO_CAT:=zcat
++ALLEGRO_DIR:=$(BUILD_DIR)/allegro-$(ALLEGRO_VERSION)
++
++$(DL_DIR)/$(ALLEGRO_SOURCE):
++ $(call DOWNLOAD,$(ALLEGRO_SITE),$(ALLEGRO_SOURCE))
++
++allegro-source: $(DL_DIR)/$(ALLEGRO_SOURCE)
++
++$(ALLEGRO_DIR)/.unpacked: $(DL_DIR)/$(ALLEGRO_SOURCE)
++ $(ALLEGRO_CAT) $(DL_DIR)/$(ALLEGRO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ touch $@
++
++$(ALLEGRO_DIR)/.configured: $(ALLEGRO_DIR)/.unpacked
++ (cd $(ALLEGRO_DIR); \
++ $(TARGET_CONFIGURE_OPTS) \
++ CFLAGS="$(TARGET_CFLAGS)" \
++ LDFLAGS="$(TARGET_LDFLAGS)" \
++ CROSSCOMPILE=1 \
++ ./configure \
++ --target=$(GNU_TARGET_NAME) \
++ --host=$(GNU_TARGET_NAME) \
++ --build=$(GNU_HOST_NAME) \
++ --prefix=/usr \
++ --without-svgalib \
++ --enable-modules=no \
++ --enable-static=yes \
++ --enable-shared=no \
++ --disable-asm \
++ --disable-mmx \
++ --disable-sse \
++ --disable-color24 \
++ --disable-color32 \
++ --without-x );
++ touch $@
++# allegro doesn't seem to build as shared library
++# --disable-color24 \
++# --disable-color32 \
++
++$(ALLEGRO_DIR)/lib/unix/liballeg.a: $(ALLEGRO_DIR)/.configured
++ $(MAKE) -C $(ALLEGRO_DIR) CROSSCOMPILE=1
++ touch $@
++
++#$(STAGING_DIR)/usr/lib/liballeg.so: $(ALLEGRO_DIR)/lib/unix/liballeg.a
++# $(MAKE) -C $(ALLEGRO_DIR) install
++# touch -c $@
++#
++# $(TARGET_DIR)/usr/lib/liballeg.so.so: $(STAGING_DIR)/usr/lib/liballeg.so
++# cp -dpf $(STAGING_DIR)/usr/lib/liballeg*.so* $(TARGET_DIR)/usr/lib/
++# -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/liballeg.so
++
++ALLEGRO allegro: $(ALLEGRO_DIR)/lib/unix/liballeg.a
++
++allegro-clean:
++ $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(ALLEGRO_DIR) uninstall
++ -$(MAKE) -C $(ALLEGRO_DIR) clean
++
++allegro-dirclean:
++ rm -rf $(ALLEGRO_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_ALLEGRO)),y)
++TARGETS+=allegro
++endif
diff --git a/patches/buildroot/2010.05/041-fbgrab.patch b/patches/buildroot/2010.05/041-fbgrab.patch
index dc4ccea..bac886e 100644
--- a/patches/buildroot/2010.05/041-fbgrab.patch
+++ b/patches/buildroot/2010.05/041-fbgrab.patch
@@ -1,3 +1,7 @@
+Add fbgrab package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in 2010-06-17 16:46:21.000000000 +0200
@@ -10,3 +14,89 @@ Index: buildroot/package/Config.in
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/fbset/Config.in"
endif
+Index: buildroot/package/fbgrab/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbgrab/Config.in 2010-06-18 23:13:05.000000000 +0200
+@@ -0,0 +1,9 @@
++config BR2_PACKAGE_FBGRAB
++ bool "fbgrab"
++ select BR2_PACKAGE_LIBPNG
++ select BR2_PACKAGE_ZLIB
++ help
++ FBGrab is a framebuffer screenshot program, capturing the Linux
++ framebuffer and converting it to a png-picture.
++
++ http://hem.bredband.net/gmogmo/fbgrab/
+Index: buildroot/package/fbgrab/fbgrab.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbgrab/fbgrab.mk 2010-06-18 23:02:49.000000000 +0200
+@@ -0,0 +1,48 @@
++#############################################################
++#
++# FBGRAB
++#
++#############################################################
++FBGRAB_VERSION:=1.0
++FBGRAB_SOURCE:=fbgrab-$(FBGRAB_VERSION).tar.gz
++FBGRAB_SITE:=http://hem.bredband.net/gmogmo/fbgrab/
++FBGRAB_DIR:=$(BUILD_DIR)/fbgrab-$(FBGRAB_VERSION)
++FBGRAB_CAT:=$(ZCAT)
++FBGRAB_BINARY:=fbgrab
++FBGRAB_TARGET_BINARY:=usr/bin/$(FBGRAB_BINARY)
++
++$(DL_DIR)/$(FBGRAB_SOURCE):
++ $(call DOWNLOAD,$(FBGRAB_SITE),$(FBGRAB_SOURCE))
++
++$(FBGRAB_DIR)/.unpacked: $(DL_DIR)/$(FBGRAB_SOURCE)
++ $(FBGRAB_CAT) $(DL_DIR)/$(FBGRAB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ toolchain/patch-kernel.sh $(FBGRAB_DIR) package/fbgrab/ fbgrab-$(FBGRAB_VERSION)\*.patch\*
++ touch $@
++
++$(FBGRAB_DIR)/$(FBGRAB_BINARY): $(FBGRAB_DIR)/.unpacked
++ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(FBGRAB_DIR)
++ touch -c $@
++
++$(TARGET_DIR)/$(FBGRAB_TARGET_BINARY): $(FBGRAB_DIR)/$(FBGRAB_BINARY)
++ $(INSTALL) -m 755 $(FBGRAB_DIR)/$(FBGRAB_BINARY) $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
++ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
++ touch -c $@
++
++fbgrab: libpng zlib $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
++
++fbgrab-clean:
++ rm -f $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
++ -$(MAKE) -C $(FBGRAB_DIR) clean
++
++fbgrab-dirclean:
++ rm -rf $(FBGRAB_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_FBGRAB)),y)
++TARGETS+=fbgrab
++endif
++
+Index: buildroot/package/fbgrab/fbgrab-1.0-make_it_cross-compile.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbgrab/fbgrab-1.0-make_it_cross-compile.patch 2010-06-18 23:07:20.000000000 +0200
+@@ -0,0 +1,14 @@
++diff -urN fbgrab-1.0/Makefile fbgrab-1.0.mod/Makefile
++--- fbgrab-1.0/Makefile 2002-03-20 20:49:06.000000000 +0100
+++++ fbgrab-1.0.mod/Makefile 2008-06-06 21:42:56.000000000 +0200
++@@ -4,8 +4,8 @@
++ ###
++
++ fbgrab: fbgrab.c
++- splint +posixlib fbgrab.c
++- gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab
+++ #splint +posixlib fbgrab.c
+++ $(CC) -Wall fbgrab.c -lpng -lz -o fbgrab
++
++ install:
++ strip fbgrab
diff --git a/patches/buildroot/2010.05/119-fbtest-add_package.patch b/patches/buildroot/2010.05/119-fbtest-add_package.patch
new file mode 100644
index 0000000..5ddfb1e
--- /dev/null
+++ b/patches/buildroot/2010.05/119-fbtest-add_package.patch
@@ -0,0 +1,141 @@
+Add fbtest package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-18 23:44:05.000000000 +0200
++++ buildroot/package/Config.in 2010-06-18 23:49:19.000000000 +0200
+@@ -344,6 +344,7 @@
+ comment "--> May be broken in busybox"
+ source "package/fbv/Config.in"
+ source "package/fbset/Config.in"
++source "package/fbtest/Config.in"
+ source "package/fbgrab/Config.in"
+
+ comment "other GUIs"
+Index: buildroot/package/fbtest/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbtest/Config.in 2010-06-18 23:51:27.000000000 +0200
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_FBTEST
++ bool "fbtest"
++ help
++ Fbtest is a collection of tests for the framebuffer device.
++ All tests are gathered inside the same executable.
++
++ http://linux-fbdev.cvs.sourceforge.net/viewvc/linux-fbdev/fbtest/
+Index: buildroot/package/fbtest/fbtest.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbtest/fbtest.mk 2010-06-18 23:56:39.000000000 +0200
+@@ -0,0 +1,51 @@
++#############################################################
++#
++# fbtest
++#
++#############################################################
++FBTEST_VERSION:=20041102-1
++FBTEST_SOURCE:=fbtest-$(FBTEST_VERSION).tar.gz
++FBTEST_SITE:=http://www.pengutronix.de/software/ptxdist/temporary-src/
++FBTEST_DIR:=$(BUILD_DIR)/fbtest-$(FBTEST_VERSION)
++FBTEST_CAT:=$(ZCAT)
++FBTEST_BINARY:=fbtest
++FBTEST_TARGET_BINARY:=usr/bin/$(FBTEST_BINARY)
++
++$(DL_DIR)/$(FBTEST_SOURCE):
++ $(call DOWNLOAD,$(FBTEST_SITE),$(FBTEST_SOURCE))
++
++$(FBTEST_DIR)/.unpacked: $(DL_DIR)/$(FBTEST_SOURCE)
++ $(FBTEST_CAT) $(DL_DIR)/$(FBTEST_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ toolchain/patch-kernel.sh $(FBTEST_DIR) package/fbtest/ \
++ fbtest-$(FBTEST_VERSION)\*.patch \
++ fbtest-$(FBTEST_VERSION)\*.patch.$(ARCH)
++ touch $@
++
++$(FBTEST_DIR)/$(FBTEST_BINARY): $(FBTEST_DIR)/.unpacked
++ $(MAKE1) ARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) -C $(FBTEST_DIR)
++ touch -c $@
++
++$(TARGET_DIR)/$(FBTEST_TARGET_BINARY): $(FBTEST_DIR)/$(FBTEST_BINARY)
++ $(INSTALL) -m 755 $(FBTEST_DIR)/$(FBTEST_BINARY) $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
++ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
++ touch -c $@
++
++fbtest: $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
++
++fbtest-source: $(DL_DIR)/$(FBTEST_SOURCE)
++
++fbtest-clean:
++ rm -f $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
++ -$(MAKE) -C $(FBTEST_DIR) clean
++
++fbtest-dirclean:
++ rm -rf $(FBTEST_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_FBTEST)),y)
++TARGETS+=fbtest
++endif
+Index: buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch 2010-06-18 23:56:15.000000000 +0200
+@@ -0,0 +1,36 @@
++--- fbtest-20041102-1.org/fb.c 2003-04-04 14:07:55.000000000 +0200
+++++ fbtest-20041102-1/fb.c 2009-05-20 10:32:32.000000000 +0200
++@@ -19,7 +19,6 @@
++ #include <sys/stat.h>
++ #include <unistd.h>
++
++-#include <asm/page.h>
++
++ #include "types.h"
++ #include "fb.h"
++@@ -179,6 +179,7 @@
++ void fb_map(void)
++ {
++ caddr_t addr;
+++ unsigned long PAGE_MASK = ~(sysconf(_SC_PAGE_SIZE)-1);
++
++ Debug("fb_map()\n");
++ fb_start = (unsigned long)fb_fix.smem_start & PAGE_MASK;
++@@ -189,7 +190,7 @@
++ addr = mmap(NULL, fb_len, PROT_READ | PROT_WRITE, MAP_SHARED, fb_fd, 0);
++ if (addr == (caddr_t)-1)
++ Fatal("mmap smem: %s\n", strerror(errno));
++- fb = addr+fb_offset;
+++ fb = (u8*)(addr+fb_offset);
++ }
++
++
++@@ -199,6 +200,8 @@
++
++ void fb_unmap(void)
++ {
+++ unsigned long PAGE_MASK = ~(sysconf(_SC_PAGE_SIZE)-1);
+++
++ Debug("fb_unmap()\n");
++ if (munmap((caddr_t)((unsigned long)fb & PAGE_MASK), fb_len) == -1)
++ Fatal("munmap smem: %s\n", strerror(errno));
+Index: buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch 2010-06-19 00:01:03.000000000 +0200
+@@ -0,0 +1,11 @@
++--- fbtest-20041102-1.org/Makefile 2009-05-21 10:16:05.000000000 +0200
+++++ fbtest-20041102-1/Makefile 2009-05-21 10:17:47.000000000 +0200
++@@ -1,7 +1,7 @@
++
++ TOPDIR = .
++
++-TARGET = $(CROSS_COMPILE)fbtest
+++TARGET = fbtest
++
++ OBJS += drawops/drawops.o fonts/fonts.o images/images.o visops/visops.o \
++ tests/tests.o
diff --git a/patches/buildroot/2010.05/cleanup_buildroot.sh b/patches/buildroot/2010.05/cleanup_buildroot.sh
index cd13a2a..02cd628 100755
--- a/patches/buildroot/2010.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.05/cleanup_buildroot.sh
@@ -35,3 +35,6 @@ rm -rf buildroot/package/socketcan/
rm -rf buildroot/package/lcd4linux/
rm -rf buildroot/package/mesa/
rm -rf buildroot/package/games/snes9x/
+rm -rf buildroot/package/allegro/
+rm -rf buildroot/package/fbgrab/
+rm -rf buildroot/package/fbtest/
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index 7ae130f..1508065 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -31,7 +31,7 @@ rm -rf buildroot/package/lmbench/
rm -rf buildroot/package/tslib/
rm -rf buildroot/package/openssh/
rm -rf buildroot/package/sdl/
-rm -rf buildroot/package/sdl-water/
+rm -rf buildroot/package/sdlwater/
rm -rf buildroot/package/slideshow/
rm -rf buildroot/package/pyserial/
rm -rf buildroot/package/pymysql/
@@ -39,3 +39,6 @@ rm -rf buildroot/package/socketcan/
rm -rf buildroot/package/lcd4linux/
rm -rf buildroot/package/mesa/
rm -rf buildroot/package/games/snes9x/
+rm -rf buildroot/package/allegro/
+rm -rf buildroot/package/fbgrab/
+rm -rf buildroot/package/fbtest/
hooks/post-receive
--
armadeus
|
