Update cogl to 1.18.2

Cogl 1.18.2                                                        2014-06-03

  # List of changes since Cogl 1.18.0

  > MSVC updates
  > KMS improvements for use by GNOME Shell
  > EGL backend improvement to avoid creating a dummy surface if
    driver supports EGL_KHR_surfacless_context extension
  > cogl-x11-tfp example fixes

  # Gnome Bugzilla bugs closed since 1.18.0:

  #728064 - New AtlasTextures should keep designated atlas alive
  #728628 - Fails to link from C++ applications due to excessive
            symbol mangling
  #728978 - Don't set EGL_PLATFORM
  #728979 - Call swap notify handler even when pageflip ioctl fails
  #730536 - Add apis needed for mutters compositor bypass

Many thanks to:

  Chun-wei Fan
  Neil Roberts
  Adel Gadllah
  Kristian Høgsberg
  Emanuele Aina
  Felix Riemann

Cogl 1.18.0                                                        2014-03-21

  # List of changes since Cogl 1.17.4

  > The license has been changed to the MIT license. This is more
    permissive than the previous LGPLv2 license and is still
    compatible with the GPL and LGPL. For more background on why we
    decided to make this change please see the following post on the
    mailing list:
    http://lists.freedesktop.org/archives/cogl/2013-December/001465.html
  > GObject introspection support has been greatly improved.
  > Add cogl_kms_renderer_set_kms_fd to make the KMS backend use a
    non-default GPU.
  > Fix a hang in the Wayland backend if it can't find some globals
    that it needs.
  > Add cogl_gst_video_sink_get_natural_size to query a suggested size
    for a Cogl-GST sink
  > Add API to query the EGL and GLX contexts. This is intended to be
    used to make a shared GL context.
  > Fix advertising the deprecated buffer age feature flag on EGL.
  > Add a new non-deprecated feature flag for the buffer age.
  > Fix a bug with allocating textures in Cogl-GST.
  > Fix a bug with the cogl-basic-video-player example where it would
    try to use non-existant mipmaps.
  > Fix selecting the GL driver in the SDL2 winsys.
  > Updates to the MSVC build files.

  # Gnome Bugzilla bugs closed since 1.17.4:

    #724992 - get the opengl context from cogl

Many thanks to:

  Chun-wei Fan
  Robert Bragg
  Lionel Landwerlin
  Jasper St. Pierre
  Wylmer Wang

Cogl 1.17.4                                                        2014-02-20

  # List of changes since Cogl 1.17.2

  > cogl-gst now ensures that sampled video fragments are always
    pre-multiplied with the alpha component.
  > cogl-gst now has NV12 format support.
  > The cogl-basic-video-player example can now be passed an
    custom gstreamer pipeline description, as long as it contains
    a coglsink element.
  > The -experimental-2.0 pkg-config files now all depend on
    cogl-2.0-experimental instead of cogl-1.0.

  # Gnome Bugzilla bugs closed since 1.17.2:

    #712832 - video-sink: Add NV12 shader support
    #719741 - GLX winsys: fix feature handling for INTEL_swap_event
    #722765 - Fix the exported symbols regular expression in cogl-path
    #723530 - cogl-pipeline: SEGV in _cogl_pipeline_fragend_glsl_end

Many thanks to:

  Neil Roberts
  Lionel Landwerlin
  Andreas Oberritter
  Daniel Korostil
  Emmanuele Bassi
  Kjartan Maraas
  Owen W. Taylor

Cogl 1.17.2                                                        2014-01-20

  # List of changes since Cogl 1.16.2

  > Textures are now allocated lazily. This means the textures can
    optionally be configured with extra API before data is uploaded to
    them.
  > The internal format for textures has been replaced with a simpler
    property to just set the number of components that will be
    required when sampling.
  > Depth writing can now be disabled per-framebuffer as well as on
    the CoglPipeline.
  > The interface typedefs such as CoglTexture, CoglFramebuffer and
    CoglBitmap etc are now defined as void so that it is no longer
    necessary to use type-cast macros when passing them to interface
    methods.
  > Added support for red-green 2-component textures.
  > The cache of GLSL shaders is now garbage collected when it gets
    too large.
  > cogl-path is now split out into a separate library.
  > New function cogl_wayland_texture_set_region_from_shm_buffer to
    update a texture from a Wayland SHM bufffer.
  > The pkg-config files for cogl-gst and cogl-gles2 have new more
    consistent names.

  # Gnome Bugzilla bugs closed since 1.16.2:

    #709827 - Add API to control per-FB depth writing
    #712562 - Fixes for the journal
    #712830 - Add COGL_PIXEL_FORMAT_U_V
    #719546 - cogl-framebuffer: Fix a potential NULL pointer dereference
    #720287 - cogl-path: Export cogl_clip_push_from_path
    #721450 - Re-enable swap_region for mesa 10.1+ llvmpipe / swrast

