[oe-commits] Klaus Kurzmann : xserver-common: patch to add a section for nokia900 to xserver-common

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 6f04cfcf9bdeccb2cc7d9620d8bcb40095eac709
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=6f04cfcf9bdeccb2cc7d9620d8bcb40095eac709

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Tue Sep 14 17:55:23 2010 +0200

xserver-common: patch to add a section for nokia900 to xserver-common

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 recipes/xserver-common/files/Xserver.n900.patch |   17 +++++++++++++++++
 recipes/xserver-common/xserver-common_1.33.bb   |    5 +++--
 recipes/xserver-common/xserver-common_1.34.bb   |    3 ++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/recipes/xserver-common/files/Xserver.n900.patch b/recipes/xserver-common/files/Xserver.n900.patch
new file mode 100644
index 0000000..4d36f5f
--- /dev/null
+++ b/recipes/xserver-common/files/Xserver.n900.patch
@@ -0,0 +1,17 @@
+diff -uri xserver-common-1.33.orig/X11/xserver-common xserver-common-1.33/X11/xserver-common
+--- xserver-common-1.33.orig/X11/xserver-common	2010-09-14 17:10:35.955430177 +0200
++++ xserver-common-1.33/X11/xserver-common	2010-09-14 17:17:12.484423440 +0200
+@@ -132,6 +132,13 @@
+         "nokia_n800" | "nokia_rx-44" | "nokia_n770")
+             ARGS="$ARGS -screen ${SCREEN_SIZE}"
+             DPI="225" ;;
++        "nokia_rx-51_board" )                                     
++            DPI="267"                                    
++            if [ "$XSERVER" != "Xorg" ] ; then                    
++                ARGS="$ARGS -screen ${SCREEN_SIZE}"               
++            else                                                  
++                ARGS="$ARGS -dpi ${DPI} -nocursor"       
++            fi ;;                                                    
+         "gta01" )
+             DPI="280"
+             if [ "$XSERVER" != "Xorg" ] ; then
diff --git a/recipes/xserver-common/xserver-common_1.33.bb b/recipes/xserver-common/xserver-common_1.33.bb
index 9ebaa31..ff5711f 100644
--- a/recipes/xserver-common/xserver-common_1.33.bb
+++ b/recipes/xserver-common/xserver-common_1.33.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r7"
+PR = "r8"
 
 PACKAGE_ARCH = "all"
 DEFAULT_PREFERENCE = "-1"
@@ -30,7 +30,8 @@ SRC_URI_append_shr = " file://89xTs_Calibrate.xinput_calibrator.patch \
                        file://90xXWindowManager.patch \
                        file://Xserver.add.nocursor.for.gta.patch \
                        file://Xserver.add.xserver-system.patch \
-                       file://Xserver.add.dpi.for.gta.patch"
+                       file://Xserver.add.dpi.for.gta.patch \
+		       file://Xserver.n900.patch"
 
 do_install_append() {
 	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
diff --git a/recipes/xserver-common/xserver-common_1.34.bb b/recipes/xserver-common/xserver-common_1.34.bb
index 7f2308c..0254965 100644
--- a/recipes/xserver-common/xserver-common_1.34.bb
+++ b/recipes/xserver-common/xserver-common_1.34.bb
@@ -28,7 +28,8 @@ SRC_URI_append_shr = " file://89xTs_Calibrate.xinput_calibrator.patch \
                        file://90xXWindowManager.patch \
                        file://Xserver.add.nocursor.for.gta.patch \
                        file://Xserver.add.xserver-system.patch \
-                       file://Xserver.add.dpi.for.gta.patch"
+                       file://Xserver.add.dpi.for.gta.patch \
+		       file://Xserver.n900.patch"
 
 do_install_append() {
 	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"