Attachment 159713 Details for Bug 201683 – cairo-fix-mips.diff

[patch] cairo-fix-mips.diff

graphics_cairo.diff (text/plain), 4.25 KB, created by Carlos J Puga Medina on 2015-08-09 23:35:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J Puga Medina

Created: 2015-08-09 23:35:12 UTC

Size: 4.25 KB

patch

obsolete

>diff -urN /usr/ports/graphics/cairo.old/Makefile /usr/ports/graphics/cairo/Makefile
>--- /usr/ports/graphics/cairo.old/Makefile	2015-08-06 09:50:29.000000000 +0200
>+++ /usr/ports/graphics/cairo/Makefile	2015-08-10 01:01:50.739644000 +0200
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	cairo
> PORTVERSION=	1.14.2
>+PORTREVISION=	1
> PORTEPOCH=	2
> CATEGORIES=	graphics
> MASTER_SITES=	http://cairographics.org/releases/
>@@ -10,6 +11,9 @@
> MAINTAINER=	gnome@FreeBSD.org
> COMMENT=	Vector graphics library with cross-device output support
> 
>+LICENSE=	LGPL21 MPL
>+LICENSE_COMB=	multi
>+
> USES=		tar:xz
> 
> .if !defined(REFERENCE_PORT)
>@@ -58,6 +62,13 @@
> 
> .include <bsd.port.options.mk>
> 
>+.if ${ARCH} == "mips"
>+BUILD_DEPENDS+=	${LOCALBASE}/include/atomic_ops.h:${PORTSDIR}/devel/libatomic_ops
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LDFLAGS+=	-L${LOCALBASE}/lib
>+CONFIGURE_ENV=	cairo_cv_atomic_primitives="libatomic-ops"
>+.endif
>+
> .if ${PORT_OPTIONS:MOPENGL} && !${PORT_OPTIONS:MX11}
> BROKEN=	OpenGL option needs X11 support
> .endif
>@@ -76,6 +87,6 @@
> 		${WRKSRC}/util/*/Makefile.in \
> 		${WRKSRC}/boilerplate/Makefile.in
> 
>-.include <bsd.port.mk>
>-
> .endif
>+
>+.include <bsd.port.mk>
>diff -urN /usr/ports/graphics/cairo.old/files/patch-src_cairo-gl.h /usr/ports/graphics/cairo/files/patch-src_cairo-gl.h
>--- /usr/ports/graphics/cairo.old/files/patch-src_cairo-gl.h	2015-08-05 21:13:24.000000000 +0200
>+++ /usr/ports/graphics/cairo/files/patch-src_cairo-gl.h	2015-08-08 22:13:56.767297000 +0200
>@@ -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
>  
>diff -urN /usr/ports/graphics/cairo.old/files/patch-src_cairo-xlib-display.c /usr/ports/graphics/cairo/files/patch-src_cairo-xlib-display.c
>--- /usr/ports/graphics/cairo.old/files/patch-src_cairo-xlib-display.c	2014-01-22 18:40:44.000000000 +0100
>+++ /usr/ports/graphics/cairo/files/patch-src_cairo-xlib-display.c	2015-08-08 22:13:56.780492000 +0200
>@@ -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.
>       */
>diff -urN /usr/ports/graphics/cairo.old/files/patch-util_cairo-sphinx_sphinx.c /usr/ports/graphics/cairo/files/patch-util_cairo-sphinx_sphinx.c
>--- /usr/ports/graphics/cairo.old/files/patch-util_cairo-sphinx_sphinx.c	2014-10-18 14:20:42.000000000 +0200
>+++ /usr/ports/graphics/cairo/files/patch-util_cairo-sphinx_sphinx.c	2015-08-08 22:13:56.802550000 +0200
>@@ -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,
>diff -urN /usr/ports/graphics/cairo.old/pkg-descr /usr/ports/graphics/cairo/pkg-descr
>--- /usr/ports/graphics/cairo.old/pkg-descr	2014-01-22 16:44:51.000000000 +0100
>+++ /usr/ports/graphics/cairo/pkg-descr	2015-08-08 21:48:14.865644000 +0200
>@@ -10,4 +10,4 @@
> and filling Bezier cubic splines, transforming and compositing translucent
> images, and antialiased text rendering.
> 
>-WWW:	http://www.cairographics.org
>+WWW: http://www.cairographics.org

Flags:

cjpm: maintainer-approval+

Actions: View | Diff

Attachments on bug 201683: 158959 | 158963 | 159441 | 159451 | 159673 | 159713 | 159714