From a273cdebe1da653ae0c8a32ed4fbef6b8d4d1f29 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 23 Nov 2011 20:07:09 -0500
Subject: [PATCH] 1.9.2

---
 .gitignore                  |  1 +
 cogl-1.9.2-no-drm-hax.patch | 81 +++++++++++++++++++++++++++++++++++++
 cogl.spec                   | 11 +++--
 sources                     |  2 +-
 4 files changed, 90 insertions(+), 5 deletions(-)
 create mode 100644 cogl-1.9.2-no-drm-hax.patch

diff --git a/.gitignore b/.gitignore
index 99cdbfa..9aef315 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /cogl-1.7.8.tar.xz
 /cogl-1.8.0.tar.xz
 /cogl-1.8.2.tar.xz
+/cogl-1.9.2.tar.xz
diff --git a/cogl-1.9.2-no-drm-hax.patch b/cogl-1.9.2-no-drm-hax.patch
new file mode 100644
index 0000000..8e1d0fb
--- /dev/null
+++ b/cogl-1.9.2-no-drm-hax.patch
@@ -0,0 +1,81 @@
+diff -up cogl-1.9.2/cogl/winsys/cogl-winsys-glx.c.drm cogl-1.9.2/cogl/winsys/cogl-winsys-glx.c
+--- cogl-1.9.2/cogl/winsys/cogl-winsys-glx.c.drm	2011-11-22 09:33:02.000000000 -0500
++++ cogl-1.9.2/cogl/winsys/cogl-winsys-glx.c	2011-11-23 20:05:36.081142159 -0500
+@@ -62,12 +62,6 @@
+ #include <GL/glx.h>
+ #include <X11/Xlib.h>
+ 
+-#ifdef HAVE_DRM
+-#include <drm.h>
+-#include <sys/ioctl.h>
+-#include <errno.h>
+-#endif
+-
+ #define COGL_ONSCREEN_X11_EVENT_MASK StructureNotifyMask
+ #define MAX_GLX_CONFIG_ATTRIBS 30
+ 
+@@ -432,20 +426,6 @@ update_winsys_features (CoglContext *con
+                     COGL_WINSYS_FEATURE_VBLANK_WAIT,
+                     TRUE);
+ 
+-#ifdef HAVE_DRM
+-  /* drm is really an extreme fallback -rumoured to work with Via
+-   * chipsets... */
+-  if (!glx_renderer->pf_glXWaitVideoSync)
+-    {
+-      if (glx_renderer->dri_fd < 0)
+-        glx_renderer->dri_fd = open("/dev/dri/card0", O_RDWR);
+-      if (glx_renderer->dri_fd >= 0)
+-        COGL_FLAGS_SET (context->winsys_features,
+-                        COGL_WINSYS_FEATURE_VBLANK_WAIT,
+-                        TRUE);
+-    }
+-#endif
+-
+   if (glx_renderer->pf_glXCopySubBuffer || context->glBlitFramebuffer)
+     COGL_FLAGS_SET (context->winsys_features,
+                     COGL_WINSYS_FEATURE_SWAP_REGION, TRUE);
+@@ -1112,24 +1092,6 @@ _cogl_winsys_onscreen_bind (CoglOnscreen
+   glx_context->current_drawable = drawable;
+ }
+ 
+-#ifdef HAVE_DRM
+-static int
+-drm_wait_vblank (int fd, drm_wait_vblank_t *vbl)
+-{
+-    int ret, rc;
+-
+-    do
+-      {
+-        ret = ioctl (fd, DRM_IOCTL_WAIT_VBLANK, vbl);
+-        vbl->request.type &= ~_DRM_VBLANK_RELATIVE;
+-        rc = errno;
+-      }
+-    while (ret && rc == EINTR);
+-
+-    return rc;
+-}
+-#endif /* HAVE_DRM */
+-
+ static void
+ _cogl_winsys_wait_for_vblank (void)
+ {
+@@ -1148,18 +1110,6 @@ _cogl_winsys_wait_for_vblank (void)
+                                          (current_count + 1) % 2,
+                                          &current_count);
+     }
+-#ifdef HAVE_DRM
+-  else
+-    {
+-      drm_wait_vblank_t blank;
+-
+-      COGL_NOTE (WINSYS, "Waiting for vblank (drm)");
+-      blank.request.type = _DRM_VBLANK_RELATIVE;
+-      blank.request.sequence = 1;
+-      blank.request.signal = 0;
+-      drm_wait_vblank (glx_renderer->dri_fd, &blank);
+-    }
+-#endif /* HAVE_DRM */
+ }
+ 
+ static guint32
diff --git a/cogl.spec b/cogl.spec
index f858960..e8e0239 100644
--- a/cogl.spec
+++ b/cogl.spec
@@ -1,12 +1,12 @@
 Name:          cogl
-Version:       1.8.2
-Release:       4%{?dist}
+Version:       1.9.2
+Release:       1%{?dist}
 Summary:       A library for using 3D graphics hardware to draw pretty pictures
 
 Group:         Development/Libraries
 License:       LGPLv2+
 URL:           http://www.clutter-project.org/
-Source0:       http://www.clutter-project.org/sources/%{name}/1.8/%{name}-%{version}.tar.xz
+Source0:       http://www.clutter-project.org/sources/%{name}/1.9/%{name}-%{version}.tar.xz
 
 BuildRequires: cairo-devel
 BuildRequires: gdk-pixbuf2-devel
@@ -21,7 +21,7 @@ BuildRequires: mesa-libGL-devel
 BuildRequires: pango-devel
 BuildRequires: pkgconfig
 
-Patch0: cogl-1.8.2-no-drm-hax.patch
+Patch0: cogl-1.9.2-no-drm-hax.patch
 Patch1: cogl-1.8.2-lp-no-framebuffer-blit.patch
 
 %description
@@ -101,6 +101,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_datadir}/gtk-doc/html/cogl-2.0-experimental
 
 %changelog
+* Wed Nov 23 2011 Matthias Clasen <mclasen@redhat.com> 1.9.2-1
+- Update to 1.9.2
+
 * Thu Nov 03 2011 Adam Jackson <ajax@redhat.com> 1.8.2-4
 - cogl-1.8.2-lp-no-framebuffer-blit.patch: Disable the subbuffer blit code
   when running on llvmpipe until it's unbroken.
diff --git a/sources b/sources
index 523a6de..cac55c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db2cbaef8c9719b03ef454ebd0351eeb  cogl-1.8.2.tar.xz
+cae2c9774d88608464b87496183a52ee  cogl-1.9.2.tar.xz