rpms/xorg-x11-proto-devel/devel randrproto-fixed.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 sources, 1.20, 1.21 xorg-x11-proto-devel.spec, 1.47, 1.48

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Feb 12 23:19:24 UTC 2007 

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10489/devel

Modified Files:
	.cvsignore sources xorg-x11-proto-devel.spec 
Added Files:
	randrproto-fixed.patch 
Log Message:
auto-import xorg-x11-proto-devel-7.2-1.fc7 on branch devel from xorg-x11-proto-devel-7.2-1.fc7.src.rpm

randrproto-fixed.patch:
 randrproto.h |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

--- NEW FILE randrproto-fixed.patch ---
--- randrproto-1.2.0/randrproto.h	2006-11-27 18:30:19.000000000 -0500
+++ randrproto-1.2.0/randrproto.h	2007-02-12 16:53:51.000000000 -0500
@@ -293,7 +293,7 @@
 
 typedef struct {
     BYTE	type;
-    CARD8	nProperties;
+    CARD8	pad0;
     CARD16	sequenceNumber B16;
     CARD32	length B32;
     CARD16	nAtoms B16;
@@ -324,7 +324,7 @@
     BOOL	range;
     BOOL	immutable;
     BYTE	pad1;
-    CARD16	pad2 B16;
+    CARD32	pad2 B32;
     CARD32	pad3 B32;
     CARD32	pad4 B32;
     CARD32	pad5 B32;
@@ -407,7 +407,7 @@
 
 typedef struct {
     BYTE	type;
-    CARD8	status;
+    CARD8	pad0;
     CARD16	sequenceNumber B16;
     CARD32	length B32;
     RRMode	mode B32;
@@ -516,11 +516,11 @@
     CARD32	length B32;
     CARD16	size B16;
     CARD16	pad1 B16;
-    CARD16	pad2 B32;
-    CARD16	pad3 B32;
-    CARD16	pad4 B32;
-    CARD16	pad5 B32;
-    CARD16	pad6 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
 } xRRGetCrtcGammaSizeReply;
 #define sz_xRRGetCrtcGammaSizeReply	32
 
@@ -539,11 +539,11 @@
     CARD32	length B32;
     CARD16	size B16;
     CARD16	pad1 B16;
-    CARD16	pad2 B32;
-    CARD16	pad3 B32;
-    CARD16	pad4 B32;
-    CARD16	pad5 B32;
-    CARD16	pad6 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
 } xRRGetCrtcGammaReply;
 #define sz_xRRGetCrtcGammaReply		32
 
@@ -608,7 +608,7 @@
     CARD8 connection;			/* connection status */
     CARD8 subpixelOrder;		/* subpixel order */
 } xRROutputChangeNotifyEvent;
-#define sz_xRROUtputChangeNotifyEvent	32
+#define sz_xRROutputChangeNotifyEvent	32
 
 typedef struct {
     CARD8 type;				/* always evBase + RRNotify */
@@ -624,7 +624,7 @@
     CARD32 pad3 B32;
     CARD32 pad4 B32;
 } xRROutputPropertyNotifyEvent;
-#define sz_xRROUtputPropertyNotifyEvent	32
+#define sz_xRROutputPropertyNotifyEvent	32
 
 #undef RRModeFlags
 #undef RRCrtc


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	6 Jan 2007 04:30:04 -0000	1.22
+++ .cvsignore	12 Feb 2007 23:19:22 -0000	1.23
@@ -9,7 +9,6 @@
 glproto-1.4.8.tar.bz2
 inputproto-1.3.2.tar.bz2
 kbproto-1.0.3.tar.bz2
-randrproto-1.1.2.tar.bz2
 recordproto-1.13.2.tar.bz2
 renderproto-0.9.2.tar.bz2
 resourceproto-1.0.2.tar.bz2
@@ -25,5 +24,6 @@
 xf86rushproto-1.1.2.tar.bz2
 xf86vidmodeproto-2.2.2.tar.bz2
 xineramaproto-1.1.2.tar.bz2
