r36787 - in /desktop/experimental/cogl/debian: changelog patches/Disable-reliance-on-KHR_create_context.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sun Feb 24 13:01:01 2013
New Revision: 36787

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36787
Log:
* d/p/Disable-reliance-on-KHR_create_context.patch
  + Added. Don't assume the GL stack supports KHR_create_context to build
    with older mesa (Disables the GL3 driver with EGL)

Added:
    desktop/experimental/cogl/debian/patches/Disable-reliance-on-KHR_create_context.patch
Modified:
    desktop/experimental/cogl/debian/changelog
    desktop/experimental/cogl/debian/patches/series

Modified: desktop/experimental/cogl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cogl/debian/changelog?rev=36787&op=diff
==============================================================================
--- desktop/experimental/cogl/debian/changelog [utf-8] (original)
+++ desktop/experimental/cogl/debian/changelog [utf-8] Sun Feb 24 13:01:01 2013
@@ -27,7 +27,12 @@
     - Lower gobject-introspection build-dependency from 1.33.4-1
       to 1.33.4-1~ to ease backports.
 
- -- Gustavo Noronha Silva <kov at debian.org>  Wed, 10 Oct 2012 11:16:30 -0300
+  [ Sjoerd Simons ]
+  * d/p/Disable-reliance-on-KHR_create_context.patch
+    + Added. Don't assume the GL stack supports KHR_create_context to build
+      with older mesa (Disables the GL3 driver with EGL)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 24 Feb 2013 13:54:07 +0100
 
 cogl (1.12.0-1) experimental; urgency=low
 

Added: desktop/experimental/cogl/debian/patches/Disable-reliance-on-KHR_create_context.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cogl/debian/patches/Disable-reliance-on-KHR_create_context.patch?rev=36787&op=file
==============================================================================
--- desktop/experimental/cogl/debian/patches/Disable-reliance-on-KHR_create_context.patch (added)
+++ desktop/experimental/cogl/debian/patches/Disable-reliance-on-KHR_create_context.patch [utf-8] Sun Feb 24 13:01:01 2013
@@ -1,0 +1,35 @@
+From 971c31bb3e13344a0203c0508119e81a4ea2c08b Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at luon.net>
+Date: Sat, 23 Feb 2013 17:29:25 +0100
+Subject: [PATCH] Disable reliance on KHR_create_context
+
+---
+ cogl/winsys/cogl-winsys-egl.c |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/cogl/winsys/cogl-winsys-egl.c b/cogl/winsys/cogl-winsys-egl.c
+index af8181b..dfce845 100644
+--- a/cogl/winsys/cogl-winsys-egl.c
++++ b/cogl/winsys/cogl-winsys-egl.c
+@@ -355,7 +355,9 @@ try_create_context (CoglDisplay *display,
+           error_message = "Driver does not support GL 3 contexts";
+           goto fail;
+         }
+-
++      error_message = "GL 3 driver not supported by this build";
++      goto fail;
++#if 0
+       /* Try to get a core profile 3.1 context with no deprecated features */
+       attribs[0] = EGL_CONTEXT_MAJOR_VERSION_KHR;
+       attribs[1] = 3;
+@@ -366,6 +368,7 @@ try_create_context (CoglDisplay *display,
+       attribs[6] = EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR;
+       attribs[7] = EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR;
+       attribs[8] = EGL_NONE;
++#endif
+     }
+   else if (display->renderer->driver == COGL_DRIVER_GLES2)
+     {
+-- 
+1.7.10.4
+

Modified: desktop/experimental/cogl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cogl/debian/patches/series?rev=36787&op=diff
==============================================================================
--- desktop/experimental/cogl/debian/patches/series [utf-8] (original)
+++ desktop/experimental/cogl/debian/patches/series [utf-8] Sun Feb 24 13:01:01 2013
@@ -1,0 +1,1 @@
+Disable-reliance-on-KHR_create_context.patch