[oe-commits] org.oe.dev xserver-common: Import a set of patches from the .oz354x branch, fixing keymapping on akita, spitz and c7x0.

coredump2 commit openembedded-commits at lists.openembedded.org
Wed May 30 23:26:26 UTC 2007 

xserver-common: Import a set of patches from the .oz354x branch, fixing keymapping on akita, spitz and c7x0.

Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: 038120fad0fb4be780b676b9dc701775945ab59f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=038120fad0fb4be780b676b9dc701775945ab59f
Files:
1
packages/xserver-common/files/Xserver-udev-input-helper.patch
packages/xserver-common/files/at-fix-slcxxxx.patch
packages/xserver-common/files/load-xmodmap-k26.patch
packages/xserver-common/files/softkeys-c7x0.patch
packages/xserver-common/files/softkeys-slcxxxx-xmodmap.patch
packages/xserver-common/xserver-common_1.16.bb
packages/xserver-common/xserver-common_svn.bb
Diffs:

#
# mt diff -r01b8b653ebc5daf21010e8433fe7e0b871a2943d -r038120fad0fb4be780b676b9dc701775945ab59f
#
# 
# 
# add_file "packages/xserver-common/files/Xserver-udev-input-helper.patch"
#  content [4cc2069ef30b4b598c11115d208a8b469d64f4b9]
# 
# add_file "packages/xserver-common/files/at-fix-slcxxxx.patch"
#  content [3a4949738e47daf0fb3301380c170f2b4a1cadd9]
# 
# add_file "packages/xserver-common/files/load-xmodmap-k26.patch"
#  content [735163a6e1b54c7c85a5febc7f7ceb8b519e220f]
# 
# add_file "packages/xserver-common/files/softkeys-c7x0.patch"
#  content [6546d2e3c112f7494cf1d5d5e139d5be97beb13e]
# 
# add_file "packages/xserver-common/files/softkeys-slcxxxx-xmodmap.patch"
#  content [c472c796c242b012989c5917b27d8d23ba13d07b]
# 
# patch "packages/xserver-common/xserver-common_1.16.bb"
#  from [924d74db820b37e3a413f6fd4245053d0c5c9336]
#    to [d1abe1688f64090876798bf1435be309392d3bef]
# 
# patch "packages/xserver-common/xserver-common_svn.bb"
#  from [668c421c2657d8f316d97687a7f411645aaef79a]
#    to [a67738f7f01abf16584247c29788d6b2e6af5b0e]
# 
============================================================
--- packages/xserver-common/files/Xserver-udev-input-helper.patch	4cc2069ef30b4b598c11115d208a8b469d64f4b9
+++ packages/xserver-common/files/Xserver-udev-input-helper.patch	4cc2069ef30b4b598c11115d208a8b469d64f4b9
@@ -0,0 +1,11 @@
+--- xserver-common-1.8/X11/Xserver.orig	2006-05-07 17:40:10.540539080 +0200
++++ xserver-common-1.8/X11/Xserver	2006-05-07 17:40:35.187792128 +0200
+@@ -27,7 +27,7 @@
+ 
+ export USER=root
+ 
+-ARGS="-br -pn"
++ARGS="-br -pn $INPUT_EXTRA_ARGS"
+ 
+ # use ucb 1x00 touchscreen if present
+ if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
============================================================
--- packages/xserver-common/files/at-fix-slcxxxx.patch	3a4949738e47daf0fb3301380c170f2b4a1cadd9
+++ packages/xserver-common/files/at-fix-slcxxxx.patch	3a4949738e47daf0fb3301380c170f2b4a1cadd9
@@ -0,0 +1,8 @@
+--- xserver-common-1.8/X11/slcXXXX.xmodmap.orig	2006-05-07 14:22:14.500971520 +0200
++++ xserver-common-1.8/X11/slcXXXX.xmodmap	2006-05-07 14:22:28.955774056 +0200
+@@ -10,3 +10,5 @@
+ keycode 80 = F28
+ keycode 81 = F29
+ keycode 86 = F30
++
++keycode 20 = minus at at 
============================================================
--- packages/xserver-common/files/load-xmodmap-k26.patch	735163a6e1b54c7c85a5febc7f7ceb8b519e220f
+++ packages/xserver-common/files/load-xmodmap-k26.patch	735163a6e1b54c7c85a5febc7f7ceb8b519e220f
@@ -0,0 +1,23 @@
+--- xserver-common-1.8/X11/Xinit.d/12keymap.orig	2006-04-14 22:57:16.200518376 +0200
++++ xserver-common-1.8/X11/Xinit.d/12keymap	2006-04-14 23:01:46.938359968 +0200
+@@ -4,18 +4,10 @@
+ 
+ case $MACHINE in
+ 	"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
+-		case `uname -r` in
+-			2.4*)
+-				xmodmap - < /etc/X11/shepherd.xmodmap
+-				;;
+-			esac
++		xmodmap - < /etc/X11/shepherd.xmodmap
+ 		;;
+ 	"SHARP Akita" | "SHARP Borzoi" | "SHARP Spitz")
+-		case `uname -r` in
+-			2.4*)
+-				xmodmap - < /etc/X11/slcXXXX.xmodmap
+-				;;
+-			esac
++		xmodmap - < /etc/X11/slcXXXX.xmodmap
+ 		;;				
+         "Sharp-Collie")
+                 xmodmap - < /etc/X11/collie.xmodmap
============================================================
--- packages/xserver-common/files/softkeys-c7x0.patch	6546d2e3c112f7494cf1d5d5e139d5be97beb13e
+++ packages/xserver-common/files/softkeys-c7x0.patch	6546d2e3c112f7494cf1d5d5e139d5be97beb13e
@@ -0,0 +1,52 @@
+--- xserver-common-1.8/X11/shepherd.xmodmap.orig	2006-04-15 13:10:03.845853928 +0200
++++ xserver-common-1.8/X11/shepherd.xmodmap	2006-04-15 13:11:14.996037456 +0200
+@@ -1,49 +0,0 @@
+-keycode 38 = Mode_switch
+-keycode 31 = w W caret
+-keycode 13 = e E equal
+-keycode 26 = r R plus
+-keycode 28 = t T bracketleft
+-keycode 33 = y y bracketright
+-keycode 29 = u U braceleft
+-keycode 17 = i I braceright
+-!keycode 73 = Tab Tab Caps_Lock
+-keycode 12 = d D periodcentered
+-keycode 14 = f F backslash
+-keycode 15 = g G semicolon
+-keycode 16 = h H colon
+-keycode 18 = j J asterisk
+-keycode 19 = k K currency
+-keycode 20 = l L bar
+-keycode 10 = b B underscore
+-keycode 66 = minus minus at
+-keycode 71 = comma slash less
+-keycode 72 = period question greater
+-
+-! Side keys
+-keycode 134 = Down
+-keycode 133 = Up
+-keycode 131 = Return
+-keycode 132 = Escape
+-
+-!Special keys
+-!keycode 96 = XF86Calendar
+-!keycode 97 = telephone
+-!keycode 98 = XF86Mail
+-!keycode 48 = XF86HomePage
+-!keycode 37 = XF86Start
+-
+-clear Shift
+-clear Lock
+-clear Control
+-clear Mod1
+-clear Mod2
+-clear Mod3
+-clear Mod4
+-clear Mod5
+-
+-add Shift   = Shift_L Shift_R
+-!add Lock    = Caps_Lock
+-add Control = Control_L Control_R
+-add Mod1    = Alt_L Alt_R
+-add Mod2 = Mode_switch
+-
============================================================
--- packages/xserver-common/files/softkeys-slcxxxx-xmodmap.patch	c472c796c242b012989c5917b27d8d23ba13d07b
+++ packages/xserver-common/files/softkeys-slcxxxx-xmodmap.patch	c472c796c242b012989c5917b27d8d23ba13d07b
@@ -0,0 +1,20 @@
+--- xserver-common-1.8/X11/slcXXXX.xmodmap.orig	2006-04-15 13:03:51.471463440 +0200
++++ xserver-common-1.8/X11/slcXXXX.xmodmap	2006-04-15 13:05:04.576349808 +0200
+@@ -1,5 +1,12 @@
+-keycode 88 = XF86Calendar
+-keycode 89 = telephone
+-keycode 40 = XF86Start
+-keycode 90 = XF86Mail
+-
++
++keycode 90 = F20
++keycode 87 = F21
++keycode 88 = F22
++keycode 89 = F23
++keycode 83 = F24
++keycode 84 = F25
++keycode 85 = F26
++keycode 79 = F27
++keycode 80 = F28
++keycode 81 = F29
++keycode 86 = F30
============================================================
--- packages/xserver-common/xserver-common_1.16.bb	924d74db820b37e3a413f6fd4245053d0c5c9336
+++ packages/xserver-common/xserver-common_1.16.bb	d1abe1688f64090876798bf1435be309392d3bef
@@ -1,8 +1,8 @@ RDEPENDS_${PN} = "xmodmap xrandr xdpyinf
 DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r2"
