[oe-commits] org.oe.dev merge of '1d6f127aae1dbce4a91a9955218de3c4f5ea5f7b'
mickeyl commit
oe at amethyst.openembedded.net
Wed Jul 30 18:44:26 UTC 2008
merge of '1d6f127aae1dbce4a91a9955218de3c4f5ea5f7b'
and '9a389e1e5a5eaac66e8c921c1d1196c323a5030c'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 29d752d6760fe8971e4d37f73f5bad5ed1b0abd7
ViewMTN: http://monotone.openembedded.org/revision/info/29d752d6760fe8971e4d37f73f5bad5ed1b0abd7
Files:
1
packages/python/python-mako_0.2.2.bb
packages/python/python-sphinxsearch_0.1.bb
packages/images/neuros-osd-base-image.bb
packages/linux/linux-neuros/neuros-osd2/defconfig
packages/linux/linux-neuros_git.bb
packages/tasks/task-python-everything.bb
packages/vlc/vlc-davinci_0.8.6h.bb
packages/tangogps/tangogps.inc
packages/tangogps/tangogps-fso_0.9.2.bb
packages/tangogps/tangogps_0.9.0.3.bb
Diffs:
#
# mt diff -r1d6f127aae1dbce4a91a9955218de3c4f5ea5f7b -r29d752d6760fe8971e4d37f73f5bad5ed1b0abd7
#
#
#
# add_file "packages/python/python-mako_0.2.2.bb"
# content [3a13570a7b58a0ed065bdbbb90fab10561d5b593]
#
# add_file "packages/python/python-sphinxsearch_0.1.bb"
# content [105f661ee4110699cbc0d8d3535b6487222e4efd]
#
# patch "packages/images/neuros-osd-base-image.bb"
# from [55e02451a61b84f5d6c47acfeab218b9afea1c42]
# to [46a40dc7951c724e6610019fc35a0d969739f332]
#
# patch "packages/linux/linux-neuros/neuros-osd2/defconfig"
# from [b437ee0b18fc27f9716c12f286fe71a31d157702]
# to [5539a43b14905d9753ce995624377ab86d43fca7]
#
# patch "packages/linux/linux-neuros_git.bb"
# from [813bb26cde3a341c5e30d2248400314919213a19]
# to [f776e221893fa16a1e86401186421973419fa57e]
#
# patch "packages/tasks/task-python-everything.bb"
# from [5c95c7ef9b80d1e01edfc398f561b98df36dd908]
# to [76ee4d36dc4c36625b1459bd63528acdd32188db]
#
# patch "packages/vlc/vlc-davinci_0.8.6h.bb"
# from [311b6631d2c164ed483e269854b4da6bc3236de6]
# to [b6c1bda931bc3931b51360e18ec6341576756a47]
#
============================================================
--- packages/python/python-mako_0.2.2.bb 3a13570a7b58a0ed065bdbbb90fab10561d5b593
+++ packages/python/python-mako_0.2.2.bb 3a13570a7b58a0ed065bdbbb90fab10561d5b593
@@ -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
============================================================
--- packages/python/python-sphinxsearch_0.1.bb 105f661ee4110699cbc0d8d3535b6487222e4efd
+++ packages/python/python-sphinxsearch_0.1.bb 105f661ee4110699cbc0d8d3535b6487222e4efd
@@ -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
============================================================
--- packages/images/neuros-osd-base-image.bb 55e02451a61b84f5d6c47acfeab218b9afea1c42
+++ packages/images/neuros-osd-base-image.bb 46a40dc7951c724e6610019fc35a0d969739f332
@@ -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 = ""
============================================================
--- packages/linux/linux-neuros/neuros-osd2/defconfig b437ee0b18fc27f9716c12f286fe71a31d157702
+++ packages/linux/linux-neuros/neuros-osd2/defconfig 5539a43b14905d9753ce995624377ab86d43fca7
@@ -32,7 +32,7 @@ CONFIG_LOCALVERSION=""
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_IDE=y
# 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_TVP5150=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
#
============================================================
--- packages/linux/linux-neuros_git.bb 813bb26cde3a341c5e30d2248400314919213a19
+++ packages/linux/linux-neuros_git.bb f776e221893fa16a1e86401186421973419fa57e
@@ -2,10 +2,10 @@ DESCRIPTION = "Linux kernel for Neuros O
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)"
============================================================
--- packages/tasks/task-python-everything.bb 5c95c7ef9b80d1e01edfc398f561b98df36dd908
+++ packages/tasks/task-python-everything.bb 76ee4d36dc4c36625b1459bd63528acdd32188db
@@ -1,7 +1,7 @@ LICENSE = "MIT"
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 \
============================================================
--- packages/vlc/vlc-davinci_0.8.6h.bb 311b6631d2c164ed483e269854b4da6bc3236de6
+++ packages/vlc/vlc-davinci_0.8.6h.bb b6c1bda931bc3931b51360e18ec6341576756a47
@@ -4,9 +4,9 @@ SECTION = "multimedia"
PRIORITY = "optional"
SECTION = "multimedia"
-SRCREV = "1ae3abd276bc478f7a3156c4acef1dd20f1b1899"
+SRCREV = "d13ee15ec1547dd34a3290684573f91df359f589"
-PR = "r3"
+PR = "r4"
PV = "0.8.6h+${PR}+gitr${SRCREV}"
#
# mt diff -r9a389e1e5a5eaac66e8c921c1d1196c323a5030c -r29d752d6760fe8971e4d37f73f5bad5ed1b0abd7
#
#
#
# add_file "packages/tangogps/tangogps.inc"
# content [97b25ecc7023d4936767623dc36d5816ad40d54b]
#
# patch "packages/tangogps/tangogps-fso_0.9.2.bb"
# from [1829b3be52c4104bd5fa0b9abcd36ff3948b5930]
# to [5cbb978159e893365e050b41da156f5424b7d760]
#
# patch "packages/tangogps/tangogps_0.9.0.3.bb"
# from [731daff061dae087ec470d68d35806ad95c3797a]
# to [2b0676072dcb31c2e8e6893bc89f5d69d6011670]
#
============================================================
--- packages/tangogps/tangogps.inc 97b25ecc7023d4936767623dc36d5816ad40d54b
+++ packages/tangogps/tangogps.inc 97b25ecc7023d4936767623dc36d5816ad40d54b
@@ -0,0 +1,10 @@
+DESCRIPTION = "A lightweight and fast mapping application"
+LICENSE = "GPLv2"
+SECTION = "x11/applications"
+PRIORITY = "optional"
+DEPENDS = "curl gtk+ gconf gypsy"
+
+SRC_URI = "http://www.tangogps.org/downloads/tangogps-${PV}.tar.gz"
+S = "${WORKDIR}/tangogps-${PV}"
+
+inherit autotools
============================================================
--- packages/tangogps/tangogps-fso_0.9.2.bb 1829b3be52c4104bd5fa0b9abcd36ff3948b5930
+++ packages/tangogps/tangogps-fso_0.9.2.bb 5cbb978159e893365e050b41da156f5424b7d760
@@ -1,13 +1,8 @@
-LICENSE = "GPLv2"
-SECTION = "x11/applications"
-PRIORITY = "optional"
-DESCRIPTION = "lightweight and fast mapping application"
-DEPENDS = "curl gtk+ gconf gypsy dbus-glib"
+require tangogps.inc
-inherit autotools
+RDEPENDS = "frameworkd"
+SRC_URI += "\
+ file://0002-Get-GPS-data-via-the-gypsy-interface.patch;patch=1 \
+ file://0003-Try-to-request-the-GPS-resource-from-ousaged.patch;patch=1 \
+"
-SRC_URI = "http://www.tangogps.org/downloads/tangogps-${PV}.tar.gz\
- file://0002-Get-GPS-data-via-the-gypsy-interface.patch;patch=1 \
- file://0003-Try-to-request-the-GPS-resource-from-ousaged.patch;patch=1"
-
-S=${WORKDIR}/tangogps-${PV}
============================================================
--- packages/tangogps/tangogps_0.9.0.3.bb 731daff061dae087ec470d68d35806ad95c3797a
+++ packages/tangogps/tangogps_0.9.0.3.bb 2b0676072dcb31c2e8e6893bc89f5d69d6011670
@@ -1,10 +1,4 @@
-LICENSE = "GPLv2"
-SECTION = "x11/applications"
-PRIORITY = "optional"
-DESCRIPTION = "lightweight and fast mapping application"
-DEPENDS = "curl gtk+ gconf gpsd"
+require tangogps.inc
+
+DEPENDS += "gpsd"
RDEPENDS = "gpsd"
-
-SRC_URI = "http://www.tangogps.org/downloads/${PN}-${PV}.tar.gz"
-
-inherit autotools
More information about the Openembedded-commits
mailing list