[114760] trunk/dports/graphics/cogl

[devans at macports.org]

Revision: 114760
          https://trac.macports.org/changeset/114760
Author:   devans at macports.org
Date:     2013-12-14 14:01:07 -0800 (Sat, 14 Dec 2013)
Log Message:
-----------
cogl: update to version 1.16.0.

Modified Paths:
--------------
    trunk/dports/graphics/cogl/Portfile
    trunk/dports/graphics/cogl/files/patch-clock_gettime.diff
    trunk/dports/graphics/cogl/files/patch-disable-quartz.diff

Added Paths:
-----------
    trunk/dports/graphics/cogl/files/patch-cogl-cogl-attribute-buffer.c.diff

Modified: trunk/dports/graphics/cogl/Portfile
===================================================================
--- trunk/dports/graphics/cogl/Portfile	2013-12-14 21:55:08 UTC (rev 114759)
+++ trunk/dports/graphics/cogl/Portfile	2013-12-14 22:01:07 UTC (rev 114760)
@@ -4,7 +4,7 @@
 PortSystem      1.0
 
 name            cogl
-version         1.14.0
+version         1.16.0
 set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      graphics
 description     A hardware accelerated 3D graphics API
@@ -21,8 +21,8 @@
 
 use_xz          yes
 
-checksums       rmd160  69a87d46c21999bde675a518ab3cbb5dfa159131 \
-                sha256  276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8
+checksums       rmd160  92359200e38139b1220c5cf43323f36887af1b4c \
+                sha256  75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094
 
 depends_build   port:pkgconfig
 
@@ -32,7 +32,7 @@
 
 patchfiles      leopard.patch \
                 patch-clock_gettime.diff \
-                patch-cogl-cogl-bitmap-pixbuf.c.diff
+                patch-cogl-cogl-attribute-buffer.c.diff
 
 use_autoreconf  yes
 autoreconf.args -fvi

Modified: trunk/dports/graphics/cogl/files/patch-clock_gettime.diff
===================================================================
--- trunk/dports/graphics/cogl/files/patch-clock_gettime.diff	2013-12-14 21:55:08 UTC (rev 114759)
+++ trunk/dports/graphics/cogl/files/patch-clock_gettime.diff	2013-12-14 22:01:07 UTC (rev 114760)
@@ -1,6 +1,6 @@
---- cogl/winsys/cogl-winsys-glx.c.orig	2013-08-20 12:33:26.000000000 -0700
-+++ cogl/winsys/cogl-winsys-glx.c	2013-08-20 12:37:55.000000000 -0700
-@@ -56,7 +56,26 @@
+--- cogl/winsys/cogl-winsys-glx.c.orig	2013-07-09 08:20:23.000000000 -0700
++++ cogl/winsys/cogl-winsys-glx.c	2013-12-14 11:29:54.000000000 -0800
+@@ -58,7 +58,26 @@
  #include <sys/stat.h>
  #include <sys/time.h>
  #include <fcntl.h>
@@ -25,5 +25,5 @@
  #include <time.h>
 +#endif
  
- #include <glib/gi18n-lib.h>
- 
+ #include <GL/glx.h>
+ #include <X11/Xlib.h>

Added: trunk/dports/graphics/cogl/files/patch-cogl-cogl-attribute-buffer.c.diff
===================================================================
--- trunk/dports/graphics/cogl/files/patch-cogl-cogl-attribute-buffer.c.diff	                        (rev 0)
+++ trunk/dports/graphics/cogl/files/patch-cogl-cogl-attribute-buffer.c.diff	2013-12-14 22:01:07 UTC (rev 114760)
@@ -0,0 +1,25 @@
+From 3b14acdbcc39a43cdeac65fd9e49775f887fe5ef Mon Sep 17 00:00:00 2001
+From: Robert Bragg <robert at linux.intel.com>
+Date: Mon, 23 Sep 2013 17:28:30 +0000
+Subject: remove spurious COGL_GTYPE_DEFINE_CLASS reference
+
+Commit 7b25c8f5caad mistakenly added a reference to a
+COGL_GTYPE_DEFINE_CLASS() macro that does not yet exist so this patch
+removes it.
+
+Reviewed-by: Neil Roberts <neil at linux.intel.com>
+---
+diff --git a/cogl/cogl-attribute-buffer.c b/cogl/cogl-attribute-buffer.c
+index afa945b..20c093d 100644
+--- cogl/cogl-attribute-buffer.c
++++ 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,
+--
+cgit v0.9.2

Modified: trunk/dports/graphics/cogl/files/patch-disable-quartz.diff
===================================================================
--- trunk/dports/graphics/cogl/files/patch-disable-quartz.diff	2013-12-14 21:55:08 UTC (rev 114759)
+++ trunk/dports/graphics/cogl/files/patch-disable-quartz.diff	2013-12-14 22:01:07 UTC (rev 114760)
@@ -1,6 +1,6 @@
---- configure.ac.orig	2013-03-25 06:29:03.000000000 -0700
-+++ configure.ac	2013-08-21 08:24:19.000000000 -0700
-@@ -194,7 +194,8 @@
+--- configure.ac.orig	2013-09-23 07:26:37.000000000 -0700
++++ configure.ac	2013-12-14 11:29:54.000000000 -0800
+@@ -202,7 +202,8 @@
  AC_MSG_RESULT([$platform_win32])
  AM_CONDITIONAL(OS_WIN32, [test "$platform_win32" = "yes"])
  
@@ -10,7 +10,7 @@
  AM_CONDITIONAL(OS_QUARTZ, [test "$platform_quartz" = "yes"])
  
  dnl ================================================================
-@@ -678,7 +679,7 @@
+@@ -801,7 +802,7 @@
  				,
  				[AC_MSG_ERROR([Unable to locate required GL library])])
  		  ])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131214/e3dd8ba2/attachment.html>