From b7f3788fa60588761232696940332b6ae2a9c4f6 Mon Sep 17 00:00:00 2001
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Thu, 23 Apr 2009 17:11:47 +0400
Subject: site/powerpc-common: add ac_cv_va_val_copy result

On powerpc it's not posible to assign va_arg by value, so
cache ac_cv_va_val_copy=no

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 site/powerpc-common | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/powerpc-common b/site/powerpc-common
index 7a988b16bd..cc523bccc6 100644
--- a/site/powerpc-common
+++ b/site/powerpc-common
@@ -36,6 +36,7 @@ ac_cv_time_r_type=${ac_cv_time_r_type=POSIX}
 cookie_io_functions_use_off64_t=${cookie_io_functions_use_off64_t=yes}
 ac_cv_va_copy=${ac_cv_va_copy=yes}
 ac_cv___va_copy=${ac_cv___va_copy=yes}
+ac_cv_va_val_copy=${ac_cv_va_val_copy=no}
 
 # apache
 ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes}
-- 
cgit v1.2.3


From c8e1d3d2d8e335d3cc5d4cdbb832d93863a2b137 Mon Sep 17 00:00:00 2001
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Thu, 23 Apr 2009 17:17:32 +0400
Subject: u-boot: fix compilation for at91sam9g20ek boards

Fix the naming of config inside machine conf file and provide a patch
that make u-boot compile for at91sam9g20ek boards.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 conf/machine/at91sam9g20ek.conf                    |   2 +-
 .../u-boot-2009.01/at91sam9g20-fix-config.patch    | 274 +++++++++++++++++++++
 recipes/u-boot/u-boot_2009.01.bb                   |   6 +
 3 files changed, 281 insertions(+), 1 deletion(-)
 create mode 100644 recipes/u-boot/u-boot-2009.01/at91sam9g20-fix-config.patch

diff --git a/conf/machine/at91sam9g20ek.conf b/conf/machine/at91sam9g20ek.conf
index df19389d9f..903e953b13 100644
--- a/conf/machine/at91sam9g20ek.conf
+++ b/conf/machine/at91sam9g20ek.conf
@@ -10,7 +10,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 KERNEL_IMAGETYPE = "uImage"
 PREFERRED_VERSION_u-boot = "2009.01"
-UBOOT_MACHINE = "at92sam9g20ek_config"
+UBOOT_MACHINE = "at91sam9g20ek_config"
 
 PREFERRED_VERSION_at91bootstrap = "2.10"
 
