From 13e75b16839847d23fd59467596ed9cc5ebe2081 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Mon, 8 Nov 2010 15:38:39 -0500
Subject: [PATCH] libXrandr 1.3.1

---
 .gitignore      |   1 +
 libXrandr.spec  |   9 +++--
 randr-git.patch | 102 ------------------------------------------------
 sources         |   2 +-
 4 files changed, 7 insertions(+), 107 deletions(-)
 delete mode 100644 randr-git.patch

diff --git a/.gitignore b/.gitignore
index 39507b1..15e993b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 libXrandr-1.2.99.4.tar.bz2
 libXrandr-1.3.0.tar.bz2
+/libXrandr-1.3.1.tar.bz2
diff --git a/libXrandr.spec b/libXrandr.spec
index be9f72b..6a4bad9 100644
--- a/libXrandr.spec
+++ b/libXrandr.spec
@@ -1,14 +1,13 @@
 Summary: X.Org X11 libXrandr runtime library
 Name: libXrandr
-Version: 1.3.0
-Release: 5%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: http://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
-Patch0: randr-git.patch
 
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: pkgconfig(randrproto) >= 1.3.0
@@ -28,7 +27,6 @@ X.Org X11 libXrandr development package
 
 %prep
 %setup -q
-%patch0 -p1 -b .git
 
 %build
 %configure  --disable-static
@@ -62,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Nov 08 2010 Adam Jackson <ajax@redhat.com> 1.3.1-1
+- libXrandr 1.3.1
+
 * Tue Nov 10 2009 Adam Jackson <ajax@redhat.com> 1.3.0-5
 - randr-git.patch: Update to git
 
diff --git a/randr-git.patch b/randr-git.patch
deleted file mode 100644
index 44f8ca9..0000000
--- a/randr-git.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a018667..09c5d8d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,7 +32,7 @@ dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n
- dnl
- AC_INIT(libXrandr, 1.3.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrandr)
- AC_CONFIG_AUX_DIR(.)
--AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_INIT_AUTOMAKE([foreign dist-bzip2])
- AM_MAINTAINER_MODE
- 
- # Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
-diff --git a/include/X11/extensions/Xrandr.h b/include/X11/extensions/Xrandr.h
-index a411321..6b756a7 100644
---- a/include/X11/extensions/Xrandr.h
-+++ b/include/X11/extensions/Xrandr.h
-@@ -197,6 +197,7 @@ Time XRRTimes (Display *dpy, int screen, Time *config_timestamp);
- 
- /* Version 1.2 additions */
- 
-+/* despite returning a Status, this returns 1 for success */
- Status
- XRRGetScreenSizeRange (Display *dpy, Window window,
- 		       int *minWidth, int *minHeight,
-diff --git a/src/XrrConfig.c b/src/XrrConfig.c
-index db7a1ae..34ff3ef 100644
---- a/src/XrrConfig.c
-+++ b/src/XrrConfig.c
-@@ -409,6 +409,7 @@ Status XRRSetScreenConfigAndRate (Display *dpy,
-     
-     (void) _XReply (dpy, (xReply *) &rep, 0, xTrue);
- 
-+    /* actually .errorCode in struct xError */
-     if (rep.status == RRSetConfigSuccess) {
-       /* if we succeed, set our view of reality to what we set it to */
-       config->config_timestamp = rep.newConfigTimestamp;
-diff --git a/src/XrrCrtc.c b/src/XrrCrtc.c
-index db9d0b4..697987a 100644
---- a/src/XrrCrtc.c
-+++ b/src/XrrCrtc.c
-@@ -167,7 +167,7 @@ XRRGetCrtcGammaSize (Display *dpy, RRCrtc crtc)
-     req->crtc = crtc;
- 
-     if (!_XReply (dpy, (xReply *) &rep, 0, xFalse))
--	rep.status = RRSetConfigFailed;
-+	rep.size = 0;
-     UnlockDisplay (dpy);
-     SyncHandle ();
-     return rep.size;
-@@ -179,7 +179,7 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc)
-     XExtDisplayInfo	    *info = XRRFindDisplay(dpy);
-     xRRGetCrtcGammaReply    rep;
-     xRRGetCrtcGammaReq	    *req;
--    XRRCrtcGamma	    *crtc_gamma;
-+    XRRCrtcGamma	    *crtc_gamma = NULL;
-     long    		    nbytes;
-     long    		    nbytesRead;
- 
-@@ -192,7 +192,7 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc)
-     req->crtc = crtc;
- 
-     if (!_XReply (dpy, (xReply *) &rep, 0, xFalse))
--	rep.status = RRSetConfigFailed;
-+	goto out;
- 
-     nbytes = (long) rep.length << 2;
-     
-@@ -204,9 +204,7 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc)
-     if (!crtc_gamma)
-     {
- 	_XEatData (dpy, (unsigned long) nbytes);
--	UnlockDisplay (dpy);
--	SyncHandle ();
--	return NULL;
-+	goto out;
-     }
-     _XRead16 (dpy, crtc_gamma->red, rep.size * 2);
-     _XRead16 (dpy, crtc_gamma->green, rep.size * 2);
-@@ -214,7 +212,8 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc)
-     
-     if (nbytes > nbytesRead)
- 	_XEatData (dpy, (unsigned long) (nbytes - nbytesRead));
--    
-+
-+out:
-     UnlockDisplay (dpy);
-     SyncHandle ();
-     return crtc_gamma;
-diff --git a/src/XrrProperty.c b/src/XrrProperty.c
-index 9554f9a..1a125b2 100644
---- a/src/XrrProperty.c
-+++ b/src/XrrProperty.c
-@@ -272,7 +272,7 @@ XRRGetOutputProperty (Display *dpy, RROutput output,
-     {
- 	UnlockDisplay (dpy);
- 	SyncHandle ();
--	return 1;
-+	return ((xError *)&rep)->errorCode;
-     }
- 
-     *prop = (unsigned char *) NULL;
diff --git a/sources b/sources
index cef07d8..6e641bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-68eb59c3b7524db6ffd78746ee893d1d  libXrandr-1.3.0.tar.bz2
+7785c3f7cff2735c94657e8f87ed8ad3  libXrandr-1.3.1.tar.bz2