Revision
118103
Author
devans@macports.org
Date
2014-03-22 10:51:24 -0700 (Sat, 22 Mar 2014)

Log Message

cogl, clutter: update to version 1.18.0

Modified Paths

Property Changed

Diff

Property changes: trunk/dports/graphics/clutter


Added: svn:mergeinfo

/users/devans/GNOME-3/unstable/dports/graphics/clutter:117866-118100

Modified: trunk/dports/graphics/clutter/Portfile (118102 => 118103)


--- trunk/dports/graphics/clutter/Portfile	2014-03-22 15:42:06 UTC (rev 118102)
+++ trunk/dports/graphics/clutter/Portfile	2014-03-22 17:51:24 UTC (rev 118103)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                clutter
-version             1.16.4
+version             1.18.0
 license             LGPL-2.1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          graphics
@@ -19,8 +19,8 @@
 
 use_xz              yes
 
-checksums           rmd160  8ac8d4c91730a49225fc2b44d75230a5e8df3f9d \
-                    sha256  cf50836ec5503577b73f75f984577610881b3e2ff7a327bb5b6918b431b51b65
+checksums           rmd160  d22eb331d4260fa48b8e387b6152fc12ae0ced52 \
+                    sha256  937ac94d10d4562c67554dd3d087bf0859a3bf254922a226fc0c13a39a457869
 
 depends_build       port:pkgconfig
 

Property changes: trunk/dports/graphics/cogl


Added: svn:mergeinfo

/users/devans/GNOME-3/unstable/dports/graphics/cogl:117866-118100

Modified: trunk/dports/graphics/cogl/Portfile (118102 => 118103)


--- trunk/dports/graphics/cogl/Portfile	2014-03-22 15:42:06 UTC (rev 118102)
+++ trunk/dports/graphics/cogl/Portfile	2014-03-22 17:51:24 UTC (rev 118103)
@@ -4,7 +4,7 @@
 PortSystem      1.0
 
 name            cogl
-version         1.16.2
+version         1.18.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  420838ca3de6db8dce4093fc20578a22f778d5d6 \
-                sha256  65be91591546ef6fdfec93a71979b2b108eee25edbc20c53190caafc9a92d4e7
+checksums       rmd160  4aab31afc68a80e9611a99a68339c07d12587018 \
+                sha256  a4d91ebf7e7aba362eb5c6e4ffebbf1167ff4ac87fabae104912d879a5390f5e
 
 # 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"

Modified: trunk/dports/graphics/cogl/files/leopard.patch (118102 => 118103)


--- trunk/dports/graphics/cogl/files/leopard.patch	2014-03-22 15:42:06 UTC (rev 118102)
+++ trunk/dports/graphics/cogl/files/leopard.patch	2014-03-22 17:51:24 UTC (rev 118103)
@@ -1,8 +1,8 @@
---- cogl/cogl-gles2-context.c.orig	2013-02-21 05:08:18.000000000 -0800
-+++ cogl/cogl-gles2-context.c	2013-08-20 22:28:45.000000000 -0700
-@@ -48,6 +48,67 @@
- #include "cogl-pipeline-opengl-private.h"
+--- cogl/cogl-gles2-context.c.orig	2014-03-21 08:50:34.000000000 -0700
++++ cogl/cogl-gles2-context.c	2014-03-22 07:26:28.000000000 -0700
+@@ -55,6 +55,67 @@
  #include "cogl-error-private.h"
+ #include "cogl-gtype-private.h"
  
 +#ifndef GL_FRAMEBUFFER
 +#define GL_FRAMEBUFFER		0x8D40

Modified: trunk/dports/graphics/cogl/files/patch-clock_gettime.diff (118102 => 118103)


--- trunk/dports/graphics/cogl/files/patch-clock_gettime.diff	2014-03-22 15:42:06 UTC (rev 118102)
+++ trunk/dports/graphics/cogl/files/patch-clock_gettime.diff	2014-03-22 17:51:24 UTC (rev 118103)
@@ -1,6 +1,6 @@
---- 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 @@
+--- cogl/winsys/cogl-winsys-glx.c.orig	2014-03-21 08:50:34.000000000 -0700
++++ cogl/winsys/cogl-winsys-glx.c	2014-03-22 07:26:28.000000000 -0700
+@@ -66,7 +66,26 @@
  #include <sys/stat.h>
  #include <sys/time.h>
  #include <fcntl.h>

Modified: trunk/dports/graphics/cogl/files/patch-disable-quartz.diff (118102 => 118103)


--- trunk/dports/graphics/cogl/files/patch-disable-quartz.diff	2014-03-22 15:42:06 UTC (rev 118102)
+++ trunk/dports/graphics/cogl/files/patch-disable-quartz.diff	2014-03-22 17:51:24 UTC (rev 118103)
@@ -1,6 +1,6 @@
---- 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 @@
+--- configure.ac.orig	2014-03-21 11:09:43.000000000 -0700
++++ configure.ac	2014-03-22 07:26:28.000000000 -0700
+@@ -205,7 +205,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 ================================================================
-@@ -801,7 +802,7 @@
+@@ -804,7 +805,7 @@
  				,
  				[AC_MSG_ERROR([Unable to locate required GL library])])
  		  ])