[PULL 1.12] glx/dri2: Fix bug #50019

[Jeremy Huddleston Sequoia]

Thanks Julien.

To ssh://jeremyhu@git.freedesktop.org/git/xorg/xserver.git
   60e0d20..e08f1c2  server-1.12-branch -> server-1.12-branch

On Jul 30, 2012, at 10:36, Julien Cristau <jcristau at debian.org> wrote:

> On Mon, Jul 30, 2012 at 09:04:20 -0700, Jeremy Huddleston Sequoia wrote:
> 
>> Would you mind sending me a [PULL]?
>> 
> Here goes.  I added in another (harmless) cherry-pick to avoid
> a conflict in hw/xfree86/dri2/dri2.h.
> 
> The following changes since commit 60e0d205666c1fc0c818b9430c1e20428c9d3808:
> 
>  configure.ac: Bump to Version 1.12.3 (2012-07-09 10:44:01 +1000)
> 
> are available in the git repository at:
> 
>  git://people.freedesktop.org/~jcristau/xserver server-1.12-branch
> 
> for you to fetch changes up to e08f1c261c75d50a3581e8791700436cba6e4b21:
> 
>  Bump video ABI version to 12.1 (2012-07-30 19:26:26 +0200)
> 
> ----------------------------------------------------------------
> Daniel Stone (1):
>      DRI2: Remove prototype for DRI2DestroyDrawable
> 
> Julien Cristau (1):
>      Bump video ABI version to 12.1
> 
> Michel Dänzer (2):
>      dri2: Add DRI2CreateDrawable2.
>      glx: Free DRI2 drawable reference to destroyed GLX drawable.
> 
> glx/glxdri2.c                  |    8 ++++++--
> hw/xfree86/common/xf86Module.h |    2 +-
> hw/xfree86/dri2/dri2.c         |   15 +++++++++++++--
> hw/xfree86/dri2/dri2.h         |    7 ++++++-
> 4 files changed, 26 insertions(+), 6 deletions(-)
> 
> Cheers,
> Julien