[oe-commits] Marcin Juszkiewicz : xserver-common 1.30: -screen option is only for Kdrive

[git version control]

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

Author: Marcin Juszkiewicz <hrw at koansoftware.com>
Date:   Fri Aug 28 18:50:44 2009 +0200

xserver-common 1.30: -screen option is only for Kdrive

---

 ...vide-screen-argument-only-for-non-X.org-s.patch |   27 ++++++++++++++++++++
 recipes/xserver-common/xserver-common_1.30.bb      |    2 +-
 2 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/recipes/xserver-common/xserver-common-1.30/0023-Xserver-provide-screen-argument-only-for-non-X.org-s.patch b/recipes/xserver-common/xserver-common-1.30/0023-Xserver-provide-screen-argument-only-for-non-X.org-s.patch
new file mode 100644
index 0000000..e80cbac
--- /dev/null
+++ b/recipes/xserver-common/xserver-common-1.30/0023-Xserver-provide-screen-argument-only-for-non-X.org-s.patch
@@ -0,0 +1,27 @@
+From 0ea66d0827131952dc1069f1ea3cb317b831df55 Mon Sep 17 00:00:00 2001
+From: Marcin Juszkiewicz <hrw at koansoftware.com>
+Date: Fri, 28 Aug 2009 18:47:55 +0200
+Subject: [PATCH 1/1] Xserver: provide -screen argument only for non-X.org servers
+
+---
+ X11/Xserver |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/X11/Xserver b/X11/Xserver
+index 3d93a0a..583cd0d 100755
+--- a/X11/Xserver
++++ b/X11/Xserver
+@@ -179,7 +179,9 @@ else
+ 			# It is a device we do not know about, in which case we force
+ 			# kdrive to use the current framebuffer geometry -- otherwise
+ 			# it will default to trying to achieve 1024x768
+-			ARGS="$ARGS -screen ${SCREEN_SIZE}"
++			if [ "$XSERVER" != "Xorg" ] ; then
++			    ARGS="$ARGS -screen ${SCREEN_SIZE}"
++			fi
+ 		    fi
+     esac
+ fi
+-- 
+1.6.3.3
+
diff --git a/recipes/xserver-common/xserver-common_1.30.bb b/recipes/xserver-common/xserver-common_1.30.bb
index 3f3e7f8..252f078 100644
--- a/recipes/xserver-common/xserver-common_1.30.bb
+++ b/recipes/xserver-common/xserver-common_1.30.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r2"
+PR = "r3"
 
 PACKAGE_ARCH = "all"
 DEFAULT_PREFERENCE = "-1"