diff options
author | Dexuan Cui <dexuan.cui@intel.com> | 2011-06-15 14:52:08 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-15 11:13:13 +0100 |
commit | 519212031d552ac11be8076c91742033f96c6218 (patch) | |
tree | 07090a668874cad72e32ae4c9db5e871782d8650 /meta/recipes-graphics/xorg-proto/glproto | |
parent | 28fff2f69d26da75fdfe4d681744339e42bff741 (diff) | |
download | poky-519212031d552ac11be8076c91742033f96c6218.tar.gz |
glproto: Revert "glxproto: make GLX swap event struct match spec"
(From OE-Core rev: 9ba2e41413348e0e9383d4d0d57a7c23cfd5596f)
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-proto/glproto')
-rw-r--r-- | meta/recipes-graphics/xorg-proto/glproto/restore_the_old_xGLXBufferSwapComplete.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-proto/glproto/restore_the_old_xGLXBufferSwapComplete.patch b/meta/recipes-graphics/xorg-proto/glproto/restore_the_old_xGLXBufferSwapComplete.patch new file mode 100644 index 0000000000..19f41c9434 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/glproto/restore_the_old_xGLXBufferSwapComplete.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 in | ||
8 | 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 dri2proto's sides, we have to revert the change, too: | ||
13 | http://cgit.freedesktop.org/xorg/proto/glproto/commit/?id=7196c9441af941be74180f8e8d4e10a08659b80f | ||
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 7196c9441af941be74180f8e8d4e10a08659b80f | ||
24 | Author: Jesse Barnes <jbarnes@virtuousgeek.org> | ||
25 | Date: Thu May 5 09:21:19 2011 -0700 | ||
26 | |||
27 | Revert "glxproto: make GLX swap event struct match spec" | ||
28 | |||
29 | This reverts commit f5403828c68af0f12c79c0504df0a4781ca84b2b. | ||
30 | |||
31 | This broke compatibility with existing code, so revert in favor of a new | ||
32 | struct definition instead. | ||
33 | |||
34 | diff --git a/glxproto.h b/glxproto.h | ||
35 | index dfa0647..0ff44e3 100644 | ||
36 | --- a/glxproto.h | ||
37 | +++ b/glxproto.h | ||
38 | @@ -1375,13 +1375,13 @@ typedef struct { | ||
39 | BYTE pad; | ||
40 | CARD16 sequenceNumber B16; | ||
41 | CARD16 event_type B16; | ||
42 | - CARD16 pad2; | ||
43 | CARD32 drawable; | ||
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 | } xGLXBufferSwapComplete; | ||
52 | |||
53 | /************************************************************************/ | ||