summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2011-08-16 16:43:43 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-17 15:14:57 +0100
commit4580761533cfefa24d45fc0d8b68f8d8c83e0d67 (patch)
tree732b508b63461c212aa134bbe5fd3ebfd4b25102 /meta/recipes-graphics
parentf08d7da6f4a0b61bab1ea5db5dde82bccf44798c (diff)
downloadpoky-4580761533cfefa24d45fc0d8b68f8d8c83e0d67.tar.gz
glproto: upgrade from 1.4.13 to 1.4.14
The patch has been integrated into 1.4.14 so let's remove it. (From OE-Core rev: 6f66bab6bf9fa202bfbbaed5d86c0d585e23571e) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-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.14.bb (renamed from meta/recipes-graphics/xorg-proto/glproto_1.4.13.bb)7
2 files changed, 3 insertions, 57 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
deleted file mode 100644
index 19f41c9434..0000000000
--- a/meta/recipes-graphics/xorg-proto/glproto/restore_the_old_xGLXBufferSwapComplete.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 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.14.bb
index 7ba9831016..76d9502343 100644
--- a/meta/recipes-graphics/xorg-proto/glproto_1.4.13.bb
+++ b/meta/recipes-graphics/xorg-proto/glproto_1.4.14.bb
@@ -1,5 +1,4 @@
1require xorg-proto-common.inc 1require xorg-proto-common.inc
2SRC_URI += "file://restore_the_old_xGLXBufferSwapComplete.patch"
3 2
4SUMMARY = "OpenGL: X OpenGL extension headers" 3SUMMARY = "OpenGL: X OpenGL extension headers"
5 4
@@ -11,10 +10,10 @@ LICENSE = "MIT"
11LIC_FILES_CHKSUM = "file://COPYING;md5=d44ed0146997856304dfbb512a59a8de \ 10LIC_FILES_CHKSUM = "file://COPYING;md5=d44ed0146997856304dfbb512a59a8de \
12 file://glxproto.h;beginline=4;endline=32;md5=6b79c570f644363b356456e7d44471d9" 11 file://glxproto.h;beginline=4;endline=32;md5=6b79c570f644363b356456e7d44471d9"
13 12
14PR = "r1" 13PR = "r0"
15PE = "1" 14PE = "1"
16 15
17BBCLASSEXTEND = "nativesdk" 16BBCLASSEXTEND = "nativesdk"
18 17
19SRC_URI[md5sum] = "9542f2d36751a8ad7eae9d8e176f70d4" 18SRC_URI[md5sum] = "f48257daf0017f7a7667e5bf48ca3578"
20SRC_URI[sha256sum] = "fc0a94d4df003cb6b6953173e6498d9c4c3268ee24bcc46a1172a1e1dbd3d742" 19SRC_URI[sha256sum] = "7aaf555a100a63c67dbffc63153dcaaa3de1a36e605a2e98fce63f64089ff999"