Many thanks to:

  Robert Bragg
  Jasper St. Pierre
  Adel Gadllah
  Lionel Landwerlin
  Chun-wei Fan
  Colin Walters
  Emilio Pozuelo Monfort
  Hans Petter Jansson

6 files changed, 56 insertions, 23 deletions

diff --git a/graphics/cogl/Makefile b/graphics/cogl/Makefile
index 15bc1903191..377dcbc5b9e 100644
--- a/graphics/cogl/Makefile
+++ b/graphics/cogl/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.8 2014/05/05 00:47:55 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.9 2015/01/17 14:28:51 prlw1 Exp $
 
-DISTNAME=	cogl-1.16.2
+DISTNAME=	cogl-1.18.2
 PKGREVISION=	1
-CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/cogl/1.16/}
+CATEGORIES=	graphics gnome
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/cogl/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cogl3d.org/
 COMMENT=	Modern 3D graphics API
-LICENSE=	gnu-lgpl-v2.1
+LICENSE=	mit AND sgi-free-software-b-v2.0 AND modified-bsd
+# if --standalone
+# LICENSE += AND gnu-lgpl-v2.1
 
 CONFLICTS+=	clutter<1.8
 
@@ -26,6 +27,13 @@ PKGCONFIG_OVERRIDE+=	cogl-pango/cogl-pango.pc.in
 PKGCONFIG_OVERRIDE+=	cogl/cogl-1.0.pc.in
 PKGCONFIG_OVERRIDE+=	cogl/cogl-2.0-experimental.pc.in
 
+PKGCONFIG_OVERRIDE+=	cogl-pango/cogl-pango2.pc.in
+PKGCONFIG_OVERRIDE+=	cogl-pango/cogl-pango.pc.in
+PKGCONFIG_OVERRIDE+=	cogl/cogl2.pc.in
+PKGCONFIG_OVERRIDE+=	cogl-gles2/cogl-gles2-experimental.pc.in
+PKGCONFIG_OVERRIDE+=	cogl-gst/cogl-gst.pc.in
+PKGCONFIG_OVERRIDE+=	cogl-path/cogl-path.pc.in
+
 .include "options.mk"
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/graphics/cogl/PLIST b/graphics/cogl/PLIST
index 1fe7fbe62bc..b9380a4bb7c 100644
--- a/graphics/cogl/PLIST
+++ b/graphics/cogl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2014/01/03 12:32:24 obache Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/01/17 14:28:51 prlw1 Exp $
 include/cogl/cogl-pango/cogl-pango.h
 include/cogl/cogl-path/cogl-path-enum-types.h
 include/cogl/cogl-path/cogl-path-types.h
@@ -8,6 +8,7 @@ include/cogl/cogl-path/cogl2-path-functions.h
 include/cogl/cogl/cogl-atlas-texture.h
 include/cogl/cogl/cogl-attribute-buffer.h
 include/cogl/cogl/cogl-attribute.h
+include/cogl/cogl/cogl-auto-texture.h
 include/cogl/cogl/cogl-bitmap.h
 include/cogl/cogl/cogl-buffer.h
 include/cogl/cogl/cogl-clip-state.h
@@ -25,10 +26,12 @@ include/cogl/cogl/cogl-euler.h
 include/cogl/cogl/cogl-fence.h
 include/cogl/cogl/cogl-fixed.h
 include/cogl/cogl/cogl-frame-info.h
+include/cogl/cogl/cogl-framebuffer-deprecated.h
 include/cogl/cogl/cogl-framebuffer.h
 include/cogl/cogl/cogl-gles2-types.h
 include/cogl/cogl/cogl-gles2.h
 include/cogl/cogl/cogl-glib-source.h
+include/cogl/cogl/cogl-glx.h
 include/cogl/cogl/cogl-index-buffer.h
 include/cogl/cogl/cogl-indices.h
 include/cogl/cogl/cogl-macros.h
@@ -60,9 +63,11 @@ include/cogl/cogl/cogl-texture-2d-gl.h
 include/cogl/cogl/cogl-texture-2d-sliced.h
 include/cogl/cogl/cogl-texture-2d.h
 include/cogl/cogl/cogl-texture-3d.h
