summaryrefslogtreecommitdiff
path: root/recipes/xserver-common
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/xserver-common
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
rename packages/ to recipes/ per earlier agreement
See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/xserver-common')
-rwxr-xr-xrecipes/xserver-common/files/98keymap-fixup10
-rw-r--r--recipes/xserver-common/files/Makefile.dpkg_ipkg114
-rw-r--r--recipes/xserver-common/files/Makefile.translation107
-rw-r--r--recipes/xserver-common/files/Xserver-udev-input-helper.patch11
-rw-r--r--recipes/xserver-common/files/at-fix-slcxxxx.patch8
-rw-r--r--recipes/xserver-common/files/calibrate-only-if-ts.patch9
-rw-r--r--recipes/xserver-common/files/calibrate_zaurusd.patch12
-rw-r--r--recipes/xserver-common/files/default.xmodmap123
-rw-r--r--recipes/xserver-common/files/gta-xorg-fixes.patch29
-rw-r--r--recipes/xserver-common/files/kdrive-1.4-fixes.patch51
-rw-r--r--recipes/xserver-common/files/keyboardless-buttonmap.patch56
-rw-r--r--recipes/xserver-common/files/load-xmodmap-k26.patch23
-rw-r--r--recipes/xserver-common/files/poodle-xmodmap-2.6.patch42
-rw-r--r--recipes/xserver-common/files/rxvt-less-pink.diff8
-rw-r--r--recipes/xserver-common/files/setDPI.sh92
-rw-r--r--recipes/xserver-common/files/sl-cxx00-modmap.patch120
-rw-r--r--recipes/xserver-common/files/softkeys-c7x0.patch52
-rw-r--r--recipes/xserver-common/files/softkeys-slcxxxx-xmodmap.patch20
-rw-r--r--recipes/xserver-common/files/svn_makefiles.patch11
-rw-r--r--recipes/xserver-common/files/ti-osk.patch12
-rw-r--r--recipes/xserver-common/files/unbreak-simpad.patch18
-rw-r--r--recipes/xserver-common/files/w100.patch12
-rw-r--r--recipes/xserver-common/files/xorg-fixes.patch25
-rw-r--r--recipes/xserver-common/files/xserver-imageon.patch14
-rw-r--r--recipes/xserver-common/xserver-common.inc9
-rw-r--r--recipes/xserver-common/xserver-common_1.11.bb10
-rw-r--r--recipes/xserver-common/xserver-common_1.12.bb10
-rw-r--r--recipes/xserver-common/xserver-common_1.13.bb11
-rw-r--r--recipes/xserver-common/xserver-common_1.14.bb18
-rw-r--r--recipes/xserver-common/xserver-common_1.15.bb18
-rw-r--r--recipes/xserver-common/xserver-common_1.16.bb23
-rw-r--r--recipes/xserver-common/xserver-common_1.18.bb16
-rw-r--r--recipes/xserver-common/xserver-common_1.21.bb16
-rw-r--r--recipes/xserver-common/xserver-common_1.22.bb26
-rw-r--r--recipes/xserver-common/xserver-common_svn.bb20
35 files changed, 1156 insertions, 0 deletions
diff --git a/recipes/xserver-common/files/98keymap-fixup b/recipes/xserver-common/files/98keymap-fixup
new file mode 100755
index 0000000000..fcc84d9cab
--- /dev/null
+++ b/recipes/xserver-common/files/98keymap-fixup
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# kdrive 1.4 and up have a heisenbug where it may take multiple tries to apply a modmap
+iter=0
+while [ $(xmodmap -pke | awk '{if ($2 == 36) { if ($4 == "Return") { print "good" } else {print "bad" }}}') = "bad" ] ; do
+ xmodmap - </etc/X11/default.xmodmap
+ let iter=iter+1
+done
+
+echo "modmap applied after $iter additional tries"
diff --git a/recipes/xserver-common/files/Makefile.dpkg_ipkg b/recipes/xserver-common/files/Makefile.dpkg_ipkg
new file mode 100644
index 0000000000..76c532154f
--- /dev/null
+++ b/recipes/xserver-common/files/Makefile.dpkg_ipkg
@@ -0,0 +1,114 @@
+## Please read the README in this directory to see how to use this
+## Makefile snippet
+
+# Let's use whatever clean target the specific app provides
+
+CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi`
+
+# URL to source tarball
+SOURCE = http://gpe.linuxtogo.org/download/source/$(PACKAGE)-$(VERSION).tar.gz
+
+# can change this to e.g. /var/tmp/deb
+DEB_PATH = ../deb
+
+ifeq ($(CVSBUILD),yes)
+LIBGPEWIDGET_PC = libgpewidget-uninstalled
+PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget
+else
+LIBGPEWIDGET_PC = libgpewidget
+endif
+
+ifeq ($(IN_LIBGPEWIDGET),)
+GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC))
+GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC))
+endif
+
+GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0)
+GTKLIBS = $(shell pkg-config --libs gtk+-2.0)
+
+STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
+STANDARD_CFLAGS = -MD -Wall
+
+ifeq ($(DEBUG),yes)
+CFLAGS += -O2 -g
+LDFLAGS = -g
+else
+CFLAGS += -Os -fomit-frame-pointer
+endif
+
+dist: check-source clean dist-prep
+ rm -rf ../$(PACKAGE)-$(VERSION)
+ mkdir ../$(PACKAGE)-$(VERSION)
+ ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -)
+ ( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile )
+ ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz )
+ rm -rf ../$(PACKAGE)-$(VERSION)
+ $(MAKE) printinfo
+
+dist-upload: dist
+ scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@linuxtogo.org:/media/data/projects/gpe/source/
+
+dist-prep:
+ipkg-prep:
+install-mo:
+# empty, can be filled in Makefile.translation
+
+install: install-program install-mo
+
+clean-dist:
+ rm -rf familiar/dist familiar/dist.list
+
+clean: clean-dist
+
+check-source:
+ @if [ -f familiar/$(CONTROL) ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi
+
+ipkg: check-source ipkg-prep clean
+ rm -rf familiar/dist
+ mkdir -p familiar/dist/CONTROL
+ sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control
+ if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi
+ if test -e familiar/preinst; then install familiar/preinst familiar/dist/CONTROL; fi
+ if test -e familiar/postinst; then install familiar/postinst familiar/dist/CONTROL; fi
+ if test -e familiar/prerm; then install familiar/prerm familiar/dist/CONTROL; fi
+ if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi
+ $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program
+ rm -rf familiar/dist.list
+ ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list
+ if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi
+ md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch
+ rm -rf familiar/dist familiar/dist.list
+ $(MAKE) printinfo
+
+dpkg: dist
+ mkdir -p $(DEB_PATH)
+ ( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz )
+ mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian
+ for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done
+
+CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_])
+printinfo:
+ @printf '-------------------------------------------------------------------------------\n'
+ @printf "If this becomes a package release, please add a CVS tag.\n"
+ @printf "You can use 'make tag' for that, it will execute\n"
+ @printf " cvs tag %s\n" $(CVSTAG)
+ @printf "Please upload a tarball (created with 'make dist') to\n"
+ @printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n"
+ @printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n"
+ @printf "You can use 'make dist-upload' to do that.\n"
+ @printf "You are currently known as USER %s.\n" $(USER)
+ @printf '-------------------------------------------------------------------------------\n'
+
+tag: check-source
+ cvs tag $(CVSTAG)
+
+retag: check-source
+ cvs tag -F $(CVSTAG)
+
+source: tag dist-upload
+
+%.pc: %.pc.in
+ sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@
+
+.c.o:;
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@
diff --git a/recipes/xserver-common/files/Makefile.translation b/recipes/xserver-common/files/Makefile.translation
new file mode 100644
index 0000000000..1ca7d648fd
--- /dev/null
+++ b/recipes/xserver-common/files/Makefile.translation
@@ -0,0 +1,107 @@
+.SUFFIXES: .mo .po .pot .po8
+
+CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi`
+
+# use ipkg-build or ipkg-deb-build
+IPKG_BUILD := ipkg-build
+
+TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint
+
+ifeq ($(DIR_PO),)
+DIR_PO := po
+endif
+
+ifeq ($(BINPACKAGE),)
+BINPACKAGE := $(PACKAGE)
+endif
+
+mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS))
+po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS))
+
+ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present)
+desktop-files += $(PACKAGE).desktop
+endif
+
+ifneq ($(EXTRA_DESKTOPS),)
+desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS))
+endif
+
+all-mo: $(mo-files)
+
+all-desktop: $(desktop-files)
+
+install-mo: all-mo
+ if [ "$(ENABLE_NLS)" != "no" ]; then \
+ if [ "x$(LINGUAS)" != "x" ]; then \
+ for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \
+ fi; \
+ fi;
+
+.po8.mo:;
+ if [ "$(ENABLE_NLS)" != "no" ]; then \
+ msgfmt -o $@ $<; \
+ fi;
+
+.po.po8:;
+ CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@
+
+update-po: $(po-files) extract-po
+
+dist-prep: update-po freshen-po
+# empty
+
+ifeq ($(CVSBUILD),yes)
+ipkg-prep: freshen-po
+# empty
+endif
+
+extract-po:
+ mkdir -p $(DIR_PO)
+ ( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi )
+ if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi
+
+clean: clean-po clean-dist-translation
+
+clean-po:
+ rm -rf $(DIR_PO)/*.mo
+ for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done
+
+%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS))
+ intltool-merge -u -d $(DIR_PO) $< $@
+
+freshen-po:
+ rm -rf tmp-po
+ mkdir tmp-po
+ cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done
+ for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done
+ rm -rf tmp-po
+
+# ------------------------------------------------------------------------
+
+MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-)
+
+ifndef BUILD
+BUILD = ../build
+endif
+
+transdist := familiar/dist-translation
+templates := $(BUILD)/familiar
+ipkglist := translation-ipkgs.txt
+
+clean-dist-translation:
+ rm -rf $(transdist) $(ipkglist)
+
+real-translation-package: all-mo
+ rm -rf $(transdist) $(ipkglist)
+ for LINGUA in $(LINGUAS); do \
+ i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \
+ mkdir -p $(transdist)/$$i/CONTROL; \
+ mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \
+ install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \
+ sed -e "s/<maintainer>/$(MAINTAINER)/;s/<package>/$(BINPACKAGE)/;s/<version>/$(VERSION)/;s/<language>/$$i/;s!<source>!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \
+ install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \
+ $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \
+ done
+
+translation-ipkg:
+ make PREFIX=/usr real-translation-package
diff --git a/recipes/xserver-common/files/Xserver-udev-input-helper.patch b/recipes/xserver-common/files/Xserver-udev-input-helper.patch
new file mode 100644
index 0000000000..b4adc9ab96
--- /dev/null
+++ b/recipes/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/recipes/xserver-common/files/at-fix-slcxxxx.patch b/recipes/xserver-common/files/at-fix-slcxxxx.patch
new file mode 100644
index 0000000000..cc2af5a245
--- /dev/null
+++ b/recipes/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/recipes/xserver-common/files/calibrate-only-if-ts.patch b/recipes/xserver-common/files/calibrate-only-if-ts.patch
new file mode 100644
index 0000000000..7be808ba04
--- /dev/null
+++ b/recipes/xserver-common/files/calibrate-only-if-ts.patch
@@ -0,0 +1,9 @@
+--- a/run-calibrate.sh.org 2006-10-12 10:19:42.000000000 +0000
++++ b/run-calibrate.sh 2007-02-09 17:54:55.000000000 +0000
+@@ -1,3 +1,5 @@
+ #! /bin/sh
+
+-exec xtscal
++if [ -e /dev/input/touchscreen0 ]; then
++ exec xtscal
++fi
diff --git a/recipes/xserver-common/files/calibrate_zaurusd.patch b/recipes/xserver-common/files/calibrate_zaurusd.patch
new file mode 100644
index 0000000000..6a7e3b02b7
--- /dev/null
+++ b/recipes/xserver-common/files/calibrate_zaurusd.patch
@@ -0,0 +1,12 @@
+--- xserver-common-1.8/X11/Xinit.d/30xTs_Calibrate.orig 2006-04-09 15:12:16.167950472 +0200
++++ xserver-common-1.8/X11/Xinit.d/30xTs_Calibrate 2006-04-09 15:14:51.511334688 +0200
+@@ -2,4 +2,9 @@
+
+ if [ ! -f /etc/pointercal ]; then
+ /usr/bin/run-calibrate.sh
++
++ if [ -x /etc/init.d/zaurusd ]; then
++ /etc/init.d/zaurusd stop
++ /etc/init.d/zaurusd start
++ fi
+ fi
diff --git a/recipes/xserver-common/files/default.xmodmap b/recipes/xserver-common/files/default.xmodmap
new file mode 100644
index 0000000000..005257d7d2
--- /dev/null
+++ b/recipes/xserver-common/files/default.xmodmap
@@ -0,0 +1,123 @@
+keycode 9 = Escape
+keycode 10 = 1 exclam
+keycode 11 = 2 at
+keycode 12 = 3 numbersign
+keycode 13 = 4 dollar
+keycode 14 = 5 percent
+keycode 15 = 6 asciicircum
+keycode 16 = 7 ampersand braceleft
+keycode 17 = 8 asterisk bracketleft
+keycode 18 = 9 parenleft bracketright
+keycode 19 = 0 parenright braceright
+keycode 20 = minus underscore backslash
+keycode 21 = equal plus
+keycode 22 = BackSpace
+keycode 23 = Tab
+keycode 24 = q Q q
+keycode 25 = w W w
+keycode 26 = e E
+keycode 27 = r R r
+keycode 28 = t T t
+keycode 29 = y Y y
+keycode 30 = u U u
+keycode 31 = i I i
+keycode 32 = o O o
+keycode 33 = p P p
+keycode 34 = bracketleft braceleft
+keycode 35 = bracketright braceright asciitilde
+keycode 36 = Return
+keycode 37 = Control_L
+keycode 38 = a A
+keycode 39 = s S s
+keycode 40 = d D
+keycode 41 = f F
+keycode 42 = g G g
+keycode 43 = h H h
+keycode 44 = j J j
+keycode 45 = k K k
+keycode 46 = l L l
+keycode 47 = semicolon colon
+keycode 48 = apostrophe quotedbl
+keycode 49 = grave asciitilde
+keycode 50 = Shift_L
+keycode 51 = backslash bar
+keycode 52 = z Z z
+keycode 53 = x X x
+keycode 54 = c C
+keycode 55 = v V v
+keycode 56 = b B
+keycode 57 = n N n
+keycode 58 = m M m
+keycode 59 = comma less
+keycode 60 = period greater
+keycode 61 = slash question
+keycode 62 = Shift_R
+keycode 63 = KP_Multiply
+keycode 64 = Alt_L
+keycode 65 = space
+keycode 66 = Caps_Lock
+keycode 67 = F1 F11
+keycode 68 = F2 F12
+keycode 69 = F3 F13
+keycode 70 = F4 F14
+keycode 71 = F5 F15
+keycode 72 = F6 F16
+keycode 73 = F7 F17
+keycode 74 = F8 F18
+keycode 75 = F9 F19
+keycode 76 = F10 F20
+keycode 77 = Num_Lock
+keycode 78 = Scroll_Lock
+keycode 79 = KP_7
+keycode 80 = KP_8
+keycode 81 = KP_9
+keycode 82 = KP_Subtract
+keycode 83 = KP_4
+keycode 84 = KP_5
+keycode 85 = KP_6
+keycode 86 = KP_Add
+keycode 87 = KP_1
+keycode 88 = KP_2
+keycode 89 = KP_3
+keycode 90 = KP_0
+keycode 91 = KP_Decimal
+keycode 94 = less greater bar
+keycode 95 = F11
+keycode 96 = F12
+keycode 104 = KP_Enter
+keycode 105 = Control_R
+keycode 106 = KP_Divide
+keycode 108 = Mode_switch
+keycode 109 = Break
+keycode 110 = Home
+keycode 111 = Up
+keycode 112 = Prior
+keycode 113 = Left
+keycode 114 = Right
+keycode 115 = End
+keycode 116 = Down
+keycode 117 = Next
+keycode 118 = Insert
+keycode 119 = Delete
+keycode 120 = Menu
+keycode 121 = F13
+keycode 122 = F14
+keycode 123 = Help
+keycode 124 = Execute
+keycode 125 = F17
+keycode 126 = KP_Subtract
+keycode 127 = Pause
+keycode 198 = Up
+keycode 200 = Left
+keycode 201 = Right
+keycode 204 = Down
+
+add shift = Shift_L
+add shift = Shift_R
+add shift = Menu
+add lock = Caps_Lock
+add control = Control_L
+add control = Control_R
+add mod1 = Alt_L
+add mod2 = Num_Lock
+add mod4 = Mode_switch
diff --git a/recipes/xserver-common/files/gta-xorg-fixes.patch b/recipes/xserver-common/files/gta-xorg-fixes.patch
new file mode 100644
index 0000000000..adf6798a99
--- /dev/null
+++ b/recipes/xserver-common/files/gta-xorg-fixes.patch
@@ -0,0 +1,29 @@
+Index: xserver-common-1.22/X11/Xserver
+===================================================================
+--- xserver-common-1.22.orig/X11/Xserver 2008-11-12 09:16:50.000000000 +0000
++++ xserver-common-1.22/X11/Xserver 2008-11-12 09:18:53.000000000 +0000
+@@ -109,7 +109,11 @@
+ "Nokia RX-44")
+ ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" ;;
+ "GTA01" )
+- ARGS="$ARGS -dpi 285 -screen 480x640" ;;
++ ARGS="$ARGS -dpi 285"
++ if [ "$XSERVER" != "Xorg" ] ; then
++ ARGS="$ARGS -screen 480x640"
++ fi
++ ;;
+ "Motorola Ezx Platform")
+ ARGS="$ARGS -dpi 170 -screen 240x320" ;;
+ "ARM-IntegratorCP" | "ARM-Versatile PB")
+@@ -118,7 +122,10 @@
+ modprobe mbxfb
+ ARGS="$ARGS -fb /dev/fb1" ;;
+ "GTA02")
+- ARGS="$ARGS -dpi 285 -screen ${SCREEN_SIZE}"
++ ARGS="$ARGS -dpi 285"
++ if [ "$XSERVER" != "Xorg" ] ; then
++ ARGS="$ARGS -screen ${SCREEN_SIZE}"
++ fi
+ ;;
+ "Boundary Devices Neon board")
+ ARGS="$ARGS -dpi 100 -screen ${SCREEN_SIZE} -mouse tslib"
diff --git a/recipes/xserver-common/files/kdrive-1.4-fixes.patch b/recipes/xserver-common/files/kdrive-1.4-fixes.patch
new file mode 100644
index 0000000000..25562b5218
--- /dev/null
+++ b/recipes/xserver-common/files/kdrive-1.4-fixes.patch
@@ -0,0 +1,51 @@
+diff -Nurd xserver-common-1.22.old/X11/Xinit.d/12keymap xserver-common-1.22/X11/Xinit.d/12keymap
+--- xserver-common-1.22.old/X11/Xinit.d/12keymap 2008-02-07 16:53:16.000000000 +0100
++++ xserver-common-1.22/X11/Xinit.d/12keymap 2008-05-04 17:30:48.278316443 +0200
+@@ -2,6 +2,9 @@
+
+ MACHINE=`awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo`
+
++# since kdrive 1.4 there is no default keymap in server
++xmodmap - </etc/X11/default.xmodmap
++
+ case $MACHINE in
+ "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
+ xmodmap - < /etc/X11/shepherd.xmodmap
+diff -Nurd xserver-common-1.22.old/X11/Xserver xserver-common-1.22/X11/Xserver
+--- xserver-common-1.22.old/X11/Xserver 2008-03-04 17:41:41.000000000 +0100
++++ xserver-common-1.22/X11/Xserver 2008-05-04 17:31:04.388313190 +0200
+@@ -53,10 +53,14 @@
+ ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
+ fi
+
+-# use usb mouse if present
++# kdrive 1.4 onwards needs -mouse args
+ # Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically
+-if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then
+- ARGS="$ARGS -mouse /dev/input/mice"
++if [ -e "$TSLIB_TSDEVICE" ] ; then
++ ARGS="$ARGS -mouse tslib"
++else
++ if [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ] ; then
++ ARGS="$ARGS -mouse mouse"
++ fi
+ fi
+
+ # start off server in conventional location.
+@@ -103,8 +107,7 @@
+ "Nokia RX-44")
+ ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" ;;
+ "GTA01" )
+- #we set 100 dpi for the time being, should the -dpi 285
+- ARGS="$ARGS -dpi 100 -screen 480x640" ;;
++ ARGS="$ARGS -dpi 285 -screen 480x640" ;;
+ "Motorola Ezx Platform")
+ ARGS="$ARGS -dpi 170 -screen 240x320" ;;
+ "ARM-IntegratorCP" | "ARM-Versatile PB")
+@@ -130,4 +133,6 @@
+ fi
+ esac
+
++echo "tslib: $TSLIB_TSDEVICE"
++echo "exec $XSERVER $ARGS $*"
+ exec $XSERVER $ARGS $*
diff --git a/recipes/xserver-common/files/keyboardless-buttonmap.patch b/recipes/xserver-common/files/keyboardless-buttonmap.patch
new file mode 100644
index 0000000000..214cb38678
--- /dev/null
+++ b/recipes/xserver-common/files/keyboardless-buttonmap.patch
@@ -0,0 +1,56 @@
+Index: ChangeLog
+===================================================================
+--- a/ChangeLog (revision 8846)
++++ a/ChangeLog (working copy)
+@@ -1,3 +1,11 @@
++2006-11-18 Paul Sokolovsky <pmiscml@gmail.com>
++
++ * X11/keyboardless.xmodmap: New common keymap for all
++ keyboardless PDA devices. (actually, a copy of h2200.xmodmap).
++ * X11/Xinit.d/12keymap: Use keyboardless.xmodmap as default for
++ all HP iPaq, Asus MyPal devices (which don't have need for adhoc
++ modmap).
++
+ 2006-11-11 Florian Boor <florian@kernelconcepts.de>
+
+ * Release version 1.12
+Index: X11/keyboardless.xmodmap
+===================================================================
+--- a/X11/keyboardless.xmodmap (revision 0)
++++ a/X11/keyboardless.xmodmap (revision 0)
+@@ -0,0 +1,6 @@
++keycode 75 = XF86Calendar
++keycode 76 = telephone
++keycode 95 = XF86Mail
++keycode 96 = XF86Start
++keycode 97 = XF86AudioRecord
++keycode 124 = XF86PowerDown
+Index: X11/Xinit.d/12keymap
+===================================================================
+--- a/X11/Xinit.d/12keymap (revision 8846)
++++ a/X11/Xinit.d/12keymap (working copy)
+@@ -26,20 +26,12 @@
+ "Simpad")
+ xmodmap - < /etc/X11/simpad.xmodmap
+ ;;
+- "HP iPAQ H2200")
+- xmodmap - < /etc/X11/h2200.xmodmap
+- ;;
+- "HP iPAQ HX4700")
+- xmodmap - < /etc/X11/hx4700.xmodmap
+- ;;
+- "HP iPAQ H1910" | "HP iPAQ H4000")
+- xmodmap - < /etc/X11/h1910.xmodmap
+- ;;
+- "Asus MyPal A716")
+- xmodmap - < /etc/X11/a716.xmodmap
+- ;;
+ "HP iPAQ h6300")
+ xmodmap - < /etc/X11/h6300.xmodmap
+ ;;
++ # All the rest of keyboardless PDA machines use common buttonmap
++ "HP iPAQ"* | "Asus MyPal"*)
++ xmodmap - < /etc/X11/keyboardless.xmodmap
++ ;;
+ esac
+
diff --git a/recipes/xserver-common/files/load-xmodmap-k26.patch b/recipes/xserver-common/files/load-xmodmap-k26.patch
new file mode 100644
index 0000000000..bc5a20bb6f
--- /dev/null
+++ b/recipes/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/recipes/xserver-common/files/poodle-xmodmap-2.6.patch b/recipes/xserver-common/files/poodle-xmodmap-2.6.patch
new file mode 100644
index 0000000000..73cf3f6ffb
--- /dev/null
+++ b/recipes/xserver-common/files/poodle-xmodmap-2.6.patch
@@ -0,0 +1,42 @@
+diff -Nur xserver-common-1.8.orig/X11/Xinit.d/12keymap xserver-common-1.8/X11/Xinit.d/12keymap
+--- xserver-common-1.8.orig/X11/Xinit.d/12keymap 2006-05-17 12:02:52.645201000 +0200
++++ xserver-common-1.8/X11/Xinit.d/12keymap 2006-05-17 12:03:49.401573648 +0200
+@@ -9,6 +9,9 @@
+ "SHARP Akita" | "SHARP Borzoi" | "SHARP Spitz")
+ xmodmap - < /etc/X11/slcXXXX.xmodmap
+ ;;
++ "SHARP Poodle")
++ xmodmap - < /etc/X11/poodle.xmodmap
++ ;;
+ "Sharp-Collie")
+ xmodmap - < /etc/X11/collie.xmodmap
+ ;;
+diff -Nur xserver-common-1.8.orig/X11/poodle.xmodmap xserver-common-1.8/X11/poodle.xmodmap
+--- xserver-common-1.8.orig/X11/poodle.xmodmap 1970-01-01 01:00:00.000000000 +0100
++++ xserver-common-1.8/X11/poodle.xmodmap 2006-05-18 13:42:45.711264920 +0200
+@@ -0,0 +1,25 @@
++keycode 37 = Control_L
++keycode 64 = Alt_L
++
++
++keycode 50 = Shift_L
++keycode 62 = Shift_R
++keycode 75 = Mode_switch
++
++
++
++clear control
++clear shift
++clear lock
++clear mod4
++clear mod1
++
++add control = Control_L
++add shift = Shift_L Shift_R
++add lock = Caps_Lock
++
++! This is AltGr
++add mod4 = Mode_switch
++
++add mod1 = Alt_L
++
diff --git a/recipes/xserver-common/files/rxvt-less-pink.diff b/recipes/xserver-common/files/rxvt-less-pink.diff
new file mode 100644
index 0000000000..5c200f654a
--- /dev/null
+++ b/recipes/xserver-common/files/rxvt-less-pink.diff
@@ -0,0 +1,8 @@
+--- /tmp/Xdefaults 2006-12-07 14:00:29.000000000 +0100
++++ xserver-common-1.12/X11/Xdefaults 2006-12-07 14:01:10.382227000 +0100
+@@ -1,3 +1,5 @@
+ Rxvt*scrollBar_right: true
+ Rxvt*font: xft:Mono:pixelsize=9
++Rxvt*foreground: white
++Rxvt*background: black
+ Xft.dpi: 100
diff --git a/recipes/xserver-common/files/setDPI.sh b/recipes/xserver-common/files/setDPI.sh
new file mode 100644
index 0000000000..04a2edd6c6
--- /dev/null
+++ b/recipes/xserver-common/files/setDPI.sh
@@ -0,0 +1,92 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: setDPI.sh
+# Date: 09-Apr-06
+
+# This script configures Xft.dpi dependent on your screens DPI. This insures that the same font-size
+# setting of 7 can be used on all machines.
+
+
+XDEFAULTS="/etc/X11/Xdefaults"
+
+
+
+set_dpi() {
+
+ CURRENT_SETTING="`cat ${XDEFAULTS} | sed -n "/Xft.dpi\:/s/.*\:\(.*\)/\1/p" | sed -n "s/\ //p"`"
+
+ if test "$CURRENT_SETTING" != "$1"
+ then
+ echo "Using Xft.dpi of $SET_SCREEN_DPI for your $SCREEN_DPI DPI screen"
+
+ if grep -q "Xft.dpi" "$XDEFAULTS"
+ then
+ cat "${XDEFAULTS}" | sed "s/^Xft.dpi\:.*/Xft.dpi\: $SET_SCREEN_DPI/" > "${XDEFAULTS}_"
+ mv "${XDEFAULTS}_" "${XDEFAULTS}"
+ else
+ echo -e "Xft.dpi: $SET_SCREEN_DPI\n" >> "$XDEFAULTS"
+ fi
+ else
+ echo "Your $SCREEN_DPI DPI screen is already configured."
+ fi
+}
+
+set_rxvt_font() {
+
+ CURRENT_SETTING="`cat ${XDEFAULTS} | sed -n "/Rxvt\*font/s/\(.*\pixelsize=\)\(.*\)/\2/p"`"
+
+ if test "$1" -gt 100
+ then
+
+ # Configure the rxvt font-size for your screen here:
+ test "$1" -gt 180 -a "$1" -lt "221" && RXVT_FONT_SIZE=16
+
+ if test -z "$RXVT_FONT_SIZE"
+ then
+ echo "WARNING: No rxvt font-size configured for a $SCREEN_DPI DPI screen!"
+ echo "Defaulting to size 9"
+ RXVT_FONT_SIZE=9
+ fi
+
+ if test "$CURRENT_SETTING" != "$RXVT_FONT_SIZE"
+ then
+ echo "Using a rxvt font-size of $RXVT_FONT_SIZE"
+ cat ${XDEFAULTS} | sed "/Rxvt\*font/s/\(.*\pixelsize\)\(=*.*\)/\1=$RXVT_FONT_SIZE/" > ${XDEFAULTS}_
+ mv ${XDEFAULTS}_ ${XDEFAULTS}
+ else
+ echo "The rxvt font-size is already configured"
+ fi
+ fi
+}
+
+if test -z "$DISPLAY"
+then
+ echo "DISPLAY is not set, aborting..."
+ exit 0
+fi
+
+SCREEN_DPI="`/usr/bin/xdpyinfo | grep "dots per inch" | awk '{print $2}'| sed -n "s/\(.*\)x\(.*\)/\2/p"`"
+
+if test -z "$SCREEN_DPI"
+then
+ echo "WARNING: Couldn't read your screens DPI, defaulting to 100"
+ SCREEN_DPI=100
+fi
+
+# Configure your screen here:
+test "$SCREEN_DPI" -gt 180 -a "$SCREEN_DPI" -lt "221" && SET_SCREEN_DPI=160
+test "$SCREEN_DPI" -gt 90 -a "$SCREEN_DPI" -lt "121" && SET_SCREEN_DPI=100
+
+
+if test -z "$SET_SCREEN_DPI"
+then
+ echo "WARNING: No default configuration found for your $SCREEN_DPI DPI screen!"
+ echo "Using 100 DPI"
+ SET_SCREEN_DPI=100
+fi
+
+set_dpi "$SET_SCREEN_DPI"
+set_rxvt_font "$SCREEN_DPI"
diff --git a/recipes/xserver-common/files/sl-cxx00-modmap.patch b/recipes/xserver-common/files/sl-cxx00-modmap.patch
new file mode 100644
index 0000000000..18cc8e88c9
--- /dev/null
+++ b/recipes/xserver-common/files/sl-cxx00-modmap.patch
@@ -0,0 +1,120 @@
+Index: xserver-common-1.16/X11/slcXXXX.xmodmap
+===================================================================
+--- xserver-common-1.16.orig/X11/slcXXXX.xmodmap 2006-10-12 11:19:42.000000000 +0100
++++ xserver-common-1.16/X11/slcXXXX.xmodmap 2007-06-27 12:31:33.000000000 +0100
+@@ -1,5 +1,111 @@
+-keycode 88 = XF86Calendar
+-keycode 89 = telephone
+-keycode 40 = XF86Start
+-keycode 90 = XF86Mail
++! Modmap for Sharp Zaurus clamshells:
++! SL-C1000 (Akita)
++! SL-C3000 (Spitz)
++! SL-C3100 (Borzoi)
++! SL-C3200 (Terrier)
++!
++! Changelog:
++! version: 30 May 2007
++! Initial version
++!
++! This modmap adds an Alt_L and a compose key (Multi_Key)
++! at the Kana/Hira and Zen/Han keys. Users can set these to their
++! original Japanese functions if desired, but as a default putting at
++! least one Alt on the keyboard is a polite thing to do.
++!
++! Adds:
++! Fn + q = ` (grave)
++! Fn + - (minus) = @ (at)
++! Fn + 5 = € (Euro)
++! Fn + k = ¥ (Yen)
++! Fn + d = ・ (nakaten)
++! Fn + Backspace = Delete
++!
++! Currently unset:
++! Fn + Kana/Hira (カナ/ひら)
++! Fn + Zen/Han (全/半)
++! Fn + Space bar (音訓)
++! These should be bound to Japanese keysims for use with Japanese
++! IME's at a later date.
++! =======================================================================
++
++! The Euro character is not printed as a label, but as
++! the 5 doesn't have a blue Fn label, this is a nice extra
++! as a normal European keyboard has it on the 5 as third level
++! character
++keycode 14 = 5 percent EuroSign
++
++keycode 20 = minus minus at
++keycode 22 = BackSpace BackSpace Delete
++
++! The grave is not printed as a label, but is missing
++! so this is a nice place to add it, not too far from where it
++! is on a normal keyboard.
++keycode 24 = q Q grave
++
++! The nakaten character
++keycode 40 = d D kana_conjunctive
++
++! The Yen character
++keycode 45 = k K yen
++
++! This is the Kana/Hira key, right from "Ctrl"
++keycode 64 = Alt_L
++
++! Turn the Zen/Han key (left of minus) into the compose key
++keycode 105 = Multi_key
++
++! Control_R is gone, so clear out and reload control:
++clear control
++add control = Control_L
++
++! These are the 11 fields that generate keycodes
++! On the edge of the touchscreen. Every second one
++! (87, 89, 84, 79, 81) has a label, the rest doesn't,
++! but can be used as button nontheless, the size of the
++! eleven fields is the same.
++! These are mapped to F20..F30.
++! These buttons with Fn or Shift generate the F1..F11 keys.
++
++! No icon
++keycode 90 = F20 F1 F1
++! "Home" icon:
++keycode 87 = F21 F2 F2
++! No icon
++keycode 88 = F22 F3 F3
++! "Mail" icon:
++keycode 89 = F23 F4 F4
++! No icon
++keycode 83 = F24 F5 F5
++! "Address" icon:
++keycode 84 = F25 F6 F6
++! No icon
++keycode 85 = F26 F7 F7
++! "Calendar" icon:
++keycode 79 = F27 F8 F8
++! No icon
++keycode 80 = F28 F9 F9
++! "Book" icon:
++keycode 81 = F29 F10 F10
++! No icon
++keycode 86 = F30 F11 F11
++
++! These are the five buttons below the inbuilt keyboard
++! These are mapped to F13..F19
++! The Menu key generates F12 when pressed with Fn or Shift.
++
++! "Calendar" label and icon, "Sync" label beneath it:
++keycode 67 = F9 F14 F14
++! "Address" label and icon:
++keycode 68 = F10 F15 F15
++! "Mail" label and icon, "Check" label beneath it:
++keycode 76 = F13 F17 F17
++! "Home" label and icon:
++keycode 107 = F12 F18 F18
++! "Menu" label and icon:
++keycode 96 = F11 F12 F12
++
++! Shift the Mode_switch definition to a different mod so mozilla stuff works
++add mod5 = Mode_switch
++remove mod4 = Mode_switch
+
diff --git a/recipes/xserver-common/files/softkeys-c7x0.patch b/recipes/xserver-common/files/softkeys-c7x0.patch
new file mode 100644
index 0000000000..6ef2d9fb59
--- /dev/null
+++ b/recipes/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/recipes/xserver-common/files/softkeys-slcxxxx-xmodmap.patch b/recipes/xserver-common/files/softkeys-slcxxxx-xmodmap.patch
new file mode 100644
index 0000000000..2f029e5352
--- /dev/null
+++ b/recipes/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/recipes/xserver-common/files/svn_makefiles.patch b/recipes/xserver-common/files/svn_makefiles.patch
new file mode 100644
index 0000000000..79916b4f46
--- /dev/null
+++ b/recipes/xserver-common/files/svn_makefiles.patch
@@ -0,0 +1,11 @@
+--- xserver-common-1.7/Makefile.org 2006-06-14 21:36:04.000000000 +0000
++++ xserver-common-1.7/Makefile 2006-08-28 20:02:47.000000000 +0000
+@@ -7,7 +7,7 @@
+ LINGUAS =
+
+ ifeq ($(CVSBUILD),yes)
+-BUILD = ../build
++BUILD = ..
+ else
+ BUILD = build
+ endif
diff --git a/recipes/xserver-common/files/ti-osk.patch b/recipes/xserver-common/files/ti-osk.patch
new file mode 100644
index 0000000000..69d93350fc
--- /dev/null
+++ b/recipes/xserver-common/files/ti-osk.patch
@@ -0,0 +1,12 @@
+diff -Naur xserver-common-1.18-orig/X11/Xserver xserver-common-1.18/X11/Xserver
+--- xserver-common-1.18-orig/X11/Xserver 2007-08-24 06:15:25.000000000 -0500
++++ xserver-common-1.18/X11/Xserver 2008-01-12 19:59:59.000000000 -0600
+@@ -76,6 +76,8 @@
+ ARGS="$ARGS -dpi 100 -rgba rgb" ;;
+ "Generic OMAP1510/1610/1710")
+ ARGS="$ARGS -dpi 220 -mouse /dev/input/event0" ;;
++ "TI-OSK")
++ ARGS="$ARGS -dpi 100 -mouse tslib" ;;
+ "Cellon C8000 Board")
+ ARGS="$ARGS -dpi 100 -screen 240x320,10,1" ;;
+ "HTC Universal")
diff --git a/recipes/xserver-common/files/unbreak-simpad.patch b/recipes/xserver-common/files/unbreak-simpad.patch
new file mode 100644
index 0000000000..7f557c317d
--- /dev/null
+++ b/recipes/xserver-common/files/unbreak-simpad.patch
@@ -0,0 +1,18 @@
+--- xserver-common-1.18/X11/Xinit.d/12keymap.org 2007-08-24 14:14:31.000000000 +0300
++++ xserver-common-1.18/X11/Xinit.d/12keymap 2007-12-22 15:06:52.000000000 +0200
+@@ -15,14 +15,11 @@
+ "Sharp-Collie")
+ xmodmap - < /etc/X11/collie.xmodmap
+ ;;
+- "Simpad")
+- xmodmap - < /etc/X11/simpad.xmodmap
+- ;;
+ "HP iPAQ h6300")
+ xmodmap - < /etc/X11/h6300.xmodmap
+ ;;
+ # All the rest of keyboardless PDA machines use common buttonmap
+- "HP iPAQ"* | "Asus MyPal"*)
++ "Simpad" | "HP iPAQ"* | "Asus MyPal"*)
+ xmodmap - < /etc/X11/keyboardless.xmodmap
+ ;;
+ esac
diff --git a/recipes/xserver-common/files/w100.patch b/recipes/xserver-common/files/w100.patch
new file mode 100644
index 0000000000..ca908850e2
--- /dev/null
+++ b/recipes/xserver-common/files/w100.patch
@@ -0,0 +1,12 @@
+--- xserver-common-1.10/X11/Xserver.orig 2006-09-02 13:54:30.000000000 +0200
++++ xserver-common-1.10/X11/Xserver 2006-09-02 14:00:22.000000000 +0200
+@@ -14,6 +14,9 @@
+ if [ -f /usr/bin/Xomap ]; then
+ XSERVER=Xomap
+ fi
++if [ -f /usr/bin/Xw100 ]; then
++ XSERVER=Xw100
++fi
+
+ . /etc/profile
+
diff --git a/recipes/xserver-common/files/xorg-fixes.patch b/recipes/xserver-common/files/xorg-fixes.patch
new file mode 100644
index 0000000000..b2fd544fb5
--- /dev/null
+++ b/recipes/xserver-common/files/xorg-fixes.patch
@@ -0,0 +1,25 @@
+Index: xserver-common-1.22/X11/Xserver
+===================================================================
+--- xserver-common-1.22.orig/X11/Xserver 2008-11-12 09:14:55.000000000 +0000
++++ xserver-common-1.22/X11/Xserver 2008-11-12 09:16:22.000000000 +0000
+@@ -48,6 +48,7 @@
+
+ ARGS="-br -pn $INPUT_EXTRA_ARGS"
+
++if [ "$XSERVER" != "Xorg" ] ; then
+ # use ucb 1x00 touchscreen if present
+ if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
+ ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
+@@ -58,10 +59,11 @@
+ if [ -e "$TSLIB_TSDEVICE" ] ; then
+ ARGS="$ARGS -mouse tslib"
+ else
+- if [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ] ; then
++ if [ -e /dev/input/mice ] ; then
+ ARGS="$ARGS -mouse mouse"
+ fi
+ fi
++fi
+
+ # start off server in conventional location.
+ case `module_id` in
diff --git a/recipes/xserver-common/files/xserver-imageon.patch b/recipes/xserver-common/files/xserver-imageon.patch
new file mode 100644
index 0000000000..6a0447a31f
--- /dev/null
+++ b/recipes/xserver-common/files/xserver-imageon.patch
@@ -0,0 +1,14 @@
+Index: xserver-common-1.13/X11/Xserver
+===================================================================
+--- xserver-common-1.13.orig/X11/Xserver
++++ xserver-common-1.13/X11/Xserver
+@@ -17,6 +17,9 @@ fi
+ if [ -f /usr/bin/Xw100 ]; then
+ XSERVER=Xw100
+ fi
++if [ -f /usr/bin/Ximageon ]; then
++ XSERVER=Ximageon
++fi
+
+ . /etc/profile
+
diff --git a/recipes/xserver-common/xserver-common.inc b/recipes/xserver-common/xserver-common.inc
new file mode 100644
index 0000000000..229fb4d374
--- /dev/null
+++ b/recipes/xserver-common/xserver-common.inc
@@ -0,0 +1,9 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
diff --git a/recipes/xserver-common/xserver-common_1.11.bb b/recipes/xserver-common/xserver-common_1.11.bb
new file mode 100644
index 0000000000..6b384699fc
--- /dev/null
+++ b/recipes/xserver-common/xserver-common_1.11.bb
@@ -0,0 +1,10 @@
+require xserver-common.inc
+
+SRC_URI_append = " file://setDPI.sh \
+ file://calibrate_zaurusd.patch;patch=1 \
+ file://w100.patch;patch=1 \
+ file://poodle-xmodmap-2.6.patch;patch=1"
+
+do_install_append() {
+ install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
diff --git a/recipes/xserver-common/xserver-common_1.12.bb b/recipes/xserver-common/xserver-common_1.12.bb
new file mode 100644
index 0000000000..dc91d7da68
--- /dev/null
+++ b/recipes/xserver-common/xserver-common_1.12.bb
@@ -0,0 +1,10 @@
+require xserver-common.inc
+
+PR = "r1"
+
+SRC_URI_append = " file://setDPI.sh \
+ file://rxvt-less-pink.diff;patch=1"
+
+do_install_append() {
+ install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
diff --git a/recipes/xserver-common/xserver-common_1.13.bb b/recipes/xserver-common/xserver-common_1.13.bb
new file mode 100644
index 0000000000..599af1d6f7
--- /dev/null
+++ b/recipes/xserver-common/xserver-common_1.13.bb
@@ -0,0 +1,11 @@
+require xserver-common.inc
+
+PR = "r2"
+
+SRC_URI_append = " file://setDPI.sh \
+ file://xserver-imageon.patch;patch=1 \
+ file://calibrate-only-if-ts.patch;patch=1"
+
+do_install_append() {
+ install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
diff --git a/recipes/xserver-common/xserver-common_1.14.bb b/recipes/xserver-common/xserver-common_1.14.bb
new file mode 100644
index 0000000000..48320ba006
--- /dev/null
+++ b/recipes/xserver-common/xserver-common_1.14.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
+PR = "r2"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh \
+ file://xserver-imageon.patch;patch=1 \
+ file://calibrate-only-if-ts.patch;patch=1"
+
+do_install_append() {
+ install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
diff --git a/recipes/xserver-common/xserver-common_1.15.bb b/recipes/xserver-common/xserver-common_1.15.bb
new file mode 100644
index 0000000000..48320ba006
--- /dev/null
+++ b/recipes/xserver-common/xserver-common_1.15.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
+PR = "r2"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh \
+ file://xserver-imageon.patch;patch=1 \
+ file://calibrate-only-if-ts.patch;patch=1"
+
+do_install_append() {
+ install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
diff --git a/recipes/xserver-common/xserver-common_1.16.bb b/recipes/xserver-common/xserver-common_1.16.bb
new file mode 100644
index 0000000000..fcf1dcfd78
--- /dev/null
+++ b/recipes/xserver-common/xserver-common_1.16.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
+PR = "r7"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh \
+ file://xserver-imageon.patch;patch=1 \
+ file://calibrate-only-if-ts.patch;patch=1 \
+ file://softkeys-c7x0.patch;patch=1 \
+ file://load-xmodmap-k26.patch;patch=1 \
+ file://Xserver-udev-input-helper.patch;patch=1 \
+ file://sl-cxx00-modmap.patch;patch=1 \
+ "
+
+do_install_append() {
+ install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
diff --git a/recipes/xserver-common/xserver-common_1.18.bb b/recipes/xserver-common/xserver-common_1.18.bb
new file mode 100644
index 0000000000..6e3e2dd1ed
--- /dev/null
+++ b/recipes/xserver-common/xserver-common_1.18.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
+PR = "r1"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://ti-osk.patch;patch=1 file://unbreak-simpad.patch;patch=1 file://setDPI.sh "
+
+do_install_append() {
+ install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
diff --git a/recipes/xserver-common/xserver-common_1.21.bb b/recipes/xserver-common/xserver-common_1.21.bb
new file mode 100644
index 0000000000..a30a37c893
--- /dev/null
+++ b/recipes/xserver-common/xserver-common_1.21.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
+PR = "r0"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh "
+
+do_install_append() {
+ install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
diff --git a/recipes/xserver-common/xserver-common_1.22.bb b/recipes/xserver-common/xserver-common_1.22.bb
new file mode 100644
index 0000000000..1bf410fd10
--- /dev/null
+++ b/recipes/xserver-common/xserver-common_1.22.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
+PR = "r11"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh "
+SRC_URI_append_angstrom = " file://kdrive-1.4-fixes.patch;patch=1 \
+ file://xorg-fixes.patch;patch=1 \
+ file://gta-xorg-fixes.patch;patch=1 \
+ file://default.xmodmap \
+ file://98keymap-fixup "
+
+do_install_append() {
+ install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
+
+do_install_append_angstrom() {
+ install -m 0644 ${WORKDIR}/default.xmodmap ${D}/etc/X11/
+ install -m 0755 ${WORKDIR}/98keymap-fixup ${D}/etc/X11/Xinit.d/
+}
diff --git a/recipes/xserver-common/xserver-common_svn.bb b/recipes/xserver-common/xserver-common_svn.bb
new file mode 100644
index 0000000000..546481d48f
--- /dev/null
+++ b/recipes/xserver-common/xserver-common_svn.bb
@@ -0,0 +1,20 @@
+require xserver-common.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
+PV = "1.12+svn${SRCDATE}"
+S = "${WORKDIR}/xserver-common"
+
+PR = "r2"
+
+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-c7x0.patch;patch=1 \
+ file://sl-cxx00-modmap.patch;patch=1 \
+ file://load-xmodmap-k26.patch;patch=1 \
+ file://Xserver-udev-input-helper.patch;patch=1"
+