[Midnightbsd-cvs] mports [21952] trunk/graphics/cairo/pkg-plist: cairo 1.14.6

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Sep 29 16:26:46 EDT 2016 

Revision: 21952
          http://svnweb.midnightbsd.org/mports/?rev=21952
Author:   laffer1
Date:     2016-09-29 16:26:46 -0400 (Thu, 29 Sep 2016)
Log Message:
-----------
cairo 1.14.6

Modified Paths:
--------------
    trunk/graphics/cairo/Makefile
    trunk/graphics/cairo/distinfo
    trunk/graphics/cairo/files/patch-src_cairo-gl.h
    trunk/graphics/cairo/files/patch-src_cairo-xlib-display.c
    trunk/graphics/cairo/files/patch-util_cairo-sphinx_sphinx.c
    trunk/graphics/cairo/pkg-descr
    trunk/graphics/cairo/pkg-plist

Property Changed:
----------------
    trunk/graphics/cairo/files/patch-src_cairo-xlib-display.c
    trunk/graphics/cairo/pkg-descr

Modified: trunk/graphics/cairo/Makefile
===================================================================
--- trunk/graphics/cairo/Makefile	2016-09-29 19:30:46 UTC (rev 21951)
+++ trunk/graphics/cairo/Makefile	2016-09-29 20:26:46 UTC (rev 21952)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	cairo
-PORTVERSION=	1.14.2
+PORTVERSION=	1.14.6
 PORTREVISION=	0
 PORTEPOCH?=	2
 CATEGORIES=	graphics
@@ -10,7 +10,8 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Vector graphics library with cross-device output support
 
-LICENSE=	lgpl
+LICENSE=	lgpl2.1 mpl
+LICENSE_COMB=	dual
 
 USES=		tar:xz
 
@@ -49,16 +50,17 @@
 XCB_CONFIGURE_ENABLE=	xcb
 # this has another option --enable-xlib-xcb=auto but it is buggy.
 
-PLIST_SUB+=	LIBVER=2.11400.2
-
 .include <bsd.mport.options.mk>
 
+PLIST_SUB+=	LIBVER=2.11400.6
+
 post-patch:
-	@${REINPLACE_CMD} -e '/test/s/==/=/g' \
-		-e '/LIBS/s/-lrt//'  -e '/LIBS/s|-ldld||' \
+	@${REINPLACE_CMD} -e '/strings/s/ - / -a /' \
+		-e '/test/s/==/=/g' \
+		-e '/LIBS/s/-lrt//' -e '/LIBS/s|-ldld||' \
 		-e '/LIBS/s|-ldl||' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-lcairo|-lcairo -pthread|' \
+	@${REINPLACE_CMD} -e 's|-lcairo|-lcairo -lpthread|' \
 		${WRKSRC}/src/*.pc.in
 	@${REINPLACE_CMD} -e '/@CAIRO_HAS_PNG_FUNCTIONS_TRUE at .*=/d' \
 		${WRKSRC}/Makefile.in

Modified: trunk/graphics/cairo/distinfo
===================================================================
--- trunk/graphics/cairo/distinfo	2016-09-29 19:30:46 UTC (rev 21951)
+++ trunk/graphics/cairo/distinfo	2016-09-29 20:26:46 UTC (rev 21952)
@@ -1,2 +1,2 @@
-SHA256 (cairo-1.14.2.tar.xz) = c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb
-SIZE (cairo-1.14.2.tar.xz) = 35376404
+SHA256 (cairo-1.14.6.tar.xz) = 613cb38447b76a93ff7235e17acd55a78b52ea84a9df128c3f2257f8eaa7b252
+SIZE (cairo-1.14.6.tar.xz) = 36040596

Modified: trunk/graphics/cairo/files/patch-src_cairo-gl.h
===================================================================
--- trunk/graphics/cairo/files/patch-src_cairo-gl.h	2016-09-29 19:30:46 UTC (rev 21951)
+++ trunk/graphics/cairo/files/patch-src_cairo-gl.h	2016-09-29 20:26:46 UTC (rev 21952)
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/cairo-gl.h.orig	2015-03-10 22:21:07 UTC
++++ src/cairo-gl.h
+@@ -92,7 +92,7 @@ cairo_public void
  cairo_gl_device_set_thread_aware (cairo_device_t	*device,
  				  cairo_bool_t		 thread_aware);
  
