diff options
7 files changed, 131 insertions, 3 deletions
diff --git a/packages/xserver-common/files/Xserver-udev-input-helper.patch b/packages/xserver-common/files/Xserver-udev-input-helper.patch new file mode 100644 index 0000000000..b4adc9ab96 --- /dev/null +++ b/packages/xserver-common/files/Xserver-udev-input-helper.patch @@ -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 diff --git a/packages/xserver-common/files/at-fix-slcxxxx.patch b/packages/xserver-common/files/at-fix-slcxxxx.patch new file mode 100644 index 0000000000..cc2af5a245 --- /dev/null +++ b/packages/xserver-common/files/at-fix-slcxxxx.patch @@ -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 diff --git a/packages/xserver-common/files/load-xmodmap-k26.patch b/packages/xserver-common/files/load-xmodmap-k26.patch new file mode 100644 index 0000000000..bc5a20bb6f --- /dev/null +++ b/packages/xserver-common/files/load-xmodmap-k26.patch @@ -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 diff --git a/packages/xserver-common/files/softkeys-c7x0.patch b/packages/xserver-common/files/softkeys-c7x0.patch new file mode 100644 index 0000000000..6ef2d9fb59 --- /dev/null +++ b/packages/xserver-common/files/softkeys-c7x0.patch @@ -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 +- diff --git a/packages/xserver-common/files/softkeys-slcxxxx-xmodmap.patch b/packages/xserver-common/files/softkeys-slcxxxx-xmodmap.patch new file mode 100644 index 0000000000..2f029e5352 --- /dev/null +++ b/packages/xserver-common/files/softkeys-slcxxxx-xmodmap.patch @@ -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 diff --git a/packages/xserver-common/xserver-common_1.16.bb b/packages/xserver-common/xserver-common_1.16.bb index 48320ba006..388f477606 100644 --- a/packages/xserver-common/xserver-common_1.16.bb +++ b/packages/xserver-common/xserver-common_1.16.bb @@ -2,7 +2,7 @@ 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 @@ inherit gpe 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" diff --git a/packages/xserver-common/xserver-common_svn.bb b/packages/xserver-common/xserver-common_svn.bb index e272ac1a87..bf5b70a84f 100644 --- a/packages/xserver-common/xserver-common_svn.bb +++ b/packages/xserver-common/xserver-common_svn.bb @@ -6,8 +6,16 @@ DEPENDS = "xmodmap xrandr xdpyinfo xtscal" 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://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" + |