summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/cogl/Makefile4
-rw-r--r--graphics/cogl/distinfo10
-rw-r--r--graphics/cogl/patches/patch-cogl_cogl-attribute-buffer.c15
-rw-r--r--graphics/cogl/patches/patch-cogl_cogl-texture-2d.c16
4 files changed, 6 insertions, 39 deletions
diff --git a/graphics/cogl/Makefile b/graphics/cogl/Makefile
index 29db0fe1d79..343eefd7189 100644
--- a/graphics/cogl/Makefile
+++ b/graphics/cogl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2014/01/03 12:32:24 obache Exp $
+# $NetBSD: Makefile,v 1.7 2014/01/26 08:44:04 obache Exp $
#
-DISTNAME= cogl-1.16.0
+DISTNAME= cogl-1.16.2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/cogl/1.16/}
EXTRACT_SUFX= .tar.xz
diff --git a/graphics/cogl/distinfo b/graphics/cogl/distinfo
index f891e3bc5ea..ab7fb10d0aa 100644
--- a/graphics/cogl/distinfo
+++ b/graphics/cogl/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.5 2014/01/03 12:32:24 obache Exp $
+$NetBSD: distinfo,v 1.6 2014/01/26 08:44:04 obache Exp $
-SHA1 (cogl-1.16.0.tar.xz) = 09c3e93c3e823fb82826f3c783cf4f8804fdc1a6
-RMD160 (cogl-1.16.0.tar.xz) = 92359200e38139b1220c5cf43323f36887af1b4c
-Size (cogl-1.16.0.tar.xz) = 1653292 bytes
+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_cogl-attribute-buffer.c) = a908a59ebb681f3e8288c4266df90a8743ad799f
-SHA1 (patch-cogl_cogl-texture-2d.c) = 1bce18a80862885c0f6d543af0eb57b617fe832f
diff --git a/graphics/cogl/patches/patch-cogl_cogl-attribute-buffer.c b/graphics/cogl/patches/patch-cogl_cogl-attribute-buffer.c
deleted file mode 100644
index 878d9c7e5e5..00000000000
--- a/graphics/cogl/patches/patch-cogl_cogl-attribute-buffer.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-cogl_cogl-attribute-buffer.c,v 1.1 2014/01/03 12:32:24 obache Exp $
-
-* remove spurious COGL_GTYPE_DEFINE_CLASS reference
- https://git.gnome.org/browse/cogl/commit/?h=cogl-1.16&id=3b14acdbcc39a43cdeac65fd9e49775f887fe5ef
-
---- cogl/cogl-attribute-buffer.c.orig 2013-09-23 14:02:31.000000000 +0000
-+++ cogl/cogl-attribute-buffer.c
-@@ -37,7 +37,6 @@
- static void _cogl_attribute_buffer_free (CoglAttributeBuffer *array);
-
- COGL_BUFFER_DEFINE (AttributeBuffer, attribute_buffer);
--COGL_GTYPE_DEFINE_CLASS (AttributeBuffer, attribute_buffer);
-
- CoglAttributeBuffer *
- cogl_attribute_buffer_new_with_size (CoglContext *context,
diff --git a/graphics/cogl/patches/patch-cogl_cogl-texture-2d.c b/graphics/cogl/patches/patch-cogl_cogl-texture-2d.c
deleted file mode 100644
index 83cbaaeed21..00000000000
--- a/graphics/cogl/patches/patch-cogl_cogl-texture-2d.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-cogl_cogl-texture-2d.c,v 1.1 2014/01/03 12:32:24 obache Exp $
-
-* Fix build on big-endian
- https://git.gnome.org/browse/cogl/commit/?h=cogl-1.16&id=ee87fcb7427962047c811c9fab0e0a4237134243
-
---- cogl/cogl-texture-2d.c.orig 2013-08-19 21:23:00.000000000 +0000
-+++ cogl/cogl-texture-2d.c
-@@ -315,7 +315,7 @@ cogl_wayland_texture_2d_new_from_buffer
- case WL_SHM_FORMAT_ARGB8888:
- format = COGL_PIXEL_FORMAT_ARGB_8888_PRE;
- break;
-- case WL_SHM_FORMAT_XRGB32:
-+ case WL_SHM_FORMAT_XRGB8888:
- format = COGL_PIXEL_FORMAT_ARGB_8888;
- internal_format = COGL_PIXEL_FORMAT_RGB_888;
- break;