diff --git a/recipes/u-boot/u-boot-2009.01/at91sam9g20-fix-config.patch b/recipes/u-boot/u-boot-2009.01/at91sam9g20-fix-config.patch
new file mode 100644
index 0000000000..473e065523
--- /dev/null
+++ b/recipes/u-boot/u-boot-2009.01/at91sam9g20-fix-config.patch
@@ -0,0 +1,274 @@
+Index: u-boot-2009.01/include/configs/at91sam9g20ek.h
+===================================================================
+--- u-boot-2009.01.orig/include/configs/at91sam9g20ek.h	2009-04-23 16:52:46.586815368 +0400
++++ u-boot-2009.01/include/configs/at91sam9g20ek.h	2009-04-23 16:52:56.062814967 +0400
+@@ -28,9 +28,12 @@
+ #define __CONFIG_H
+ 
+ /* ARM asynchronous clock */
+-#define AT91_MAIN_CLOCK		396288000	/* from 18.432 MHz crystal */
++#define AT91_CPU_NAME		"AT91SAM9G20"
++#define AT91_MAIN_CLOCK		18432000	/* 18.432 MHz crystal */
+ #define AT91_MASTER_CLOCK	132096000	/* peripheral = main / 3 */
+-#define CFG_HZ			1000000		/* 1us resolution */
++#define AT91_CPU_CLOCK		396000000	/* cpu */
++#define CONFIG_SYS_AT91_PLLB	0x107c3e18	/* PLLB settings for USB */
++#define CONFIG_SYS_HZ		1000000		/* 1us resolution */
+ 
+ #define AT91_SLOW_CLOCK		32768	/* slow clock */
+ 
+@@ -88,22 +91,22 @@
+ 
+ /* DataFlash */
+ #define CONFIG_HAS_DATAFLASH		1
+-#define CFG_SPI_WRITE_TOUT		(5*CFG_HZ)
+-#define CFG_MAX_DATAFLASH_BANKS		2
+-#define CFG_DATAFLASH_LOGIC_ADDR_CS0	0xC0000000	/* CS0 */
+-#define CFG_DATAFLASH_LOGIC_ADDR_CS1	0xD0000000	/* CS1 */
++#define CONFIG_SYS_SPI_WRITE_TOUT		(5*CONFIG_SYS_HZ)
++#define CONFIG_SYS_MAX_DATAFLASH_BANKS		2
++#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0	0xC0000000	/* CS0 */
++#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1	0xD0000000	/* CS1 */
+ #define AT91_SPI_CLK			15000000
+ #define DATAFLASH_TCSS			(0x22 << 16)
+ #define DATAFLASH_TCHS			(0x1 << 24)
+ 
+ /* NAND flash */
+ #define NAND_MAX_CHIPS			1
+-#define CFG_MAX_NAND_DEVICE		1
+-#define CFG_NAND_BASE			0x40000000
+-#define CFG_NAND_DBW_8			1
++#define CONFIG_SYS_MAX_NAND_DEVICE		1
++#define CONFIG_SYS_NAND_BASE			0x40000000
++#define CONFIG_SYS_NAND_DBW_8			1
+ 
+ /* NOR flash - no real flash on this board */
+-#define CFG_NO_FLASH			1
++#define CONFIG_SYS_NO_FLASH			1
+ 
+ /* Ethernet */
+ #define CONFIG_MACB			1
+@@ -116,52 +119,53 @@
+ #define CONFIG_USB_OHCI_NEW		1
+ #define LITTLEENDIAN			1
+ #define CONFIG_DOS_PARTITION		1
+-#define CFG_USB_OHCI_CPU_INIT		1
+-#define CFG_USB_OHCI_REGS_BASE		0x00500000	/* AT91SAM9G20_UHP_BASE */
+-#define CFG_USB_OHCI_SLOT_NAME		"at91sam9g20"
+-#define CFG_USB_OHCI_MAX_ROOT_PORTS	2
++#define CONFIG_SYS_USB_OHCI_CPU_INIT		1
++#define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00500000	/* AT91SAM9G20_UHP_BASE */
++#define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91sam9g20"
++#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2
+ #define CONFIG_USB_STORAGE		1
++#define CONFIG_CMD_FAT			1
+ 
+-#define CFG_LOAD_ADDR			0x22000000	/* load address */
++#define CONFIG_SYS_LOAD_ADDR			0x22000000	/* load address */
+ 
+-#define CFG_MEMTEST_START		PHYS_SDRAM
+-#define CFG_MEMTEST_END			0x23e00000
++#define CONFIG_SYS_MEMTEST_START		PHYS_SDRAM
++#define CONFIG_SYS_MEMTEST_END			0x23e00000
+ 
+-#ifdef CFG_USE_DATAFLASH_CS0
++#ifdef CONFIG_SYS_USE_DATAFLASH_CS0
+ 
+ /* bootstrap + u-boot + env + linux in dataflash on CS0 */
+-#define CFG_ENV_IS_IN_DATAFLASH	1
+-#define CFG_MONITOR_BASE	(CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
+-#define CFG_ENV_OFFSET		0x4200
+-#define CFG_ENV_ADDR		(CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
+-#define CFG_ENV_SIZE		0x4200
++#define CONFIG_ENV_IS_IN_DATAFLASH	1
++#define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
++#define CONFIG_ENV_OFFSET		0x4200
++#define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
++#define CONFIG_ENV_SIZE		0x4200
+ #define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
+ #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
+ 				"root=/dev/mtdblock0 "			\
+ 				"mtdparts=at91_nand:-(root) "		\
+ 				"rw rootfstype=jffs2"
+ 
+-#elif CFG_USE_DATAFLASH_CS1
++#elif CONFIG_SYS_USE_DATAFLASH_CS1
+ 
+ /* bootstrap + u-boot + env + linux in dataflash on CS1 */
+-#define CFG_ENV_IS_IN_DATAFLASH	1
+-#define CFG_MONITOR_BASE	(CFG_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
+-#define CFG_ENV_OFFSET		0x4200
+-#define CFG_ENV_ADDR		(CFG_DATAFLASH_LOGIC_ADDR_CS1 + CFG_ENV_OFFSET)
+-#define CFG_ENV_SIZE		0x4200
++#define CONFIG_ENV_IS_IN_DATAFLASH	1
++#define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
++#define CONFIG_ENV_OFFSET		0x4200
++#define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + CONFIG_ENV_OFFSET)
++#define CONFIG_ENV_SIZE		0x4200
+ #define CONFIG_BOOTCOMMAND	"cp.b 0xD0042000 0x22000000 0x210000; bootm"
+ #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
+ 				"root=/dev/mtdblock0 "			\
+ 				"mtdparts=at91_nand:-(root) "		\
+ 				"rw rootfstype=jffs2"
+ 
+-#else /* CFG_USE_NANDFLASH */
++#else /* CONFIG_SYS_USE_NANDFLASH */
+ 
+ /* bootstrap + u-boot + env + linux in nandflash */
+-#define CFG_ENV_IS_IN_NAND	1
+-#define CFG_ENV_OFFSET		0x60000
+-#define CFG_ENV_OFFSET_REDUND	0x80000
+-#define CFG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */
++#define CONFIG_ENV_IS_IN_NAND	1
++#define CONFIG_ENV_OFFSET		0x60000
++#define CONFIG_ENV_OFFSET_REDUND	0x80000
++#define CONFIG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */
+ #define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0xA0000 0x200000; bootm"
+ #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
+ 				"root=/dev/mtdblock5 "			\
+@@ -173,21 +177,21 @@
+ #endif
+ 
+ #define CONFIG_BAUDRATE		115200
+-#define CFG_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
++#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
+ 
+-#define CFG_PROMPT		"U-Boot> "
+-#define CFG_CBSIZE		256
+-#define CFG_MAXARGS		16
+-#define CFG_PBSIZE		(CFG_CBSIZE + sizeof(CFG_PROMPT) + 16)
+-#define CFG_LONGHELP		1
++#define CONFIG_SYS_PROMPT		"U-Boot> "
++#define CONFIG_SYS_CBSIZE		256
++#define CONFIG_SYS_MAXARGS		16
++#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
++#define CONFIG_SYS_LONGHELP		1
+ #define CONFIG_CMDLINE_EDITING	1
+ 
+ #define ROUND(A, B)		(((A) + (B)) & ~((B) - 1))
+ /*
+  * Size of malloc() pool
+  */
+-#define CFG_MALLOC_LEN		ROUND(3 * CFG_ENV_SIZE + 128*1024, 0x1000)
+-#define CFG_GBL_DATA_SIZE	128	/* 128 bytes for initial data */
++#define CONFIG_SYS_MALLOC_LEN		ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000)
++#define CONFIG_SYS_GBL_DATA_SIZE	128	/* 128 bytes for initial data */
+ 
+ #define CONFIG_STACKSIZE	(32*1024)	/* regular stack */
+ 
+Index: u-boot-2009.01/board/atmel/at91sam9g20ek/at91sam9g20ek.c
+===================================================================
+--- u-boot-2009.01.orig/board/atmel/at91sam9g20ek/at91sam9g20ek.c	2009-04-23 16:52:46.602814682 +0400
++++ u-boot-2009.01/board/atmel/at91sam9g20ek/at91sam9g20ek.c	2009-04-23 16:52:56.066814644 +0400
+@@ -33,6 +33,7 @@
+ #if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
+ #include <net.h>
+ #endif
++#include <netdev.h>
+ 
+ DECLARE_GLOBAL_DATA_PTR;
+ 
+@@ -90,9 +91,9 @@
+ 	at91_sys_write(AT91_SMC_MODE(3),
+ 		       AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
+ 		       AT91_SMC_EXNWMODE_DISABLE |
+-#ifdef CFG_NAND_DBW_16
++#ifdef CONFIG_SYS_NAND_DBW_16
+ 		       AT91_SMC_DBW_16 |
+-#else /* CFG_NAND_DBW_8 */
++#else /* CONFIG_SYS_NAND_DBW_8 */
+ 		       AT91_SMC_DBW_8 |
+ #endif
+ 		       AT91_SMC_TDF_(3));
+@@ -253,7 +254,7 @@
+ {
+ 	int rc = 0;
+ #ifdef CONFIG_MACB
+-	rc = macb_eth_initialize(0, (void *)AT91_BASE_EMAC, 0x00);
++	rc = macb_eth_initialize(0, (void *)AT91SAM9260_BASE_EMAC, 0x00);
+ #endif
+ 	return rc;
+ }
+Index: u-boot-2009.01/board/atmel/at91sam9g20ek/nand.c
+===================================================================
+--- u-boot-2009.01.orig/board/atmel/at91sam9g20ek/nand.c	2009-04-23 16:52:46.614814115 +0400
++++ u-boot-2009.01/board/atmel/at91sam9g20ek/nand.c	2009-04-23 16:52:56.066814644 +0400
+@@ -37,27 +37,26 @@
+ #define	MASK_ALE	(1 << 21)	/* our ALE is AD21 */
+ #define	MASK_CLE	(1 << 22)	/* our CLE is AD22 */
+ 
+-static void at91sam9g20ek_nand_hwcontrol(struct mtd_info *mtd, int cmd)
++static void at91sam9g20ek_nand_hwcontrol(struct mtd_info *mtd,
++					 int cmd, unsigned int ctrl)
+ {
+ 	struct nand_chip *this = mtd->priv;
+-	ulong IO_ADDR_W = (ulong) this->IO_ADDR_W;
+ 
+-	IO_ADDR_W &= ~(MASK_ALE|MASK_CLE);
+-	switch (cmd) {
+-	case NAND_CTL_SETCLE:
+-		IO_ADDR_W |= MASK_CLE;
+-		break;
+-	case NAND_CTL_SETALE:
+-		IO_ADDR_W |= MASK_ALE;
+-		break;
+-	case NAND_CTL_CLRNCE:
+-		at91_set_gpio_value(AT91_PIN_PC14, 1);
+-		break;
+-	case NAND_CTL_SETNCE:
+-		at91_set_gpio_value(AT91_PIN_PC14, 0);
+-		break;
++	if (ctrl & NAND_CTRL_CHANGE) {
++		ulong IO_ADDR_W = (ulong) this->IO_ADDR_W;
++		IO_ADDR_W &= ~(MASK_ALE | MASK_CLE);
++
++		if (ctrl & NAND_CLE)
++			IO_ADDR_W |= MASK_CLE;
++		if (ctrl & NAND_ALE)
++			IO_ADDR_W |= MASK_ALE;
++
++		at91_set_gpio_value(AT91_PIN_PC14, !(ctrl & NAND_NCE));
++		this->IO_ADDR_W = (void *) IO_ADDR_W;
+ 	}
+-	this->IO_ADDR_W = (void *) IO_ADDR_W;
++
++	if (cmd != NAND_CMD_NONE)
++		writeb(cmd, this->IO_ADDR_W);
+ }
+ 
+ static int at91sam9g20ek_nand_ready(struct mtd_info *mtd)
+@@ -67,11 +66,11 @@
+ 
+ int board_nand_init(struct nand_chip *nand)
+ {
+-	nand->eccmode = NAND_ECC_SOFT;
+-#ifdef CFG_NAND_DBW_16
++	nand->ecc.mode = NAND_ECC_SOFT;
++#ifdef CONFIG_SYS_NAND_DBW_16
+ 	nand->options = NAND_BUSWIDTH_16;
+ #endif
+-	nand->hwcontrol = at91sam9g20ek_nand_hwcontrol;
++	nand->cmd_ctrl = at91sam9g20ek_nand_hwcontrol;
+ 	nand->dev_ready = at91sam9g20ek_nand_ready;
+ 	nand->chip_delay = 20;
+ 
+Index: u-boot-2009.01/board/atmel/at91sam9g20ek/partition.c
+===================================================================
+--- u-boot-2009.01.orig/board/atmel/at91sam9g20ek/partition.c	2009-04-23 16:52:46.634814571 +0400
++++ u-boot-2009.01/board/atmel/at91sam9g20ek/partition.c	2009-04-23 16:52:56.066814644 +0400
+@@ -23,11 +23,11 @@
+ #include <asm/hardware.h>
+ #include <dataflash.h>
+ 
+-AT91S_DATAFLASH_INFO dataflash_info[CFG_MAX_DATAFLASH_BANKS];
++AT91S_DATAFLASH_INFO dataflash_info[CONFIG_SYS_MAX_DATAFLASH_BANKS];
+ 
+-struct dataflash_addr cs[CFG_MAX_DATAFLASH_BANKS] = {
+-	{CFG_DATAFLASH_LOGIC_ADDR_CS0, 0},	/* Logical adress, CS */
+-	{CFG_DATAFLASH_LOGIC_ADDR_CS1, 1}
++struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
++	{CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0, 0},	/* Logical adress, CS */
++	{CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1, 1}
+ };
+ 
+ /*define the area offsets*/
diff --git a/recipes/u-boot/u-boot_2009.01.bb b/recipes/u-boot/u-boot_2009.01.bb
index fd1801a29b..e0839c923e 100644
--- a/recipes/u-boot/u-boot_2009.01.bb
+++ b/recipes/u-boot/u-boot_2009.01.bb
@@ -23,6 +23,12 @@ SRC_URI_append_at91sam9263ek = "\
 	   file://u-boot-2009.01-exp-003-drivers-net-macb.c.patch;patch=1 \
            "
 
+SRC_URI_append_at91sam9g20ek = "\
+	   file://u-boot-2009.01-exp-002-at91sam9g20ek.patch;patch=1 \
+	   file://u-boot-2009.01-exp-003-drivers-net-macb.c.patch;patch=1 \
+           file://at91sam9g20-fix-config.patch;patch=1 \
+           "
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 PARALLEL_MAKE = ""
 
-- 
cgit v1.2.3


From 5fdfa25604069c306cdbfbedf51277534c3b9e9f Mon Sep 17 00:00:00 2001
From: Denis 'Gnutoo' Carikli <GNUtoo@no-log.org>
Date: Thu, 23 Apr 2009 16:29:52 +0200
Subject: gtk+-2.8.16 : fixed problematic " in SRC_URI: there was a
 suplementary " in SRC_URI that made it fail at: run.staging_helper.16868:
 line 869: syntax error near unexpected token `else'

---
 recipes/gtk+/gtk+_2.8.16.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/gtk+/gtk+_2.8.16.bb b/recipes/gtk+/gtk+_2.8.16.bb
index fd25122d5c..8eac914ed6 100644
--- a/recipes/gtk+/gtk+_2.8.16.bb
+++ b/recipes/gtk+/gtk+_2.8.16.bb
@@ -22,7 +22,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \
 	   file://scroll-timings.patch;patch=1 \
 	   file://small-gtkfilesel.patch;patch=1 \
 	   file://migration.patch;patch=1;pnum=0 \
-	   file://no-demos.patch;patch=1" \
+	   file://no-demos.patch;patch=1 \
 	   file://gtk+-handhelds.patch;patch=1 \
 	   file://single-click.patch;patch=1"
 
-- 
cgit v1.2.3


From b0775dcad53b678235842eb18253b50c772d27a0 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 23 Apr 2009 20:37:30 +0200
Subject: angstrom feed sorter: add support for a few more machines

---
 contrib/angstrom/sort.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh
index dc4c1863a2..a1a4882480 100755
--- a/contrib/angstrom/sort.sh
+++ b/contrib/angstrom/sort.sh
@@ -46,15 +46,15 @@ case "$arch" in
 	"arm-oabi")
 			machines="h3600 h3800 collie simpad htcwallaby" ;;
 	"armv4t")
-			machines="ep93xx h6300 om-gta01 om-gta02 fic-gta01 fic-gta02" ;;
+			machines="micro2440 ep93xx h6300 om-gta01 om-gta02 fic-gta01 fic-gta02" ;;
 	"armv5te")
-			machines="sheevaplug dm355-leopard n2100 dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa" ;;
+			machines="topas910 sheevaplug dm355-leopard n2100 dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa" ;;
 	"armv5teb")
 			machines="ixp4xxbe nslu2be" ;;
 	"armv6-novfp")
 			machines="htcdiamond htckaiser htcpolaris htcraphael htcvogue" ;;	
 	"armv6")	
-			machines="mx31ads nokia800 " ;;
+			machines="bug mx31ads nokia800 " ;;
 	"armv7")
 			machines="" ;;
 	"armv7a")
@@ -150,6 +150,8 @@ echo "Processing 'all' feed"
 for i in `find . -name  "*.ipk"| grep _all` ; do mkdir -p ../all/ || true ;mv $i ../all/ ; done
  (mkdir -p ../all ; cd ../all && ipkg-make-index -p Packages -m . >& /dev/null ; touch Packages.sig )  
 
+rm *x86_64*
+
 for arch in arm-oabi armv4t armv5teb armv5te armv6-novfp armv6 armv7a armv7 avr32 bfin geode i486 i586 i686 iwmmxt ppc405 ppc603e sparc ; do 
 	do_sort
 done
-- 
cgit v1.2.3


From 0bdb7654c8a9b9850db27e5f6b4a746fb1083ed1 Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@embeddedalley.com>
Date: Thu, 23 Apr 2009 15:07:52 -0400
Subject: fbv: Add a framebuffer-based png viewer. bmp/gif is supported but
 disabled.

---
 conf/checksums.ini                       |  4 ++++
 recipes/fbv/fbv-1.0b/cross_compile.patch | 41 ++++++++++++++++++++++++++++++++
 recipes/fbv/fbv_1.0b.bb                  | 25 +++++++++++++++++++
 3 files changed, 70 insertions(+)
 create mode 100644 recipes/fbv/fbv-1.0b/cross_compile.patch
 create mode 100644 recipes/fbv/fbv_1.0b.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index f4ee6537d9..3e621fce0a 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -5854,6 +5854,10 @@ sha256=517fa062d7b2d367f931a1c6ebb2bef84907077f0ce3f0c899e34490bbea9338
 md5=e97c609af171cceb85d08f366406374a
 sha256=112ba595859ad6e42f5ad522ada27a08da7702e3ea8c84df48ae1c5d6177ae8e
 
+[http://s-tech.elsat.net.pl/fbv/fbv-1.0b.tar.gz]
+md5=3e466375b930ec22be44f1041e77b55d
+sha256=9b55b9dafd5eb01562060d860e267e309a1876e8ba5ce4d3303484b94129ab3c
+
 [http://sdgsystems.com/download/fbvncserver-0.9.4.tar.gz]
 md5=01a37f17857641253541307f59dd8cc5
 sha256=e22ed10ecba059904649f344be260512fdb3cbecbd95ca965f8b5cc3ea1785b5
diff --git a/recipes/fbv/fbv-1.0b/cross_compile.patch b/recipes/fbv/fbv-1.0b/cross_compile.patch
new file mode 100644
index 0000000000..df8be13b60
--- /dev/null
+++ b/recipes/fbv/fbv-1.0b/cross_compile.patch
@@ -0,0 +1,41 @@
+---
+ configure |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Index: fbv-1.0b/configure
+===================================================================
+--- fbv-1.0b.orig/configure
++++ fbv-1.0b/configure
+@@ -106,12 +106,12 @@ xdir="/usr/X11R6"
+ ungif="no"
+ echo "libungif check" >>./config.log
+ echo "  1st:" >>./config.log
+-cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs
++${CC} 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs
+ if [ -e \$\$~test ]; then
+ 	libs="-lungif $libs" ; ungif="yes"
+ else
+ 	echo "  2nd: -lX11 -L$xdir/lib" >>./config.log
+-	cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs
++	${CC} 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs
+ 	if [ -e \$\$~test ]; then
+ 	libs="-lungif -lX11 -L$xdir/lib $libs" ; ungif="yes"
+ 	fi
+@@ -124,7 +124,7 @@ echo "libungif: $ungif" >> ./config.log
+ echo -n "checking for libjpeg presence... "
+ if [ "$jpeg" != "disabled" ]; then
+ jpeg="no"
+-cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs
++${CC} 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs
+ if [ -e \$\$~test ]; then
+ 	libs="-ljpeg $libs" ; jpeg="yes"
+ fi
+@@ -135,7 +135,7 @@ echo "libjpeg: $jpeg" >> ./config.log
+ echo -n "checking for libpng presence... "
+ if [ "$png" != "disabled" ]; then
+ png="no"
+-cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs
++${CC} 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs
+ if [ -e \$\$~test ]; then
+ 	libs="-lpng $libs" ; png="yes"
+ fi
diff --git a/recipes/fbv/fbv_1.0b.bb b/recipes/fbv/fbv_1.0b.bb
new file mode 100644
index 0000000000..04c70661d6
--- /dev/null
+++ b/recipes/fbv/fbv_1.0b.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Frame Buffer Viewer"
+LICENSE = "GPL"
+DEPENDS = "libpng"
+PR = "r1"
+
+SRC_URI = "http://s-tech.elsat.net.pl/fbv/fbv-1.0b.tar.gz \
+	   file://cross_compile.patch;patch=1"
+
+do_configure() {
+	CC="${CC}" ./configure --without-libungif --without-bmp \
+		--without-libjpeg
+}
+
+do_compile() {
+	oe_runmake CFLAGS="-O2 -Wall -D_GNU_SOURCE -D__KERNEL_STRICT_NAMES" \
+		CC="${CC}"
+}
+do_install() {
+	install -d ${D}${bindir}
+        install -m 0755 fbv ${D}${bindir}
+
+        # man
+        install -d ${D}${mandir}/man1/
+        install -m 0644 fbv.1 ${D}${mandir}/man1/fbv.1
+}
-- 
cgit v1.2.3


From 9ce2add5af0a4c21a6255b3fd235d99cb9722cf4 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Thu, 23 Apr 2009 21:06:44 +0000
Subject: man: GNU_HASH QA fix.

---
 recipes/man/man_1.5p.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes/man/man_1.5p.bb b/recipes/man/man_1.5p.bb
index 2a1ed7fd72..c3412a5806 100644
--- a/recipes/man/man_1.5p.bb
+++ b/recipes/man/man_1.5p.bb
@@ -14,13 +14,14 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/man/man-${PV}.tar.bz2 \
 # Disable parallel make or it tries to link objects before they are built
 PARALLEL_MAKE = ""
 
-EXTRA_OEMAKE = ""
+EXTRA_OEMAKE = 'LFDLAGS="${LDFLAGS}"'
 GS = "-DGREPSILENT=\"q\""
 DEFS = "-DUSG -DDO_COMPRESS ${GS}"
 
 do_configure() {
 	# this doesn't support cross compilation, so it generates a
 	# bogus configuration
+	sed -i /^LDFLAGS/d src/Makefile.in
 	./configure -d -confdir ${sysconfdir}
 }
 
-- 
cgit v1.2.3


From f822ec3f5a0820addc1025a132ae27fa43b11c9f Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Thu, 23 Apr 2009 23:46:21 +0200
Subject: console-base-image,console-image,gnuradio-image: readd psplash-zap  -
 for distros without psplash keep the old behaviour and check 'screen'

---
 recipes/images/console-base-image.bb | 8 +++++---
 recipes/images/console-image.bb      | 8 +++++---
 recipes/images/gnuradio-image.bb     | 8 +++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/recipes/images/console-base-image.bb b/recipes/images/console-base-image.bb
index 93391c6776..d25a4fc79e 100644
--- a/recipes/images/console-base-image.bb
+++ b/recipes/images/console-base-image.bb
@@ -4,18 +4,20 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
 ANGSTROM_EXTRA_INSTALL ?= ""
 
-SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}'
+SPLASH ?= ""
+ZZAPSPLASH = ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}'
 
 DEPENDS = "task-base \
            ${SPLASH} \
+           ${ZZAPSPLASH} \
 	   "
 
 IMAGE_INSTALL = "task-base \
 	    ${ANGSTROM_EXTRA_INSTALL} \
 	    ${SPLASH} \
-	   "
+	    ${ZZAPSPLASH} \
+	    "
 
 IMAGE_LINGUAS = ""
 
 inherit image
-
diff --git a/recipes/images/console-image.bb b/recipes/images/console-image.bb
index e30793b05f..9707881402 100644
--- a/recipes/images/console-image.bb
+++ b/recipes/images/console-image.bb
@@ -4,19 +4,21 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
 ANGSTROM_EXTRA_INSTALL ?= ""
 
-SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}'
+SPLASH ?= ""
+ZZAPSPLASH = ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}'
 
 DEPENDS = "task-base-extended \
            ${SPLASH} \
+           ${ZZAPSPLASH} \
 	   "
 
 IMAGE_INSTALL = "task-base-extended \
 	    ${ANGSTROM_EXTRA_INSTALL} \
 	    ${SPLASH} \
-	   "
+	    ${ZZAPSPLASH} \
+	    "
 
 export IMAGE_BASENAME = "console-image"
 IMAGE_LINGUAS = ""
 
 inherit image
-
diff --git a/recipes/images/gnuradio-image.bb b/recipes/images/gnuradio-image.bb
index ce4f4997eb..53e79b8a1a 100644
--- a/recipes/images/gnuradio-image.bb
+++ b/recipes/images/gnuradio-image.bb
@@ -4,25 +4,27 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
 IMAGE_EXTRA_INSTALL ?= ""
 
-SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}'
+SPLASH ?= ""
+ZZAPSPLASH = ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}'
 
 DEPENDS = "task-base-extended \
            ${SPLASH} \
+           ${ZZAPSPLASH} \
 	   "
 
 IMAGE_INSTALL = "task-base-extended \
 	    ${IMAGE_EXTRA_INSTALL} \
 	    ${SPLASH} \
+	    ${ZZAPSPLASH} \
             oprofile \
             screen \
             ntp ntp-bin \
             make \
             nfs-utils-client \
             gnuradio gnuradio-examples \
-	   "
+	    "
 
 export IMAGE_BASENAME = "gnuradio-image"
 IMAGE_LINGUAS = ""
 
 inherit image
-
-- 
cgit v1.2.3


From 3c33e2e72963d68715a8a4da131b42f4e104b395 Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Thu, 23 Apr 2009 23:57:12 +0200
Subject: initramfs-kexecboot-image: minor text cleanings

---
 recipes/kexecboot/initramfs-kexecboot-image.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/kexecboot/initramfs-kexecboot-image.bb b/recipes/kexecboot/initramfs-kexecboot-image.bb
index 0284f691a7..94f1ff75ef 100644
--- a/recipes/kexecboot/initramfs-kexecboot-image.bb
+++ b/recipes/kexecboot/initramfs-kexecboot-image.bb
@@ -12,8 +12,9 @@ export IMAGE_BASENAME = "initramfs-kexecboot-image"
 
 KEXECBOOT_IMAGEDEPENDS ?= ""
 
-# avoid to depend from kexecboot
+# avoid circular dependencies
 EXTRA_IMAGEDEPENDS = "${KEXECBOOT_IMAGEDEPENDS}"
+
 IMAGE_INSTALL = "kexecboot"
 IMAGE_LINGUAS = ""
 
@@ -21,4 +22,3 @@ IMAGE_LOGIN_MANAGER = ""
 IMAGE_INIT_MANAGER = ""
 IMAGE_INITSCRIPTS = ""
 IMAGE_DEV_MANAGER = ""
-#ONLINE_PACKAGE_MANAGEMENT = "none"
-- 
cgit v1.2.3


From ee9583856741c42516bb7a7a3fb41bdad6064007 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Thu, 23 Apr 2009 22:22:12 +0000
Subject: fsi-client: GNU_HASH QA fix.

---
 recipes/fsi-client/fsi-client_20040803.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes/fsi-client/fsi-client_20040803.bb b/recipes/fsi-client/fsi-client_20040803.bb
index 84c185abf9..e4acf05871 100644
--- a/recipes/fsi-client/fsi-client_20040803.bb
+++ b/recipes/fsi-client/fsi-client_20040803.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/client"
 FILES_${PN} += "${libdir}/libfsiclient.so"
 
 do_compile() {
-	oe_runmake all examples
+	oe_runmake all examples CC="${CC} ${LDFLAGS}"
 }
 
 do_install() {
@@ -19,4 +19,3 @@ do_install() {
 	install libfsiclient.so ${D}${libdir}
 	install fsidumpraw fsidumppgm ${D}${bindir}
 }
-
-- 
cgit v1.2.3


From b3c9508c518b224e02917a803574d4e077d97640 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Thu, 23 Apr 2009 23:35:21 +0000
Subject: unzip: GNU_HASH QA fix.

---
 recipes/unzip/unzip_552.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/unzip/unzip_552.bb b/recipes/unzip/unzip_552.bb
index 2f06e1b1c6..d8809196d8 100644
--- a/recipes/unzip/unzip_552.bb
+++ b/recipes/unzip/unzip_552.bb
@@ -6,7 +6,7 @@ PR = "r1"
 SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/unzip${PV}.tar.gz"
 S = "${WORKDIR}/unzip-5.52"
 
-export LD = "${CC}"
+export LD = "${CC} ${LDFLAGS}"
 
 do_compile() {
         oe_runmake -f unix/Makefile generic
-- 
cgit v1.2.3


From f8f96581f7eda437dcc97bd65e5d95e4f73144eb Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Thu, 23 Apr 2009 23:41:52 +0000
Subject: pxaregs: GNU_HASH QA fix.

---
 recipes/pxaregs/pxaregs_1.14.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/pxaregs/pxaregs_1.14.bb b/recipes/pxaregs/pxaregs_1.14.bb
index d57dacef51..ada5220bf0 100644
--- a/recipes/pxaregs/pxaregs_1.14.bb
+++ b/recipes/pxaregs/pxaregs_1.14.bb
@@ -12,7 +12,7 @@ SRC_URI = "http://www.mn-logistik.de/unsupported/pxa250/pxaregs.c \
 S = "${WORKDIR}"
 
 do_compile() {
-    ${CC} pxaregs.c -o pxaregs ${CFLAGS}
+    ${CC} pxaregs.c -o pxaregs ${CFLAGS} ${LDFLAGS}
 }
 
 do_install() {
-- 
cgit v1.2.3


From 5677ff24dfa105e2aaee777c1652fb1a66c1e7a5 Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denis@denix.org>
Date: Wed, 22 Apr 2009 16:43:02 +0000
Subject: udev 124: add cache invalidation logic on kernel change or its
 bootargs/cmdline/atags

also add /etc/default/udev with the option to disable device caching

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Tom Rini <trini@embeddedalley.com>
Acked-by: Koen Kooi <koen@openembedded.org>
---
 recipes/udev/udev-124/default |  4 ++++
 recipes/udev/udev-124/init    | 29 +++++++++++++++++++++++++----
 recipes/udev/udev_124.bb      | 10 +++++++++-
 3 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 recipes/udev/udev-124/default

diff --git a/recipes/udev/udev-124/default b/recipes/udev/udev-124/default
new file mode 100644
index 0000000000..5c4937a9a0
--- /dev/null
+++ b/recipes/udev/udev-124/default
@@ -0,0 +1,4 @@
+# Default for /etc/init.d/udev
+
+# Comment this out to disable device cache
+DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-124/init b/recipes/udev/udev-124/init
index 9e11f08989..efe44708ca 100644
--- a/recipes/udev/udev-124/init
+++ b/recipes/udev/udev-124/init
@@ -14,6 +14,7 @@ export TZ=/etc/localtime
 [ -d /sys/class ] || exit 1
 [ -r /proc/mounts ] || exit 1
 [ -x /sbin/udevd ] || exit 1
+[ -f /etc/default/udev ] && . /etc/default/udev
 [ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
 
 kill_udevd() {
@@ -34,9 +35,18 @@ LANG=C awk "\$2 == \"/dev\" && \$4 == \"tmpfs\" { exit 1 }" /proc/mounts && {
         mkdir -m 0755 /dev/shm
 }
 
-if [ -e /etc/dev.tar ]; then
-	(cd /; tar xf /etc/dev.tar)
-	not_first_boot=1
+if [ "$DEVCACHE" != "" ]; then
+	# Invalidate udev cache if the kernel or its bootargs/cmdline have changed
+	[ -x /bin/uname ] && /bin/uname -mrspv > /tmp/uname || touch /tmp/uname
+	[ -r /proc/cmdline ] && cat /proc/cmdline > /tmp/cmdline || touch /tmp/cmdline
+	[ -r /proc/atags ] && cat /proc/atags > /tmp/atags || touch /tmp/atags
+	if [ -e $DEVCACHE ] && \
+	   cmp -s /tmp/uname /etc/udev/saved.uname && \
+	   cmp -s /tmp/cmdline /etc/udev/saved.cmdline && \
+	   cmp -s /tmp/atags /etc/udev/saved.atags; then
+		(cd /; tar xf $DEVCACHE)
+		not_first_boot=1
+	fi
 fi
 
 # make_extra_nodes
@@ -50,10 +60,21 @@ kill_udevd > "/dev/null" 2>&1
 		if [ "$not_first_boot" != "" ];then
 			/sbin/udevadm trigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus  --subsystem-nomatch=graphics  --subsystem-nomatch=backlight --subsystem-nomatch=video4linux  --subsystem-nomatch=platform
 			(/sbin/udevadm settle --timeout=3; /sbin/udevadm control env STARTUP=)&
+			if [ "$DEVCACHE" != "" ]; then
+				rm -f /tmp/uname
+				rm -f /tmp/cmdline
+				rm -f /tmp/atags
+			fi
 		else
 			/sbin/udevadm trigger
 			/sbin/udevadm settle
-			(cd /; tar cf /etc/dev.tar dev)
+			if [ "$DEVCACHE" != "" ]; then
+				echo -n " and populating dev cache"
+				(cd /; tar cf $DEVCACHE dev)
+				mv /tmp/uname /etc/udev/saved.uname
+				mv /tmp/cmdline /etc/udev/saved.cmdline
+				mv /tmp/atags /etc/udev/saved.atags
+			fi
 		fi
 
 echo
diff --git a/recipes/udev/udev_124.bb b/recipes/udev/udev_124.bb
index 37dc3a7dbe..e5d9d73f89 100644
--- a/recipes/udev/udev_124.bb
+++ b/recipes/udev/udev_124.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 /dev/, handles hotplug events and loads drivers at boot time. It replaces \
 the hotplug package and requires a kernel not older than 2.6.12."
 RPROVIDES_${PN} = "hotplug"
-PR = "r15"
+PR = "r16"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
@@ -12,6 +12,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://libvolume-id-soname.patch;patch=1 \
 	   file://mount.blacklist \
 	   file://run.rules \
+	   file://default \
 	   "
 
 SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
@@ -33,6 +34,9 @@ do_install () {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
 
+	install -d ${D}${sysconfdir}/default
+	install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/udev
+
 	install -d ${D}${sysconfdir}/udev/rules.d/
 
 	install -m 0644 ${WORKDIR}/mount.blacklist     ${D}${sysconfdir}/udev/
@@ -45,6 +49,10 @@ do_install () {
 		install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules
 	fi
 
+	touch ${D}${sysconfdir}/udev/saved.uname
+	touch ${D}${sysconfdir}/udev/saved.cmdline
+	touch ${D}${sysconfdir}/udev/saved.atags
+
 	install -d ${D}${sysconfdir}/udev/scripts/
 
 	install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
-- 
cgit v1.2.3


From 9d54794e4edd80519e7c0ea47c0b107ab648c94f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
Date: Fri, 24 Apr 2009 08:02:44 +0200
Subject: qt4(-tools-native)?.inc: compatibility fixes for Qt 4.5.1

---
 recipes/qt4/qt4-tools-native.inc | 2 +-
 recipes/qt4/qt4.inc              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/qt4/qt4-tools-native.inc b/recipes/qt4/qt4-tools-native.inc
index df5afd3c15..75ce4e6f30 100644
--- a/recipes/qt4/qt4-tools-native.inc
+++ b/recipes/qt4/qt4-tools-native.inc
@@ -30,7 +30,7 @@ EXTRA_OECONF = "-prefix ${prefix} \
 EXTRA_OEMAKE = " "
 
 do_configure() {
-    echo yes | LFLAGS="-L${STAGING_LIBDIR_NATIVE}" ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+   (echo o; echo yes) | LFLAGS="-L${STAGING_LIBDIR_NATIVE}" ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
 }
 
 TOBUILD = "\
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index fb44e58faa..dede5cb43e 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -103,7 +103,7 @@ do_configure() {
     echo "Examples=${bindir}/${QT_DIR_NAME}/examples" >> $QT_CONF_PATH
     echo "Demos=${bindir}/${QT_DIR_NAME}/demos"   >> $QT_CONF_PATH
 
-    echo yes | ./configure -v \
+    (echo o; echo yes) | ./configure -v \
             -prefix ${prefix} \
             -bindir ${bindir} \
             -libdir ${libdir} \
-- 
cgit v1.2.3


From f5daa62a4430164c4f9f7c34e8d7c53e37af8875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
Date: Fri, 24 Apr 2009 08:43:51 +0200
Subject: qt4: update from 4.5.0 to 4.5.1

---
 recipes/qt4/files/4.5.0/0003-no-tools.patch        | 18 ----------
 .../files/4.5.0/0006-freetype-host-includes.patch  | 20 -----------
 .../files/4.5.0/0007-openssl-host-includes.patch   | 20 -----------
 recipes/qt4/files/4.5.0/0008-qt-lib-infix.patch    | 34 ------------------
 .../4.5.0/0010-no-simpledecoration-example.patch   |  9 -----
 recipes/qt4/files/4.5.1/0003-no-tools.patch        | 18 ++++++++++
 .../files/4.5.1/0006-freetype-host-includes.patch  | 20 +++++++++++
 .../files/4.5.1/0007-openssl-host-includes.patch   | 20 +++++++++++
 recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch    | 34 ++++++++++++++++++
 .../4.5.1/0010-no-simpledecoration-example.patch   |  9 +++++
 recipes/qt4/qt4-embedded_4.5.0.bb                  | 41 ----------------------
 recipes/qt4/qt4-embedded_4.5.1.bb                  | 40 +++++++++++++++++++++
 recipes/qt4/qt4-tools-native_4.5.0.bb              |  5 ---
 recipes/qt4/qt4-tools-native_4.5.1.bb              |  4 +++
 recipes/qt4/qt4-x11-free_4.5.0.bb                  | 32 -----------------
 recipes/qt4/qt4-x11-free_4.5.1.bb                  | 32 +++++++++++++++++
 16 files changed, 177 insertions(+), 179 deletions(-)
 delete mode 100644 recipes/qt4/files/4.5.0/0003-no-tools.patch
 delete mode 100644 recipes/qt4/files/4.5.0/0006-freetype-host-includes.patch
 delete mode 100644 recipes/qt4/files/4.5.0/0007-openssl-host-includes.patch
 delete mode 100644 recipes/qt4/files/4.5.0/0008-qt-lib-infix.patch
 delete mode 100644 recipes/qt4/files/4.5.0/0010-no-simpledecoration-example.patch
 create mode 100644 recipes/qt4/files/4.5.1/0003-no-tools.patch
 create mode 100644 recipes/qt4/files/4.5.1/0006-freetype-host-includes.patch
 create mode 100644 recipes/qt4/files/4.5.1/0007-openssl-host-includes.patch
 create mode 100644 recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch
 create mode 100644 recipes/qt4/files/4.5.1/0010-no-simpledecoration-example.patch
 delete mode 100644 recipes/qt4/qt4-embedded_4.5.0.bb
 create mode 100644 recipes/qt4/qt4-embedded_4.5.1.bb
 delete mode 100644 recipes/qt4/qt4-tools-native_4.5.0.bb
 create mode 100644 recipes/qt4/qt4-tools-native_4.5.1.bb
 delete mode 100644 recipes/qt4/qt4-x11-free_4.5.0.bb
 create mode 100644 recipes/qt4/qt4-x11-free_4.5.1.bb

diff --git a/recipes/qt4/files/4.5.0/0003-no-tools.patch b/recipes/qt4/files/4.5.0/0003-no-tools.patch
deleted file mode 100644
index 3829ffcdc5..0000000000
--- a/recipes/qt4/files/4.5.0/0003-no-tools.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: qt-embedded-linux-opensource-src-4.5.0/src/src.pro
-===================================================================
---- qt-embedded-linux-opensource-src-4.5.0.orig/src/src.pro	2009-02-25 22:32:41.000000000 +0100
-+++ qt-embedded-linux-opensource-src-4.5.0/src/src.pro	2009-03-26 17:11:07.000000000 +0100
-@@ -6,12 +6,9 @@
- wince*:{
-   SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_script src_testlib
- } else {
--    SRC_SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_network src_gui src_sql src_script src_testlib
-+    SRC_SUBDIRS += src_corelib src_xml src_network src_gui src_sql src_script src_testlib
-     contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support
-     contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus
--    !cross_compile {
--        contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3
--    }
- }
- win32:!contains(QT_EDITION, OpenSource|Console): {
-     SRC_SUBDIRS += src_activeqt
diff --git a/recipes/qt4/files/4.5.0/0006-freetype-host-includes.patch b/recipes/qt4/files/4.5.0/0006-freetype-host-includes.patch
deleted file mode 100644
index 987c425138..0000000000
--- a/recipes/qt4/files/4.5.0/0006-freetype-host-includes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001
-From: Michael Krelin <hacker@klever.net>
-Date: Mon, 4 Jun 2007 14:48:50 +0200
-Subject: [PATCH] freetype host includes
-
----
- config.tests/unix/freetype/freetype.pri |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri
-===================================================================
---- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/freetype/freetype.pri	2009-02-25 22:32:32.000000000 +0100
-+++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri	2009-03-26 17:14:16.000000000 +0100
-@@ -1,5 +1,5 @@
- !cross_compile {
--    TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
-+    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
-     # LSB doesn't allow using headers from /include or /usr/include
-     linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
-     for(p, TRY_INCLUDEPATHS) {
diff --git a/recipes/qt4/files/4.5.0/0007-openssl-host-includes.patch b/recipes/qt4/files/4.5.0/0007-openssl-host-includes.patch
deleted file mode 100644
index 3409cc0bf2..0000000000
--- a/recipes/qt4/files/4.5.0/0007-openssl-host-includes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From d45943adb443ad4b85ca4504952dee743c675e1e Mon Sep 17 00:00:00 2001
-From: Michael Krelin <hacker@klever.net>
-Date: Mon, 4 Jun 2007 14:58:34 +0200
-Subject: [PATCH] openssl host includes
-
----
- config.tests/unix/openssl/openssl.pri |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/openssl/openssl.pri
-===================================================================
---- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/openssl/openssl.pri	2009-02-25 22:32:32.000000000 +0100
-+++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/openssl/openssl.pri	2009-03-26 17:16:28.000000000 +0100
-@@ -1,5 +1,5 @@
- !cross_compile {
--    TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH
-+    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH
-     # LSB doesn't allow using headers from /include or /usr/include
-     linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH
-     for(p, TRY_INCLUDEPATHS) {
diff --git a/recipes/qt4/files/4.5.0/0008-qt-lib-infix.patch b/recipes/qt4/files/4.5.0/0008-qt-lib-infix.patch
deleted file mode 100644
index 3efaff37d3..0000000000
--- a/recipes/qt4/files/4.5.0/0008-qt-lib-infix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf
-===================================================================
---- qt-embedded-linux-opensource-src-4.5.0.orig/mkspecs/features/uitools.prf	2009-02-25 22:32:34.000000000 +0100
-+++ qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf	2009-03-26 17:17:27.000000000 +0100
-@@ -2,10 +2,10 @@
- qt:load(qt)
- 
- # Include the correct version of the UiLoader library
--QTUITOOLS_LINKAGE = -lQtUiTools
-+QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}
- CONFIG(debug, debug|release) {
--    mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug
--    win32: QTUITOOLS_LINKAGE = -lQtUiToolsd
-+    mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug
-+    win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d
- }
- LIBS += $$QTUITOOLS_LINKAGE
- 
-Index: qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro
-===================================================================
---- qt-embedded-linux-opensource-src-4.5.0.orig/tools/designer/src/uitools/uitools.pro	2009-02-25 22:32:42.000000000 +0100
-+++ qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro	2009-03-26 17:17:27.000000000 +0100
-@@ -1,5 +1,5 @@
- TEMPLATE = lib
--TARGET = $$qtLibraryTarget(QtUiTools)
-+TARGET = QtUiTools
- QT += xml
- CONFIG += qt staticlib
- DESTDIR = ../../../../lib
-@@ -39,3 +39,4 @@
-    QMAKE_PKGCONFIG_REQUIRES += QtXml
- }
- 
-+TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
diff --git a/recipes/qt4/files/4.5.0/0010-no-simpledecoration-example.patch b/recipes/qt4/files/4.5.0/0010-no-simpledecoration-example.patch
deleted file mode 100644
index 070b4ac9c1..0000000000
--- a/recipes/qt4/files/4.5.0/0010-no-simpledecoration-example.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- qt-embedded-linux-opensource-src-4.5.0.orig/examples/qws/qws.pro	2009-02-25 22:32:34.000000000 +0100
-+++ qt-embedded-linux-opensource-src-4.5.0/examples/qws/qws.pro	2009-03-26 19:53:19.000000000 +0100
-@@ -1,5 +1,5 @@
- TEMPLATE      = subdirs
--SUBDIRS       = framebuffer mousecalibration simpledecoration
-+SUBDIRS       = framebuffer mousecalibration
- 
- # install
- sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro
diff --git a/recipes/qt4/files/4.5.1/0003-no-tools.patch b/recipes/qt4/files/4.5.1/0003-no-tools.patch
new file mode 100644
index 0000000000..3829ffcdc5
--- /dev/null
+++ b/recipes/qt4/files/4.5.1/0003-no-tools.patch
@@ -0,0 +1,18 @@
+Index: qt-embedded-linux-opensource-src-4.5.0/src/src.pro
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.0.orig/src/src.pro	2009-02-25 22:32:41.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.5.0/src/src.pro	2009-03-26 17:11:07.000000000 +0100
+@@ -6,12 +6,9 @@
+ wince*:{
+   SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_script src_testlib
+ } else {
+-    SRC_SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_network src_gui src_sql src_script src_testlib
++    SRC_SUBDIRS += src_corelib src_xml src_network src_gui src_sql src_script src_testlib
+     contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support
+     contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus
+-    !cross_compile {
+-        contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3
+-    }
+ }
+ win32:!contains(QT_EDITION, OpenSource|Console): {
+     SRC_SUBDIRS += src_activeqt
diff --git a/recipes/qt4/files/4.5.1/0006-freetype-host-includes.patch b/recipes/qt4/files/4.5.1/0006-freetype-host-includes.patch
new file mode 100644
index 0000000000..987c425138
--- /dev/null
+++ b/recipes/qt4/files/4.5.1/0006-freetype-host-includes.patch
@@ -0,0 +1,20 @@
+From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Mon, 4 Jun 2007 14:48:50 +0200
+Subject: [PATCH] freetype host includes
+
+---
+ config.tests/unix/freetype/freetype.pri |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/freetype/freetype.pri	2009-02-25 22:32:32.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri	2009-03-26 17:14:16.000000000 +0100
+@@ -1,5 +1,5 @@
+ !cross_compile {
+-    TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
++    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+     # LSB doesn't allow using headers from /include or /usr/include
+     linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+     for(p, TRY_INCLUDEPATHS) {
diff --git a/recipes/qt4/files/4.5.1/0007-openssl-host-includes.patch b/recipes/qt4/files/4.5.1/0007-openssl-host-includes.patch
new file mode 100644
index 0000000000..3409cc0bf2
--- /dev/null
+++ b/recipes/qt4/files/4.5.1/0007-openssl-host-includes.patch
@@ -0,0 +1,20 @@
+From d45943adb443ad4b85ca4504952dee743c675e1e Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Mon, 4 Jun 2007 14:58:34 +0200
+Subject: [PATCH] openssl host includes
+
+---
+ config.tests/unix/openssl/openssl.pri |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/openssl/openssl.pri
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/openssl/openssl.pri	2009-02-25 22:32:32.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/openssl/openssl.pri	2009-03-26 17:16:28.000000000 +0100
+@@ -1,5 +1,5 @@
+ !cross_compile {
+-    TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH
++    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH
+     # LSB doesn't allow using headers from /include or /usr/include
+     linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH
+     for(p, TRY_INCLUDEPATHS) {
diff --git a/recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch b/recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch
new file mode 100644
index 0000000000..3efaff37d3
--- /dev/null
+++ b/recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch
@@ -0,0 +1,34 @@
+Index: qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.0.orig/mkspecs/features/uitools.prf	2009-02-25 22:32:34.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf	2009-03-26 17:17:27.000000000 +0100
+@@ -2,10 +2,10 @@
+ qt:load(qt)
+ 
+ # Include the correct version of the UiLoader library
+-QTUITOOLS_LINKAGE = -lQtUiTools
++QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}
+ CONFIG(debug, debug|release) {
+-    mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug
+-    win32: QTUITOOLS_LINKAGE = -lQtUiToolsd
++    mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug
++    win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d
+ }
+ LIBS += $$QTUITOOLS_LINKAGE
+ 
+Index: qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.0.orig/tools/designer/src/uitools/uitools.pro	2009-02-25 22:32:42.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro	2009-03-26 17:17:27.000000000 +0100
+@@ -1,5 +1,5 @@
+ TEMPLATE = lib
+-TARGET = $$qtLibraryTarget(QtUiTools)
++TARGET = QtUiTools
+ QT += xml
+ CONFIG += qt staticlib
+ DESTDIR = ../../../../lib
+@@ -39,3 +39,4 @@
+    QMAKE_PKGCONFIG_REQUIRES += QtXml
+ }
+ 
++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
diff --git a/recipes/qt4/files/4.5.1/0010-no-simpledecoration-example.patch b/recipes/qt4/files/4.5.1/0010-no-simpledecoration-example.patch
new file mode 100644
index 0000000000..070b4ac9c1
--- /dev/null
+++ b/recipes/qt4/files/4.5.1/0010-no-simpledecoration-example.patch
@@ -0,0 +1,9 @@
+--- qt-embedded-linux-opensource-src-4.5.0.orig/examples/qws/qws.pro	2009-02-25 22:32:34.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.5.0/examples/qws/qws.pro	2009-03-26 19:53:19.000000000 +0100
+@@ -1,5 +1,5 @@
+ TEMPLATE      = subdirs
+-SUBDIRS       = framebuffer mousecalibration simpledecoration
++SUBDIRS       = framebuffer mousecalibration
+ 
+ # install
+ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro
diff --git a/recipes/qt4/qt4-embedded_4.5.0.bb b/recipes/qt4/qt4-embedded_4.5.0.bb
deleted file mode 100644
index 35b56de48a..0000000000
--- a/recipes/qt4/qt4-embedded_4.5.0.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-SUMMARY = "Qt is a versatile cross-platform application framework -- this is the embedded version."
-SECTION = "libs"
-LICENSE = "GPL LGPL QPL"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.trolltech.com"
-DEPENDS += "tslib"
-PR = "r1"
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
-           file://0001-cross-compile.patch;patch=1 \
-           file://0002-fix-resinit-declaration.patch;patch=1 \
-           file://${PV}/0003-no-tools.patch;patch=1 \
-           file://0004-no-qmake.patch;patch=1 \
-           file://${PV}/0006-freetype-host-includes.patch;patch=1 \
-           file://${PV}/0007-openssl-host-includes.patch;patch=1 \ 
-           file://${PV}/0008-qt-lib-infix.patch;patch=1 \
-           file://0009-support-2bpp.patch;patch=1 \
-           file://${PV}/0010-no-simpledecoration-example.patch;patch=1 \
-           file://g++.conf \
-           file://linux.conf \
-           "
-S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
-
-QT_CONFIG_FLAGS += " \
-    -qtlibinfix E \
-    -qt-decoration-styled -plugin-decoration-default -plugin-decoration-windows \
-    -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc \
-    -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb \
-    -qt-kbd-tty -qt-kbd-usb -qt-kbd-qvfb \
-    -DQT_KEYPAD_NAVIGATION \
-    "
-
-QT_BASE_NAME = "qt4-embedded"
-QT_BASE_LIB  = "libqt-embedded"
-QT_DIR_NAME = "qtopia"
-QT_LIBINFIX="E"
-
-require qt4.inc
-
-inherit qt4e
diff --git a/recipes/qt4/qt4-embedded_4.5.1.bb b/recipes/qt4/qt4-embedded_4.5.1.bb
new file mode 100644
index 0000000000..5da55f9c1c
--- /dev/null
+++ b/recipes/qt4/qt4-embedded_4.5.1.bb
@@ -0,0 +1,40 @@
+SUMMARY = "Qt is a versatile cross-platform application framework -- this is the embedded version."
+SECTION = "libs"
+LICENSE = "GPL LGPL QPL"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.trolltech.com"
+DEPENDS += "tslib"
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
+           file://0001-cross-compile.patch;patch=1 \
+           file://0002-fix-resinit-declaration.patch;patch=1 \
+           file://${PV}/0003-no-tools.patch;patch=1 \
+           file://0004-no-qmake.patch;patch=1 \
+           file://${PV}/0006-freetype-host-includes.patch;patch=1 \
+           file://${PV}/0007-openssl-host-includes.patch;patch=1 \ 
+           file://${PV}/0008-qt-lib-infix.patch;patch=1 \
+           file://0009-support-2bpp.patch;patch=1 \
+           file://${PV}/0010-no-simpledecoration-example.patch;patch=1 \
+           file://g++.conf \
+           file://linux.conf \
+           "
+S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
+
+QT_CONFIG_FLAGS += " \
+    -qtlibinfix E \
+    -qt-decoration-styled -plugin-decoration-default -plugin-decoration-windows \
+    -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc \
+    -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb \
+    -qt-kbd-tty -qt-kbd-usb -qt-kbd-qvfb \
+    -DQT_KEYPAD_NAVIGATION \
+    "
+
+QT_BASE_NAME = "qt4-embedded"
+QT_BASE_LIB  = "libqt-embedded"
+QT_DIR_NAME = "qtopia"
+QT_LIBINFIX="E"
+
+require qt4.inc
+
+inherit qt4e
diff --git a/recipes/qt4/qt4-tools-native_4.5.0.bb b/recipes/qt4/qt4-tools-native_4.5.0.bb
deleted file mode 100644
index ab633149ba..0000000000
--- a/recipes/qt4/qt4-tools-native_4.5.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt4-tools-native.inc
-PR = "r1"
-
-DEFAULT_PREFERENCE = "-1"
-TOBUILD := "src/tools/bootstrap ${TOBUILD}"
diff --git a/recipes/qt4/qt4-tools-native_4.5.1.bb b/recipes/qt4/qt4-tools-native_4.5.1.bb
new file mode 100644
index 0000000000..cadc7357c4
--- /dev/null
+++ b/recipes/qt4/qt4-tools-native_4.5.1.bb
@@ -0,0 +1,4 @@
+require qt4-tools-native.inc
+
+DEFAULT_PREFERENCE = "-1"
+TOBUILD := "src/tools/bootstrap ${TOBUILD}"
diff --git a/recipes/qt4/qt4-x11-free_4.5.0.bb b/recipes/qt4/qt4-x11-free_4.5.0.bb
deleted file mode 100644
index 0ffbbc2e09..0000000000
--- a/recipes/qt4/qt4-x11-free_4.5.0.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.trolltech.com"
-LICENSE = "GPL LGPL QPL"
-DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor"
-PROVIDES = "qt4x11"
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
-           file://0001-cross-compile.patch;patch=1 \
-           file://0002-fix-resinit-declaration.patch;patch=1 \
-           file://${PV}/0003-no-tools.patch;patch=1 \
-           file://0004-no-qmake.patch;patch=1 \
-           file://${PV}/0006-freetype-host-includes.patch;patch=1 \
-           file://${PV}/0007-openssl-host-includes.patch;patch=1 \ 
-           file://${PV}/0008-qt-lib-infix.patch;patch=1 \
-           file://g++.conf \
-           file://linux.conf \
-           "
-S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
-
-
-QT_CONFIG_FLAGS += "-no-xinerama -no-xkb -no-opengl"
-QT_BASE_NAME = "qt4"
-QT_BASE_LIB  = "libqt"
-QT_DIR_NAME = "qt4"
-QT_LIBINFIX = ""
-
-require qt4.inc
-
-inherit qt4x11
diff --git a/recipes/qt4/qt4-x11-free_4.5.1.bb b/recipes/qt4/qt4-x11-free_4.5.1.bb
new file mode 100644
index 0000000000..0ffbbc2e09
--- /dev/null
+++ b/recipes/qt4/qt4-x11-free_4.5.1.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.trolltech.com"
+LICENSE = "GPL LGPL QPL"
+DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor"
+PROVIDES = "qt4x11"
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
+           file://0001-cross-compile.patch;patch=1 \
+           file://0002-fix-resinit-declaration.patch;patch=1 \
+           file://${PV}/0003-no-tools.patch;patch=1 \
+           file://0004-no-qmake.patch;patch=1 \
+           file://${PV}/0006-freetype-host-includes.patch;patch=1 \
+           file://${PV}/0007-openssl-host-includes.patch;patch=1 \ 
+           file://${PV}/0008-qt-lib-infix.patch;patch=1 \
+           file://g++.conf \
+           file://linux.conf \
+           "
+S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
+
+
+QT_CONFIG_FLAGS += "-no-xinerama -no-xkb -no-opengl"
+QT_BASE_NAME = "qt4"
+QT_BASE_LIB  = "libqt"
+QT_DIR_NAME = "qt4"
+QT_LIBINFIX = ""
+
+require qt4.inc
+
+inherit qt4x11
-- 
cgit v1.2.3


From b4d5cf802d35f58a5c357864eb137c9b45b1cd01 Mon Sep 17 00:00:00 2001
From: Gregoire Gentil <gregoire@gentil.com>
Date: Fri, 24 Apr 2009 09:16:02 +0200
Subject: mplayer: reenable vo_omapfb patch

---
 recipes/mplayer/files/omapfb.patch |  19 +++
 recipes/mplayer/files/vo_omapfb.c  | 269 +++++++++++--------------------------
 recipes/mplayer/mplayer_svn.bb     |   6 +-
 3 files changed, 100 insertions(+), 194 deletions(-)

diff --git a/recipes/mplayer/files/omapfb.patch b/recipes/mplayer/files/omapfb.patch
index 860cf070f4..2356d80960 100644
--- a/recipes/mplayer/files/omapfb.patch
+++ b/recipes/mplayer/files/omapfb.patch
@@ -8,3 +8,22 @@
  extern vo_functions_t video_out_svga;
  extern vo_functions_t video_out_png;
  extern vo_functions_t video_out_ggi;
+@@ -177,6 +178,7 @@
+ #ifdef CONFIG_FBDEV
+         &video_out_fbdev,
+         &video_out_fbdev2,
++        &video_out_omapfb,
+ #endif
+ #ifdef CONFIG_SVGALIB
+         &video_out_svga,
+--- a/Makefile	2009-02-03 13:45:48.000000000 -0800
++++ b/Makefile	2009-02-03 13:45:50.000000000 -0800
+@@ -551,7 +551,7 @@
+ SRCS_MPLAYER-$(DXR2)         += libao2/ao_dxr2.c libvo/vo_dxr2.c
+ SRCS_MPLAYER-$(DXR3)         += libvo/vo_dxr3.c
+ SRCS_MPLAYER-$(ESD)          += libao2/ao_esd.c
+-SRCS_MPLAYER-$(FBDEV)        += libvo/vo_fbdev.c libvo/vo_fbdev2.c
++SRCS_MPLAYER-$(FBDEV)        += libvo/vo_fbdev.c libvo/vo_fbdev2.c libvo/vo_omapfb.c libvo/yuv.S
+ SRCS_MPLAYER-$(GGI)          += libvo/vo_ggi.c
+ SRCS_MPLAYER-$(GIF)          += libvo/vo_gif89a.c
+ SRCS_MPLAYER-$(GL)           += libvo/gl_common.c libvo/vo_gl.c libvo/vo_gl2.c
diff --git a/recipes/mplayer/files/vo_omapfb.c b/recipes/mplayer/files/vo_omapfb.c
index 5a43404300..127e550cae 100644
--- a/recipes/mplayer/files/vo_omapfb.c
+++ b/recipes/mplayer/files/vo_omapfb.c
@@ -58,8 +58,8 @@ It's an interpolation bug in the color conversion that needs to be fixed
 #include "fastmemcpy.h"
 #include "sub.h"
 #include "mp_msg.h"
-
 #include "omapfb.h"
+#include "x11_common.h"
 
 #include "libswscale/swscale.h"
 #include "libmpcodecs/vf_scale.h"
@@ -87,10 +87,12 @@ static int fb_overlay_only = 0; // if set, we need only framebuffer overlay, but
 static int dbl_buffer = 0;
 static int fullscreen_flag = 0;
 static int plane_ready = 0;
+static uint32_t drwX, drwY;
 
 extern void yuv420_to_yuv422(uint8_t *yuv, uint8_t *y, uint8_t *u, uint8_t *v, int w, int h, int yw, int cw, int dw);
 static struct fb_var_screeninfo sinfo_p0;
 static struct fb_var_screeninfo sinfo;
+static struct fb_fix_screeninfo finfo;
 static struct omapfb_mem_info minfo;
 static struct omapfb_plane_info pinfo;
 static struct {
@@ -155,155 +157,20 @@ static void x11_get_window_abs_position(Display *display, Window window,
         XFree(child);
 }
 
-
-/**
- * Function that controls fullscreen state for x11 window
- * action = 1 (set fullscreen)
- * action = 0 (set windowed mode)
- */
-static void x11_set_fullscreen_state(Display *display, Window window, int action)
-{
-    XEvent xev;
-
-    /* init X event structure for _NET_WM_FULLSCREEN client msg */
-    xev.xclient.type = ClientMessage;
-    xev.xclient.serial = 0;
-    xev.xclient.send_event = True;
-    xev.xclient.message_type = XInternAtom(display, "_NET_WM_STATE", False);
-    xev.xclient.window = window;
-    xev.xclient.format = 32;
-    xev.xclient.data.l[0] = action;
-    xev.xclient.data.l[1] = XInternAtom(display, "_NET_WM_STATE_FULLSCREEN", False);
-    xev.xclient.data.l[2] = 0;
-    xev.xclient.data.l[3] = 0;
-    xev.xclient.data.l[4] = 0;
-
-    /* finally send that damn thing */
-    if (!XSendEvent(display, DefaultRootWindow(display), False, SubstructureRedirectMask | SubstructureNotifyMask, &xev)) {
-        mp_msg(MSGT_VO, MSGL_ERR, "[omapfb] failure in x11_set_fullscreen_state\n");
-        exit(1);
-    }
-    XSync(display, False);
-}
-
-
-XClassHint classhint = {"mediaplayer-ui", "mediaplayer-ui"};
-
-
-/**
- * Initialize x11 window (it is used to allocate some screen area for framebuffer overlay)
- */
-static void x11_init()
+static void x11_check_events(void)
 {
-    display = XOpenDisplay(getenv("DISPLAY"));
-    if (display == NULL) {
-        mp_msg(MSGT_VO, MSGL_ERR, "[omapfb] failure in x11_init, can't open display\n");
-        exit(1);
-    }
+    int e = vo_x11_check_events(mDisplay);
 
-    screen_num = DefaultScreen(display);
+    if (e & VO_EVENT_RESIZE)
+        vo_calc_drwXY(&drwX, &drwY);
 
-    if (WinID > 0)
+    if (e & VO_EVENT_EXPOSE || e & VO_EVENT_RESIZE)
     {
-        Window root;
-        Window *child;
-        unsigned int n_children;
-
-        win = WinID;
-
-        /* Query window tree information */
-        XQueryTree(display, win, &root, &parent, &child, &n_children);
-        if (n_children)
-            XFree(child);
-
-        XUnmapWindow(display, win);
-        if (parent)
-            XSelectInput(display, parent, StructureNotifyMask);
-        XMapWindow(display, win);
-
-        wm_delete_window = XInternAtom(display, "WM_DELETE_WINDOW", False);
-        XSetWMProtocols(display, win, &wm_delete_window, 1);
-    } else {
-        win = XCreateSimpleWindow(display, RootWindow(display, screen_num),
-                                  sinfo_p0.xres / 2 - sinfo.xres / 2, sinfo_p0.yres / 2 - sinfo.yres / 2, sinfo.xres, sinfo.yres, 0,
-                                  WhitePixel(display, screen_num),
-                                  TRANSPARENT_COLOR_KEY);
-
-        XSetClassHint(display, win, &classhint);
-
-        XStoreName(display, win, "MPlayer");
-        XMapWindow(display, win);
-
-        /* Set WM_DELETE_WINDOW atom in WM_PROTOCOLS property (to get window_delete requests).  */
-        wm_delete_window = XInternAtom(display, "WM_DELETE_WINDOW", False);
-        XSetWMProtocols(display, win, &wm_delete_window, 1);
-        XSelectInput(display, win, StructureNotifyMask | KeyPressMask);
-    }
-}
-
-
-void print_properties(Window win2)
-{
-	Atom *p;
-	int num, j;
-	char *aname;
-	Atom type;
-	int format;
-	unsigned long nitems, bytes_after;
-	unsigned char *ret = NULL;
-
-	p = XListProperties(display, win2, &num);
-	printf("found %d properties for window %d\n", num, (int)win2);
-	for (j = 0; j < num; j++) {
-		aname = XGetAtomName(display, p[j]);
-		if (aname) {
-			if(Success == XGetWindowProperty(display, win2, XInternAtom(display, aname, False),
-						0L, ~0L, False, XA_STRING,
-						&type, &format, &nitems,
-						&bytes_after, &ret))
-			{
-/*				printf("format = %d, nitems = %d, bytes_after = %d\n", format, nitems, bytes_after);*/
-				printf("%s = %s\n", aname, ret);
-				XFree(ret);
-			}
-			XFree(aname);
-		} else printf("NULL\n");
-	}
-	XFree(p);
-}
-
-
-static int x11_check_events()
-{
-    if (!display) {
-        mp_msg(MSGT_VO, MSGL_ERR, "[omapfb] 'x11_check_events' called out of sequence\n");
-        exit(1);
-    }
-
-    int ret = 0;
-    XEvent Event;
-    while (XPending(display)) {
-        XNextEvent(display, &Event);
-        if (Event.type == UnmapNotify)
-            omapfb_update(0, 0, 0, 0, 0);
-        else if ((Event.type == MapNotify) || (Event.type == ConfigureNotify))
-            omapfb_update(0, 0, 0, 0, 1);
-        else if (Event.type == KeyPress) {
-            int key;
-            KeySym keySym = XKeycodeToKeysym(display, Event.xkey.keycode, 0);
-            key = ((keySym & 0xff00) != 0 ? ((keySym & 0x00ff) + 256) : (keySym));
-            ret |= VO_EVENT_KEYPRESS;
-            vo_x11_putkey(key);
-        } else if (Event.type == ClientMessage) {
-            if ((Atom)Event.xclient.data.l[0] == wm_delete_window) {
-                mplayer_put_key(KEY_ESC);
-            }
-        }
+        vo_xv_draw_colorkey(drwX, drwY, vo_dwidth - 1, vo_dheight - 1);
+        omapfb_update(0, 0, 0, 0, 1);
     }
-    return ret;
 }
 
-
 static void x11_uninit()
 {
     if (display) {
@@ -312,13 +179,11 @@ static void x11_uninit()
     }
 }
 
-
 /**
  * Initialize framebuffer
  */
 static int preinit(const char *arg)
 {
-
     opt_t subopts[] = {
         {"fb_overlay_only", OPT_ARG_BOOL, &fb_overlay_only, NULL},
         {"dbl_buffer", OPT_ARG_BOOL, &dbl_buffer, NULL},
@@ -351,49 +216,28 @@ static int preinit(const char *arg)
     ioctl(dev_fd, OMAPFB_QUERY_PLANE, &pinfo);
     ioctl(dev_fd, OMAPFB_QUERY_MEM, &minfo);
 
-    if (!fb_overlay_only)
-        x11_init();
+    if (!fb_overlay_only && !vo_init())
+    {
+        mp_msg(MSGT_VO, MSGL_FATAL, "[omapfb] Could not open X, overlay only...\n");        
+        fb_overlay_only = 1;
+    }
 
     return 0;
 }
 
-
 static void omapfb_update(int x, int y, int out_w, int out_h, int show)
 {
     if (!fb_overlay_only)
-        x11_get_window_abs_position(display, win, &x, &y, &out_w, &out_h);
-
-    if ((x < 0) ||