Attachment #159713 for bug #201683

Lines 3-8 Link Here

(-)/usr/ports/graphics/cairo/Makefile (-2 / +13 lines)
3		3
4	PORTNAME= cairo	4	PORTNAME= cairo
5	PORTVERSION= 1.14.2	5	PORTVERSION= 1.14.2
		6	PORTREVISION= 1
6	PORTEPOCH= 2	7	PORTEPOCH= 2
7	CATEGORIES= graphics	8	CATEGORIES= graphics
8	MASTER_SITES= http://cairographics.org/releases/	9	MASTER_SITES= http://cairographics.org/releases/
Lines 10-15 Link Here
10	MAINTAINER= gnome@FreeBSD.org	11	MAINTAINER= gnome@FreeBSD.org
11	COMMENT= Vector graphics library with cross-device output support	12	COMMENT= Vector graphics library with cross-device output support
12		13
		14	LICENSE= LGPL21 MPL
		15	LICENSE_COMB= multi
		16
13	USES= tar:xz	17	USES= tar:xz
14		18
15	.if !defined(REFERENCE_PORT)	19	.if !defined(REFERENCE_PORT)
Lines 58-63 Link Here
58		62
59	.include <bsd.port.options.mk>	63	.include <bsd.port.options.mk>
60		64
		65	.if ${ARCH} == "mips"
		66	BUILD_DEPENDS+= ${LOCALBASE}/include/atomic_ops.h:${PORTSDIR}/devel/libatomic_ops
		67	CPPFLAGS+= -I${LOCALBASE}/include
		68	LDFLAGS+= -L${LOCALBASE}/lib
		69	CONFIGURE_ENV= cairo_cv_atomic_primitives="libatomic-ops"
		70	.endif
		71
61	.if ${PORT_OPTIONS:MOPENGL} && !${PORT_OPTIONS:MX11}	72	.if ${PORT_OPTIONS:MOPENGL} && !${PORT_OPTIONS:MX11}
62	BROKEN= OpenGL option needs X11 support	73	BROKEN= OpenGL option needs X11 support
63	.endif	74	.endif
Lines 76-81 Link Here
76	${WRKSRC}/util/*/Makefile.in \	87	${WRKSRC}/util/*/Makefile.in \
77	${WRKSRC}/boilerplate/Makefile.in	88	${WRKSRC}/boilerplate/Makefile.in
78		89
79	.include <bsd.port.mk>
80
81	.endif	90	.endif
		91
		92	.include <bsd.port.mk>




--- 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);
 

 #include <GL/glx.h>
 
 cairo_public cairo_device_t *
@@ -110,7 +110,7 @@ cairo_gl_surface_create_for_window (cair
 				    int width, int height);
 #endif
 

 #include <windows.h>
 
 cairo_public cairo_device_t *
@@ -126,7 +126,7 @@ cairo_gl_surface_create_for_dc (cairo_de
 				int			 height);
 #endif
 

Lines 1-6 Link Here

(-)/usr/ports/graphics/cairo/files/patch-src_cairo-xlib-display.c (-3 / +3 lines)
1	--- src/cairo-xlib-display.c.orig 2010-11-21 14:41:31.000000000 -0500	1	--- src/cairo-xlib-display.c.orig 2015-03-10 22:21:07 UTC
2	+++ src/cairo-xlib-display.c 2010-11-21 14:42:12.000000000 -0500	2	+++ src/cairo-xlib-display.c
3	@@ -353,11 +353,7 @@ _cairo_xlib_device_create (Display *dpy)	3	@@ -263,11 +263,7 @@ _cairo_xlib_device_create (Display *dpy)
4	/* Prior to Render 0.10, there is no protocol support for gradients and	4	/* Prior to Render 0.10, there is no protocol support for gradients and
5	* we call function stubs instead, which would silently consume the drawing.	5	* we call function stubs instead, which would silently consume the drawing.
6	*/	6	*/

Lines 1-6 Link Here

(-)/usr/ports/graphics/cairo/files/patch-util_cairo-sphinx_sphinx.c (-3 / +3 lines)
1	--- util/cairo-sphinx/sphinx.c.orig 2014-10-06 15:22:24.000000000 -0400	1	--- util/cairo-sphinx/sphinx.c.orig 2015-03-10 22:21:07 UTC
2	+++ util/cairo-sphinx/sphinx.c 2014-10-06 15:23:04.000000000 -0400	2	+++ util/cairo-sphinx/sphinx.c
3	@@ -1325,7 +1325,7 @@ client_shm (const char *shm_path)	3	@@ -1337,7 +1337,7 @@ client_shm (const char *shm_path)
4		4
5	base = mmap (NULL, DATA_SIZE,	5	base = mmap (NULL, DATA_SIZE,
6	PROT_READ \| PROT_WRITE,	6	PROT_READ \| PROT_WRITE,

Lines 10-13 Link Here

(-)/usr/ports/graphics/cairo/pkg-descr (-1 / +1 lines)
10	and filling Bezier cubic splines, transforming and compositing translucent	10	and filling Bezier cubic splines, transforming and compositing translucent
11	images, and antialiased text rendering.	11	images, and antialiased text rendering.
12		12
13	WWW: http://www.cairographics.org	13	WWW: http://www.cairographics.org

Return to bug 201683

Lines 1-6 Link Here

(-)/usr/ports/graphics/cairo/files/patch-src_cairo-gl.h (-5 / +5 lines)
1	--- src/cairo-gl.h.orig 2013-03-15 21:29:27.000000000 +0100	1	--- src/cairo-gl.h.orig 2015-03-10 22:21:07 UTC
2	+++ src/cairo-gl.h 2015-01-05 10:30:46.611768380 +0100	2	+++ src/cairo-gl.h
3	@@ -92,7 +92,7 @@	3	@@ -92,7 +92,7 @@ cairo_public void
4	cairo_gl_device_set_thread_aware (cairo_device_t *device,	4	cairo_gl_device_set_thread_aware (cairo_device_t *device,
5	cairo_bool_t thread_aware);	5	cairo_bool_t thread_aware);
6		6
Lines 9-15 Link Here
9	#include <GL/glx.h>	9	#include <GL/glx.h>
10		10
11	cairo_public cairo_device_t *	11	cairo_public cairo_device_t *
12	@@ -110,7 +110,7 @@	12	@@ -110,7 +110,7 @@ cairo_gl_surface_create_for_window (cair
13	int width, int height);	13	int width, int height);
14	#endif	14	#endif
15		15
Lines 18-24 Link Here
18	#include <windows.h>	18	#include <windows.h>
19		19
20	cairo_public cairo_device_t *	20	cairo_public cairo_device_t *
21	@@ -126,7 +126,7 @@	21	@@ -126,7 +126,7 @@ cairo_gl_surface_create_for_dc (cairo_de
22	int height);	22	int height);
23	#endif	23	#endif
24		24