[116193] trunk/dports/graphics/cogl
devans at macports.org
devans at macports.org
Tue Jan 21 01:02:28 PST 2014
Revision: 116193
https://trac.macports.org/changeset/116193
Author: devans at macports.org
Date: 2014-01-21 01:02:28 -0800 (Tue, 21 Jan 2014)
Log Message:
-----------
cogl: update to version 1.16.2.
Modified Paths:
--------------
trunk/dports/graphics/cogl/Portfile
trunk/dports/graphics/cogl/files/patch-clock_gettime.diff
Removed Paths:
-------------
trunk/dports/graphics/cogl/files/patch-cogl-cogl-attribute-buffer.c.diff
trunk/dports/graphics/cogl/files/patch-cogl-cogl-bitmap-pixbuf.c.diff
Modified: trunk/dports/graphics/cogl/Portfile
===================================================================
--- 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)
@@ -4,7 +4,7 @@
PortSystem 1.0
name cogl
-version 1.16.0
+version 1.16.2
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 92359200e38139b1220c5cf43323f36887af1b4c \
- sha256 75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094
+checksums rmd160 420838ca3de6db8dce4093fc20578a22f778d5d6 \
+ sha256 65be91591546ef6fdfec93a71979b2b108eee25edbc20c53190caafc9a92d4e7
# Pulling in port:grep due to this error observed on the Lion buildbot:
# 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"
@@ -34,8 +34,7 @@
port:gobject-introspection
patchfiles leopard.patch \
- patch-clock_gettime.diff \
- patch-cogl-cogl-attribute-buffer.c.diff
+ patch-clock_gettime.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 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)
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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 @@
#include <sys/stat.h>
#include <sys/time.h>
#include <fcntl.h>
Deleted: trunk/dports/graphics/cogl/files/patch-cogl-cogl-attribute-buffer.c.diff
===================================================================
--- 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)
@@ -1,25 +0,0 @@
-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
Deleted: trunk/dports/graphics/cogl/files/patch-cogl-cogl-bitmap-pixbuf.c.diff
===================================================================
--- 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)
@@ -1,47 +0,0 @@
-From 1827965befccf331b0787f71cb191d370640a9de Mon Sep 17 00:00:00 2001
-From: Neil Roberts <neil at 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 at 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140121/77a8b946/attachment.html>
More information about the macports-changes
mailing list