merge of '2b98fc6fe63ab6d8f550bd5e53546e27d970f533'

     and '6263ba0e14af7bb1eb9f572dc90726e8be06ae51'

16 files changed, 154 insertions, 21 deletions

diff --git a/packages/angstrom/angstrom-feed-configs.bb b/packages/angstrom/angstrom-feed-configs.bb
index 0b17aa6cb8..fc6c9c59ce 100644
--- a/packages/angstrom/angstrom-feed-configs.bb
+++ b/packages/angstrom/angstrom-feed-configs.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Configuration files for online package repositories aka feeds"
 
 #PV = "${DISTRO_VERSION}"
-PR = "r5"
+PR = "r6"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 FEED_BASEPATH ?= "unstable/feed/"
diff --git a/packages/efl1/emotion_cvs.bb b/packages/efl1/emotion_cvs.bb
index 826f201779..960d10ad31 100644
--- a/packages/efl1/emotion_cvs.bb
+++ b/packages/efl1/emotion_cvs.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The Enlightenment multimedia library"
 LICENSE = "MIT BSD"
 # we no longer build the libxine backend, since the gstreamer backend seems more promising
-DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base"
+DEPENDS = "libxcursor libxinerama eet evas ecore edje gstreamer gst-plugins-base"
 PV = "0.1.0+cvs${SRCDATE}"
 PR = "r1"
 
diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb
index 5069ea19e2..8ee658c286 100644
--- a/packages/glibc/glibc_2.6.1.bb
+++ b/packages/glibc/glibc_2.6.1.bb
@@ -1,5 +1,5 @@
 require glibc.inc
-PR = "r6"
+PR = "r7"
 
 ARM_INSTRUCTION_SET = "arm"
 
diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc
index 1cd3bc9991..f77ef6ae02 100644
--- a/packages/gnash/gnash-minimal.inc
+++ b/packages/gnash/gnash-minimal.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
 HOMEPAGE = "http://www.gnu.org/software/gnash"
 LICENSE = "GPL-2"
-DEPENDS = "libtool agg libxml2 libmad zlib boost jpeg pango curl freetype"
+DEPENDS = "virtual/libiconv virtual/libintl libtool agg libxml2 libmad zlib boost jpeg pango curl freetype"
 
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
 S = ${WORKDIR}/gnash-${PV}
diff --git a/packages/images/beagleboard-demo-image.bb b/packages/images/beagleboard-demo-image.bb
index fa211a0a97..67632ff0a9 100644
--- a/packages/images/beagleboard-demo-image.bb
+++ b/packages/images/beagleboard-demo-image.bb
@@ -19,7 +19,8 @@ IMAGE_INSTALL = "\
     psplash \
     e-wm exhibit \
     xterm xmms epiphany-firefox-replacement \
-    hicolor-icon-theme gnome-icon-theme \
+    swfdec-mozilla \
+	hicolor-icon-theme gnome-icon-theme \
     jaaa nmap iperf gnuplot \
     abiword \
 #    gnumeric \
diff --git a/packages/initscripts/initscripts-1.0/arm/alignment.sh b/packages/initscripts/initscripts-1.0/arm/alignment.sh
index 4a66dc6bc8..32a9eaace2 100644
--- a/packages/initscripts/initscripts-1.0/arm/alignment.sh
+++ b/packages/initscripts/initscripts-1.0/arm/alignment.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ -e /proc/cpu/alignment ]; then
+if [ -e /proc/cpu/alignment ] && ! [ $(uname -m) = "armv7l" ]; then
    echo "3" > /proc/cpu/alignment
 fi
 
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 55998c0a4a..6d4b7e6ea5 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r105"
+PR = "r107"
 
 SRC_URI = "file://functions \
            file://halt \
diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
index 60361f5862..0adb5da265 100644
--- a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
@@ -1,7 +1,7 @@
 require ipkg-utils_${PV}.bb
 
 RDEPENDS = ""
-PR = "r18"
+PR = "r19"
 
 inherit native
 
diff --git a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
index 707a005c5c..40bef907c8 100644
--- a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 CONFLICTS = "ipkg-link"
 RDEPENDS = "python"
 SRCDATE = "20050404"
-PR = "r20.1"
+PR = "r21"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
            file://ipkg-utils-fix.patch;patch=1 \
