aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/distro/include/sane-srcrevs.inc2
-rw-r--r--packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb34
2 files changed, 8 insertions, 28 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 8844f5edde..8e48ba407b 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -178,5 +178,5 @@ SRCREV_pn-wesnoth ?= "22021"
SRCREV_pn-wlan-ng-modules ?= "1859"
SRCREV_pn-wlan-ng-utils ?= "1859"
SRCREV_pn-xoo ?= "1971"
-SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
+SRCREV_pn-xserver-kdrive-glamo ?= "4147f80c0bfedaff7749bccbd1e1d566dee0e04c"
SRCREV_pn-zhone ?= "69e029bd85a1caaad4e5d61087836a8e1ea20dcc"
diff --git a/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb b/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb
index 65ff03cc16..8c285b75dd 100644
--- a/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb
+++ b/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "X server for glamo chip in GTA02"
+DESCRIPTION = "X server for glamo chip in the Openmoko GTA02 device"
SECTION = "x11/base"
LICENSE = "MIT"
DEPENDS = "compositeproto damageproto fixesproto recordproto resourceproto \
@@ -8,37 +8,17 @@ DEPENDS = "compositeproto damageproto fixesproto recordproto resourceproto \
DEPENDS += "libxkbfile libxcalibrate"
RDEPENDS_${PN} = "xserver-kdrive"
PROVIDES = "virtual/xserver"
+
PE = "1"
-PR = "r6"
-PV = "1.3.0.0+git${SRCREV}"
+PV = "1.3.0.0+gitr${SRCREV}"
+PR = "r0"
-SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git \
- file://kmode.patch;patch=1 \
- file://disable-apm.patch;patch=1 \
- file://no-serial-probing.patch;patch=1 \
- file://fbdev-not-fix.patch;patch=1 \
- file://optional-xkb.patch;patch=1 \
- file://enable-tslib.patch;patch=1 \
- file://kmode-palm.patch;patch=1 \
- file://enable-epson.patch;patch=1 \
- file://enable-builtin-fonts.patch;patch=1 \
- file://kdrive-evdev.patch;patch=1 \
- file://kdrive-use-evdev.patch;patch=1 \
- file://disable-xf86-dga-xorgcfg.patch;patch=1 \
- file://fix_default_mode.patch;patch=1 \
- file://enable-xcalibrate.patch;patch=1 \
- file://hide-cursor-and-ppm-root.patch;patch=1 \
- file://xcalibrate_coords.patch;patch=1 \
- file://w100.patch;patch=1 \
- file://w100-autofoo.patch;patch=1 \
- file://w100-fix-offscreen-bmp.patch;patch=1 \
- file://kdrive-1.3-18bpp.patch;patch=1 \
- file://gumstix-kmode.patch;patch=1 \
- file://fix-picturestr-include-order.patch;patch=1 \
-"
+COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = 'om-gta02'
FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.3.0.0:${FILE_DIRNAME}/xserver-kdrive:${FILE_DIRNAME}/files"
+SRC_URI = "git://git.openmoko.org/git/xglamo.git;protocol=git"
S = "${WORKDIR}/git"
inherit autotools pkgconfig