diff options
| author |   Dexuan Cui <dexuan.cui@intel.com> | 2011-08-16 16:43:43 +0800 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2011-08-16 22:54:21 -0700 |
| commit | 6f66bab6bf9fa202bfbbaed5d86c0d585e23571e (patch) | |
| tree | 6131e18596bebb2c7843a4047ed1ab75a960ec7a /meta/recipes-graphics/xorg-proto | |
| parent | 8f80adf492226af775487e9224d4892a5f9c72a3 (diff) | |
| download | openembedded-core-6f66bab6bf9fa202bfbbaed5d86c0d585e23571e.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.
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-proto')
| -rw-r--r-- | meta/recipes-graphics/xorg-proto/glproto/restore_the_old_xGLXBufferSwapComplete.patch | 53 | ||||
| -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 @@ -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 dri2proto's sides, we have to revert the change, too: -http://cgit.freedesktop.org/xorg/proto/glproto/commit/?id=7196c9441af941be74180f8e8d4e10a08659b80f - -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 7196c9441af941be74180f8e8d4e10a08659b80f -Author: Jesse Barnes <jbarnes@virtuousgeek.org> -Date: Thu May 5 09:21:19 2011 -0700 - - Revert "glxproto: make GLX swap event struct match spec" - - This reverts commit f5403828c68af0f12c79c0504df0a4781ca84b2b. - - This broke compatibility with existing code, so revert in favor of a new - struct definition instead. - -diff --git a/glxproto.h b/glxproto.h -index dfa0647..0ff44e3 100644 ---- a/glxproto.h -+++ b/glxproto.h -@@ -1375,13 +1375,13 @@ typedef struct { - BYTE pad; - CARD16 sequenceNumber B16; - CARD16 event_type B16; -- CARD16 pad2; - CARD32 drawable; - 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; - } xGLXBufferSwapComplete; - - /************************************************************************/ 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 @@ require xorg-proto-common.inc -SRC_URI += "file://restore_the_old_xGLXBufferSwapComplete.patch" SUMMARY = "OpenGL: X OpenGL extension headers" @@ -11,10 +10,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d44ed0146997856304dfbb512a59a8de \ file://glxproto.h;beginline=4;endline=32;md5=6b79c570f644363b356456e7d44471d9" -PR = "r1" +PR = "r0" PE = "1" BBCLASSEXTEND = "nativesdk" -SRC_URI[md5sum] = "9542f2d36751a8ad7eae9d8e176f70d4" -SRC_URI[sha256sum] = "fc0a94d4df003cb6b6953173e6498d9c4c3268ee24bcc46a1172a1e1dbd3d742" +SRC_URI[md5sum] = "f48257daf0017f7a7667e5bf48ca3578" +SRC_URI[sha256sum] = "7aaf555a100a63c67dbffc63153dcaaa3de1a36e605a2e98fce63f64089ff999" |