Attachment #147615 for bug #193625





PORTNAME=	cairo
PORTVERSION=	1.12.16
PORTEPOCH?=	2
PORTEPOCH=	2
CATEGORIES=	graphics
MASTER_SITES=	http://cairographics.org/releases/


		--disable-directfb \
		--enable-tee
USES+=		libtool:keepla pathfix pkgconfig
USE_XORG=	pixman
USE_GNOME=	referencehack
USE_LDCONFIG=	yes
INSTALL_TARGET=	install-strip


.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MX11}
USE_XORG+=	xrender
PLIST_SUB+=	X11=""
.else
CONFIGURE_ARGS+=--disable-xlib
PLIST_SUB+=	X11="@comment "
.endif

.if ${PORT_OPTIONS:MOPENGL}
USE_GL=		gl
USE_XORG+=	glproto:both dri2proto:both
CONFIGURE_ARGS+=	--enable-gl
PLIST_SUB+=	GL=""
.else
CONFIGURE_ARGS+=	--disable-gl
PLIST_SUB+=	GL="@comment "
.endif

.if ${PORT_OPTIONS:MXCB}
BUILD_DEPENDS+=		${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil
RUN_DEPENDS+=		${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil
CONFIGURE_ARGS+=	--enable-xcb
# this option exposes a bug --enable-xlib-xcb=auto
PLIST_SUB+=		XCB=""
.else
CONFIGURE_ARGS+=	--disable-xcb
PLIST_SUB+=		XCB="@comment "
.endif

.if ${PORT_OPTIONS:MGLIB}
USE_GNOME+=	glib20
PLIST_SUB+=	GLIB=""
.else
CONFIGURE_ARGS+=	--enable-gobject=no
PLIST_SUB+=	GLIB="@comment "
.endif

post-patch:
	@${REINPLACE_CMD} -e '/test/s/==/=/g' \
		-e '/LIBS/s/-lrt//'  -e '/LIBS/s|-ldld||' \

Lines 1-6 Link Here

(-)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 2013-08-26 21:07:21.000000000 +0600
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-5 Link Here

(-)graphics/cairo/files/patch-src_cairoint.h (-5 / +5 lines)
1	--- src/cairoint.h.orig Sun Oct 15 18:02:35 2006	1	--- src/cairoint.h.orig 2013-08-26 21:07:21.000000000 +0600
2	+++ src/cairoint.h Sun Oct 15 18:10:11 2006	2	+++ src/cairoint.h
3	@@ -50,6 +50,11 @@	3	@@ -50,6 +50,11 @@
4	#include "config.h"	4	#include "config.h"
5	#endif	5	#endif
Lines 9-14 Link Here
9	+#define INT16_MIN (-0x7fff-1)	9	+#define INT16_MIN (-0x7fff-1)
10	+#endif	10	+#endif
11	+	11	+
12	#include <assert.h>	12	#ifdef _MSC_VER
13	#include <stdlib.h>	13	#define cairo_public __declspec(dllexport)
14	#include <string.h>	14	#endif




%%GLIB%%lib/libcairo-gobject.la
%%GLIB%%lib/libcairo-gobject.so
%%GLIB%%lib/libcairo-gobject.so.2
%%GLIB%%lib/libcairo-gobject.so.2.11200.16
lib/libcairo-script-interpreter.a
lib/libcairo-script-interpreter.la
lib/libcairo-script-interpreter.so
lib/libcairo-script-interpreter.so.2
lib/libcairo-script-interpreter.so.2.11200.16
lib/libcairo.a
lib/libcairo.la
lib/libcairo.so
lib/libcairo.so.2
lib/libcairo.so.2.11200.16
libdata/pkgconfig/cairo.pc
libdata/pkgconfig/cairo-fc.pc
libdata/pkgconfig/cairo-ft.pc

libdata/pkgconfig/cairo-script.pc
libdata/pkgconfig/cairo-svg.pc
libdata/pkgconfig/cairo-tee.pc
%%XCB%%libdata/pkgconfig/cairo-xcb-shm.pc
%%XCB%%libdata/pkgconfig/cairo-xcb.pc
%%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc
%%X11%%libdata/pkgconfig/cairo-xlib.pc
@comment %%X11%%%%XCB%%libdata/pkgconfig/cairo-xlib-xcb.pc
%%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc
@dirrm include/cairo
@dirrm lib/cairo

Return to bug 193625

Lines 4-11 Link Here

(-)graphics/cairo/Makefile (-3 / +39 lines)
4		4
5	PORTNAME= cairo	5	PORTNAME= cairo
6	PORTVERSION= 1.12.16	6	PORTVERSION= 1.12.16
7	PORTREVISION= 1	7	PORTEPOCH?= 2
8	PORTEPOCH= 2
9	CATEGORIES= graphics	8	CATEGORIES= graphics
10	MASTER_SITES= http://cairographics.org/releases/	9	MASTER_SITES= http://cairographics.org/releases/
11		10
Lines 27-33 Link Here
27	--disable-directfb \	26	--disable-directfb \
28	--enable-tee	27	--enable-tee
29	USES+= libtool:keepla pathfix pkgconfig	28	USES+= libtool:keepla pathfix pkgconfig
30	USE_XORG= pixman xext	29	USE_XORG= pixman
31	USE_GNOME= referencehack	30	USE_GNOME= referencehack
32	USE_LDCONFIG= yes	31	USE_LDCONFIG= yes
33	INSTALL_TARGET= install-strip	32	INSTALL_TARGET= install-strip
Lines 60-65 Link Here
60		59
61	.include <bsd.port.options.mk>	60	.include <bsd.port.options.mk>
62		61
		62	.if ${PORT_OPTIONS:MX11}
		63	USE_XORG+= xrender
		64	PLIST_SUB+= X11=""
		65	.else
		66	CONFIGURE_ARGS+=--disable-xlib
		67	PLIST_SUB+= X11="@comment "
		68	.endif
		69
		70	.if ${PORT_OPTIONS:MOPENGL}
		71	USE_GL= gl
		72	USE_XORG+= glproto:both dri2proto:both
		73	CONFIGURE_ARGS+= --enable-gl
		74	PLIST_SUB+= GL=""
		75	.else
		76	CONFIGURE_ARGS+= --disable-gl
		77	PLIST_SUB+= GL="@comment "
		78	.endif
		79
		80	.if ${PORT_OPTIONS:MXCB}
		81	BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil
		82	RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil
		83	CONFIGURE_ARGS+= --enable-xcb
		84	# this option exposes a bug --enable-xlib-xcb=auto
		85	PLIST_SUB+= XCB=""
		86	.else
		87	CONFIGURE_ARGS+= --disable-xcb
		88	PLIST_SUB+= XCB="@comment "
		89	.endif
		90
		91	.if ${PORT_OPTIONS:MGLIB}
		92	USE_GNOME+= glib20
		93	PLIST_SUB+= GLIB=""
		94	.else
		95	CONFIGURE_ARGS+= --enable-gobject=no
		96	PLIST_SUB+= GLIB="@comment "
		97	.endif
		98
63	post-patch:	99	post-patch:
64	@${REINPLACE_CMD} -e '/test/s/==/=/g' \	100	@${REINPLACE_CMD} -e '/test/s/==/=/g' \
65	-e '/LIBS/s/-lrt//' -e '/LIBS/s\|-ldld\|\|' \	101	-e '/LIBS/s/-lrt//' -e '/LIBS/s\|-ldld\|\|' \

Lines 35-51 Link Here

(-)graphics/cairo/pkg-plist (-6 / +5 lines)
35	%%GLIB%%lib/libcairo-gobject.la	35	%%GLIB%%lib/libcairo-gobject.la
36	%%GLIB%%lib/libcairo-gobject.so	36	%%GLIB%%lib/libcairo-gobject.so
37	%%GLIB%%lib/libcairo-gobject.so.2	37	%%GLIB%%lib/libcairo-gobject.so.2
38	%%GLIB%%lib/libcairo-gobject.so.%%LIBVER%%	38	%%GLIB%%lib/libcairo-gobject.so.2.11200.16
39	lib/libcairo-script-interpreter.a	39	lib/libcairo-script-interpreter.a
40	lib/libcairo-script-interpreter.la	40	lib/libcairo-script-interpreter.la
41	lib/libcairo-script-interpreter.so	41	lib/libcairo-script-interpreter.so
42	lib/libcairo-script-interpreter.so.2	42	lib/libcairo-script-interpreter.so.2
43	lib/libcairo-script-interpreter.so.%%LIBVER%%	43	lib/libcairo-script-interpreter.so.2.11200.16
44	lib/libcairo.a	44	lib/libcairo.a
45	lib/libcairo.la	45	lib/libcairo.la
46	lib/libcairo.so	46	lib/libcairo.so
47	lib/libcairo.so.2	47	lib/libcairo.so.2
48	lib/libcairo.so.%%LIBVER%%	48	lib/libcairo.so.2.11200.16
49	libdata/pkgconfig/cairo.pc	49	libdata/pkgconfig/cairo.pc
50	libdata/pkgconfig/cairo-fc.pc	50	libdata/pkgconfig/cairo-fc.pc
51	libdata/pkgconfig/cairo-ft.pc	51	libdata/pkgconfig/cairo-ft.pc
Lines 58-67 Link Here
58	libdata/pkgconfig/cairo-script.pc	58	libdata/pkgconfig/cairo-script.pc
59	libdata/pkgconfig/cairo-svg.pc	59	libdata/pkgconfig/cairo-svg.pc
60	libdata/pkgconfig/cairo-tee.pc	60	libdata/pkgconfig/cairo-tee.pc
		61	%%XCB%%libdata/pkgconfig/cairo-xcb-shm.pc
61	%%XCB%%libdata/pkgconfig/cairo-xcb.pc	62	%%XCB%%libdata/pkgconfig/cairo-xcb.pc
62	%%XCB%%libdata/pkgconfig/cairo-xcb-shm.pc	63	%%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc
63	%%X11%%libdata/pkgconfig/cairo-xlib.pc	64	%%X11%%libdata/pkgconfig/cairo-xlib.pc
64	@comment %%X11%%%%XCB%%libdata/pkgconfig/cairo-xlib-xcb.pc
65	%%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc
66	@dirrm include/cairo	65	@dirrm include/cairo
67	@dirrm lib/cairo	66	@dirrm lib/cairo