+PR = "r4"
 
 PACKAGE_ARCH = "all"
 
@@ -11,7 +11,13 @@ SRC_URI_append = " file://setDPI.sh \
 
 SRC_URI_append = " file://setDPI.sh \
                    file://xserver-imageon.patch;patch=1 \
-                   file://calibrate-only-if-ts.patch;patch=1"
+                   file://calibrate-only-if-ts.patch;patch=1 \
+		   file://softkeys-slcxxxx-xmodmap.patch;patch=1 \
+		   file://softkeys-c7x0.patch;patch=1 \
+		   file://at-fix-slcxxxx.patch;patch=1 \
+		   file://load-xmodmap-k26.patch;patch=1 \
+		   file://Xserver-udev-input-helper.patch;patch=1 \
+		   "
 
 do_install_append() {
 	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
============================================================
--- packages/xserver-common/xserver-common_svn.bb	668c421c2657d8f316d97687a7f411645aaef79a
+++ packages/xserver-common/xserver-common_svn.bb	a67738f7f01abf16584247c29788d6b2e6af5b0e
@@ -6,8 +6,16 @@ S = "${WORKDIR}/xserver-common"
 PV = "1.12+svn${SRCDATE}"
 S = "${WORKDIR}/xserver-common"
 
+PR = "r1"
+
 SRC_URI = "${GPE_SVN} \
             file://Makefile.translation \
             file://Makefile.dpkg_ipkg \
 	    file://svn_makefiles.patch;patch=1 \
+	    file://keyboardless-buttonmap.patch;patch=1 \
+	    file://softkeys-slcxxxx-xmodmap.patch;patch=1 \
+	    file://softkeys-c7x0.patch;patch=1 \
+	    file://at-fix-slcxxxx.patch;patch=1 \
+	    file://load-xmodmap-k26.patch;patch=1 \
+	    file://Xserver-udev-input-helper.patch;patch=1"
+	    
-	    file://keyboardless-buttonmap.patch;patch=1"

More information about the Openembedded-commits mailing list