+include/cogl/cogl/cogl-texture-deprecated.h
 include/cogl/cogl/cogl-texture-pixmap-x11.h
 include/cogl/cogl/cogl-texture-rectangle.h
 include/cogl/cogl/cogl-texture.h
+include/cogl/cogl/cogl-type-casts.h
 include/cogl/cogl/cogl-types.h
 include/cogl/cogl/cogl-vector.h
 include/cogl/cogl/cogl-version.h
@@ -72,23 +77,41 @@ include/cogl/cogl/cogl-xlib.h
 include/cogl/cogl/cogl.h
 include/cogl/cogl/cogl1-context.h
 include/cogl/cogl/cogl2-experimental.h
+include/cogl/cogl/deprecated/cogl-auto-texture.h
+include/cogl/cogl/deprecated/cogl-clip-state.h
+include/cogl/cogl/deprecated/cogl-clutter-xlib.h
+include/cogl/cogl/deprecated/cogl-clutter.h
+include/cogl/cogl/deprecated/cogl-fixed.h
+include/cogl/cogl/deprecated/cogl-framebuffer-deprecated.h
+include/cogl/cogl/deprecated/cogl-material-compat.h
+include/cogl/cogl/deprecated/cogl-shader.h
+include/cogl/cogl/deprecated/cogl-texture-deprecated.h
+include/cogl/cogl/deprecated/cogl-type-casts.h
+include/cogl/cogl/deprecated/cogl-vertex-buffer.h
 include/cogl/cogl/gl-prototypes/cogl-core-functions.h
 include/cogl/cogl/gl-prototypes/cogl-gles2-functions.h
 include/cogl/cogl/gl-prototypes/cogl-glsl-functions.h
 include/cogl/cogl/gl-prototypes/cogl-in-gles-core-functions.h
 include/cogl/cogl/gl-prototypes/cogl-in-gles2-core-functions.h
 ${PLIST.introspection}lib/girepository-1.0/Cogl-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/Cogl-2.0.typelib
 ${PLIST.introspection}lib/girepository-1.0/CoglPango-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/CoglPango-2.0.typelib
 lib/libcogl-pango.la
+lib/libcogl-path.la
 lib/libcogl.la
 lib/pkgconfig/cogl-1.0.pc
 lib/pkgconfig/cogl-2.0-experimental.pc
 lib/pkgconfig/cogl-gl-1.0.pc
 lib/pkgconfig/cogl-pango-1.0.pc
 lib/pkgconfig/cogl-pango-2.0-experimental.pc
+lib/pkgconfig/cogl-path-1.0.pc
+lib/pkgconfig/cogl-path-2.0-experimental.pc
 share/cogl/examples-data/crate.jpg
 ${PLIST.introspection}share/gir-1.0/Cogl-1.0.gir
+${PLIST.introspection}share/gir-1.0/Cogl-2.0.gir
 ${PLIST.introspection}share/gir-1.0/CoglPango-1.0.gir
+${PLIST.introspection}share/gir-1.0/CoglPango-2.0.gir
 share/locale/an/LC_MESSAGES/cogl.mo
 share/locale/ar/LC_MESSAGES/cogl.mo
 share/locale/as/LC_MESSAGES/cogl.mo
diff --git a/graphics/cogl/buildlink3.mk b/graphics/cogl/buildlink3.mk
index 9978305952c..425968f7428 100644
--- a/graphics/cogl/buildlink3.mk
+++ b/graphics/cogl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2014/01/03 12:32:24 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2015/01/17 14:28:51 prlw1 Exp $
 #
 
 BUILDLINK_TREE+=	cogl
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=	cogl
 COGL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.cogl+=	cogl>=1.14.0
-BUILDLINK_ABI_DEPENDS.cogl+=	cogl>=1.16.0
+BUILDLINK_ABI_DEPENDS.cogl+=	cogl>=1.18.2nb1
 BUILDLINK_PKGSRCDIR.cogl?=	../../graphics/cogl
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/graphics/cogl/distinfo b/graphics/cogl/distinfo
index d88dcbee822..eba8a41378b 100644
--- a/graphics/cogl/distinfo
+++ b/graphics/cogl/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2014/05/16 01:56:59 obache Exp $
+$NetBSD: distinfo,v 1.8 2015/01/17 14:28:51 prlw1 Exp $
 