diff --git a/packages/linux/linux-omap2-git/beagleboard/16bpp.patch b/packages/linux/linux-omap2-git/beagleboard/16bpp.patch
index f1e2181c82..d2bff4b018 100644
--- a/packages/linux/linux-omap2-git/beagleboard/16bpp.patch
+++ b/packages/linux/linux-omap2-git/beagleboard/16bpp.patch
@@ -1,13 +1,137 @@
+diff --git a/drivers/video/omap/Kconfig b/drivers/video/omap/Kconfig
+index bdeb8fb..bf256f3 100644
+--- a/drivers/video/omap/Kconfig
++++ b/drivers/video/omap/Kconfig
+@@ -7,6 +7,27 @@ config FB_OMAP
+ 	help
+           Frame buffer driver for OMAP based boards.
+ 
++choice
++	depends on FB_OMAP && MACH_OMAP3_BEAGLE
++	prompt "Screen resolution"
++	default FB_OMAP_079M3R
++	help
++	  Selected desired screen resolution
++
++config FB_OMAP_031M3R
++	boolean "640 x 480 @ 60 Hz Reduced blanking"
++
++config FB_OMAP_048M3R
++	boolean "800 x 600 @ 60 Hz Reduced blanking"
++
++config FB_OMAP_079M3R
++	boolean "1024 x 768 @ 60 Hz Reduced blanking"
++
++config FB_OMAP_092M9R
++	boolean "1280 x 720 @ 60 Hz Reduced blanking"
++
++endchoice
++
+ config FB_OMAP_LCDC_EXTERNAL
+ 	bool "External LCD controller support"
+ 	depends on FB_OMAP
 diff --git a/drivers/video/omap/lcd_omap3beagle.c b/drivers/video/omap/lcd_omap3beagle.c
-index 69d4e06..c1c4f4c 100644
+index 69d4e06..5e098c2 100644
 --- a/drivers/video/omap/lcd_omap3beagle.c
 +++ b/drivers/video/omap/lcd_omap3beagle.c
