packages: xorg-proto-dri2proto/xorg-proto-dri2proto.spec, xorg-proto-dri2pr...

[baggins]

Author: baggins                      Date: Tue Jun 28 11:13:46 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- fix struct xDRI2BufferSwapComplete breakage

---- Files affected:
packages/xorg-proto-dri2proto:
   xorg-proto-dri2proto.spec (1.13 -> 1.14) , xorg-proto-dri2proto-xDRI2BufferSwapComplete.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xorg-proto-dri2proto/xorg-proto-dri2proto.spec
diff -u packages/xorg-proto-dri2proto/xorg-proto-dri2proto.spec:1.13 packages/xorg-proto-dri2proto/xorg-proto-dri2proto.spec:1.14
--- packages/xorg-proto-dri2proto/xorg-proto-dri2proto.spec:1.13	Fri May  6 17:01:27 2011
+++ packages/xorg-proto-dri2proto/xorg-proto-dri2proto.spec	Tue Jun 28 13:13:40 2011
@@ -3,11 +3,12 @@
 Summary(pl.UTF-8):	Nagłówki rozszerzenia DRI2
 Name:		xorg-proto-dri2proto
 Version:	2.4
-Release:	1
+Release:	2
 License:	MIT
 Group:		X11/Development/Libraries
 Source0:	http://xorg.freedesktop.org/releases/individual/proto/dri2proto-%{version}.tar.bz2
 # Source0-md5:	0cdeb1e95901813385dc9576be272bd3
+Patch0:		%{name}-xDRI2BufferSwapComplete.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -35,6 +36,7 @@
 
 %prep
 %setup -q -n dri2proto-%{version}
+%patch0 -p1
 
 %build
 %{__aclocal}
@@ -66,6 +68,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2011/06/28 11:13:40  baggins
+- rel 2
+- fix struct xDRI2BufferSwapComplete breakage
+
 Revision 1.13  2011/05/06 15:01:27  qboosh
 - updated to 2.4
 

================================================================
Index: packages/xorg-proto-dri2proto/xorg-proto-dri2proto-xDRI2BufferSwapComplete.patch
diff -u /dev/null packages/xorg-proto-dri2proto/xorg-proto-dri2proto-xDRI2BufferSwapComplete.patch:1.1
--- /dev/null	Tue Jun 28 13:13:46 2011
+++ packages/xorg-proto-dri2proto/xorg-proto-dri2proto-xDRI2BufferSwapComplete.patch	Tue Jun 28 13:13:40 2011
@@ -0,0 +1,91 @@
+From f3c211e1ae183dab5c7529814c9f42af2c29fc6c Mon Sep 17 00:00:00 2001
+From: Jesse Barnes <jbarnes at virtuousgeek.org>
+Date: Thu, 05 May 2011 16:22:39 +0000
+Subject: Revert "dri2proto: make DRI2 swap event match GLX spec"
+
+This reverts commit 0ca3778de195a82087d0f07415a1cf8fc94f5b0a.
+
+This broke compatibility by renaming existing struct fields.  So revert
+in favor of a new struct.
+---
+diff --git a/dri2proto.h b/dri2proto.h
+index ff76355..9708a4a 100644
+--- a/dri2proto.h
++++ b/dri2proto.h
+@@ -290,13 +290,13 @@ typedef struct {
+     CARD8 pad;
+     CARD16 sequenceNumber B16;
+     CARD16 event_type B16;
+-    CARD16 pad2;
+     CARD32 drawable B32;
+     CARD32 ust_hi B32;
+     CARD32 ust_lo B32;
+     CARD32 msc_hi B32;
+     CARD32 msc_lo B32;
+-    CARD32 sbc B32;
++    CARD32 sbc_hi B32;
++    CARD32 sbc_lo B32;
+ } xDRI2BufferSwapComplete;
+ #define sz_xDRI2BufferSwapComplete 32
+ 
+--
+cgit v0.8.3-6-g21f6
+From 005096937e1da6f65f8ece77662a8db6102d933d Mon Sep 17 00:00:00 2001
+From: Jesse Barnes <jbarnes at virtuousgeek.org>
+Date: Thu, 05 May 2011 20:11:22 +0000
+Subject: dri2proto: add a new DRI2BufferSwapComplete struct that matches the spec
+
+Just add a new struct to remain compatible with existing code.
+
+Reviewed-by: Eric Anholt <eric at anholt.net>
+Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
+Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
+Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
+---
+diff --git a/configure.ac b/configure.ac
+index 9505f56..297be0e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,5 +1,5 @@
+ AC_PREREQ([2.60])
+-AC_INIT([DRI2Proto], [2.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
++AC_INIT([DRI2Proto], [2.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ AM_MAINTAINER_MODE
+ 
+diff --git a/dri2proto.h b/dri2proto.h
+index 9708a4a..cd82afb 100644
+--- a/dri2proto.h
++++ b/dri2proto.h
+@@ -290,6 +290,7 @@ typedef struct {
+     CARD8 pad;
+     CARD16 sequenceNumber B16;
+     CARD16 event_type B16;
++    CARD16 pad2;
+     CARD32 drawable B32;
+     CARD32 ust_hi B32;
+     CARD32 ust_lo B32;
+@@ -304,6 +305,21 @@ typedef struct {
+     CARD8 type;
+     CARD8 pad;
+     CARD16 sequenceNumber B16;
++    CARD16 event_type B16;
++    CARD16 pad2;
++    CARD32 drawable B32;
++    CARD32 ust_hi B32;
++    CARD32 ust_lo B32;
++    CARD32 msc_hi B32;
++    CARD32 msc_lo B32;
++    CARD32 sbc B32;
++} xDRI2BufferSwapComplete2;
++#define sz_xDRI2BufferSwapComplete2 32
++
++typedef struct {
++    CARD8 type;
++    CARD8 pad;
++    CARD16 sequenceNumber B16;
+     CARD32 drawable B32;
+     CARD32 pad1 B32;
+     CARD32 pad2 B32;
+--
+cgit v0.8.3-6-g21f6
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-proto-dri2proto/xorg-proto-dri2proto.spec?r1=1.13&r2=1.14&f=u