merge of '1d6f127aae1dbce4a91a9955218de3c4f5ea5f7b'

     and '9a389e1e5a5eaac66e8c921c1d1196c323a5030c'

7 files changed, 40 insertions, 10 deletions

diff --git a/packages/images/neuros-osd-base-image.bb b/packages/images/neuros-osd-base-image.bb
index d2e39760c8..008bd67321 100644
--- a/packages/images/neuros-osd-base-image.bb
+++ b/packages/images/neuros-osd-base-image.bb
@@ -21,6 +21,9 @@ IMAGE_INSTALL = "task-boot \
                  wireless-tools zd1211-firmware \
                  ${DISTRO_SSH_DAEMON} \
                  qt-embedded dbus \
+                 neuros-mainmenu \
+                 neuros-nwm \
+#                 vlc-davinci \
                 "
 
 IMAGE_LINGUAS = ""
diff --git a/packages/linux/linux-neuros/neuros-osd2/defconfig b/packages/linux/linux-neuros/neuros-osd2/defconfig
index d68f2d069f..1958f1ca0c 100644
--- a/packages/linux/linux-neuros/neuros-osd2/defconfig
+++ b/packages/linux/linux-neuros/neuros-osd2/defconfig
@@ -32,7 +32,7 @@ CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
@@ -496,7 +496,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 CONFIG_IDE=y
-CONFIG_IDE_MAX_HWIFS=4
+CONFIG_IDE_MAX_HWIFS=1
 CONFIG_BLK_DEV_IDE=y
 
 #
@@ -850,6 +850,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 CONFIG_VIDEO_DAVINCI=y
 CONFIG_VIDEO_TVP5150=y
+CONFIG_VIDEO_TVP7000=y
 # CONFIG_VIDEO_TVP5146 is not set
 # CONFIG_VIDEO_CPIA is not set
 # CONFIG_VIDEO_CPIA2 is not set
@@ -892,7 +893,7 @@ CONFIG_DAB=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_VIDEO_OUTPUT_CONTROL=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FB_DDC is not set
@@ -914,9 +915,9 @@ CONFIG_FB_DEFERRED_IO=y
 # Frame buffer hardware drivers
 #
 # CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_DAVINCI=y
+# CONFIG_FB_DAVINCI is not set
 # CONFIG_FB_VIRTUAL is not set
-
+CONFIG_FB_DM=y
 #
 # Console display driver support
 #
diff --git a/packages/linux/linux-neuros_git.bb b/packages/linux/linux-neuros_git.bb
index 345e3174ae..563a2c5aaa 100644
--- a/packages/linux/linux-neuros_git.bb
+++ b/packages/linux/linux-neuros_git.bb
@@ -2,10 +2,10 @@ require linux.inc
 
 DESCRIPTION = "Linux kernel for Neuros OSD devices"
 
-SRCREV = "7ee93e596406d465e5af2c119e13def9af323f6b"
+SRCREV = "d2867be8abb7d67442cec3ae13d782f1254835d8"
 
 PV = "2.6.23-${PR}+git${SRCREV}"
-PR = "r8"
+PR = "r9"
 
 COMPATIBLE_MACHINE = "(neuros-osd|neuros-osd2)"
 
diff --git a/packages/python/python-mako_0.2.2.bb b/packages/python/python-mako_0.2.2.bb
new file mode 100644
index 0000000000..718e58a09b
--- /dev/null
+++ b/packages/python/python-mako_0.2.2.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "A super-fast templating language that borrows the best ideas from the existing templating languages"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "MIT"
+HOMEPAGE = "http://www.makotemplates.org/"
+SRCNAME = "Mako"
+PR = "ml0"
+
+SRC_URI = "http://pypi.python.org/packages/source/M/Mako/Mako-${PV}.tar.gz" 
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
diff --git a/packages/python/python-sphinxsearch_0.1.bb b/packages/python/python-sphinxsearch_0.1.bb
new file mode 100644
index 0000000000..6c1afdcbe6
--- /dev/null
+++ b/packages/python/python-sphinxsearch_0.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "A module for querying the sphinx search daemon"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.sphinxsearch.com/"
+SRCNAME = "sphinxsearch"
+PR = "ml0"
+
+SRC_URI = "http://pypi.python.org/packages/source/s/sphinxsearch/${SRCNAME}-${PV}.tar.gz" 
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb
index 623337455c..f6aec948bd 100644
--- a/packages/tasks/task-python-everything.bb
+++ b/packages/tasks/task-python-everything.bb
@@ -1,7 +1,7 @@
 DESCRIPTION= "Everything Python"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml31"
+PR = "ml32"
 
 RDEPENDS = "\
 		python-ao 		\
@@ -33,6 +33,7 @@ RDEPENDS = "\
 		python-lxml		\
 		python-m2crypto \
 		python-mad		\
+		python-mako		\
 		python-numarray		\
 		python-numeric		\
 		python-ogg		\
@@ -79,6 +80,7 @@ RDEPENDS = "\
 		python-sgmlop		\
 		python-snmplib		\
 		python-soappy		\
+		python-sphinxsearch	\
 		python-spydi		\
 		python-spyro		\
 		python-sqlalchemy	\
diff --git a/packages/vlc/vlc-davinci_0.8.6h.bb b/packages/vlc/vlc-davinci_0.8.6h.bb
index 6f0308880c..26fba388c3 100644
--- a/packages/vlc/vlc-davinci_0.8.6h.bb
+++ b/packages/vlc/vlc-davinci_0.8.6h.bb
@@ -4,9 +4,9 @@ LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "multimedia"
 
-SRCREV = "1ae3abd276bc478f7a3156c4acef1dd20f1b1899"
+SRCREV = "d13ee15ec1547dd34a3290684573f91df359f589"
 
-PR = "r3"
+PR = "r4"
 
 PV = "0.8.6h+${PR}+gitr${SRCREV}"