[oe-commits] org.oe.dev merge of '00eeaaee6f40de3293fc0a633b5d6fac506a7f54'

[dodji commit]

merge of '00eeaaee6f40de3293fc0a633b5d6fac506a7f54'
     and '4f26e8bbc7aa3ec656f049526069bce37063c326'

Author: dodji at openedhand.com
Branch: org.openembedded.dev
Revision: d0954a8a227efc014d29aba8d911adfc59934357
ViewMTN: http://monotone.openembedded.org/revision/info/d0954a8a227efc014d29aba8d911adfc59934357
Files:
1
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
packages/linux/linux-openmoko_2.6.22.5.bb
Diffs:

#
# mt diff -r00eeaaee6f40de3293fc0a633b5d6fac506a7f54 -rd0954a8a227efc014d29aba8d911adfc59934357
#
#
#
# patch "packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb"
#  from [f9825c85f0e52ef579e9bef9ad5f2469dae32694]
#    to [a4a2ac59779672f6a5b3885fc5f9e1f9cd030d69]
#
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb	f9825c85f0e52ef579e9bef9ad5f2469dae32694
+++ packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb	a4a2ac59779672f6a5b3885fc5f9e1f9cd030d69
@@ -3,9 +3,10 @@ PE = "1"
 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/xse
 	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"


#
# mt diff -r4f26e8bbc7aa3ec656f049526069bce37063c326 -rd0954a8a227efc014d29aba8d911adfc59934357
#
#
#
# patch "packages/linux/linux-openmoko_2.6.22.5.bb"
#  from [d89b509fdf785825a3eb01bc37bdbdbfe08e0bcf]
#    to [1e58f82511889c4f23c4fd8839680dd6c335509e]
#
============================================================
--- packages/linux/linux-openmoko_2.6.22.5.bb	d89b509fdf785825a3eb01bc37bdbdbfe08e0bcf
+++ packages/linux/linux-openmoko_2.6.22.5.bb	1e58f82511889c4f23c4fd8839680dd6c335509e
@@ -29,7 +29,6 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux
            file://iis-suspend.patch;patch=1 \
            file://s3c24xx-pcm-suspend.patch;patch=1 \
            file://gta-vibro-pwm-suspend.patch;patch=1 \
-           file://glamo-report-vram-size-to-userspace.patch;patch=1 \
            file://defconfig-${KERNEL_RELEASE}"
 
 S = "${WORKDIR}/linux-${VANILLA_VERSION}"