r50289 - in /desktop/unstable/cogl/debian: changelog patches/fix-undef-build-failure.patch patches/series

[jbicha-guest at users.alioth.debian.org]

Author: jbicha-guest
Date: Sun Sep 11 00:18:51 2016
New Revision: 50289

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50289
Log:
Add patch from Bugzilla to fix kfreebsd build failure

Added:
    desktop/unstable/cogl/debian/patches/fix-undef-build-failure.patch
Modified:
    desktop/unstable/cogl/debian/changelog
    desktop/unstable/cogl/debian/patches/series

Modified: desktop/unstable/cogl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/changelog?rev=50289&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/changelog	[utf-8] (original)
+++ desktop/unstable/cogl/debian/changelog	[utf-8] Sun Sep 11 00:18:51 2016
@@ -1,3 +1,10 @@
+cogl (1.22.2-3) UNRELEASED; urgency=medium
+
+  * Add debian/patches/fix-undef-build-failure.patch:
+    - Patch from Bugzilla to fix kfreebsd build failure
+
+ -- Jeremy Bicha <jbicha at ubuntu.com>  Sat, 10 Sep 2016 19:57:01 -0400
+
 cogl (1.22.2-2) unstable; urgency=medium
 
   * Disable test suite as the tests need a working GL/GLES environment which

Added: desktop/unstable/cogl/debian/patches/fix-undef-build-failure.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/patches/fix-undef-build-failure.patch?rev=50289&op=file
==============================================================================
--- desktop/unstable/cogl/debian/patches/fix-undef-build-failure.patch	(added)
+++ desktop/unstable/cogl/debian/patches/fix-undef-build-failure.patch	[utf-8] Sun Sep 11 00:18:51 2016
@@ -0,0 +1,24 @@
+From da5e0859e15eeb93fa81bd645c93425f6acef0cd Mon Sep 17 00:00:00 2001
+From: Felix Zhang <fezhang at suse.com>
+Date: Mon, 29 Aug 2016 15:02:14 +0800
+Subject: [PATCH] fix build failure with -Werror=undef
+
+https://bugzilla.gnome.org/show_bug.cgi?id=770533
+---
+ cogl/winsys/cogl-winsys-egl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cogl/winsys/cogl-winsys-egl.c b/cogl/winsys/cogl-winsys-egl.c
+index 39bfd88..4a9f3aa 100644
+--- a/cogl/winsys/cogl-winsys-egl.c
++++ b/cogl/winsys/cogl-winsys-egl.c
+@@ -1029,7 +1029,7 @@ _cogl_egl_create_image (CoglContext *ctx,
+     egl_ctx = EGL_NO_CONTEXT;
+   else
+ #endif
+-#if COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
++#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
+   /* The WL_bind_wayland_display spec states that EGL_NO_CONTEXT is to be used
+    * in conjunction with the EGL_WAYLAND_BUFFER_WL target */
+   if (target == EGL_WAYLAND_BUFFER_WL)
+

Modified: desktop/unstable/cogl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/patches/series?rev=50289&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/cogl/debian/patches/series	[utf-8] Sun Sep 11 00:18:51 2016
@@ -0,0 +1 @@
+fix-undef-build-failure.patch