summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-proto
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2011-06-15 14:52:08 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-15 11:13:13 +0100
commit519212031d552ac11be8076c91742033f96c6218 (patch)
tree07090a668874cad72e32ae4c9db5e871782d8650 /meta/recipes-graphics/xorg-proto
parent28fff2f69d26da75fdfe4d681744339e42bff741 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-graphics/xorg-proto/glproto/restore_the_old_xGLXBufferSwapComplete.patch53
-rw-r--r--meta/recipes-graphics/xorg-proto/glproto_1.4.13.bb3
2 files changed, 55 insertions, 1 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 @@
1Upstream-Status: Inappropriate [backport from upstream]
2
3In May, people already reported the mesa-dri build issue when upgrading to
4glproto-1.4.13 and dri2proto-2.4:
5http://lists.freedesktop.org/archives/mesa-dev/2011-May/007331.html
6
7The story is: Jesse tried to change the definitions of some structs in
8glproto, dri2proto and mesa-dri, but the change in mesa-dri side was accepted
9and then reverted, see
10http://cgit.freedesktop.org/mesa/mesa/commit/?id=dc4a3edcf9d414d5098618d5d3b79d8dd90adcc3
11
12so in glproto and dri2proto's sides, we have to revert the change, too:
13http://cgit.freedesktop.org/xorg/proto/glproto/commit/?id=7196c9441af941be74180f8e8d4e10a08659b80f
14
15We could remove this patch when upgrading to newer glproto, dri2proto and
16mesa-dri in future.
17
18Wed Jun 15 14:33:14 CST 2011
19Dexuan Cui <dexuan.cui@intel.com>
20
21-------------------------------------------------------
22
23commit 7196c9441af941be74180f8e8d4e10a08659b80f
24Author: Jesse Barnes <jbarnes@virtuousgeek.org>
25Date: 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
34diff --git a/glxproto.h b/glxproto.h
35index 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 /************************************************************************/
diff --git a/meta/recipes-graphics/xorg-proto/glproto_1.4.13.bb b/meta/recipes-graphics/xorg-proto/glproto_1.4.13.bb
index 38b17b6ad3..7ba9831016 100644
--- a/meta/recipes-graphics/xorg-proto/glproto_1.4.13.bb
+++ b/meta/recipes-graphics/xorg-proto/glproto_1.4.13.bb
@@ -1,4 +1,5 @@
1require xorg-proto-common.inc 1require xorg-proto-common.inc
2SRC_URI += "file://restore_the_old_xGLXBufferSwapComplete.patch"
2 3
3SUMMARY = "OpenGL: X OpenGL extension headers" 4SUMMARY = "OpenGL: X OpenGL extension headers"
4 5
@@ -10,7 +11,7 @@ LICENSE = "MIT"
10LIC_FILES_CHKSUM = "file://COPYING;md5=d44ed0146997856304dfbb512a59a8de \ 11LIC_FILES_CHKSUM = "file://COPYING;md5=d44ed0146997856304dfbb512a59a8de \
11 file://glxproto.h;beginline=4;endline=32;md5=6b79c570f644363b356456e7d44471d9" 12 file://glxproto.h;beginline=4;endline=32;md5=6b79c570f644363b356456e7d44471d9"
12 13
13PR = "r0" 14PR = "r1"
14PE = "1" 15PE = "1"
15 16
16BBCLASSEXTEND = "nativesdk" 17BBCLASSEXTEND = "nativesdk"