summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/xorg-proto/dri2proto/restore_to_old_xDRI2BufferSwapComplete.patch53
-rw-r--r--meta/recipes-graphics/xorg-proto/dri2proto_2.6.bb (renamed from meta/recipes-graphics/xorg-proto/dri2proto_2.4.bb)7
2 files changed, 3 insertions, 57 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
deleted file mode 100644
index e628f6dff3..0000000000
--- a/meta/recipes-graphics/xorg-proto/dri2proto/restore_to_old_xDRI2BufferSwapComplete.patch
+++ /dev/null
@@ -1,53 +0,0 @@
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
8in glproto, 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 driproto's sides, we have to revert the change, too:
13http://cgit.freedesktop.org/xorg/proto/dri2proto/commit/?id=f3c211e1ae183dab5c7529814c9f42af2c29fc6c
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 f3c211e1ae183dab5c7529814c9f42af2c29fc6c
24Author: Jesse Barnes <jbarnes@virtuousgeek.org>
25Date: 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
34diff --git a/dri2proto.h b/dri2proto.h
35index 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
diff --git a/meta/recipes-graphics/xorg-proto/dri2proto_2.4.bb b/meta/recipes-graphics/xorg-proto/dri2proto_2.6.bb
index 4861f7d11b..99c089a7f9 100644
--- a/meta/recipes-graphics/xorg-proto/dri2proto_2.4.bb
+++ b/meta/recipes-graphics/xorg-proto/dri2proto_2.6.bb
@@ -1,5 +1,4 @@
1require xorg-proto-common.inc 1require xorg-proto-common.inc
2SRC_URI += "file://restore_to_old_xDRI2BufferSwapComplete.patch"
3 2
4SUMMARY = "DRI2: Direct Rendering Infrastructure 2 headers" 3SUMMARY = "DRI2: Direct Rendering Infrastructure 2 headers"
5 4
@@ -11,7 +10,7 @@ LICENSE = "MIT"
11LIC_FILES_CHKSUM = "file://COPYING;md5=2e396fa91834f8786032cad2da5638f3 \ 10LIC_FILES_CHKSUM = "file://COPYING;md5=2e396fa91834f8786032cad2da5638f3 \
12 file://dri2proto.h;endline=31;md5=22f28bf68d01b533f26195e94b3ed8ca" 11 file://dri2proto.h;endline=31;md5=22f28bf68d01b533f26195e94b3ed8ca"
13 12
14PR = "r1" 13PR = "r0"
15 14
16SRC_URI[md5sum] = "0cdeb1e95901813385dc9576be272bd3" 15SRC_URI[md5sum] = "2eb74959684f47c862081099059a11ab"
17SRC_URI[sha256sum] = "ff156f178d48ab31beeb4be5eb39d5df7540791ba489a8d94c443bb99a2376f1" 16SRC_URI[sha256sum] = "ad82c0b28c19fcd3f91ea1f93956cb666526b41b91f239773b5854b9b1a3b909"