diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-04-28 11:31:25 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-02 21:15:01 +0200 |
| commit | b491380a2ae06bcd1fe0982904363000524e9c67 (patch) | |
| tree | 49239ed39646d02d6968c494d6dc946307890353 /recipes/xserver-common | |
| parent | 267fc260d31b9968036b3309362cb9f0bc2188f6 (diff) | |
xserver-common: add SHR patches and RCONFLICTS for xserver-kdrive-common
* for SHR updated calibration script
* x-window-manager launcher to Xsession 90xXWindowManager
* -nocursor param to Xorg ARGS, because strange artifacts or even
segfault happen when using illume keyboard
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/xserver-common')
5 files changed, 109 insertions, 0 deletions
diff --git a/recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch b/recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch new file mode 100644 index 0000000000..6de221f865 --- /dev/null +++ b/recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch @@ -0,0 +1,40 @@ +Index: xserver-common/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator +=================================================================== +--- xserver-common/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator (revision 0) ++++ xserver-common/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator (revision 0) +@@ -0,0 +1,35 @@ ++#!/bin/sh ++ ++SYSFS_CALIBRATION_DIR=/sys/bus/i2c/devices/0-0073/s3c2440-ts/calibration ++ ++if [ ! -d $SYSFS_CALIBRATION_DIR ]; then ++ # moved in 2.6.31 ++ SYSFS_CALIBRATION_DIR=/sys/devices/platform/s3c2440-i2c/i2c-adapter/i2c-0/0-0073/s3c2410-ts/calibration ++fi ++ ++if [ ! -d $SYSFS_CALIBRATION_DIR ]; then ++ # moved in 2.6.32 ++ SYSFS_CALIBRATION_DIR=/sys/devices/platform/s3c2440-i2c/i2c-0/0-0073/s3c2410-ts/calibration ++fi ++ ++if [ -d $SYSFS_CALIBRATION_DIR ]; then ++ echo 0 > $SYSFS_CALIBRATION_DIR/0 ++ echo 80000 > $SYSFS_CALIBRATION_DIR/1 ++ echo -8000000 > $SYSFS_CALIBRATION_DIR/2 ++ echo -81000 > $SYSFS_CALIBRATION_DIR/3 ++ echo 0 > $SYSFS_CALIBRATION_DIR/4 ++ echo 75000000 > $SYSFS_CALIBRATION_DIR/5 ++ echo 65536 > $SYSFS_CALIBRATION_DIR/6 ++fi ++ ++if [ -e /usr/bin/xinput_calibrator_once.sh ] ; then ++ if [ -e /etc/pointercal.xinput ] ; then ++ if [ -e /usr/bin/fsoraw ] ; then ++ # because ts tap to unblank will be used as first calibration click and then store invalid calibration ++ fsoraw -fr CPU,Display -- /usr/bin/xinput_calibrator_once.sh ++ else ++ /usr/bin/xinput_calibrator_once.sh ++ fi ++ exit ++ fi ++fi diff --git a/recipes/xserver-common/files/90xXWindowManager.patch b/recipes/xserver-common/files/90xXWindowManager.patch new file mode 100644 index 0000000000..be5f5ce70c --- /dev/null +++ b/recipes/xserver-common/files/90xXWindowManager.patch @@ -0,0 +1,11 @@ +Index: xserver-common/X11/Xsession.d/90xXWindowManager +=================================================================== +--- xserver-common/X11/Xsession.d/90xXWindowManager (revision 0) ++++ xserver-common/X11/Xsession.d/90xXWindowManager (revision 0) +@@ -0,0 +1,6 @@ ++#!/bin/sh ++if [ -x $HOME/.Xsession ]; then ++ exec $HOME/.Xsession ++else ++ exec /usr/bin/x-window-manager ++fi diff --git a/recipes/xserver-common/files/Xserver.add.dpi.for.gta.patch b/recipes/xserver-common/files/Xserver.add.dpi.for.gta.patch new file mode 100644 index 0000000000..f6e36d9e10 --- /dev/null +++ b/recipes/xserver-common/files/Xserver.add.dpi.for.gta.patch @@ -0,0 +1,29 @@ +xdpyinfo returns 96, but 285 is right value (but 280 is used as it renders 4 columns of illume icons instead of 3 and empty space) + +diff -uNr xserver-common-1.33.orig//X11/xserver-common xserver-common-1.33/X11/xserver-common +--- xserver-common-1.33.orig//X11/xserver-common 2010-04-28 23:27:10.000000000 +0200 ++++ xserver-common-1.33/X11/xserver-common 2010-04-28 23:29:07.000000000 +0200 +@@ -133,19 +133,19 @@ + ARGS="$ARGS -screen ${SCREEN_SIZE}" + DPI="225" ;; + "gta01" ) +- DPI="285" ++ DPI="280" + if [ "$XSERVER" != "Xorg" ] ; then + ARGS="$ARGS -screen 480x640" + else +- ARGS="$ARGS -nocursor" ++ ARGS="$ARGS -dpi ${DPI} -nocursor" + fi + ;; + "gta02") +- DPI="285" ++ DPI="280" + if [ "$XSERVER" != "Xorg" ] ; then + ARGS="$ARGS -screen ${SCREEN_SIZE}" + else +- ARGS="$ARGS -nocursor" ++ ARGS="$ARGS -dpi ${DPI} -nocursor" + fi + ;; + "motorola_ezx_platform") diff --git a/recipes/xserver-common/files/Xserver.add.nocursor.for.gta.patch b/recipes/xserver-common/files/Xserver.add.nocursor.for.gta.patch new file mode 100644 index 0000000000..bd16efc106 --- /dev/null +++ b/recipes/xserver-common/files/Xserver.add.nocursor.for.gta.patch @@ -0,0 +1,20 @@ +diff -uNr xserver-common-1.33.orig//X11/xserver-common xserver-common-1.33/X11/xserver-common +--- xserver-common-1.33.orig//X11/xserver-common 2010-04-28 10:44:23.000000000 +0200 ++++ xserver-common-1.33/X11/xserver-common 2010-04-28 10:46:41.000000000 +0200 +@@ -136,12 +136,16 @@ + DPI="285" + if [ "$XSERVER" != "Xorg" ] ; then + ARGS="$ARGS -screen 480x640" ++ else ++ ARGS="$ARGS -nocursor" + fi + ;; + "gta02") + DPI="285" + if [ "$XSERVER" != "Xorg" ] ; then + ARGS="$ARGS -screen ${SCREEN_SIZE}" ++ else ++ ARGS="$ARGS -nocursor" + fi + ;; + "motorola_ezx_platform") diff --git a/recipes/xserver-common/xserver-common_1.33.bb b/recipes/xserver-common/xserver-common_1.33.bb index 80d703ec70..8da0a63906 100644 --- a/recipes/xserver-common/xserver-common_1.33.bb +++ b/recipes/xserver-common/xserver-common_1.33.bb @@ -2,10 +2,14 @@ DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" +PR = "r1" PACKAGE_ARCH = "all" DEFAULT_PREFERENCE = "-1" +RCONFLICTS_${PN} = "xserver-kdrive-common" +RREPLACES_${PN} = "xserver-kdrive-common" + # we are using a gpe-style Makefile inherit gpe @@ -20,6 +24,11 @@ SRC_URI_append = " file://loop.patch;patch=1;pnum=3 \ SRC_URI_append_angstrom = " file://xtscal-fix.patch;patch=1 " RDEPENDS_${PN}_append_angstrom = " tslib-calibrate " +SRC_URI_append_shr = " file://89xTs_Calibrate.xinput_calibrator.patch;patch=1 \ + file://90xXWindowManager.patch;patch=1 \ + file://Xserver.add.nocursor.for.gta.patch;patch=1 \ + file://Xserver.add.dpi.for.gta.patch;patch=1" + do_install_append() { install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" install -m 0755 "${WORKDIR}/89xdgautostart.sh" "${D}/etc/X11/Xsession.d/89xdgautostart" |