[oe-commits] org.oe.dev merge of '070533cbb8f39d9306bbc120371891e171775516'
ifaistos commit
openembedded-commits at lists.openembedded.org
Tue Oct 23 10:45:11 UTC 2007
merge of '070533cbb8f39d9306bbc120371891e171775516'
and 'f695654d2676f4d969fd509c4b4e96172463fbe2'
Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: 5c1f800d5a3c66b86677c20801619331b7bc3b4c
ViewMTN: http://monotone.openembedded.org/revision/info/5c1f800d5a3c66b86677c20801619331b7bc3b4c
Files:
1
packages/fbset/fbset-modes
packages/fbset/fbset-modes/fic-gta01
packages/fbset/fbset-modes/fic-gta01/fb.modes
packages/fbset/fbset-modes.bb
conf/distro/include/angstrom-2007-preferred-versions.inc
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
packages/fbset/fbset_2.1.bb
packages/gstreamer/gst-meta-base_0.10.bb
packages/linux/linux-ezx_2.6.21.bb
packages/tasks/task-openmoko.bb
packages/grdesktop
packages/grdesktop/grdesktop-0.23
packages/grdesktop/grdesktop-0.23/fr.po.patch
packages/grdesktop/grdesktop-0.23/install-help.patch
packages/grdesktop/grdesktop_0.23.bb
conf/distro/angstrom-2007.1.conf
Diffs:
#
# mt diff -r070533cbb8f39d9306bbc120371891e171775516 -r5c1f800d5a3c66b86677c20801619331b7bc3b4c
#
#
#
# add_dir "packages/fbset/fbset-modes"
#
# add_dir "packages/fbset/fbset-modes/fic-gta01"
#
# add_file "packages/fbset/fbset-modes/fic-gta01/fb.modes"
# content [69c95216456c7e600b70f0abf276b88b6dabc0fc]
#
# add_file "packages/fbset/fbset-modes.bb"
# content [2457f644de75bfb1dd5accd49d33c36e31d7fbf5]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [e755feeba1ad85fc8e37a2ef61b2f5629c6a9daf]
# to [4d5a7f08cdd84d2ab2ab7515d0b01729d2b6a2ed]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [b99885aacfc99f0c86d447df7bcc24bf538272e7]
# to [16c0fc923805c466619f4643b791f2d9181ad7f6]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [a95e773bc3e57df2c4a7569056a37d6ef59052af]
# to [301e003965fa638063dd3fca5ff7aa4b47691e1b]
#
# patch "packages/fbset/fbset_2.1.bb"
# from [40a6c728d0367db58266310f67a8cd583691333e]
# to [e076fdda9b2d137ffe3b0f7e1919558a79759bda]
#
# patch "packages/gstreamer/gst-meta-base_0.10.bb"
# from [f7556e526303b21566c49eb45960b865ca58944b]
# to [997c6ca039a778157fe99f9a3ec60d498181ec59]
#
# patch "packages/linux/linux-ezx_2.6.21.bb"
# from [eb31269e5b23d7d27da1cca934cbec96a1ca3234]
# to [8b5016d2776b0d38d689c421d789e102336bc6ff]
#
# patch "packages/tasks/task-openmoko.bb"
# from [870be401b6ac910ccf7cbc8611c17b7ebeb32882]
# to [c61e187b170a735e74e42908214d2ca1ea3c8cae]
#
============================================================
--- packages/fbset/fbset-modes/fic-gta01/fb.modes 69c95216456c7e600b70f0abf276b88b6dabc0fc
+++ packages/fbset/fbset-modes/fic-gta01/fb.modes 69c95216456c7e600b70f0abf276b88b6dabc0fc
@@ -0,0 +1,29 @@
+# Timings for GTA01 VGA and QVGA mode
+
+mode "480x640"
+ # D: 26.000 MHz, H: 43.334 kHz, V: 65.657 Hz
+ geometry 480 640 480 640 16
+ timings 38461 104 8 2 16 8 2
+ accel false
+endmode
+
+mode "vga"
+ # D: 26.000 MHz, H: 43.334 kHz, V: 65.657 Hz
+ geometry 480 640 480 640 16
+ timings 38461 104 8 2 16 8 2
+ accel false
+endmode
+
+mode "240x320"
+ # D: 8.475 MHz, H: 24.635 kHz, V: 75.569 Hz
+ geometry 240 320 240 320 16
+ timings 118000 88 8 2 2 8 2
+ accel false
+endmode
+
+mode "qvga"
+ # D: 8.475 MHz, H: 24.635 kHz, V: 75.569 Hz
+ geometry 240 320 240 320 16
+ timings 118000 88 8 2 2 8 2
+ accel false
+endmode
============================================================
--- packages/fbset/fbset-modes.bb 2457f644de75bfb1dd5accd49d33c36e31d7fbf5
+++ packages/fbset/fbset-modes.bb 2457f644de75bfb1dd5accd49d33c36e31d7fbf5
@@ -0,0 +1,18 @@
+DESCRIPTION = "Default display timings and resolutions for fbset"
+PV = "0.1.0"
+PR = "r0"
+
+ALLOW_EMPTY = "1"
+
+SRC_URI_append_fic-gta01 = " \
+ file://fb.modes"
+
+do_install() {
+ install -d ${D}${sysconfdir}
+ install -m 0644 ${WORKDIR}/fb.modes ${D}${sysconfdir}
+}
+
+FILES_${PN} = "${sysconfdir}/fb.modes"
+PACKAGE_ARCH_${PN} = "all"
+PACKAGE_ARCH_fbset-modes = "${MACHINE}"
+
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc e755feeba1ad85fc8e37a2ef61b2f5629c6a9daf
+++ conf/distro/include/angstrom-2007-preferred-versions.inc 4d5a7f08cdd84d2ab2ab7515d0b01729d2b6a2ed
@@ -668,7 +668,6 @@ PREFERRED_VERSION_hildon-thumbnail ?= "0
PREFERRED_VERSION_hildon-navigator ?= "0.9.6-2"
PREFERRED_VERSION_hildon-status-bar ?= "0.8.11-1"
PREFERRED_VERSION_hildon-thumbnail ?= "0.11"
-PREFERRED_VERSION_hnb ?= "1.9.17"
PREFERRED_VERSION_hostap-conf ?= "1.0"
PREFERRED_VERSION_hostap-daemon ?= "0.4.4"
PREFERRED_VERSION_hostap-modules ?= "0.4.7"
@@ -1232,7 +1231,7 @@ PREFERRED_VERSION_microwindows ?= "0.90"
PREFERRED_VERSION_micro-emacs ?= "20060909"
PREFERRED_VERSION_microcom ?= "1.02"
PREFERRED_VERSION_microwindows ?= "0.90"
-PREFERRED_VERSION_midori ?= "0.0.8"
+PREFERRED_VERSION_midori ?= "0.0.10"
PREFERRED_VERSION_midpath ?= "0.1"
PREFERRED_VERSION_midpath-alsa ?= "0.1"
PREFERRED_VERSION_midpath-cldc ?= "0.1"
============================================================
--- conf/distro/include/moko-autorev.inc b99885aacfc99f0c86d447df7bcc24bf538272e7
+++ conf/distro/include/moko-autorev.inc 16c0fc923805c466619f4643b791f2d9181ad7f6
@@ -7,9 +7,12 @@ SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}
SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
+SRCREV_pn-neod ?= "${AUTOREV}"
SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
+SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
+SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-common ?= "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcrevs.inc a95e773bc3e57df2c4a7569056a37d6ef59052af
+++ conf/distro/include/sane-srcrevs.inc 301e003965fa638063dd3fca5ff7aa4b47691e1b
@@ -49,7 +49,7 @@ SRCREV_pn-openmoko-appmanager2 ?= "3090"
SRCREV_pn-openmoko-appearance ?= "3239"
SRCREV_pn-openmoko-appmanager ?= "1851"
SRCREV_pn-openmoko-appmanager2 ?= "3090"
-SRCREV_pn-openmoko-browser2 ?= "3082"
+SRCREV_pn-openmoko-browser2 ?= "3249"
SRCREV_pn-openmoko-calculator ?= "2404"
SRCREV_pn-openmoko-calculator2 ?= "3235"
SRCREV_pn-openmoko-common ?= "397"
@@ -103,7 +103,7 @@ SRCREV_pn-sphyrna ?= "45"
SRCREV_pn-settings-daemon ?= "1755"
SRCREV_pn-sjf2410-linux-native ?= "933"
SRCREV_pn-sphyrna ?= "45"
-SRCREV_pn-webkit-gtk ?= "26079"
+SRCREV_pn-webkit-gtk ?= "26915"
SRCREV_pn-webkit-qt ?= "26079"
SRCREV_pn-webkit-qtopia ?= "26079"
SRCREV_pn-xoo ?= "1623"
============================================================
--- packages/fbset/fbset_2.1.bb 40a6c728d0367db58266310f67a8cd583691333e
+++ packages/fbset/fbset_2.1.bb e076fdda9b2d137ffe3b0f7e1919558a79759bda
@@ -7,6 +7,7 @@ LICENSE = "GPL"
DESCRIPTION = "The fbset console tool"
LICENSE = "GPL"
+RRECOMMENDS = "fbset-modes"
PR = "r2"
============================================================
--- packages/gstreamer/gst-meta-base_0.10.bb f7556e526303b21566c49eb45960b865ca58944b
+++ packages/gstreamer/gst-meta-base_0.10.bb 997c6ca039a778157fe99f9a3ec60d498181ec59
@@ -1,8 +1,8 @@ DEPENDS = "gstreamer gst-plugins-base gs
# Based on its sibling on Poky which is copyright (C) 2006,2007 OpenedHand LTD
DESCRIPTION = "Gstreamer package groups"
DEPENDS = "gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly"
-PR = "r9"
+PR = "r10"
PACKAGES = "\
gst-meta-base \
@@ -20,17 +20,15 @@ RDEPENDS_gst-meta-base = "\
gst-plugin-audioconvert \
gst-plugin-audioresample \
gst-plugin-typefindfunctions \
- gst-plugin-videoscale \
gst-plugin-autodetect"
RRECOMMENDS_gst-meta-base = "\
gst-plugin-gnomevfs \
gst-plugin-alsa \
gst-plugin-ximagesink \
- gst-plugin-typefindfunctions \
gst-plugin-videoscale \
- gst-plugin-ffmpegcolorspace \
- gst-plugin-autodetect"
+ gst-plugin-videorate \
+ gst-plugin-ffmpegcolorspace"
RDEPENDS_gst-meta-audio = "\
gst-meta-base \
@@ -49,6 +47,9 @@ RDEPENDS_gst-meta-video = "\
gst-meta-base \
gst-plugin-avi \
gst-plugin-matroska \
+ gst-plugin-mpegstream \
+ gst-plugin-mpegaudioparse \
+ gst-plugin-mpegvideoparse \
gst-plugin-mpeg2dec"
RRECOMMENDS_gst-meta-video = "\
============================================================
--- packages/linux/linux-ezx_2.6.21.bb eb31269e5b23d7d27da1cca934cbec96a1ca3234
+++ packages/linux/linux-ezx_2.6.21.bb 8b5016d2776b0d38d689c421d789e102336bc6ff
@@ -1,8 +1,8 @@ EZX = "ezxdev"
DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and E680"
AUTHOR = "The OpenEZX Team <openezx-devel at lists.openezx.org>"
HOMEPAGE = "http://www.openezx.org"
EZX = "ezxdev"
-PR = "${EZX}-r23"
+PR = "${EZX}-r24"
require linux.inc
@@ -92,8 +92,8 @@ CMDLINE_CON = "console=tty1 "
#CMDLINE_CON = "console=ttyS2,115200n8 console=tty1 "
CMDLINE_CON = "console=tty1 "
-CMDLINE_ROOT = "root=/dev/mmcblk0p2 rootfstype=ext2 rootdelay=5"
-CMDLINE_NFSROOT = "root=/dev/nfs rootfstype=nfs nfsroot=192.168.0.200:/export/ezx-image rootdelay=5 "
+CMDLINE_ROOT = "root=/dev/mmcblk0p2 rootfstype=ext2 rootdelay=1"
+CMDLINE_NFSROOT = "root=/dev/nfs rootfstype=nfs nfsroot=192.168.0.200:/export/ezx-image rootdelay=1 "
# Uncomment to enable dyntick
#CMDLINE_OTHER = "dyntick=enable"
CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
============================================================
--- packages/tasks/task-openmoko.bb 870be401b6ac910ccf7cbc8611c17b7ebeb32882
+++ packages/tasks/task-openmoko.bb c61e187b170a735e74e42908214d2ca1ea3c8cae
@@ -37,6 +37,8 @@ RDEPENDS_task-openmoko-linux = "\
rsync \
screen \
psplash \
+ fbset \
+ fbset-modes \
# update-alternatives \
"
#
# mt diff -rf695654d2676f4d969fd509c4b4e96172463fbe2 -r5c1f800d5a3c66b86677c20801619331b7bc3b4c
#
#
#
# add_dir "packages/grdesktop"
#
# add_dir "packages/grdesktop/grdesktop-0.23"
#
# add_file "packages/grdesktop/grdesktop-0.23/fr.po.patch"
# content [5c4dc9a83fbb35a2dce0ee2f9fa1c7af925dc960]
#
# add_file "packages/grdesktop/grdesktop-0.23/install-help.patch"
# content [334ad5006db33fcb62a7da3bdf40bb4a242a5385]
#
# add_file "packages/grdesktop/grdesktop_0.23.bb"
# content [fe223775e1264037b8ea322322934800c3985844]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [99f9b8aefa171947ca0486164ce4bbc39d40e700]
# to [65949b96ffda674365178112dee75bfe8cf276c9]
#
============================================================
--- packages/grdesktop/grdesktop-0.23/fr.po.patch 5c4dc9a83fbb35a2dce0ee2f9fa1c7af925dc960
+++ packages/grdesktop/grdesktop-0.23/fr.po.patch 5c4dc9a83fbb35a2dce0ee2f9fa1c7af925dc960
@@ -0,0 +1,11 @@
+--- /po/orig-fr.po 2004-03-04 13:22:07.000000000 +0200
++++ /po/fr.po 2007-10-23 11:56:53.000000000 +0300
+@@ -12,7 +12,7 @@
+ "PO-Revision-Date: 2002-11-13 16:30+0200\n"
+ "Last-Translator: Jean-Francois Kubitowicz <jean-francois.kubitowicz at laposte."
+ "net>\n"
+-"Language-Team: LANGUAGE <LL at li.org>\n"
++"Language-Team: French <LL at li.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=utf-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
============================================================
--- packages/grdesktop/grdesktop-0.23/install-help.patch 334ad5006db33fcb62a7da3bdf40bb4a242a5385
+++ packages/grdesktop/grdesktop-0.23/install-help.patch 334ad5006db33fcb62a7da3bdf40bb4a242a5385
@@ -0,0 +1,11 @@
+--- /help/C/orig-Makefile.am 2004-03-30 16:56:57.000000000 +0300
++++ /help/C/Makefile.am 2007-10-23 12:22:10.000000000 +0300
+@@ -40,7 +40,7 @@
+ install-data-hook-omf:
+ $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
+ for file in $(extraomf); do \
+- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++ $(INSTALL_DATA) $$file $(DESTDIR)$(omf_dest_dir)/$$file; \
+ done
+ -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
+
============================================================
--- packages/grdesktop/grdesktop_0.23.bb fe223775e1264037b8ea322322934800c3985844
+++ packages/grdesktop/grdesktop_0.23.bb fe223775e1264037b8ea322322934800c3985844
@@ -0,0 +1,21 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+DESCRIPTION = "grdesktop is a GNOME frontend, for the remote desktop client (rdesktop)."
+HOMEPAGE = "http://www.nongnu.org/grdesktop/index.html"
+SECTION = "x11/utils"
+LICENSE = "GPLv2"
+
+DEPENDS = "gtk+ libgnomeui"
+RDEPENDS ="rdesktop"
+
+PR = "r0"
+
+SRC_URI = "http://download.savannah.nongnu.org/releases/grdesktop/grdesktop-${PV}.tar.gz \
+ file://fr.po.patch;patch=1 \
+ file://install-help.patch;patch=1"
+
+
+S = "${WORKDIR}/grdesktop-${PV}"
+
+inherit autotools pkgconfig
+
============================================================
--- conf/distro/angstrom-2007.1.conf 99f9b8aefa171947ca0486164ce4bbc39d40e700
+++ conf/distro/angstrom-2007.1.conf 65949b96ffda674365178112dee75bfe8cf276c9
@@ -71,7 +71,7 @@ PREFERRED_VERSION_pango = "1.
PREFERRED_VERSION_cairo = "1.4.10"
PREFERRED_VERSION_glib-2.0 = "2.12.12"
PREFERRED_VERSION_pango = "1.16.4"
-PREFERRED_VERSION_atk = "1.10.3"
+PREFERRED_VERSION_atk = "1.20.0"
PREFERRED_VERSION_gtk+ = "2.10.14"
# newer poppler cvs breaks some apps, fix until popper 6 and apps
More information about the Openembedded-commits
mailing list