From 861bd6ec70ed68f7931065aa41977f26717da2de Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 29 Sep 2007 19:20:10 +0000 Subject: xserver-kdrive-common: fix tabs/indentation of Xserver script --- .../xserver-kdrive-common/xserver-kdrive-common/Xserver | 14 +++++++------- .../xserver-kdrive-common/openmoko/Xserver | 13 ++++++------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver index 5965352c83..b0c65f426e 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver @@ -91,19 +91,19 @@ case `module_id` in ARGS="$ARGS -rgba vrgb" ;; "Compulab CM-x270") modprobe mbxfb - ARGS="$ARGS -fb /dev/fb1" ;; + ARGS="$ARGS -fb /dev/fb1" ;; "GTA01" | "GTA02") ARGS="$ARGS -dpi 285 -screen 480x640" ;; "Nokia N800") ARGS="$ARGS -dpi 225 -screen 800x480x16 -mouse tslib" ;; "Motorola Ezx Platform") ARGS="$ARGS -dpi 170 -screen 240x320" ;; - *) - # It is a device we do not know about, in which case we force - # kdrive to use the current framebuffer geometry -- otherwise - # it will default to trying to achieve 1024x768 - S=`fallback_screen_arg` - ARGS="$ARGS -screen $S" ;; + *) + # It is a device we do not know about, in which case we force + # kdrive to use the current framebuffer geometry -- otherwise + # it will default to trying to achieve 1024x768 + S=`fallback_screen_arg` + ARGS="$ARGS -screen $S" ;; esac DISPLAY=':0' diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver index 0b65c264a9..f6d30113af 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver @@ -72,8 +72,7 @@ case `module_id` in *Poodle) ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270" ;; *Collie) - ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270" - ;; + ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270" ;; "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") ARGS="$ARGS -br -dpi 200 -rgba rgb" ;; "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi") @@ -89,7 +88,7 @@ case `module_id` in "HTC Universal") ARGS="$ARGS -br -dpi 225 -screen 480x640@270" ;; "ARM-IntegratorCP" | "ARM-Versatile PB") - ARGS="$ARGS -br -rgba vrgb" ;; + ARGS="$ARGS -br -rgba vrgb" ;; "Compulab CM-x270") modprobe mbxfb ARGS="$ARGS -br -fb /dev/fb1" ;; @@ -100,11 +99,11 @@ case `module_id` in "Nokia N800") ARGS="$ARGS -br -dpi 225 -screen 800x480x16 -mouse tslib" ;; *) - # It is a device we do not know about, in which case we force + # It is a device we do not know about, in which case we force # kdrive to use the current framebuffer geometry -- otherwise - # it will default to trying to achieve 1024x768 - S=`fallback_screen_arg` - ARGS="$ARGS -screen $S" ;; + # it will default to trying to achieve 1024x768 + S=`fallback_screen_arg` + ARGS="$ARGS -screen $S" ;; esac DISPLAY=':0' -- cgit v1.2.3 From 231e1df3269619850860e229962473a29fd9694a Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 29 Sep 2007 19:33:53 +0000 Subject: xserver-kdrive-common: only consider Xw100/Ximageon if the device has such a chip --- .../xserver-kdrive-common/Xserver | 23 ++++++++++++++-------- .../xserver-kdrive-common/openmoko/Xserver | 23 ++++++++++++++-------- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver index b0c65f426e..85ca58439a 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver @@ -15,12 +15,6 @@ fi if [ -f /usr/bin/Xomap ]; then XSERVER=/usr/bin/Xomap fi -if [ -f /usr/bin/Xw100 ]; then - XSERVER=/usr/bin/Xw100 -fi -if [ -f /usr/bin/Ximageon ]; then - XSERVER=/usr/bin/Ximageon -fi . /etc/profile @@ -64,7 +58,9 @@ case `module_id` in "HP iPAQ H5400" | "HP iPAQ H2200") ARGS="$ARGS -dpi 100 -rgba rgb" ;; "HP iPAQ HX4700") - ARGS="$ARGS -dpi 200" ;; + ARGS="$ARGS -dpi 200" + IMAGEON="w3220" + ;; "Ramses") # What is this "vt2" in aid of? ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@90 vt2" ;; @@ -74,7 +70,9 @@ case `module_id` in *Collie) ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@270" ;; "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") - ARGS="$ARGS -dpi 200 -rgba rgb" ;; + ARGS="$ARGS -dpi 200 -rgba rgb" + IMAGEON="w100" + ;; "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi") ARGS="$ARGS -dpi 200 -rgba rgb -screen 480x640@270" ;; "Simpad") @@ -106,6 +104,15 @@ case `module_id` in ARGS="$ARGS -screen $S" ;; esac +if [ ! -z "$IMAGEON" ]; then + if [ -f /usr/bin/Xw100 ]; then + XSERVER=/usr/bin/Xw100 + fi + if [ -f /usr/bin/Ximageon ]; then + XSERVER=/usr/bin/Ximageon + fi +fi + DISPLAY=':0' exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $* diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver index f6d30113af..489010a414 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver @@ -15,12 +15,6 @@ fi if [ -f /usr/bin/Xomap ]; then XSERVER=/usr/bin/Xomap fi -if [ -f /usr/bin/Xw100 ]; then - XSERVER=/usr/bin/Xw100 -fi -if [ -f /usr/bin/Ximageon ]; then - XSERVER=/usr/bin/Ximageon -fi . /etc/profile @@ -64,7 +58,9 @@ case `module_id` in "HP iPAQ H5400" | "HP iPAQ H2200") ARGS="$ARGS -br -dpi 100 -rgba rgb" ;; "HP iPAQ HX4700") - ARGS="$ARGS -br -dpi 200" ;; + ARGS="$ARGS -br -dpi 200" + IMAGEON="w3220" + ;; "Ramses") # What is this "vt2" in aid of? ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@90 vt2" ;; @@ -74,7 +70,9 @@ case `module_id` in *Collie) ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270" ;; "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") - ARGS="$ARGS -br -dpi 200 -rgba rgb" ;; + ARGS="$ARGS -br -dpi 200 -rgba rgb" + IMAGEON="w100" + ;; "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi") ARGS="$ARGS -br -dpi 200 -rgba rgb -screen 480x640@270" ;; "Simpad") @@ -106,6 +104,15 @@ case `module_id` in ARGS="$ARGS -screen $S" ;; esac +if [ ! -z "$IMAGEON" ]; then + if [ -f /usr/bin/Xw100 ]; then + XSERVER=/usr/bin/Xw100 + fi + if [ -f /usr/bin/Ximageon ]; then + XSERVER=/usr/bin/Ximageon + fi +fi + DISPLAY=':0' exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $* -- cgit v1.2.3 From fae15326b7a88c3464d096ba4c64f7eca202c885 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Sat, 29 Sep 2007 20:36:40 +0000 Subject: gnome-keyring: Change package version from 2.20 to 2.20.0. Fixes bb parsing. --- packages/gnome/gnome-keyring_2.20.0.bb | 23 +++++++++++++++++++++++ packages/gnome/gnome-keyring_2.20.bb | 23 ----------------------- 2 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 packages/gnome/gnome-keyring_2.20.0.bb delete mode 100644 packages/gnome/gnome-keyring_2.20.bb diff --git a/packages/gnome/gnome-keyring_2.20.0.bb b/packages/gnome/gnome-keyring_2.20.0.bb new file mode 100644 index 0000000000..2f72c5dfb1 --- /dev/null +++ b/packages/gnome/gnome-keyring_2.20.0.bb @@ -0,0 +1,23 @@ +LICENSE = "GPL" +SECTION = "x11/gnome" + +PR = "r2" + +inherit autotools gnome pkgconfig + +DEPENDS = "gtk+ libgcrypt" + +EXTRA_OECONF = "--disable-gtk-doc" + +SRC_URI += "file://org.gnome.keyring.service" + +do_install_append () { + install -d ${D}${datadir}/dbus-1/services + install -m 0644 ${WORKDIR}/org.gnome.keyring.service ${D}${datadir}/dbus-1/services +} + +FILES_${PN} += "${datadir}/dbus-1/services" + +do_stage() { + autotools_stage_all +} diff --git a/packages/gnome/gnome-keyring_2.20.bb b/packages/gnome/gnome-keyring_2.20.bb deleted file mode 100644 index c18d9f19f4..0000000000 --- a/packages/gnome/gnome-keyring_2.20.bb +++ /dev/null @@ -1,23 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" - -PR = "r1" - -inherit autotools gnome pkgconfig - -DEPENDS = "gtk+ libgcrypt" - -EXTRA_OECONF = "--disable-gtk-doc" - -SRC_URI += "file://org.gnome.keyring.service" - -do_install_append () { - install -d ${D}${datadir}/dbus-1/services - install -m 0644 ${WORKDIR}/org.gnome.keyring.service ${D}${datadir}/dbus-1/services -} - -FILES_${PN} += "${datadir}/dbus-1/services" - -do_stage() { - autotools_stage_all -} -- cgit v1.2.3