diff options
author | Ross Burton <ross@openedhand.com> | 2008-09-26 09:02:47 +0000 |
---|---|---|
committer | Ross Burton <ross@openedhand.com> | 2008-09-26 09:02:47 +0000 |
commit | 005f63f560c5e0bb8a13087bc1c2107c4a6aa786 (patch) | |
tree | 376d68472e276c890b53d822a919fa5d4be2bd6a | |
parent | cd8b52418c475cf8708f136babb2bfa2f3b1744f (diff) | |
download | poky-005f63f560c5e0bb8a13087bc1c2107c4a6aa786.tar.gz |
Merged revisions 5203,5235-5236,5278-5279 via svnmerge from
https://svn.o-hand.com/repos/poky/trunk
........
r5203 | richard | 2008-09-19 18:32:35 +0100 (Fri, 19 Sep 2008) | 1 line
tune-xscale.inc: Compile cairo for armv4 to avoid alighment trap issues with double instruction
........
r5235 | ross | 2008-09-23 10:54:16 +0100 (Tue, 23 Sep 2008) | 1 line
poky-fixed-revisions.inc: bump matchbox-desktop srvrev to fix icon loading bug
........
r5236 | ross | 2008-09-23 11:14:38 +0100 (Tue, 23 Sep 2008) | 1 line
poky-fixed-revisions.inc: fix typo
........
r5278 | ross | 2008-09-25 21:52:29 +0100 (Thu, 25 Sep 2008) | 1 line
dialer: specify revision instead of using autorev
........
r5279 | richard | 2008-09-25 22:03:38 +0100 (Thu, 25 Sep 2008) | 1 line
xserver-kdrive: Feed xrandr calls to the framebuffer driver in case it can do better than software rotation
........
git-svn-id: https://svn.o-hand.com/repos/poky/branches/elroy@5285 311d38ba-8fff-0310-9ca6-ca027cbcb966
5 files changed, 66 insertions, 3 deletions
diff --git a/meta-openmoko/packages/dialer/dialer_git.bb b/meta-openmoko/packages/dialer/dialer_git.bb index 9669ee0aa3..602565f04f 100644 --- a/meta-openmoko/packages/dialer/dialer_git.bb +++ b/meta-openmoko/packages/dialer/dialer_git.bb | |||
@@ -8,7 +8,6 @@ inherit autotools pkgconfig | |||
8 | 8 | ||
9 | SRC_URI = "git://folks.o-hand.com/thomas/git/phone.git;protocol=http" | 9 | SRC_URI = "git://folks.o-hand.com/thomas/git/phone.git;protocol=http" |
10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
11 | SRCREV = "${AUTOREV}" | ||
12 | 11 | ||
13 | EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}" | 12 | EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}" |
14 | 13 | ||
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc index 59dd6cebdc..c635fbf3f2 100644 --- a/meta/conf/distro/include/poky-fixed-revisions.inc +++ b/meta/conf/distro/include/poky-fixed-revisions.inc | |||
@@ -24,6 +24,7 @@ SRCREV_pn-clutter-box2d = "3197" | |||
24 | SRCREV_pn-clutter-cairo ?= "3210" | 24 | SRCREV_pn-clutter-cairo ?= "3210" |
25 | SRCREV_pn-clutter-gst ?= "3188" | 25 | SRCREV_pn-clutter-gst ?= "3188" |
26 | SRCREV_pn-clutter ?= "3240" | 26 | SRCREV_pn-clutter ?= "3240" |
27 | SRCREV_pn-dialer ?= "42a2b4dd62cf94dc905caeb087f5e7e9f418bf93" | ||
27 | SRCREV_pn-dbus-wait ?= "402" | 28 | SRCREV_pn-dbus-wait ?= "402" |
28 | SRCREV_pn-eds-dbus ?= "691" | 29 | SRCREV_pn-eds-dbus ?= "691" |
29 | SRCREV_pn-evince ?= "2437" | 30 | SRCREV_pn-evince ?= "2437" |
@@ -46,7 +47,7 @@ SRCREV_pn-matchbox-applet-light ?= "1548" | |||
46 | SRCREV_pn-matchbox-common ?= "1561" | 47 | SRCREV_pn-matchbox-common ?= "1561" |
47 | SRCREV_pn-matchbox-config-gtk ?= "1614" | 48 | SRCREV_pn-matchbox-config-gtk ?= "1614" |
48 | SRCREV_pn-matchbox-desktop-sato ?= "76" | 49 | SRCREV_pn-matchbox-desktop-sato ?= "76" |
49 | SRCREV_pn-matchbox-desktop ?= "2077" | 50 | SRCREV_pn-matchbox-desktop ?= "2078" |
50 | SRCREV_pn-matchbox-keyboard ?= "1910" | 51 | SRCREV_pn-matchbox-keyboard ?= "1910" |
51 | SRCREV_pn-matchbox-panel-2 ?= "2061" | 52 | SRCREV_pn-matchbox-panel-2 ?= "2061" |
52 | SRCREV_pn-matchbox-panel ?= "1364" | 53 | SRCREV_pn-matchbox-panel ?= "1364" |
diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc index fc6827c532..134758621e 100644 --- a/meta/conf/machine/include/tune-xscale.inc +++ b/meta/conf/machine/include/tune-xscale.inc | |||
@@ -7,3 +7,4 @@ BASE_PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANE | |||
7 | # webkit-gtk has alignment issues with double instructions on armv5 so | 7 | # webkit-gtk has alignment issues with double instructions on armv5 so |
8 | # disable them here | 8 | # disable them here |
9 | TARGET_CC_ARCH_pn-webkit-gtk = "-march=armv4t" | 9 | TARGET_CC_ARCH_pn-webkit-gtk = "-march=armv4t" |
10 | TARGET_CC_ARCH_pn-cairo = "-march=armv4t" | ||
diff --git a/meta/packages/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch b/meta/packages/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch new file mode 100644 index 0000000000..a5c22a5efc --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch | |||
@@ -0,0 +1,61 @@ | |||
1 | Index: xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c | ||
2 | =================================================================== | ||
3 | --- xorg-server-1.3.0.0.orig/hw/kdrive/fbdev/fbdev.c 2008-09-25 21:55:12.000000000 +0100 | ||
4 | +++ xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c 2008-09-25 21:55:46.000000000 +0100 | ||
5 | @@ -498,6 +498,7 @@ | ||
6 | KdScreenInfo *screen = pScreenPriv->screen; | ||
7 | FbdevScrPriv *scrpriv = screen->driver; | ||
8 | Bool wasEnabled = pScreenPriv->enabled; | ||
9 | + FbdevPriv *priv = screen->card->driver; | ||
10 | FbdevScrPriv oldscr; | ||
11 | int oldwidth; | ||
12 | int oldheight; | ||
13 | @@ -525,11 +526,46 @@ | ||
14 | oldheight = screen->height; | ||
15 | oldmmwidth = pScreen->mmWidth; | ||
16 | oldmmheight = pScreen->mmHeight; | ||
17 | - | ||
18 | + | ||
19 | /* | ||
20 | * Set new configuration | ||
21 | */ | ||
22 | - | ||
23 | + | ||
24 | + if (newwidth != oldwidth || newheight != oldheight) | ||
25 | + { | ||
26 | + struct fb_var_screeninfo var; | ||
27 | + int k; | ||
28 | + | ||
29 | + k = ioctl (priv->fd, FBIOGET_VSCREENINFO, &var); | ||
30 | + | ||
31 | + if (k < 0) | ||
32 | + { | ||
33 | + ErrorF("Error with framebuffer ioctl FBIOGET_VSCREENINFO: %s", strerror (errno)); | ||
34 | + return FALSE; | ||
35 | + } | ||
36 | + | ||
37 | + var.xres = newwidth; | ||
38 | + var.yres = newheight; | ||
39 | + var.activate = FB_ACTIVATE_NOW; | ||
40 | + | ||
41 | + k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &var); | ||
42 | + | ||
43 | + if (k >= 0) | ||
44 | + { | ||
45 | + if ((k=ioctl(priv->fd, FBIOGET_FSCREENINFO, &priv->fix)) < 0) | ||
46 | + { | ||
47 | + perror("Error with framebuffer ioctl FIOGET_FSCREENINFO"); | ||
48 | + close (priv->fd); | ||
49 | + return FALSE; | ||
50 | + } | ||
51 | + if ((k=ioctl(priv->fd, FBIOGET_VSCREENINFO, &priv->var)) < 0) { | ||
52 | + perror("Error framebuffer ioctl FIOGET_VSCREENINFO"); | ||
53 | + close (priv->fd); | ||
54 | + return FALSE; | ||
55 | + } | ||
56 | + } | ||
57 | + } | ||
58 | + | ||
59 | scrpriv->randr = KdAddRotation (screen->randr, randr); | ||
60 | |||
61 | KdOffscreenSwapOut (screen->pScreen); | ||
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb index 6b494d3e45..b1d654b391 100644 --- a/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb +++ b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb | |||
@@ -3,7 +3,7 @@ require xserver-kdrive.inc | |||
3 | DEPENDS += "libxkbfile libxcalibrate" | 3 | DEPENDS += "libxkbfile libxcalibrate" |
4 | 4 | ||
5 | PE = "1" | 5 | PE = "1" |
6 | PR = "r18" | 6 | PR = "r21" |
7 | 7 | ||
8 | SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ | 8 | SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ |
9 | file://extra-kmodes.patch;patch=1 \ | 9 | file://extra-kmodes.patch;patch=1 \ |
@@ -20,6 +20,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ | |||
20 | file://enable-xcalibrate.patch;patch=1 \ | 20 | file://enable-xcalibrate.patch;patch=1 \ |
21 | file://hide-cursor-and-ppm-root.patch;patch=1 \ | 21 | file://hide-cursor-and-ppm-root.patch;patch=1 \ |
22 | file://xcalibrate_coords.patch;patch=1 \ | 22 | file://xcalibrate_coords.patch;patch=1 \ |
23 | file://fbdev_xrandr_ioctl.patch;patch=1 \ | ||
23 | file://scheduler.patch;patch=1" | 24 | file://scheduler.patch;patch=1" |
24 | 25 | ||
25 | S = "${WORKDIR}/xorg-server-${PV}" | 26 | S = "${WORKDIR}/xorg-server-${PV}" |