Merge branch 'org.openembedded.dev' of git@melo.nslu2-linux.org:openembedded into org.openembedded.dev

7 files changed, 59 insertions, 10 deletions

diff --git a/packages/clutter/clutter-box2d_svn.bb b/packages/clutter/clutter-box2d_svn.bb
index f241622a50..24b9b1feae 100644
--- a/packages/clutter/clutter-box2d_svn.bb
+++ b/packages/clutter/clutter-box2d_svn.bb
@@ -1,7 +1,7 @@
 require clutter-box2d.inc
 
 PV = "0.0+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http"
 
diff --git a/packages/clutter/clutter_0.8+svn.bb b/packages/clutter/clutter_0.8+svn.bb
new file mode 100644
index 0000000000..a203165ca8
--- /dev/null
+++ b/packages/clutter/clutter_0.8+svn.bb
@@ -0,0 +1,14 @@
+require clutter.inc
+
+CLUTTER_REV = "3597"
+
+PV = "0.8.4+svnr${CLUTTER_REV}"
+PR = "r0"
+SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-8;proto=http;rev=${CLUTTER_REV} \
+           file://enable_tests.patch;patch=1;maxrev=2989 \
+           file://enable-tests-r2990.patch;patch=1;minrev=2990"
+
+S = "${WORKDIR}/clutter-0-8"
+
+
+
diff --git a/packages/clutter/clutter_svn.bb b/packages/clutter/clutter_svn.bb
index cf88871ae0..cdcb2109e0 100644
--- a/packages/clutter/clutter_svn.bb
+++ b/packages/clutter/clutter_svn.bb
@@ -1,5 +1,7 @@
 require clutter.inc
 
+DEFAULT_PREFERENCE = "-1"
+
 PV = "0.8.0+svnr${SRCREV}"
 PR = "r0"
 
diff --git a/packages/linux/linux-omap-2.6.27/beagleboard/defconfig b/packages/linux/linux-omap-2.6.27/beagleboard/defconfig
index fde144acef..8380a200bf 100644
--- a/packages/linux/linux-omap-2.6.27/beagleboard/defconfig
+++ b/packages/linux/linux-omap-2.6.27/beagleboard/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.27-omap1
-# Sat Dec 20 19:45:19 2008
+# Sun Jan  4 17:13:56 2009
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1270,15 +1270,23 @@ CONFIG_PVR_SGX_CORE_REV_103=y
 CONFIG_PVR_PVR2D_ALT_2DHW=y
 CONFIG_PVR_SYSTEM_OMAP3430=y
 # CONFIG_PVR_SYSTEM_NO_HARDWARE is not set
-# CONFIG_PVR_BUFFERCLASS_EXAMPLE is not set
+CONFIG_PVR_BUFFERCLASS_EXAMPLE=y
 CONFIG_PVR_USE_PTHREADS=y
 CONFIG_PVR_SUPPORT_SGX_EVENT_OBJECT=y
 CONFIG_PVR_SYS_USING_INTERRUPTS=y
 CONFIG_PVR_SUPPORT_HW_RECOVERY=y
 CONFIG_PVR_SUPPORT_ACTIVE_POWER_MANAGEMENT=y
-CONFIG_PVR_BUILD_RELEASE=y
-# CONFIG_PVR_BUILD_DEBUG is not set
+# CONFIG_PVR_BUILD_RELEASE is not set
+CONFIG_PVR_BUILD_DEBUG=y
 # CONFIG_PVR_BUILD_TIMING is not set
+CONFIG_PVR_DEBUG_LINUX_MEMORY_ALLOCATIONS=y
+CONFIG_PVR_DEBUG_LINUX_MEM_AREAS=y
+CONFIG_PVR_DEBUG_LINUX_MMAP_AREAS=y
+# CONFIG_PVR_DEBUG_LINUX_XML_PROC_FILES is not set
+# CONFIG_PVR_DEBUG_LINUX_SLAB_ALLOCATIONS is not set
+CONFIG_PVR_DEBUG_BRIDGE_KM=y
+# CONFIG_PVR_DEBUG_TRACE_BRIDGE_KM is not set
+CONFIG_PVR_DEBUG_BEIDGE_KM_DISPATCH_TABLE=y
 CONFIG_PVR_SUPPORT_SGX1=y
 # CONFIG_DRM_VER_ORIG is not set
 CONFIG_DRM_VER_TUNGSTEN=y