@@ -9,7 +9,7 @@
  #include <GL/glx.h>
  
  cairo_public cairo_device_t *
-@@ -110,7 +110,7 @@
+@@ -110,7 +110,7 @@ cairo_gl_surface_create_for_window (cair
  				    int width, int height);
  #endif
  
@@ -18,7 +18,7 @@
  #include <windows.h>
  
  cairo_public cairo_device_t *
-@@ -126,7 +126,7 @@
+@@ -126,7 +126,7 @@ cairo_gl_surface_create_for_dc (cairo_de
  				int			 height);
  #endif
  

Modified: trunk/graphics/cairo/files/patch-src_cairo-xlib-display.c
===================================================================
--- trunk/graphics/cairo/files/patch-src_cairo-xlib-display.c	2016-09-29 19:30:46 UTC (rev 21951)
+++ trunk/graphics/cairo/files/patch-src_cairo-xlib-display.c	2016-09-29 20:26:46 UTC (rev 21952)
@@ -1,6 +1,6 @@
---- src/cairo-xlib-display.c.orig	2010-11-21 14:41:31.000000000 -0500
-+++ src/cairo-xlib-display.c	2010-11-21 14:42:12.000000000 -0500
-@@ -353,11 +353,7 @@ _cairo_xlib_device_create (Display *dpy)
+--- src/cairo-xlib-display.c.orig	2015-03-10 22:21:07 UTC
++++ src/cairo-xlib-display.c
+@@ -263,11 +263,7 @@ _cairo_xlib_device_create (Display *dpy)
      /* Prior to Render 0.10, there is no protocol support for gradients and
       * we call function stubs instead, which would silently consume the drawing.
       */


Property changes on: trunk/graphics/cairo/files/patch-src_cairo-xlib-display.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/graphics/cairo/files/patch-util_cairo-sphinx_sphinx.c
===================================================================
--- trunk/graphics/cairo/files/patch-util_cairo-sphinx_sphinx.c	2016-09-29 19:30:46 UTC (rev 21951)
+++ trunk/graphics/cairo/files/patch-util_cairo-sphinx_sphinx.c	2016-09-29 20:26:46 UTC (rev 21952)
@@ -1,6 +1,6 @@
---- util/cairo-sphinx/sphinx.c.orig	2014-10-06 15:22:24.000000000 -0400
-+++ util/cairo-sphinx/sphinx.c	2014-10-06 15:23:04.000000000 -0400
-@@ -1325,7 +1325,7 @@ client_shm (const char *shm_path)
+--- util/cairo-sphinx/sphinx.c.orig	2015-03-10 22:21:07 UTC
++++ util/cairo-sphinx/sphinx.c
+@@ -1337,7 +1337,7 @@ client_shm (const char *shm_path)
  
      base = mmap (NULL, DATA_SIZE,
  		 PROT_READ | PROT_WRITE,

Modified: trunk/graphics/cairo/pkg-descr
===================================================================
--- trunk/graphics/cairo/pkg-descr	2016-09-29 19:30:46 UTC (rev 21951)
+++ trunk/graphics/cairo/pkg-descr	2016-09-29 20:26:46 UTC (rev 21952)
@@ -6,8 +6,8 @@
 available (eg. through the X Render Extension).
 
 Cairo provides a stateful user-level API with capabilities similar to
-the PDF 1.4 imaging model. Cairo provides operations including stroking 
+the PDF 1.4 imaging model. Cairo provides operations including stroking
 and filling Bezier cubic splines, transforming and compositing translucent
 images, and antialiased text rendering.
 
-WWW:	http://www.cairographics.org
+WWW: http://www.cairographics.org


Property changes on: trunk/graphics/cairo/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/graphics/cairo/pkg-plist
===================================================================
--- trunk/graphics/cairo/pkg-plist	2016-09-29 19:30:46 UTC (rev 21951)
+++ trunk/graphics/cairo/pkg-plist	2016-09-29 20:26:46 UTC (rev 21952)
@@ -41,6 +41,7 @@
 lib/libcairo.so.2
 lib/libcairo.so.%%LIBVER%%
 libdata/pkgconfig/cairo.pc
+%%OPENGL%%libdata/pkgconfig/cairo-egl.pc
 libdata/pkgconfig/cairo-fc.pc
 libdata/pkgconfig/cairo-ft.pc
 %%OPENGL%%libdata/pkgconfig/cairo-gl.pc

More information about the Midnightbsd-cvs mailing list