diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb | 26 | ||||
| -rw-r--r-- | packages/tasks/task-openmoko.bb | 15 | ||||
| -rw-r--r-- | packages/tslib/tslib/e680/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/tslib/tslib/e680/tslib.sh | 6 | ||||
| -rw-r--r-- | packages/xserver-kdrive-common/xserver-kdrive-common/Xserver | 27 | ||||
| -rw-r--r-- | packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver | 28 | ||||
| -rw-r--r-- | packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb | 2 |
7 files changed, 66 insertions, 38 deletions
diff --git a/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb b/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb new file mode 100644 index 0000000000..6ac1c3fca4 --- /dev/null +++ b/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution, QVGA edition" +SECTION = "openmoko/base" +RCONFLICTS = "openmoko-theme-standard" +RPROVIDES = "openmoko-theme-standard-2" +PV = "0.1.0+${SVNREV}" +PR = "r0" + +inherit openmoko2 + +SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/themes;module=openmoko-standard-2-qvga;proto=http" +S = "${WORKDIR}/openmoko-standard-2-qvga" + +do_install() { + find ${WORKDIR} -name ".svn" | xargs rm -rf + install -d ${D}${datadir}/themes/openmoko-standard-2/gtk-2.0 + cp -fpPR ${S}/* ${D}${datadir}/themes/openmoko-standard-2/ + rm -rf ${D}${datadir}/themes/openmoko-standard-2/patches/ + + install -d ${D}${sysconfdir}/gtk-2.0 + echo 'include "${datadir}/themes/openmoko-standard-2/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc +} + +CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc" + +PACKAGE_ARCH = "all" +FILES_${PN} = "${datadir} ${sysconfdir}" diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 3616d843e2..f28589b6b7 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -68,14 +68,25 @@ RDEPENDS_task-openmoko-ui = "\ settings-daemon \ \ openmoko-session2 \ - openmoko-theme-standard2 \ - openmoko-icon-theme-standard2 \ openmoko-sound-system \ openmoko-sound-theme-standard \ neod \ gpe-scap \ " +# handle theming. FIXME: properly use machine database in a smart way, +# taking into account not only size but also PPI! Ultimately this might +# need recomputing some theme files and images on-the-fly :/ SVG and logical +# theme description anyone? +THEMES = "openmoko-icon-theme-standard2 openmoko-theme-standard2" +THEMES_a780 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga" +THEMES_e680 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga" +THEMES_a1200 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga" +THEMES_rokr2 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga" +THEMES_rokr6 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga" + +RDEPENDS_task-openmoko-ui += "${THEMES}" + # # task-openmoko-base # diff --git a/packages/tslib/tslib/e680/.mtn2git_empty b/packages/tslib/tslib/e680/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/tslib/tslib/e680/.mtn2git_empty +++ /dev/null diff --git a/packages/tslib/tslib/e680/tslib.sh b/packages/tslib/tslib/e680/tslib.sh deleted file mode 100644 index 51cd0f1f36..0000000000 --- a/packages/tslib/tslib/e680/tslib.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -TSLIB_TSDEVICE=/dev/input/event1 -TSLIB_CONFFILE=/etc/ts.conf - -export TSLIB_TSDEVICE TSLIB_CONFFILE diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver index 709d501dfc..cd58624ce0 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver @@ -74,8 +74,7 @@ case `module_id` in *Poodle) ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@270" ;; *Collie) - ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@270" - ;; + ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@270" ;; "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") ARGS="$ARGS -dpi 200 -rgba rgb" ;; "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi") @@ -90,23 +89,23 @@ case `module_id` in ARGS="$ARGS -dpi 142" ;; "HTC Universal") ARGS="$ARGS -dpi 225 -screen 480x640@270" ;; - "ARM-IntegratorCP" | "ARM-Versatile PB") - ARGS="$ARGS -rgba vrgb" ;; - "Compulab CM-x270") + "ARM-IntegratorCP" | "ARM-Versatile PB") + ARGS="$ARGS -rgba vrgb" ;; + "Compulab CM-x270") modprobe mbxfb - ARGS="$ARGS -fb /dev/fb1" - ;; - "GTA01") + ARGS="$ARGS -fb /dev/fb1" ;; + "GTA01" | "GTA02") ARGS="$ARGS -dpi 285 -screen 480x640" ;; "Nokia N800") - ARGS="$ARGS -dpi 225 -screen 800x480x16 -mouse tslib" ;; + ARGS="$ARGS -dpi 225 -screen 800x480x16 -mouse tslib" ;; + "Motorola Ezx Platform") + ARGS="$ARGS -dpi 170 -screen 240x320" ;; *) - # Its a device we dont know about - in which case force - # kdrive to use the current framebuffer geometry otherwise - # it will defualt to trying to achieve 1024x768 + # 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" - ;; + 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 dddced4b6f..7c8e6d3365 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver @@ -24,8 +24,6 @@ fi . /etc/profile - - fallback_screen_arg() { geom=`fbset | grep geometry` w=`echo $geom | awk '{ print $2 }'` @@ -90,23 +88,23 @@ case `module_id` in ARGS="$ARGS -br -dpi 142" ;; "HTC Universal") ARGS="$ARGS -br -dpi 225 -screen 480x640@270" ;; - "ARM-IntegratorCP" | "ARM-Versatile PB") - ARGS="$ARGS -br -rgba vrgb" ;; - "Compulab CM-x270") + "ARM-IntegratorCP" | "ARM-Versatile PB") + ARGS="$ARGS -br -rgba vrgb" ;; + "Compulab CM-x270") modprobe mbxfb - ARGS="$ARGS -br -fb /dev/fb1" - ;; + ARGS="$ARGS -br -fb /dev/fb1" ;; "GTA01" | "GTA02") ARGS="$ARGS -dpi 285 -screen 480x640 -hide-cursor -root-ppm /usr/share/pixmaps/xsplash.ppm" ;; + "Motorola Ezx Platform") + ARGS="$ARGS -dpi 170 -screen 240x320 -hide-cursor -root-ppm /usr/share/pixmaps/xsplash.ppm" ;; "Nokia N800") - ARGS="$ARGS -br -dpi 225 -screen 800x480x16 -mouse tslib" ;; - *) - # Its a device we dont know about - in which case force - # kdrive to use the current framebuffer geometry otherwise - # it will defualt to trying to achieve 1024x768 - S=`fallback_screen_arg` - ARGS="$ARGS -screen $S" - ;; + ARGS="$ARGS -br -dpi 225 -screen 800x480x16 -mouse tslib" ;; + *) + # 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_0.1.bb b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb index cb3cf4578f..9329cd2e52 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb +++ b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit" -PR = "r17" +PR = "r18" SRC_URI = "\ file://Xdefaults \ |