Revision
133306
Author
devans@macports.org
Date
2015-02-24 19:04:24 -0800 (Tue, 24 Feb 2015)

Log Message

cogl: update to version 1.20.0, minor white space.

Modified Paths

Property Changed

Diff

Property changes: trunk/dports/graphics/cogl


Modified: svn:mergeinfo

/users/devans/GNOME-3/unstable/dports/graphics/cogl:117866-118100 + /branches/mld-qt-481/dports/graphics/cogl:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /users/devans/GNOME-3/stable/dports/graphics/cogl:133248-133305 /users/devans/GNOME-3/unstable/dports/graphics/cogl:117866-118100

Modified: trunk/dports/graphics/cogl/Portfile (133305 => 133306)


--- trunk/dports/graphics/cogl/Portfile	2015-02-25 03:02:34 UTC (rev 133305)
+++ trunk/dports/graphics/cogl/Portfile	2015-02-25 03:04:24 UTC (rev 133306)
@@ -5,7 +5,7 @@
 PortGroup           gobject_introspection 1.0
 
 name                cogl
-version             1.18.2
+version             1.20.0
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          graphics
 description         A hardware accelerated 3D graphics API
@@ -21,14 +21,16 @@
 
 use_xz              yes
 
-checksums           rmd160  db7ddf172d5d1290fab1e003fad1b024c415eec7 \
-                    sha256  9278e519d5480eb0379efd48db024e8fdbf93f01dff48a7e756b85b508a863aa
+checksums           rmd160  271518c1b07eddb2b117ba4c3ef2770ac28f4bb3 \
+                    sha256  729e35495829e7d31fafa3358e47b743ba21a2b08ff9b6cd28fb74c0de91192b
 
 # 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"
 # grep: Regular expression too big
-depends_build       port:pkgconfig port:grep
 
+depends_build       port:pkgconfig \
+                    port:grep
+
 depends_lib         path:lib/pkgconfig/cairo.pc:cairo \
                     path:lib/pkgconfig/pango.pc:pango
 

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


--- trunk/dports/graphics/cogl/files/patch-disable-quartz.diff	2015-02-25 03:02:34 UTC (rev 133305)
+++ trunk/dports/graphics/cogl/files/patch-disable-quartz.diff	2015-02-25 03:04:24 UTC (rev 133306)
@@ -1,6 +1,6 @@
---- 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 @@
+--- configure.ac.orig	2015-02-23 11:45:18.000000000 -0800
++++ configure.ac	2015-02-23 15:00:26.000000000 -0800
+@@ -207,7 +207,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 ================================================================
-@@ -804,7 +805,7 @@
+@@ -806,7 +807,7 @@
  				,
  				[AC_MSG_ERROR([Unable to locate required GL library])])
  		  ])