-xproxymanagementprotocol-1.0.2.tar.bz2
 xproto-7.0.10.tar.bz2
+xproxymanagementprotocol-1.0.2.tar.bz2
+randrproto-1.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	6 Jan 2007 04:30:04 -0000	1.20
+++ sources	12 Feb 2007 23:19:22 -0000	1.21
@@ -9,7 +9,6 @@
 3dfbd17203c0c88b94b6f579f24c11cc  glproto-1.4.8.tar.bz2
 e0b7df0fc69f0712aa7f2161faa94e1d  inputproto-1.3.2.tar.bz2
 6092cdb0a1225f95356ddbe6c2abaad5  kbproto-1.0.3.tar.bz2
-8e72173ad7aa8abe218e6e7fe0903842  randrproto-1.1.2.tar.bz2
 0ed4706564a34fc2aff724aa16d3ff00  recordproto-1.13.2.tar.bz2
 28fbe8a59ebd31f098b90ec64f3d133a  renderproto-0.9.2.tar.bz2
 b823b314e37eb19dae1f297951d2e933  resourceproto-1.0.2.tar.bz2
@@ -25,5 +24,6 @@
 b6a96ffdae084e27487a58314008b000  xf86rushproto-1.1.2.tar.bz2
 f00844a63d6e76b69eb0eb5e41eed843  xf86vidmodeproto-2.2.2.tar.bz2
 1cc292c562962ad0ad3a253cae68c632  xineramaproto-1.1.2.tar.bz2
-d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
 2ed80e90992e7455eaac4c3e977ebd01  xproto-7.0.10.tar.bz2
+d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
+8a3bdb579fe18fd0b70db21b56363cee  randrproto-1.2.0.tar.bz2


Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- xorg-x11-proto-devel.spec	6 Jan 2007 04:30:04 -0000	1.47
+++ xorg-x11-proto-devel.spec	12 Feb 2007 23:19:22 -0000	1.48
@@ -9,8 +9,8 @@
 
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
-Version: 7.1
-Release: 11%{?dist}
+Version: 7.2
+Release: 1%{?dist}
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -27,7 +27,7 @@
 Source8:  ftp://ftp.x.org/pub/individual/proto/glproto-1.4.8.tar.bz2
 Source9:  ftp://ftp.x.org/pub/individual/proto/inputproto-1.3.2.tar.bz2
 Source10: ftp://ftp.x.org/pub/individual/proto/kbproto-1.0.3.tar.bz2
-Source13: ftp://ftp.x.org/pub/individual/proto/randrproto-1.1.2.tar.bz2
+Source13: ftp://ftp.x.org/pub/individual/proto/randrproto-1.2.0.tar.bz2
 Source14: ftp://ftp.x.org/pub/individual/proto/recordproto-1.13.2.tar.bz2
 Source15: ftp://ftp.x.org/pub/individual/proto/renderproto-0.9.2.tar.bz2
 Source16: ftp://ftp.x.org/pub/individual/proto/resourceproto-1.0.2.tar.bz2
@@ -46,6 +46,8 @@
 Source29: ftp://ftp.x.org/pub/individual/proto/xproto-7.0.10.tar.bz2
 Source30: ftp://ftp.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2
 
+Patch13: randrproto-fixed.patch
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.0.2-1
 # FIXME: This buildreq on xorg-x11-filesystem isn't really necessary, and
@@ -71,6 +73,9 @@
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30
 
+# This should be removed once 1.2.1 releases
+%patch13 -p0 -b .randr
+
 %build
 #ls -al
 
@@ -273,6 +278,10 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Mon Feb 12 2007 Adam Jackson <ajax at redhat.com> 7.2-1
+- randrproto 1.2
+- Superstition bump to 7.2
+
 * Fri Jan 05 2007 Adam Jackson <ajax at redhat.com> 7.1-11
 - xproto 7.0.10

More information about the fedora-cvs-commits mailing list