<!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>[116193] 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/116193">116193</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-01-21 01:02:28 -0800 (Tue, 21 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>cogl: update to version 1.16.2.</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>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicscoglfilespatchcoglcoglattributebuffercdiff">trunk/dports/graphics/cogl/files/patch-cogl-cogl-attribute-buffer.c.diff</a></li>
<li><a href="#trunkdportsgraphicscoglfilespatchcoglcoglbitmappixbufcdiff">trunk/dports/graphics/cogl/files/patch-cogl-cogl-bitmap-pixbuf.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 (116192 => 116193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/cogl/Portfile 2014-01-21 08:59:36 UTC (rev 116192)
+++ trunk/dports/graphics/cogl/Portfile 2014-01-21 09:02:28 UTC (rev 116193)
</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.16.0
</del><ins>+version 1.16.2
</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 92359200e38139b1220c5cf43323f36887af1b4c \
- sha256 75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094
</del><ins>+checksums rmd160 420838ca3de6db8dce4093fc20578a22f778d5d6 \
+ sha256 65be91591546ef6fdfec93a71979b2b108eee25edbc20c53190caafc9a92d4e7
</ins><span class="cx">
</span><span class="cx"> # Pulling in port:grep due to this error observed on the Lion buildbot:
</span><span class="cx"> # libtool: link: /usr/bin/grep -E -e "^(cogl|_cogl_debug_flags|_cogl_atlas_new|_cogl_atlas_add_reorganize_callback|_cogl_atlas_reserve_space|_cogl_callback|_cogl_util_get_eye_planes_for_screen_poly|_cogl_atlas_texture_remove_reorganize_callback|_cogl_atlas_texture_add_reorganize_callback|_cogl_texture_foreach_sub_texture_in_region|_cogl_profile_trace_message|_cogl_context_get_default|_cogl_framebuffer_get_stencil_bits|_cogl_clip_stack_push_rectangle|_cogl_framebuffer_get_modelview_stack|_cogl_object_default_unref|_cogl_pipeline_foreach_layer_internal|_cogl_clip_stack_push_primitive|_cogl_buffer_unmap_for_fill_or_fallback|_cogl_framebuffer_draw_primitive|_cogl_debug_instances|_cogl_framebuffer_get_projection_stack|_cogl_pipeline_layer_get_texture|_cogl_buffer_map_for_fill_or_fallback|_cogl_framebuffer_get_clip_state|_cogl_texture_can_hardware_repeat|_cogl_pipeline_prune_to_n_layers|_cogl_primitive_draw|test_|unit_test_).*" ".libs/libcogl.exp" > ".libs/libcogl.expT"
</span><span class="lines">@@ -34,8 +34,7 @@
</span><span class="cx"> port:gobject-introspection
</span><span class="cx">
</span><span class="cx"> patchfiles leopard.patch \
</span><del>- patch-clock_gettime.diff \
- patch-cogl-cogl-attribute-buffer.c.diff
</del><ins>+ patch-clock_gettime.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 (116192 => 116193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/cogl/files/patch-clock_gettime.diff 2014-01-21 08:59:36 UTC (rev 116192)
+++ trunk/dports/graphics/cogl/files/patch-clock_gettime.diff 2014-01-21 09:02:28 UTC (rev 116193)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- 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 @@
</del><ins>+--- cogl/winsys/cogl-winsys-glx.c.orig 2014-01-20 10:05:34.000000000 -0800
++++ cogl/winsys/cogl-winsys-glx.c 2014-01-21 00:39:03.000000000 -0800
+@@ -59,7 +59,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></pre></div>
<a id="trunkdportsgraphicscoglfilespatchcoglcoglattributebuffercdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/cogl/files/patch-cogl-cogl-attribute-buffer.c.diff (116192 => 116193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/cogl/files/patch-cogl-cogl-attribute-buffer.c.diff 2014-01-21 08:59:36 UTC (rev 116192)
+++ trunk/dports/graphics/cogl/files/patch-cogl-cogl-attribute-buffer.c.diff 2014-01-21 09:02:28 UTC (rev 116193)
</span><span class="lines">@@ -1,25 +0,0 @@
</span><del>-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
</del></span></pre></div>
<a id="trunkdportsgraphicscoglfilespatchcoglcoglbitmappixbufcdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/cogl/files/patch-cogl-cogl-bitmap-pixbuf.c.diff (116192 => 116193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/cogl/files/patch-cogl-cogl-bitmap-pixbuf.c.diff 2014-01-21 08:59:36 UTC (rev 116192)
+++ trunk/dports/graphics/cogl/files/patch-cogl-cogl-bitmap-pixbuf.c.diff 2014-01-21 09:02:28 UTC (rev 116193)
</span><span class="lines">@@ -1,47 +0,0 @@
</span><del>-From 1827965befccf331b0787f71cb191d370640a9de Mon Sep 17 00:00:00 2001
-From: Neil Roberts <neil@linux.intel.com>
-Date: Thu, 28 Mar 2013 13:57:11 +0000
-Subject: quartz-image: Pass a CoglError argument to the bitmap functions
-
-Since 67cad9c0 and f7735e141a the bitmap allocation and mapping
-functions now take an extra error argument. The quartz image backend
-was missed in this update so Cogl would fail to compile if
---enable-quartz-image is used.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=696730
-
-Reviewed-by: Robert Bragg <robert@linux.intel.com>
----
-diff --git a/cogl/cogl-bitmap-pixbuf.c b/cogl/cogl-bitmap-pixbuf.c
-index a02b253..ad34234 100644
---- cogl/cogl-bitmap-pixbuf.c.orig
-+++ cogl/cogl-bitmap-pixbuf.c
-@@ -125,11 +125,24 @@ _cogl_bitmap_from_file (CoglContext *ctx,
- /* allocate buffer big enough to hold pixel data */
- bmp = _cogl_bitmap_new_with_malloc_buffer (ctx,
- width, height,
-- COGL_PIXEL_FORMAT_ARGB_8888);
-+ COGL_PIXEL_FORMAT_ARGB_8888,
-+ error);
-+ if (bmp == NULL)
-+ {
-+ CFRelease (image);
-+ return NULL;
-+ }
- rowstride = cogl_bitmap_get_rowstride (bmp);
- out_data = _cogl_bitmap_map (bmp,
- COGL_BUFFER_ACCESS_WRITE,
-- COGL_BUFFER_MAP_HINT_DISCARD);
-+ COGL_BUFFER_MAP_HINT_DISCARD,
-+ error);
-+ if (out_data == NULL)
-+ {
-+ cogl_object_unref (bmp);
-+ CFRelease (image);
-+ return NULL;
-+ }
-
- /* render to buffer */
- color_space = CGColorSpaceCreateWithName (kCGColorSpaceGenericRGB);
---
-cgit v0.9.2
</del></span></pre>
</div>
</div>
</body>
</html>