summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Zabel <philipp.zabel@gmail.com>2006-09-02 12:14:36 +0000
committerPhilipp Zabel <philipp.zabel@gmail.com>2006-09-02 12:14:36 +0000
commitcd40986a93e3d0c01a4c506ef2540878741ae0ca (patch)
tree1d8945c4e6c5d132628efceaea0c4016c09ae32a
parentf317b85a70280478bdd281cacafcaf2cda1fc81f (diff)
xserver-common: use Xw100 if available
-rw-r--r--packages/xserver-common/files/w100.patch12
-rw-r--r--packages/xserver-common/xserver-common_1.10.bb3
2 files changed, 14 insertions, 1 deletions
diff --git a/packages/xserver-common/files/w100.patch b/packages/xserver-common/files/w100.patch
new file mode 100644
index 0000000000..ca908850e2
--- /dev/null
+++ b/packages/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/packages/xserver-common/xserver-common_1.10.bb b/packages/xserver-common/xserver-common_1.10.bb
index de81537f99..64c223f109 100644
--- a/packages/xserver-common/xserver-common_1.10.bb
+++ b/packages/xserver-common/xserver-common_1.10.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Common X11 scripts and support files"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r1"
+PR = "r2"
PACKAGE_ARCH = "all"
@@ -12,6 +12,7 @@ inherit gpe
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() {