From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from ns.awellconnected.net ([83.167.180.132] helo=edison.awellconnected.net) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1PyFdw-000596-Ku for openembedded-devel@lists.openembedded.org; Sat, 12 Mar 2011 04:37:28 +0100 Received: from ip-80-226-0-1.vodafone-net.de ([80.226.0.1] helo=[10.225.76.243]) by edison.awellconnected.net with esmtp (Exim 4.69) (envelope-from ) id 1PyFcL-0008AU-MW for openembedded-devel@lists.openembedded.org; Sat, 12 Mar 2011 03:35:51 +0000 From: Lukas-David Gorris To: openembedded-devel@lists.openembedded.org In-Reply-To: <20110311235903.GD5603@sakrah.homelinux.org> References: <1299838487.2321.9.camel@computer> <20110311235903.GD5603@sakrah.homelinux.org> Date: Sat, 12 Mar 2011 04:35:38 +0100 Message-ID: <1299900938.2785.1.camel@computer> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - edison.awellconnected.net X-AntiAbuse: Original Domain - lists.openembedded.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - htc-linux.org X-Source: X-Source-Args: X-Source-Dir: Subject: Re: [PATCH] htcleo: update xorg.conf X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2011 03:37:28 -0000 X-Groupsio-MsgNum: 30120 Content-Type: multipart/mixed; boundary="=-0NYTOBx9+LN/gT18JKMj" --=-0NYTOBx9+LN/gT18JKMj Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Am Freitag, den 11.03.2011, 15:59 -0800 schrieb Khem Raj: > On (11/03/11 11:14), Lukas-David Gorris wrote: > > Attached patch updates xorg.conf for htcleo machine. It's needed to > > disable tslib. Tested on the device. > > > > needs a PR bump. Thanks! Patch with added PR bump attached. Best, Lukas --=-0NYTOBx9+LN/gT18JKMj Content-Disposition: attachment; filename="htcleo_update-xorg-conf_bump-pr.diff" Content-Type: text/x-patch; name="htcleo_update-xorg-conf_bump-pr.diff"; charset="UTF-8" Content-Transfer-Encoding: 7bit >From fef8c5c43547b9fe83a1d76120e499596d47afcc Mon Sep 17 00:00:00 2001 From: Lukas-David Gorris Date: Sat, 12 Mar 2011 04:31:50 +0100 Subject: [PATCH] xserver-xorg-conf: Update htcleo/xorg.conf and bump PR Thanks to Khem for the review --- .../xserver-xorg-conf/htcleo/xorg.conf | 93 +++++++++++++------- recipes/xorg-xserver/xserver-xorg-conf_0.1.bb | 2 +- 2 files changed, 63 insertions(+), 32 deletions(-) diff --git a/recipes/xorg-xserver/xserver-xorg-conf/htcleo/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/htcleo/xorg.conf index 4153a26..c819873 100644 --- a/recipes/xorg-xserver/xserver-xorg-conf/htcleo/xorg.conf +++ b/recipes/xorg-xserver/xserver-xorg-conf/htcleo/xorg.conf @@ -1,3 +1,11 @@ +Section "Module" + Load "extmod" + Load "dbe" + Load "freetype" + Load "type1" + Load "record" +EndSection + Section "Monitor" Identifier "Monitor0" Mode "480x800" @@ -18,17 +26,6 @@ Section "Device" EndSection -Section "Screen" - Identifier "Framebuffer" - Device "fbdev" - Monitor "Monitor" - DefaultFbBpp 16 - SubSection "Display" - Depth 16 - Modes "480x800" - EndSubSection -EndSection - Section "Screen" Identifier "480x800x16" Device "fbdev" @@ -41,33 +38,67 @@ Section "Screen" EndSection -Section "ServerLayout" - Identifier "Builtin Default Layout" - Screen "Framebuffer" - InputDevice "Touchscreen" "CorePointer" - InputDevice "Keyboard" "CoreKeyboard" -EndSection +Section "ServerLayout" + Identifier "Default Layout" + Screen "480x800x16" +# InputDevice "event0" +# InputDevice "event1" +# InputDevice "event2" + InputDevice "event3" +# InputDevice "event4" +# InputDevice "event5" + InputDevice "event6" +EndSection + + +Section "InputDevice" + Identifier "event0" + Driver "evdev" + Option "Device" "/dev/input/event0" +EndSection + +Section "InputDevice" + Identifier "event1" + Driver "evdev" + Option "Device" "/dev/input/event1" +EndSection + + +Section "InputDevice" + Identifier "event2" + Driver "evdev" + Option "Device" "/dev/input/event2" +EndSection Section "InputDevice" - Identifier "Mouse0" - Driver "mouse" - Option "Protocol" "auto" - Option "Device" "/dev/input/mice" - Option "Emulate3Buttons" "no" - Option "ZAxisMapping" "4 5" + Identifier "event3" + Driver "evdev" + Option "Device" "/dev/input/event3" +# Option "Calibration" "6713 86 262 4110" +# Option "InvertY" "1" +# Option "InvertX" "1" + +# Option "SwapAxes" "1" # unless it was already set to 1 + EndSection +Section "InputDevice" + Identifier "event4" + Driver "evdev" + Option "Device" "/dev/input/event4" +EndSection Section "InputDevice" - Identifier "Touchscreen" - Driver "tslib" - Option "Protocol" "auto" - Option "Device" "/dev/input/event0" - Option "CorePointer" "true" + Identifier "event5" + Driver "evdev" + Option "Device" "/dev/input/event5" EndSection Section "InputDevice" - Identifier "Keyboard" - Driver "kbd" - Option "XkbLayout" "en_US" + Identifier "event6" + Driver "evdev" + Option "Device" "/dev/input/event6" +# Option "InvertY" "1" + +# Option "SwapAxes" "1" # unless it was already set to 1 EndSection diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb index 692df9d..a549cf2 100644 --- 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 = "r43" +PR = "r44" SRC_URI = "file://xorg.conf" -- 1.7.1 --=-0NYTOBx9+LN/gT18JKMj--