Merge branch 'master' of git://openpandora.org/openpandora.oe

diff --git a/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb b/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb
index 1f20d95..fc31937 100755 (executable)
--- a/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb
+++ b/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb
@@ -5,7 +5,7 @@ KERNEL_IMAGETYPE = "uImage"
 
 COMPATIBLE_MACHINE = "omap3-pandora"
 
-SRCREV = "fd96f5bb4f65e1fd6f185a37073dfaf76da57e4a"
+SRCREV = "a0a25e6fd8c1f53602d73f818e327cbb29e2ba86"
 
 SRC_URI = " \
            git://git.openpandora.org/pandora-kernel.git;protocol=git;branch=pandora-27-omap1 \
@@ -33,7 +33,6 @@ SRC_URI_append = " \
            file://dvb-fix-dma.diff;patch=1 \
            file://0001-Removed-resolution-check-that-prevents-scaling-when.patch;patch=1 \
            file://0001-Implement-downsampling-with-debugs.patch;patch=1 \
-           file://sitecomwl168-support.diff;patch=1 \
            file://musb-rxtx.patch;patch=1 \
 "
 

diff --git a/recipes/pandora-system/pandora-misc.bb b/recipes/pandora-system/pandora-misc.bb
index d3a639d..e189c7d 100644 (file)
--- a/recipes/pandora-system/pandora-misc.bb
+++ b/recipes/pandora-system/pandora-misc.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Miscellaneous OpenPandora utilities"
 
-PR = "r4"
+PR = "r5"
 
 PARALLEL_MAKE = ""
 
@@ -12,7 +12,7 @@ SRC_URI = " \
 
 TARGET_LDFLAGS += "-lpthread -lX11 -lts"
 
-SRCREV = "27058c48ecef47331a1f1683fb323ba51a8a5670"
+SRCREV = "9179a68e9f79d99534111f09971c2ad434990843"
 
 S = "${WORKDIR}/git"
 

diff --git a/recipes/tasks/task-pandora-core.bb b/recipes/tasks/task-pandora-core.bb
index 876b19e..8d2dfe9 100755 (executable)
--- a/recipes/tasks/task-pandora-core.bb
+++ b/recipes/tasks/task-pandora-core.bb
@@ -5,12 +5,11 @@ DESCRIPTION = "Task file for default core/console apps and libs in the Pandora i
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r22"
+PR = "r24"
 
 inherit task 
 
 AUFS = " \
-#  aufs2-27 \
   aufs2-util \
 "
 
@@ -123,6 +122,7 @@ RDEPENDS_${PN} = "\
   ${MEDIA_LIBS} \
   ${OPENGLES} \
   ${PANDORA_LIBS} \
+  ${PAM} \  
   ${SSH} \
   ${SUDO} \
   ${TOUCHSCREEN} \
@@ -133,20 +133,12 @@ RDEPENDS_${PN} = "\
   python-pygame \
   alsa-utils alsa-utils-alsactl alsa-utils-alsamixer alsa-utils-aplay \
   rdesktop \
-  mplayer \
   \
 #  angstrom-zeroconf-audio \
   angstrom-led-config \ 
-  \
-  ${PAM} \
 "
 
 # Make sure we install all kernel modules with the Pandora images
 RRECOMMENDS_${PN} += "kernel-modules"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-RRECOMMENDS_${PN}_append_armv7a = " \
-#      gnash gnash-browser-plugin \
-       omapfbplay \
-"

diff --git a/recipes/tasks/task-pandora-xfce.bb b/recipes/tasks/task-pandora-xfce.bb
index 4825a80..7f3fae4 100755 (executable)
--- a/recipes/tasks/task-pandora-xfce.bb
+++ b/recipes/tasks/task-pandora-xfce.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Task file for the XFCE Pandora image"
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r23"
+PR = "r24"
 
 inherit task
 
@@ -61,11 +61,11 @@ GAMES = " \
 #  scummvm \
 #  frozen-bubble \
 #  gnome-games \  
-  numptyphysics \
+#  numptyphysics \
 "
 
 GNOME_APPS = " \
-  gnome-mplayer \
+#  gnome-mplayer \
 #  gcalctool \ 
   gnome-keyring gnome-keyring-pam-plugin \
   gksu \
@@ -78,13 +78,13 @@ GNOME_GTK = " \
 
 GSTREAMER = " \
 #  gstreamer-ti \
-  gst-ffmpeg \
+#  gst-ffmpeg \
   gst-omapfb \
 #  gst-plugin-pulse \
   gst-plugin-xvimagesink \
-  gst-plugins-base-meta \
-  gst-plugins-good-meta \
-  gst-plugins-bad-meta \
+#  gst-plugins-base-meta \
+#  gst-plugins-good-meta \
+#  gst-plugins-bad-meta \
 #  gst-plugins-ugly-meta \
   gst-plugin-gles \
 "
@@ -148,16 +148,16 @@ BAD_RRECOMMENDS += " \
 "
 
 TOTEM = " \
-  totem \
-  totem-browser-plugin \
-  totem-plugin-bemused \
-  totem-plugin-gromit \
-  totem-plugin-media-player-keys \
-  totem-plugin-ontop \
-  totem-plugin-properties \
-  totem-plugin-screensaver \
-  totem-plugin-skipto \
-  totem-plugin-thumbnail \
+#  totem \
+#  totem-browser-plugin \
+#  totem-plugin-bemused \
+#  totem-plugin-gromit \
+#  totem-plugin-media-player-keys \
+#  totem-plugin-ontop \
+#  totem-plugin-properties \
+#  totem-plugin-screensaver \
+#  totem-plugin-skipto \
+#  totem-plugin-thumbnail \
 "
 
 TOUCHSCREEN = " \