-SHA1 (cogl-1.16.2.tar.xz) = a97b917ae6033aba7b132c0095e24bd8bfb62aee
-RMD160 (cogl-1.16.2.tar.xz) = 420838ca3de6db8dce4093fc20578a22f778d5d6
-Size (cogl-1.16.2.tar.xz) = 1647192 bytes
-SHA1 (patch-cogl-winsys-cogl-winsys-glx.c) = 1d651b757c1ae2e4705922a7c7ac3a7c557bf0e4
-SHA1 (patch-cogl_driver_gl_gl_cogl-driver-gl.c) = 91e72c0c54f4c79a4cb555bc5cf42e639680210a
+SHA1 (cogl-1.18.2.tar.xz) = 40be1ceb45701d27d1e506efbbbdea8a06daf354
+RMD160 (cogl-1.18.2.tar.xz) = db7ddf172d5d1290fab1e003fad1b024c415eec7
+Size (cogl-1.18.2.tar.xz) = 1635384 bytes
+SHA1 (patch-cogl-winsys-cogl-winsys-glx.c) = 52be226fb3c62a3275ebec470597937e0b017f96
+SHA1 (patch-cogl_driver_gl_gl_cogl-driver-gl.c) = 41d0010a6e2a6a1fb03b6fb23f34db59cb867e14
diff --git a/graphics/cogl/patches/patch-cogl-winsys-cogl-winsys-glx.c b/graphics/cogl/patches/patch-cogl-winsys-cogl-winsys-glx.c
index ea0fc50189a..0b4d7dc9367 100644
--- a/graphics/cogl/patches/patch-cogl-winsys-cogl-winsys-glx.c
+++ b/graphics/cogl/patches/patch-cogl-winsys-cogl-winsys-glx.c
@@ -1,6 +1,7 @@
-$NetBSD: patch-cogl-winsys-cogl-winsys-glx.c,v 1.3 2014/01/03 12:32:24 obache Exp $
+$NetBSD: patch-cogl-winsys-cogl-winsys-glx.c,v 1.4 2015/01/17 14:28:51 prlw1 Exp $
 
 * for Mac OS X, missing clock_gettime(2), taken from MacPorts.
+  https://bugzilla.gnome.org/show_bug.cgi?id=741647
 
 --- cogl/winsys/cogl-winsys-glx.c.orig	2013-07-09 15:20:23.000000000 +0000
 +++ cogl/winsys/cogl-winsys-glx.c
diff --git a/graphics/cogl/patches/patch-cogl_driver_gl_gl_cogl-driver-gl.c b/graphics/cogl/patches/patch-cogl_driver_gl_gl_cogl-driver-gl.c
index b6a6f49175e..86dcf5c3edf 100644
--- a/graphics/cogl/patches/patch-cogl_driver_gl_gl_cogl-driver-gl.c
+++ b/graphics/cogl/patches/patch-cogl_driver_gl_gl_cogl-driver-gl.c
@@ -1,17 +1,18 @@
-$NetBSD: patch-cogl_driver_gl_gl_cogl-driver-gl.c,v 1.1 2014/05/16 01:56:59 obache Exp $
+$NetBSD: patch-cogl_driver_gl_gl_cogl-driver-gl.c,v 1.2 2015/01/17 14:28:51 prlw1 Exp $
 
 * prepare missing OpenGL ARB_sync extension.
+  https://bugzilla.gnome.org/show_bug.cgi?id=741646
 
---- cogl/driver/gl/gl/cogl-driver-gl.c.orig	2014-01-20 17:31:02.000000000 +0000
+--- cogl/driver/gl/gl/cogl-driver-gl.c.orig	2014-07-02 23:31:31.000000000 +0000
 +++ cogl/driver/gl/gl/cogl-driver-gl.c
-@@ -616,8 +616,10 @@ _cogl_driver_update_features (CoglContex
-                     COGL_PRIVATE_FEATURE_QUERY_TEXTURE_PARAMETERS |
-                     COGL_PRIVATE_FEATURE_TEXTURE_MAX_LEVEL);
+@@ -634,8 +634,10 @@ _cogl_driver_update_features (CoglContex
+   COGL_FLAGS_SET (private_features,
+                   COGL_PRIVATE_FEATURE_TEXTURE_MAX_LEVEL, TRUE);
  
 +#ifdef GL_ARB_sync
    if (ctx->glFenceSync)
      COGL_FLAGS_SET (ctx->features, COGL_FEATURE_ID_FENCE, TRUE);
 +#endif
  
-   /* Cache features */
-   ctx->private_feature_flags |= private_flags;
+   if (COGL_CHECK_GL_VERSION (gl_major, gl_minor, 3, 0) ||
+       _cogl_check_extension ("GL_ARB_texture_rg", gl_extensions))