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

Submitted by Dexuan Cui on June 15, 2011, 7:19 a.m. | Patch ID: 5975

Details

Message ID cover.1308122189.git.dexuan.cui@intel.com
State New, archived
Headers show

Pull-request

git://git.pokylinux.org/poky-contrib dcui/fix_mesa-dri

Commit Message

Dexuan Cui June 15, 2011, 7:19 a.m. 
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

Comments

Martin Jansa June 15, 2011, 7:26 a.m. 
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
>
Koen Kooi June 15, 2011, 7:32 a.m. 
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
Dexuan Cui June 15, 2011, 7:42 a.m. 
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
Richard Purdie June 15, 2011, 9:36 a.m. 
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