[PATCH 0/2] fix the mesa-dri build failure after upgrading to newer glproto and dri2proto

[PATCH 0/2] fix the mesa-dri build failure after upgrading to newer glproto and dri2proto

[Dexuan Cui]

Please review them.

The following changes since commit 6719d1e245234767bb5409c30dd34388ab935550:

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib dcui/fix_mesa-dri
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/fix_mesa-dri

Dexuan Cui (2):
  glproto: Revert "glxproto: make GLX swap event struct match spec"
  dri2proto: Revert "dri2proto: make DRI2 swap event match GLX spec"

 .../restore_to_old_xDRI2BufferSwapComplete.patch   |   53 ++++++++++++++++++++
 meta/recipes-graphics/xorg-proto/dri2proto_2.4.bb  |    3 +-
 .../restore_the_old_xGLXBufferSwapComplete.patch   |   53 ++++++++++++++++++++
 meta/recipes-graphics/xorg-proto/glproto_1.4.13.bb |    3 +-
 4 files changed, 110 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-proto/dri2proto/restore_to_old_xDRI2BufferSwapComplete.patch
 create mode 100644 meta/recipes-graphics/xorg-proto/glproto/restore_the_old_xGLXBufferSwapComplete.patch

[PATCH 1/2] glproto: Revert "glxproto: make GLX swap event struct match spec"

[Dexuan Cui]

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 .../restore_the_old_xGLXBufferSwapComplete.patch   |   53 ++++++++++++++++++++
 meta/recipes-graphics/xorg-proto/glproto_1.4.13.bb |    3 +-
 2 files changed, 55 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-proto/glproto/restore_the_old_xGLXBufferSwapComplete.patch

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
new file mode 100644
index 0000000..19f41c9
--- /dev/null
+++ b/meta/recipes-graphics/xorg-proto/glproto/restore_the_old_xGLXBufferSwapComplete.patch
@@ -0,0 +1,53 @@
+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.13.bb
index 38b17b6..7ba9831 100644
--- a/meta/recipes-graphics/xorg-proto/glproto_1.4.13.bb
+++ b/meta/recipes-graphics/xorg-proto/glproto_1.4.13.bb
@@ -1,4 +1,5 @@
 require xorg-proto-common.inc
+SRC_URI += "file://restore_the_old_xGLXBufferSwapComplete.patch"
 
 SUMMARY = "OpenGL: X OpenGL extension headers"
 
@@ -10,7 +11,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d44ed0146997856304dfbb512a59a8de \
                     file://glxproto.h;beginline=4;endline=32;md5=6b79c570f644363b356456e7d44471d9"
 
-PR = "r0"
+PR = "r1"
 PE = "1"
 
 BBCLASSEXTEND = "nativesdk"
-- 
1.7.1

[PATCH 2/2] dri2proto: Revert "dri2proto: make DRI2 swap event match GLX spec"

[Dexuan Cui]

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 .../restore_to_old_xDRI2BufferSwapComplete.patch   |   53 ++++++++++++++++++++
 meta/recipes-graphics/xorg-proto/dri2proto_2.4.bb  |    3 +-
 2 files changed, 55 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-proto/dri2proto/restore_to_old_xDRI2BufferSwapComplete.patch

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
new file mode 100644
index 0000000..e628f6d
--- /dev/null
+++ b/meta/recipes-graphics/xorg-proto/dri2proto/restore_to_old_xDRI2BufferSwapComplete.patch
@@ -0,0 +1,53 @@
+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
+ 
diff --git a/meta/recipes-graphics/xorg-proto/dri2proto_2.4.bb b/meta/recipes-graphics/xorg-proto/dri2proto_2.4.bb
index 9d30e94..4861f7d 100644
--- a/meta/recipes-graphics/xorg-proto/dri2proto_2.4.bb
+++ b/meta/recipes-graphics/xorg-proto/dri2proto_2.4.bb
@@ -1,4 +1,5 @@
 require xorg-proto-common.inc
+SRC_URI += "file://restore_to_old_xDRI2BufferSwapComplete.patch"
 
 SUMMARY = "DRI2: Direct Rendering Infrastructure 2 headers"
 
@@ -10,7 +11,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2e396fa91834f8786032cad2da5638f3 \
                     file://dri2proto.h;endline=31;md5=22f28bf68d01b533f26195e94b3ed8ca"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "0cdeb1e95901813385dc9576be272bd3"
 SRC_URI[sha256sum] = "ff156f178d48ab31beeb4be5eb39d5df7540791ba489a8d94c443bb99a2376f1"
-- 
1.7.1

Re: [PATCH 0/2] fix the mesa-dri build failure after upgrading to newer glproto and dri2proto

[Martin Jansa]

On Wed, Jun 15, 2011 at 9:19 AM, Dexuan Cui <dexuan.cui@intel.com> wrote:
> Please review them.

Acked-by: Martin.Jansa <Martin.Jansa@gmail.com>

with sort of deja vu :)
http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=de74afec8a067071d17365438d6c462664bc5054
http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=f02e320146c701ad0f02f7daf52acac6389c71fd
http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=f2a73450a70d113d77fbf703772fbf0db81e8e61

>
> The following changes since commit 6719d1e245234767bb5409c30dd34388ab935550:
>
> are available in the git repository at:
>  git://git.pokylinux.org/poky-contrib dcui/fix_mesa-dri
>  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/fix_mesa-dri
>
> Dexuan Cui (2):
>  glproto: Revert "glxproto: make GLX swap event struct match spec"
>  dri2proto: Revert "dri2proto: make DRI2 swap event match GLX spec"
>
>  .../restore_to_old_xDRI2BufferSwapComplete.patch   |   53 ++++++++++++++++++++
>  meta/recipes-graphics/xorg-proto/dri2proto_2.4.bb  |    3 +-
>  .../restore_the_old_xGLXBufferSwapComplete.patch   |   53 ++++++++++++++++++++
>  meta/recipes-graphics/xorg-proto/glproto_1.4.13.bb |    3 +-
>  4 files changed, 110 insertions(+), 2 deletions(-)
>  create mode 100644 meta/recipes-graphics/xorg-proto/dri2proto/restore_to_old_xDRI2BufferSwapComplete.patch
>  create mode 100644 meta/recipes-graphics/xorg-proto/glproto/restore_the_old_xGLXBufferSwapComplete.patch
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Re: [PATCH 0/2] fix the mesa-dri build failure after upgrading to newer glproto and dri2proto

[Koen Kooi]

Op 15 jun 2011, om 09:19 heeft Dexuan Cui het volgende geschreven:

> Please review them.

This is more elegant than my solution of keeping dri2proto 2.3 in meta-oe :)

Acked-by: Koen Kooi <koen@dominion.thruhere.net>

> 
> The following changes since commit 6719d1e245234767bb5409c30dd34388ab935550:
> 
> are available in the git repository at:
>  git://git.pokylinux.org/poky-contrib dcui/fix_mesa-dri
>  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/fix_mesa-dri
> 
> Dexuan Cui (2):
>  glproto: Revert "glxproto: make GLX swap event struct match spec"
>  dri2proto: Revert "dri2proto: make DRI2 swap event match GLX spec"
> 
> .../restore_to_old_xDRI2BufferSwapComplete.patch   |   53 ++++++++++++++++++++
> meta/recipes-graphics/xorg-proto/dri2proto_2.4.bb  |    3 +-
> .../restore_the_old_xGLXBufferSwapComplete.patch   |   53 ++++++++++++++++++++
> meta/recipes-graphics/xorg-proto/glproto_1.4.13.bb |    3 +-
> 4 files changed, 110 insertions(+), 2 deletions(-)
> create mode 100644 meta/recipes-graphics/xorg-proto/dri2proto/restore_to_old_xDRI2BufferSwapComplete.patch
> create mode 100644 meta/recipes-graphics/xorg-proto/glproto/restore_the_old_xGLXBufferSwapComplete.patch
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [PATCH 0/2] fix the mesa-dri build failure after upgrading to newer glproto and dri2proto

[Cui, Dexuan]

Martin Jansa wrote:
> On Wed, Jun 15, 2011 at 9:19 AM, Dexuan Cui <dexuan.cui@intel.com>
> wrote: 
>> Please review them.
> 
> Acked-by: Martin.Jansa <Martin.Jansa@gmail.com>
> 
> with sort of deja vu :)
> http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=de74afec8a067071d17365438d6c462664bc5054
> http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=f02e320146c701ad0f02f7daf52acac6389c71fd
> http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=f2a73450a70d113d77fbf703772fbf0db81e8e61

Yes, I made the same mistake... I should be more careful.

Thanks,
-- Dexuan

Re: [PATCH 0/2] fix the mesa-dri build failure after upgrading to newer glproto and dri2proto

[Richard Purdie]

On Wed, 2011-06-15 at 15:19 +0800, Dexuan Cui wrote:
> Please review them.
> 
> The following changes since commit 6719d1e245234767bb5409c30dd34388ab935550:
> 
> are available in the git repository at:
>   git://git.pokylinux.org/poky-contrib dcui/fix_mesa-dri
>   http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/fix_mesa-dri
> 
> Dexuan Cui (2):
>   glproto: Revert "glxproto: make GLX swap event struct match spec"
>   dri2proto: Revert "dri2proto: make DRI2 swap event match GLX spec"

Merged to master, thanks.

Richard