-@@ -66,7 +66,7 @@ struct lcd_panel omap3beagle_panel = {
+@@ -31,10 +31,6 @@
+ 
+ #define LCD_PANEL_ENABLE_GPIO       170
+ 
+-#define LCD_XRES		1024	
+-#define LCD_YRES 		768
+-#define LCD_PIXCLOCK		64000 /* in kHz */
+-
+ static int omap3beagle_panel_init(struct lcd_panel *panel,
+ 				struct omapfb_device *fbdev)
+ {
+@@ -65,19 +61,76 @@ static unsigned long omap3beagle_panel_get_caps(struct lcd_panel *panel)
+ struct lcd_panel omap3beagle_panel = {
  	.name		= "omap3beagle",
  	.config		= OMAP_LCDC_PANEL_TFT,
- 
+-
 -	.bpp		= 24,
 +	.bpp		= 16,
  	.data_lines	= 24,
- 	.x_res		= LCD_XRES,
- 	.y_res		= LCD_YRES,
+-	.x_res		= LCD_XRES,
+-	.y_res		= LCD_YRES,
+-	.hsw		= 3,		/* hsync_len (4) - 1 */
+-	.hfp		= 3,		/* right_margin (4) - 1 */
+-	.hbp		= 39,		/* left_margin (40) - 1 */
+-	.vsw		= 1,		/* vsync_len (2) - 1 */
+-	.vfp		= 2,		/* lower_margin */
+-	.vbp		= 7,		/* upper_margin (8) - 1 */
+-
+-	.pixel_clock	= LCD_PIXCLOCK,
++
++#if defined CONFIG_FB_OMAP_031M3R
++
++	/* 640 x 480 @ 60 Hz  Reduced blanking VESA CVT 0.31M3-R */
++	.x_res		= 640,
++	.y_res		= 480,
++	.hfp		= 48,
++	.hsw		= 32,
++	.hbp		= 80,
++	.vfp		= 3,
++	.vsw		= 4,
++	.vbp		= 7,
++	.pixel_clock	= 23500,
++
++#elif defined CONFIG_FB_OMAP_048M3R
++ 
++	/* 800 x 600 @ 60 Hz  Reduced blanking VESA CVT 0.48M3-R */
++	.x_res		= 800,
++	.y_res		= 600,
++	.hfp		= 48,
++	.hsw		= 32,
++	.hbp		= 80,
++	.vfp		= 3,
++	.vsw		= 4,
++	.vbp		= 11,
++	.pixel_clock	= 35500,
++
++#elif defined CONFIG_FB_OMAP_079M3R
++
++	/* 1024 x 768 @ 60 Hz  Reduced blanking VESA CVT 0.79M3-R */
++	.x_res		= 1024,
++	.y_res		= 768,
++	.hfp		= 48,
++	.hsw		= 32,
++	.hbp		= 80,
++	.vfp		= 3,
++	.vsw		= 4,
++	.vbp		= 15,
++	.pixel_clock	= 56000,
++
++#elif defined CONFIG_FB_OMAP_092M9R
++
++	/* 1280 x 720 @ 60 Hz  Reduced blanking VESA CVT 0.92M9-R */
++	.x_res		= 1280,
++	.y_res		= 720,
++	.hfp		= 48,
++	.hsw		= 32,
++	.hbp		= 80,
++	.vfp		= 3,
++	.vsw		= 5,
++	.vbp		= 13,
++	.pixel_clock	= 64000,
++
++#else
++
++	/* use 640 x 480 if no config option */	
++	/* 640 x 480 @ 60 Hz  Reduced blanking VESA CVT 0.31M3-R */
++	.x_res		= 640,
++	.y_res		= 480,
++	.hfp		= 48,
++	.hsw		= 32,
++	.hbp		= 80,
++	.vfp		= 3,
++	.vsw		= 4,
++	.vbp		= 7,
++	.pixel_clock	= 23500,
++
++#endif
+ 
+ 	.init		= omap3beagle_panel_init,
+ 	.cleanup	= omap3beagle_panel_cleanup,
+
diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig
index 87fadae1ec..fa11eefc3c 100644
--- a/packages/linux/linux-omap2-git/beagleboard/defconfig
+++ b/packages/linux/linux-omap2-git/beagleboard/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.26-rc8-omap1
-# Fri Jul  4 09:57:18 2008
+# Sun Jul  6 15:22:47 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1225,6 +1225,10 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_FB_OMAP=y
+# CONFIG_FB_OMAP_031M3R is not set
+# CONFIG_FB_OMAP_048M3R is not set
+CONFIG_FB_OMAP_079M3R=y
+# CONFIG_FB_OMAP_092M9R is not set
 # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set
 # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
 CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=4
diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index 5307629282..0fcda6d6ad 100644
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MA
 SRCREV = "c32c81d59d2d8a66e63f82c9732db256d302068e"
 
 PV = "2.6.25+2.6.26-rc8+${PR}+git${SRCREV}"
-PR = "r38"
+PR = "r39"
 
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
diff --git a/packages/oprofile/oprofile_cvs.bb b/packages/oprofile/oprofile_cvs.bb
index 2096a27b40..786e7046de 100644
--- a/packages/oprofile/oprofile_cvs.bb
+++ b/packages/oprofile/oprofile_cvs.bb
@@ -7,6 +7,8 @@ LICENSE = "GPL"
 DEPENDS = "popt binutils"
 RDEPENDS = "binutils-symlinks"
 
+DEFAULT_PREFERENCE = "-1"
+
 SRC_URI = "cvs://anonymous@oprofile.cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \
            file://opstart.patch;patch=1 \
 	   file://acinclude.m4"
diff --git a/packages/sl/sl_3.03.bb b/packages/sl/sl_3.03.bb
index 883a48f67e..4b9061dd2e 100644
--- a/packages/sl/sl_3.03.bb
+++ b/packages/sl/sl_3.03.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Corrects you if you type `sl' by mistake"
+DESCRIPTION = "Corrects you if you type sl by mistake"
 SECTION = "console/games"
 LICENSE = "unknown"
 DEPENDS = "ncurses"
@@ -8,7 +8,7 @@ SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/universe/s/sl/sl_3.03.orig.tar.
 
 S = "${WORKDIR}/${P}.orig"
 
-LDFLAGS += "-lcurses"
+LDFLAGS += "-lncurses"
 
 do_install() {
         install -d ${D}${bindir}
diff --git a/packages/u-boot/u-boot-git/beagleboard/base.patch b/packages/u-boot/u-boot-git/beagleboard/base.patch
index 1d3a9e5154..dedc34398f 100644
--- a/packages/u-boot/u-boot-git/beagleboard/base.patch
+++ b/packages/u-boot/u-boot-git/beagleboard/base.patch
@@ -1467,10 +1467,10 @@ index 0000000..2f94684
 +#endif /* (CONFIG_COMMANDS & CFG_CMD_NAND) */
 diff --git a/board/omap3530beagle/omap3530beagle.c b/board/omap3530beagle/omap3530beagle.c
 new file mode 100644
-index 0000000..7d9a566
+index 0000000..0bdfb72
 --- /dev/null
 +++ b/board/omap3530beagle/omap3530beagle.c
-@@ -0,0 +1,388 @@
+@@ -0,0 +1,390 @@
 +/*
 + * (C) Copyright 2004-2008
 + * Texas Instruments, <www.ti.com>
@@ -1740,6 +1740,8 @@ index 0000000..7d9a566
 +	*((uint *) 0x49058094) = 0x00000506;
 +	*((uint *) 0x49056094) = 0xF060F000;
 +
++	/* set clksel_tv and clksel_dss1 */
++	*((uint *) 0x48004E40) = 0x00001002;
 +	return (0);
 +}
 +
diff --git a/packages/u-boot/u-boot_git.bb b/packages/u-boot/u-boot_git.bb
index 545438e9f7..c201eced37 100644
--- a/packages/u-boot/u-boot_git.bb
+++ b/packages/u-boot/u-boot_git.bb
@@ -1,5 +1,5 @@
 require u-boot.inc
-PR="r4"
+PR="r6"
 
 SRCREV_davinci-sffsdr = "a524e112b424c6843800ea2f19d3a8cf01d0aa94"
 SRCREV_beagleboard = "a94f22f08f280905926219e568568964cb9eeb9d"