[oe-commits] org.oe.dev merge of '20d0fba0036cb5884005ec525ad0313ac816ab40'

[xora commit]

merge of '20d0fba0036cb5884005ec525ad0313ac816ab40'
     and '42116cabf57a560c5f62c543e5cfde0687c99243'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 2cede492dcacf2a0da5e0cdd419d41a41086b31d
ViewMTN: http://monotone.openembedded.org/revision/info/2cede492dcacf2a0da5e0cdd419d41a41086b31d
Files:
1
packages/xorg-xserver/gumstix-kmode.patch
packages/rxvt-unicode/rxvt-unicode_7.9.bb
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
conf/machine/include/zaurus-2.6.inc
Diffs:

#
# mt diff -r20d0fba0036cb5884005ec525ad0313ac816ab40 -r2cede492dcacf2a0da5e0cdd419d41a41086b31d
#
# 
# 
# add_file "packages/xorg-xserver/gumstix-kmode.patch"
#  content [2ccfaa43986522f20a4d600872a7689d970b8c64]
# 
# patch "packages/rxvt-unicode/rxvt-unicode_7.9.bb"
#  from [ce13b2bc186b619fe7cb9b03cb1ab9fc5f27c115]
#    to [a758bd14abdf6e8f4ec493eb7b6c485f9ab5ccc7]
# 
# patch "packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb"
#  from [7f2e709c62424285446c1f454d2bd609e6ab405d]
#    to [bc48ac913bf5619e2ef613e1dcc2f78c81bcd221]
# 
============================================================
--- packages/xorg-xserver/gumstix-kmode.patch	2ccfaa43986522f20a4d600872a7689d970b8c64
+++ packages/xorg-xserver/gumstix-kmode.patch	2ccfaa43986522f20a4d600872a7689d970b8c64
@@ -0,0 +1,23 @@
+--- /tmp/kmode.c	2007-10-07 11:49:52.000000000 +0200
++++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c	2007-10-07 11:51:57.962045000 +0200
+@@ -119,7 +119,19 @@
+                0,      0,     0,     KdSyncNegative, /* 59.940 */
+    },
+   
+-    
++
++/* gumstix console-vx */
++    {   480,    272,    60,     0,                      /* VESA */
++               0,      0,     0,    KdSyncNegative, /* 31.469 */
++               0,      0,     0,     KdSyncNegative, /* 59.940 */
++   },
++ 
++    {   272,    480,    60,     0,                      /* VESA */
++               0,      0,     0,    KdSyncNegative, /* 31.469 */
++               0,      0,     0,     KdSyncNegative, /* 59.940 */
++   },
++
++
+     /* 800x600 modes */
+     {	800,	600,	85,	56250,			    /* VESA */
+ 		    32,	    152,    248,    KdSyncPositive, /* 53.674 */
============================================================
--- packages/rxvt-unicode/rxvt-unicode_7.9.bb	ce13b2bc186b619fe7cb9b03cb1ab9fc5f27c115
+++ packages/rxvt-unicode/rxvt-unicode_7.9.bb	a758bd14abdf6e8f4ec493eb7b6c485f9ab5ccc7
@@ -13,7 +13,7 @@ SRC_URI = "http://dist.schmorp.de/rxvt-u
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
            file://xwc.patch;patch=1 \
            file://signedchar.patch;patch=1"
-PR = "r0"
+PR = "r1"
 
 inherit autotools update-alternatives
 
@@ -23,6 +23,10 @@ CFLAGS_append = " -fpermissive"
 
 CFLAGS_append = " -fpermissive"
 
+# This is necessary so that the "tic" command executed during the install can
+# link with the correct libary in staging.
+export LD_LIBRARY_PATH = "${STAGING_LIBDIR_NATIVE}"
+
 EXTRA_OECONF = "--enable-menubar --enable-xim \
 		--enable-utmp --enable-wtmp --enable-lastlog \
 		--disable-strings --with-term=rxvt --enable-keepscrolling \
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb	7f2e709c62424285446c1f454d2bd609e6ab405d
+++ packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb	bc48ac913bf5619e2ef613e1dcc2f78c81bcd221
@@ -1,9 +1,9 @@ PE = "1"
 require xserver-kdrive-common.inc
 
 DEPENDS += "libxkbfile libxcalibrate"
 
 PE = "1"
-PR = "r17"
+PR = "r19"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
@@ -19,7 +19,9 @@ SRC_URI = "${XORG_MIRROR}/individual/xse
 	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 \
+"
 
 S = "${WORKDIR}/xorg-server-${PV}"
 


#
# mt diff -r42116cabf57a560c5f62c543e5cfde0687c99243 -r2cede492dcacf2a0da5e0cdd419d41a41086b31d
#
# 
# 
# patch "conf/machine/include/zaurus-2.6.inc"
#  from [7baf3e010a9649ace2bc8172df240209ae4c83f0]
#    to [6fd05921765dc1975a082049180e563ef15d17ae]
# 
============================================================
--- conf/machine/include/zaurus-2.6.inc	7baf3e010a9649ace2bc8172df240209ae4c83f0
+++ conf/machine/include/zaurus-2.6.inc	6fd05921765dc1975a082049180e563ef15d17ae
@@ -21,8 +21,9 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
 SERIAL_CONSOLE = "115200 ttyS0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 
+
 PCMCIA_MANAGER ?= "pcmciautils"
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen"