<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[114760] trunk/dports/graphics/cogl</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/114760">114760</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2013-12-14 14:01:07 -0800 (Sat, 14 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>cogl: update to version 1.16.0.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicscoglPortfile">trunk/dports/graphics/cogl/Portfile</a></li>
<li><a href="#trunkdportsgraphicscoglfilespatchclock_gettimediff">trunk/dports/graphics/cogl/files/patch-clock_gettime.diff</a></li>
<li><a href="#trunkdportsgraphicscoglfilespatchdisablequartzdiff">trunk/dports/graphics/cogl/files/patch-disable-quartz.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicscoglfilespatchcoglcoglattributebuffercdiff">trunk/dports/graphics/cogl/files/patch-cogl-cogl-attribute-buffer.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicscoglPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/cogl/Portfile (114759 => 114760)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name cogl
</span><del>-version 1.14.0
</del><ins>+version 1.16.0
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories graphics
</span><span class="cx"> description A hardware accelerated 3D graphics API
</span><span class="lines">@@ -21,8 +21,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 69a87d46c21999bde675a518ab3cbb5dfa159131 \
- sha256 276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8
</del><ins>+checksums rmd160 92359200e38139b1220c5cf43323f36887af1b4c \
+ sha256 75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> patchfiles leopard.patch \
</span><span class="cx"> patch-clock_gettime.diff \
</span><del>- patch-cogl-cogl-bitmap-pixbuf.c.diff
</del><ins>+ patch-cogl-cogl-attribute-buffer.c.diff
</ins><span class="cx">
</span><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.args -fvi
</span></span></pre></div>
<a id="trunkdportsgraphicscoglfilespatchclock_gettimediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/cogl/files/patch-clock_gettime.diff (114759 => 114760)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- 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 @@
</del><ins>+--- 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 @@
</ins><span class="cx"> #include <sys/stat.h>
</span><span class="cx"> #include <sys/time.h>
</span><span class="cx"> #include <fcntl.h>
</span><span class="lines">@@ -25,5 +25,5 @@
</span><span class="cx"> #include <time.h>
</span><span class="cx"> +#endif
</span><span class="cx">
</span><del>- #include <glib/gi18n-lib.h>
-
</del><ins>+ #include <GL/glx.h>
+ #include <X11/Xlib.h>
</ins></span></pre></div>
<a id="trunkdportsgraphicscoglfilespatchcoglcoglattributebuffercdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/cogl/files/patch-cogl-cogl-attribute-buffer.c.diff (0 => 114760)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+From 3b14acdbcc39a43cdeac65fd9e49775f887fe5ef Mon Sep 17 00:00:00 2001
+From: Robert Bragg <robert@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@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
</ins></span></pre></div>
<a id="trunkdportsgraphicscoglfilespatchdisablequartzdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/cogl/files/patch-disable-quartz.diff (114759 => 114760)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- 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 @@
</del><ins>+--- 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 @@
</ins><span class="cx"> AC_MSG_RESULT([$platform_win32])
</span><span class="cx"> AM_CONDITIONAL(OS_WIN32, [test "$platform_win32" = "yes"])
</span><span class="cx">
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> AM_CONDITIONAL(OS_QUARTZ, [test "$platform_quartz" = "yes"])
</span><span class="cx">
</span><span class="cx"> dnl ================================================================
</span><del>-@@ -678,7 +679,7 @@
</del><ins>+@@ -801,7 +802,7 @@
</ins><span class="cx"> ,
</span><span class="cx"> [AC_MSG_ERROR([Unable to locate required GL library])])
</span><span class="cx"> ])
</span></span></pre>
</div>
</div>
</body>
</html>