@@ -1313,7 +1321,7 @@ CONFIG_FB_OMAP=y
 CONFIG_FB_OMAP_VIDEO_MODE="1024x768@60"
 # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set
 # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
-CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=8
+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=12
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
diff --git a/packages/linux/linux-omap_2.6.27.bb b/packages/linux/linux-omap_2.6.27.bb
index 34d3b4ac17..bc12d9da62 100644
--- a/packages/linux/linux-omap_2.6.27.bb
+++ b/packages/linux/linux-omap_2.6.27.bb
@@ -6,7 +6,7 @@ KERNEL_IMAGETYPE = "uImage"
 COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|omap3evm"
 
 SRCREV = "2a3408be17f287fdb5809c9b6c68e7ad96d25b74"
-PR = "r5"
+PR = "r7"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
diff --git a/packages/powervr-drivers/libgles-omap3/rc.pvr b/packages/powervr-drivers/libgles-omap3/rc.pvr
new file mode 100755
index 0000000000..7c23603280
--- /dev/null
+++ b/packages/powervr-drivers/libgles-omap3/rc.pvr
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+rmmod bc_example
+rmmod omaplfb
+rmmod pvrsrvkm
+
+insmod $(find /lib/modules/$(uname -r) -name "pvrsrvkm.ko")
+modprobe -f bc_example
+modprobe -f omaplfb
+
+pvr_maj=`grep "pvrsrvkm$" /proc/devices | cut -b1,2,3`
+
+if [ -e /dev/pvrsrvkm ] ; then 
+	rm -f /dev/pvrsrvkm
+fi
+
+mknod /dev/pvrsrvkm c $pvr_maj 0 
+
+/usr/bin/pvrsrvinit
+
diff --git a/packages/powervr-drivers/libgles-omap3_1.0.bb b/packages/powervr-drivers/libgles-omap3_1.0.bb
index 8656ec04a5..b18b7a485b 100644
--- a/packages/powervr-drivers/libgles-omap3_1.0.bb
+++ b/packages/powervr-drivers/libgles-omap3_1.0.bb
@@ -1,9 +1,11 @@
 DESCRIPTION = "libGLES for the omap3"
 LICENCE = "proprietary-binary"
-PR = "r4"
+PR = "r6"
 
 # Put "OMAP35x_Graphics_SDK_setuplinux_3_00_00_01.bin" in the same directory as this recipe
-SRC_URI = "file://OMAP35x_Graphics_SDK_setuplinux_3_00_00_01.bin"
+SRC_URI = "file://OMAP35x_Graphics_SDK_setuplinux_3_00_00_01.bin \
+           file://rc.pvr \
+          "
 
 S = "${WORKDIR}/OMAP35x_Graphics_SDK_3_00_00_01"
 
@@ -57,7 +59,7 @@ do_install () {
 	cp -pPR ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/Include/* ${D}${includedir}/
 	
 	install -d ${D}${sysconfdir}/init.d/
-	cp -pP ${S}/gfx_rel/rc.pvr ${D}${sysconfdir}/init.d/pvr-init
+	cp -pP ${WORKDIR}/rc.pvr ${D}${sysconfdir}/init.d/pvr-init
 }
 
 do_stage () {
@@ -69,6 +71,9 @@ do_stage () {
 	cp -pPR ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/Include/*  ${STAGING_INCDIR}/
 }
 
+# Quality control is really poor on these SDKs, so hack around the latest madness:
+FILES_${PN} += "${libdir}/*.so"
+FILES_${PN}-dev = "${includedir}"
 
 pkg_postinst() {
 #!/bin/sh