helium-3rd-party/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky synced 2026-04-02 02:49:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 5203,5235-5236,5278-5279 via svnmerge from

Browse Source 
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
This commit is contained in:
Ross Burton 2008-09-26 09:02:47 +00:00
parent cd8b52418c
commit 005f63f560
5 changed files with 66 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta-openmoko/packages/dialer/dialer_git.bb
View File

@ -8,7 +8,6 @@ inherit autotools pkgconfig
SRC_URI = "git://folks.o-hand.com/thomas/git/phone.git;protocol=http"
S = "${WORKDIR}/git"
SRCREV = "${AUTOREV}"
EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"

3
meta/conf/distro/include/poky-fixed-revisions.inc
View File

@ -24,6 +24,7 @@ SRCREV_pn-clutter-box2d = "3197"
SRCREV_pn-clutter-cairo ?= "3210"
SRCREV_pn-clutter-gst ?= "3188"
SRCREV_pn-clutter ?= "3240"
SRCREV_pn-dialer ?= "42a2b4dd62cf94dc905caeb087f5e7e9f418bf93"
SRCREV_pn-dbus-wait ?= "402"
SRCREV_pn-eds-dbus ?= "691"
SRCREV_pn-evince ?= "2437"
@ -46,7 +47,7 @@ SRCREV_pn-matchbox-applet-light ?= "1548"
SRCREV_pn-matchbox-common ?= "1561"
SRCREV_pn-matchbox-config-gtk ?= "1614"
SRCREV_pn-matchbox-desktop-sato ?= "76"
SRCREV_pn-matchbox-desktop ?= "2077"
SRCREV_pn-matchbox-desktop ?= "2078"
SRCREV_pn-matchbox-keyboard ?= "1910"
SRCREV_pn-matchbox-panel-2 ?= "2061"
SRCREV_pn-matchbox-panel ?= "1364"

1
meta/conf/machine/include/tune-xscale.inc
View File

@ -7,3 +7,4 @@ BASE_PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANE
# webkit-gtk has alignment issues with double instructions on armv5 so
# disable them here
TARGET_CC_ARCH_pn-webkit-gtk = "-march=armv4t"
TARGET_CC_ARCH_pn-cairo = "-march=armv4t"

61
meta/packages/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch Normal file
View File

@ -0,0 +1,61 @@
Index: xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c
===================================================================
--- xorg-server-1.3.0.0.orig/hw/kdrive/fbdev/fbdev.c 2008-09-25 21:55:12.000000000 +0100
+++ xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c 2008-09-25 21:55:46.000000000 +0100
@@ -498,6 +498,7 @@
KdScreenInfo *screen = pScreenPriv->screen;
FbdevScrPriv *scrpriv = screen->driver;
Bool wasEnabled = pScreenPriv->enabled;
+ FbdevPriv *priv = screen->card->driver;
FbdevScrPriv oldscr;
int oldwidth;
int oldheight;
@@ -525,11 +526,46 @@
oldheight = screen->height;
oldmmwidth = pScreen->mmWidth;
oldmmheight = pScreen->mmHeight;
-
+
/*
* Set new configuration
*/
-
+
+ if (newwidth != oldwidth || newheight != oldheight)
+ {
+ struct fb_var_screeninfo var;
+ int k;
+
+ k = ioctl (priv->fd, FBIOGET_VSCREENINFO, &var);
+
+ if (k < 0)
+ {
+ ErrorF("Error with framebuffer ioctl FBIOGET_VSCREENINFO: %s", strerror (errno));
+ return FALSE;
+ }
+
+ var.xres = newwidth;
+ var.yres = newheight;
+ var.activate = FB_ACTIVATE_NOW;
+
+ k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &var);
+
+ if (k >= 0)
+ {
+ if ((k=ioctl(priv->fd, FBIOGET_FSCREENINFO, &priv->fix)) < 0)
+ {
+ perror("Error with framebuffer ioctl FIOGET_FSCREENINFO");
+ close (priv->fd);
+ return FALSE;
+ }
+ if ((k=ioctl(priv->fd, FBIOGET_VSCREENINFO, &priv->var)) < 0) {
+ perror("Error framebuffer ioctl FIOGET_VSCREENINFO");
+ close (priv->fd);
+ return FALSE;
+ }
+ }
+ }
+
scrpriv->randr = KdAddRotation (screen->randr, randr);
KdOffscreenSwapOut (screen->pScreen);

3
meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
View File

@ -3,7 +3,7 @@ require xserver-kdrive.inc
DEPENDS += "libxkbfile libxcalibrate"
PE = "1"
PR = "r18"
PR = "r21"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
file://extra-kmodes.patch;patch=1 \
@ -20,6 +20,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
file://enable-xcalibrate.patch;patch=1 \
file://hide-cursor-and-ppm-root.patch;patch=1 \
file://xcalibrate_coords.patch;patch=1 \
file://fbdev_xrandr_ioctl.patch;patch=1 \
file://scheduler.patch;patch=1"
S = "${WORKDIR}/xorg-server-${PV}"