[Midnightbsd-cvs] mports [20061] trunk/graphics: update cairo

[laffer1 at midnightbsd.org]

Revision: 20061
          http://svnweb.midnightbsd.org/mports/?rev=20061
Author:   laffer1
Date:     2015-08-26 12:50:20 -0400 (Wed, 26 Aug 2015)
Log Message:
-----------
update cairo

Modified Paths:
--------------
    trunk/graphics/cairo/Makefile
    trunk/graphics/cairo/distinfo
    trunk/graphics/cairomm/Makefile
    trunk/graphics/cairomm/pkg-plist
    trunk/graphics/py-cairo/pkg-plist

Added Paths:
-----------
    trunk/graphics/cairo/files/patch-src_cairo-gl.h

Modified: trunk/graphics/cairo/Makefile
===================================================================
--- trunk/graphics/cairo/Makefile	2015-08-26 16:39:49 UTC (rev 20060)
+++ trunk/graphics/cairo/Makefile	2015-08-26 16:50:20 UTC (rev 20061)
@@ -1,8 +1,8 @@
 # $MidnightBSD$
 
 PORTNAME=	cairo
-PORTVERSION=	1.12.18
-PORTREVISION=	3
+PORTVERSION=	1.14.2
+PORTREVISION=	0
 PORTEPOCH?=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
@@ -49,7 +49,7 @@
 XCB_CONFIGURE_ENABLE=	xcb
 # this has another option --enable-xlib-xcb=auto but it is buggy.
 
-PLIST_SUB+=	LIBVER=2.11200.18
+PLIST_SUB+=	LIBVER=2.11400.2
 
 .include <bsd.mport.options.mk>
 

Modified: trunk/graphics/cairo/distinfo
===================================================================
--- trunk/graphics/cairo/distinfo	2015-08-26 16:39:49 UTC (rev 20060)
+++ trunk/graphics/cairo/distinfo	2015-08-26 16:50:20 UTC (rev 20061)
@@ -1,2 +1,2 @@
-SHA256 (cairo-1.12.18.tar.xz) = dc59f0b7ac945ce4e138a03c227a29260915a8b05a4226c1f6f1be586ba7f5b6
-SIZE (cairo-1.12.18.tar.xz) = 38276736
+SHA256 (cairo-1.14.2.tar.xz) = c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb
+SIZE (cairo-1.14.2.tar.xz) = 35376404

Added: trunk/graphics/cairo/files/patch-src_cairo-gl.h
===================================================================
--- trunk/graphics/cairo/files/patch-src_cairo-gl.h	                        (rev 0)
+++ trunk/graphics/cairo/files/patch-src_cairo-gl.h	2015-08-26 16:50:20 UTC (rev 20061)
@@ -0,0 +1,29 @@
+--- src/cairo-gl.h.orig	2013-03-15 21:29:27.000000000 +0100
++++ src/cairo-gl.h	2015-01-05 10:30:46.611768380 +0100
+@@ -92,7 +92,7 @@
+ cairo_gl_device_set_thread_aware (cairo_device_t	*device,
+ 				  cairo_bool_t		 thread_aware);
+ 
+-#if CAIRO_HAS_GLX_FUNCTIONS
++#if defined(CAIRO_HAS_GLX_FUNCTIONS)
+ #include <GL/glx.h>
+ 
+ cairo_public cairo_device_t *
+@@ -110,7 +110,7 @@
+ 				    int width, int height);
+ #endif
+ 
+-#if CAIRO_HAS_WGL_FUNCTIONS
++#if defined(CAIRO_HAS_WGL_FUNCTIONS)
+ #include <windows.h>
+ 
+ cairo_public cairo_device_t *
+@@ -126,7 +126,7 @@
+ 				int			 height);
+ #endif
+ 
+-#if CAIRO_HAS_EGL_FUNCTIONS
++#if defined(CAIRO_HAS_EGL_FUNCTIONS)
+ #include <EGL/egl.h>
+ 
+ cairo_public cairo_device_t *


Property changes on: trunk/graphics/cairo/files/patch-src_cairo-gl.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/graphics/cairomm/Makefile
===================================================================
--- trunk/graphics/cairomm/Makefile	2015-08-26 16:39:49 UTC (rev 20060)
+++ trunk/graphics/cairomm/Makefile	2015-08-26 16:50:20 UTC (rev 20061)
@@ -2,7 +2,7 @@
 
 PORTNAME=	cairomm
 PORTVERSION=	1.10.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
 
@@ -14,7 +14,7 @@
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		gmake libtool:keepla pathfix pkgconfig
+USES=		gmake libtool pathfix pkgconfig
 USE_GNOME=	cairo libxml++26
 CONFIGURE_ENV=	AUTOMAKE="${TRUE}" AUTOCONF="${TRUE}" DOXYGEN="${TRUE}"
 CPPFLAGS+=	-I${LOCALBASE}/include

Modified: trunk/graphics/cairomm/pkg-plist
===================================================================
--- trunk/graphics/cairomm/pkg-plist	2015-08-26 16:39:49 UTC (rev 20060)
+++ trunk/graphics/cairomm/pkg-plist	2015-08-26 16:50:20 UTC (rev 20061)
@@ -19,7 +19,6 @@
 include/cairomm-1.0/cairomm/win32_surface.h
 include/cairomm-1.0/cairomm/xlib_surface.h
 lib/cairomm-1.0/include/cairommconfig.h
-lib/libcairomm-1.0.la
 lib/libcairomm-1.0.so
 lib/libcairomm-1.0.so.1
 lib/libcairomm-1.0.so.1.4.0

Modified: trunk/graphics/py-cairo/pkg-plist
===================================================================
--- trunk/graphics/py-cairo/pkg-plist	2015-08-26 16:39:49 UTC (rev 20060)
+++ trunk/graphics/py-cairo/pkg-plist	2015-08-26 16:50:20 UTC (rev 20061)
@@ -4,5 +4,3 @@
 %%PYTHON_SITELIBDIR%%/cairo/__init__.pyo
 %%PYTHON_SITELIBDIR%%/cairo/_cairo.so
 libdata/pkgconfig/pycairo.pc
- at dirrm %%PYTHON_SITELIBDIR%%/cairo
- at dirrmtry include/pycairo