diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-proto/dri2proto/restore_to_old_xDRI2BufferSwapComplete.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-proto/dri2proto/restore_to_old_xDRI2BufferSwapComplete.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-proto/dri2proto/restore_to_old_xDRI2BufferSwapComplete.patch b/meta/recipes-graphics/xorg-proto/dri2proto/restore_to_old_xDRI2BufferSwapComplete.patch new file mode 100644 index 0000000000..e628f6dff3 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/dri2proto/restore_to_old_xDRI2BufferSwapComplete.patch | |||
@@ -0,0 +1,53 @@ | |||
1 | Upstream-Status: Inappropriate [backport from upstream] | ||
2 | |||
3 | In May, people already reported the mesa-dri build issue when upgrading to | ||
4 | glproto-1.4.13 and dri2proto-2.4: | ||
5 | http://lists.freedesktop.org/archives/mesa-dev/2011-May/007331.html | ||
6 | |||
7 | The story is: Jesse tried to change the definitions of some structs | ||
8 | in glproto, dri2proto and mesa-dri, but the change in mesa-dri side was accepted | ||
9 | and then reverted, see | ||
10 | http://cgit.freedesktop.org/mesa/mesa/commit/?id=dc4a3edcf9d414d5098618d5d3b79d8dd90adcc3 | ||
11 | |||
12 | so in glproto and driproto's sides, we have to revert the change, too: | ||
13 | http://cgit.freedesktop.org/xorg/proto/dri2proto/commit/?id=f3c211e1ae183dab5c7529814c9f42af2c29fc6c | ||
14 | |||
15 | We could remove this patch when upgrading to newer glproto, dri2proto and | ||
16 | mesa-dri in future. | ||
17 | |||
18 | Wed Jun 15 14:33:14 CST 2011 | ||
19 | Dexuan Cui <dexuan.cui@intel.com> | ||
20 | |||
21 | ------------------------------------------------------- | ||
22 | |||
23 | commit f3c211e1ae183dab5c7529814c9f42af2c29fc6c | ||
24 | Author: Jesse Barnes <jbarnes@virtuousgeek.org> | ||
25 | Date: Thu May 5 09:22:39 2011 -0700 | ||
26 | |||
27 | Revert "dri2proto: make DRI2 swap event match GLX spec" | ||
28 | |||
29 | This reverts commit 0ca3778de195a82087d0f07415a1cf8fc94f5b0a. | ||
30 | |||
31 | This broke compatibility by renaming existing struct fields. So revert | ||
32 | in favor of a new struct. | ||
33 | |||
34 | diff --git a/dri2proto.h b/dri2proto.h | ||
35 | index ff76355..9708a4a 100644 | ||
36 | --- a/dri2proto.h | ||
37 | +++ b/dri2proto.h | ||
38 | @@ -290,13 +290,13 @@ typedef struct { | ||
39 | CARD8 pad; | ||
40 | CARD16 sequenceNumber B16; | ||
41 | CARD16 event_type B16; | ||
42 | - CARD16 pad2; | ||
43 | CARD32 drawable B32; | ||
44 | CARD32 ust_hi B32; | ||
45 | CARD32 ust_lo B32; | ||
46 | CARD32 msc_hi B32; | ||
47 | CARD32 msc_lo B32; | ||
48 | - CARD32 sbc B32; | ||
49 | + CARD32 sbc_hi B32; | ||
50 | + CARD32 sbc_lo B32; | ||
51 | } xDRI2BufferSwapComplete; | ||
52 | #define sz_xDRI2BufferSwapComplete 32 | ||
53 | |||