xserver-xorg-conf and xinput-calibrator : add iphone3g support

Without the calibration data the touchscreen is uncalibrated
  and unusable.

Signed-off-by: Chris 'Lopi' Spehn <chris.spehn@gmail.com>
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>

diff --git a/recipes/xinput-calibrator/pointercal-xinput/iphone3g/pointercal.xinput b/recipes/xinput-calibrator/pointercal-xinput/iphone3g/pointercal.xinput
new file mode 100644 (file)
index 0000000..d6ce56b
--- /dev/null
+++ b/recipes/xinput-calibrator/pointercal-xinput/iphone3g/pointercal.xinput
@@ -0,0 +1 @@
+xinput set-int-prop "Touchscreen" "Evdev Axis Calibration" 32 -102 4739 6 7321;

diff --git a/recipes/xinput-calibrator/pointercal-xinput_0.0.bb b/recipes/xinput-calibrator/pointercal-xinput_0.0.bb
index ad96666..2d62f20 100644 (file)
--- a/recipes/xinput-calibrator/pointercal-xinput_0.0.bb
+++ b/recipes/xinput-calibrator/pointercal-xinput_0.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Touchscreen calibration data from xinput-calibrator"
 LICENSE = "MIT/X11"
 SECTION = "base"
 
-PR = "r1"
+PR = "r2"
 SRC_URI = "file://pointercal.xinput"
 S = "${WORKDIR}"
 

diff --git a/recipes/xorg-xserver/xserver-xorg-conf/iphone3g/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/iphone3g/xorg.conf
new file mode 100644 (file)
index 0000000..83ac9c1
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-conf/iphone3g/xorg.conf
@@ -0,0 +1,29 @@
+Section "Device"
+       Identifier "Builtin Default fbdev Device 0"
+       Driver  "fbdev"
+       Option "ShadowFB" "on"
+EndSection
+
+Section "Screen"
+       Identifier "Builtin Default fbdev Screen 0"
+       Device "Builtin Default fbdev Device 0"
+EndSection
+
+
+Section "InputDevice"
+       Identifier "touchscreen"
+       Driver "evdev"
+       Option "Device" "/dev/input/event2"
+       Option "ReportingMode" "Raw"
+       Option "SendCoreEvents" "On"
+       Option "GrabDevices" "True"
+       Option "InvertY" "0"
+       Option "SwapAxes" "0"
+EndSection
+
+
+Section "ServerLayout"
+       Identifier      "Builtin Default Layout"
+       Screen  "Builtin Default fbdev Screen 0"
+       InputDevice "touchscreen" "CorePointer" "AlwaysCore"
+EndSection

diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
index 25a3867..71d3be3 100644 (file)
--- a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Machine specific xorg.conf files"
-PR = "r37"
+PR = "r38"
 
 SRC_URI = "file://xorg.conf"