aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDojii Seketeli <dodji@openedhand.com>2008-01-09 21:05:10 +0000
committerDojii Seketeli <dodji@openedhand.com>2008-01-09 21:05:10 +0000
commit7fbdf8b4dcd7a7a1d596c5c14ac9e2b545b9eff8 (patch)
treed2eb3057e2efda78c3039754f81f41f7ae38efef
parentfc6f8419e5eed8f16a9fefd193c94c08c26024fd (diff)
parent5f85023a55c3e444f6e53dd77de449f8c2f3ef34 (diff)
downloadopenembedded-7fbdf8b4dcd7a7a1d596c5c14ac9e2b545b9eff8.tar.gz
openembedded-7fbdf8b4dcd7a7a1d596c5c14ac9e2b545b9eff8.tar.bz2
openembedded-7fbdf8b4dcd7a7a1d596c5c14ac9e2b545b9eff8.zip
merge of '00eeaaee6f40de3293fc0a633b5d6fac506a7f54'
and '4f26e8bbc7aa3ec656f049526069bce37063c326'
-rw-r--r--packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb14
1 files changed, 5 insertions, 9 deletions
diff --git a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index 368b421650..e3bb271ef2 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -3,9 +3,10 @@ require xserver-kdrive-common.inc
DEPENDS += "libxkbfile libxcalibrate"
PE = "1"
-PR = "r21"
+PR = "r22"
-SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
+#SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
+SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git;tag=master \
${KDRIVE_COMMON_PATCHES} \
file://enable-epson.patch;patch=1 \
file://enable-builtin-fonts.patch;patch=1 \
@@ -21,15 +22,10 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
file://w100-fix-offscreen-bmp.patch;patch=1 \
file://kdrive-1.3-18bpp.patch;patch=1 \
file://gumstix-kmode.patch;patch=1 \
- file://smedia-glamo.patch;patch=1 \
- file://build-glamo.patch;patch=1 \
- file://00-xglamo-logs.patch;patch=1 \
- file://01-xglamo-scrolling-artifact-fix.patch;patch=1 \
- file://02-xglamo-no-dri.patch;patch=1 \
- file://03-xglamo-no-vesa.patch;patch=1 \
"
-S = "${WORKDIR}/xorg-server-${PV}"
+#S = "${WORKDIR}/xorg-server-${PV}"
+S = "${WORKDIR}/git"
W100_OECONF = "--disable-w100"
W100_OECONF_arm = "--enable-w100"