[xorg-x11-server-utils/f18] Print primary output in xrandr

[Adam Jackson]

commit 3217f3611e563911e6f5013477f47e20b3bfa1bb
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Jan 30 18:55:11 2013 -0500

    Print primary output in xrandr

 0001-xrandr-print-primary-output.patch |   34 ++++++++++++++++++++++++++++++++
 xorg-x11-server-utils.spec             |   18 ++++++++--------
 2 files changed, 43 insertions(+), 9 deletions(-)
---
diff --git a/0001-xrandr-print-primary-output.patch b/0001-xrandr-print-primary-output.patch
new file mode 100644
index 0000000..bb3ea28
--- /dev/null
+++ b/0001-xrandr-print-primary-output.patch
@@ -0,0 +1,34 @@
+From 094b40e89707828df2bb7b204a97eed256a3c3fd Mon Sep 17 00:00:00 2001
+From: "Pierre-Loup A. Griffais" <pgriffais at nvidia.com>
+Date: Wed, 19 Dec 2012 12:32:03 -0800
+Subject: [PATCH] xrandr: print primary output
+
+Sample output:
+
+LVDS-0 connected primary 1920x1080+1920+120 [...]
+
+Signed-off-by: Pierre-Loup A. Griffais <pgriffais at nvidia.com>
+Reviewed-by: Aaron Plattner <aplattner at nvidia.com>
+Tested-by: Aaron Plattner <aplattner at nvidia.com>
+Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
+---
+ xrandr.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/xrandr.c b/xrandr.c
+index 548015c..e8d24fb 100644
+--- a/xrandr.c
++++ b/xrandr.c
+@@ -3249,6 +3249,9 @@ main (int argc, char **argv)
+ 	    Rotation	    rotations = output_rotations (output);
+ 
+ 	    printf ("%s %s", output_info->name, connection[output_info->connection]);
++	    if (output->primary) {
++		printf(" primary");
++	    }
+ 	    if (mode)
+ 	    {
+ 		if (crtc_info) {
+-- 
+1.8.1
+
diff --git a/xorg-x11-server-utils.spec b/xorg-x11-server-utils.spec
index 9484fe1..db5f1bc 100644
--- a/xorg-x11-server-utils.spec
+++ b/xorg-x11-server-utils.spec
@@ -5,7 +5,7 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.5
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -27,15 +27,8 @@ Source15: http://www.x.org/pub/individual/app/xstdcmap-1.0.2.tar.bz2
 Source16: http://www.x.org/pub/individual/app/xkill-1.0.3.tar.bz2
 Source17: http://www.x.org/pub/individual/app/xinput-1.6.0.tar.bz2
 
-# NOTE: Each upstream tarball has its own "PatchN" section, taken from
-# multiplying the "SourceN" line times 100.  Please keep them in this
-# order.  Also, please keep each patch specific to a single upstream tarball,
-# so that they don't have to be split in half when submitting upstream.
-#
-# iceauth section
-#Patch0: 
+Patch1000: 0001-xrandr-print-primary-output.patch
 
-# rgb section
 Patch1100: rgb-1.0.0-datadir-rgbpath-fix.patch
 
 BuildRequires: xorg-x11-util-macros
@@ -77,6 +70,10 @@ Utility to perform keystone adjustments on X screens.
 %prep
 %setup -q -c %{name}-%{version} -a2 -a3 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17
 
+pushd xrandr-*
+%patch1000 -p1 -b .primary
+popd
+
 #patch1100 -p0 -b .datadir-rgbpath-fix
 
 %build
@@ -175,6 +172,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Jan 30 2013 Adam Jackson <ajax at redhat.com> 7.5-15
+- Print primary output in xrandr
+
 * Wed Nov 14 2012 Adam Jackson <ajax at redhat.com> 7.5-14
 - xinput 1.6.0