From 4580761533cfefa24d45fc0d8b68f8d8c83e0d67 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Tue, 16 Aug 2011 16:43:43 +0800 Subject: 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 Signed-off-by: Richard Purdie --- .../restore_the_old_xGLXBufferSwapComplete.patch | 53 ---------------------- meta/recipes-graphics/xorg-proto/glproto_1.4.13.bb | 20 -------- meta/recipes-graphics/xorg-proto/glproto_1.4.14.bb | 19 ++++++++ 3 files changed, 19 insertions(+), 73 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-proto/glproto/restore_the_old_xGLXBufferSwapComplete.patch delete mode 100644 meta/recipes-graphics/xorg-proto/glproto_1.4.13.bb create mode 100644 meta/recipes-graphics/xorg-proto/glproto_1.4.14.bb (limited to 'meta/recipes-graphics/xorg-proto') 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 - -------------------------------------------------------- - -commit 7196c9441af941be74180f8e8d4e10a08659b80f -Author: Jesse Barnes -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.13.bb deleted file mode 100644 index 7ba9831016..0000000000 --- a/meta/recipes-graphics/xorg-proto/glproto_1.4.13.bb +++ /dev/null @@ -1,20 +0,0 @@ -require xorg-proto-common.inc -SRC_URI += "file://restore_the_old_xGLXBufferSwapComplete.patch" - -SUMMARY = "OpenGL: X OpenGL extension headers" - -DESCRIPTION = "This package provides the wire protocol for the \ -OpenGL-related extensions, used to enable the rendering of applications \ -using OpenGL." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d44ed0146997856304dfbb512a59a8de \ - file://glxproto.h;beginline=4;endline=32;md5=6b79c570f644363b356456e7d44471d9" - -PR = "r1" -PE = "1" - -BBCLASSEXTEND = "nativesdk" - -SRC_URI[md5sum] = "9542f2d36751a8ad7eae9d8e176f70d4" -SRC_URI[sha256sum] = "fc0a94d4df003cb6b6953173e6498d9c4c3268ee24bcc46a1172a1e1dbd3d742" diff --git a/meta/recipes-graphics/xorg-proto/glproto_1.4.14.bb b/meta/recipes-graphics/xorg-proto/glproto_1.4.14.bb new file mode 100644 index 0000000000..76d9502343 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/glproto_1.4.14.bb @@ -0,0 +1,19 @@ +require xorg-proto-common.inc + +SUMMARY = "OpenGL: X OpenGL extension headers" + +DESCRIPTION = "This package provides the wire protocol for the \ +OpenGL-related extensions, used to enable the rendering of applications \ +using OpenGL." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=d44ed0146997856304dfbb512a59a8de \ + file://glxproto.h;beginline=4;endline=32;md5=6b79c570f644363b356456e7d44471d9" + +PR = "r0" +PE = "1" + +BBCLASSEXTEND = "nativesdk" + +SRC_URI[md5sum] = "f48257daf0017f7a7667e5bf48ca3578" +SRC_URI[sha256sum] = "7aaf555a100a63c67dbffc63153dcaaa3de1a36e605a2e98fce63f64089ff999" -- cgit v1.2.3-54-g00ecf