sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

dri2proto: upgrade from 2.4 to 2.6 

The patch has been integrated into 1.4.14 so let's remove it.

(From OE-Core rev: 8e0e309966576d705c75eb0e82cbf46e57fc0e46)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Dexuan Cui 2011-08-16 16:49:54 +08:00 committed by Richard Purdie
parent 4580761533
commit 99fbca7271
2 changed files with 3 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
meta/recipes-graphics/xorg-proto/dri2proto/restore_to_old_xDRI2BufferSwapComplete.patch
View File

@ -1,53 +0,0 @@
Upstream-Status: Inappropriate [backport from upstream]
In May, people already reported the mesa-dri build issue when upgrading to
glproto-1.4.13 and dri2proto-2.4:
http://lists.freedesktop.org/archives/mesa-dev/2011-May/007331.html
The story is: Jesse tried to change the definitions of some structs
in glproto, dri2proto and mesa-dri, but the change in mesa-dri side was accepted
and then reverted, see
http://cgit.freedesktop.org/mesa/mesa/commit/?id=dc4a3edcf9d414d5098618d5d3b79d8dd90adcc3
so in glproto and driproto's sides, we have to revert the change, too:
http://cgit.freedesktop.org/xorg/proto/dri2proto/commit/?id=f3c211e1ae183dab5c7529814c9f42af2c29fc6c
We could remove this patch when upgrading to newer glproto, dri2proto and
mesa-dri in future.
Wed Jun 15 14:33:14 CST 2011
Dexuan Cui <dexuan.cui@intel.com>
-------------------------------------------------------
commit f3c211e1ae183dab5c7529814c9f42af2c29fc6c
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Thu May 5 09:22:39 2011 -0700
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

7
meta/recipes-graphics/xorg-proto/dri2proto_2.4.bb → meta/recipes-graphics/xorg-proto/dri2proto_2.6.bb
View File

@ -1,5 +1,4 @@
require xorg-proto-common.inc
SRC_URI += "file://restore_to_old_xDRI2BufferSwapComplete.patch"
SUMMARY = "DRI2: Direct Rendering Infrastructure 2 headers"
@ -11,7 +10,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=2e396fa91834f8786032cad2da5638f3 \
file://dri2proto.h;endline=31;md5=22f28bf68d01b533f26195e94b3ed8ca"
PR = "r1"
PR = "r0"
SRC_URI[md5sum] = "0cdeb1e95901813385dc9576be272bd3"
SRC_URI[sha256sum] = "ff156f178d48ab31beeb4be5eb39d5df7540791ba489a8d94c443bb99a2376f1"
SRC_URI[md5sum] = "2eb74959684f47c862081099059a11ab"
SRC_URI[sha256sum] = "ad82c0b28c19fcd3f91ea1f93956cb666526b41b91f239773b5854b9b1a3b909"