Attachment 89944 Details for Bug 126993 – file.diff

[patch] file.diff

file.diff (text/plain), 1.93 KB, created by bf on 2008-08-31 06:50:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: bf

Created: 2008-08-31 06:50:02 UTC

Size: 1.93 KB

patch

obsolete

>diff -ruN cairo.orig/Makefile cairo/Makefile
>--- cairo.orig/Makefile	2008-06-30 16:16:18.000000000 -0400
>+++ cairo/Makefile	2008-08-31 01:27:07.391337071 -0400
>@@ -8,7 +8,7 @@
> 
> PORTNAME=	cairo
> PORTVERSION=	1.6.4
>-PORTREVISION?=	2
>+PORTREVISION?=	3
> PORTEPOCH?=	1
> CATEGORIES=	graphics
> MASTER_SITES=	http://cairographics.org/releases/
>@@ -42,7 +42,8 @@
> PLIST_SUB+=	X11=""
> .endif
> 
>-OPTIONS+=	GLITZ "Enable Glitz OpenGL Support" Off
>+OPTIONS+=	GLITZ "Enable Glitz OpenGL Support" Off \
>+		XCB "Enable XCB (X C-language Binding) Support" Off
> 
> .include <bsd.port.pre.mk>
> 
>@@ -55,6 +56,21 @@
> PLIST_SUB+=	GLITZ="@comment "
> .endif
> 
>+.ifdef(WITH_XCB)
>+.ifdef(WITHOUT_X11)
>+IGNORE=option WITH_XCB requires X11
>+.endif
>+BUILD_DEPENDS+= 	${LOCALBASE}/libdata/pkgconfig/xcb-render.pc:${PORTSDIR}/x11/libxcb \
>+			${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util
>+RUN_DEPENDS+=		${LOCALBASE}/libdata/pkgconfig/xcb-render.pc:${PORTSDIR}/x11/libxcb \
>+			${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util
>+CONFIGURE_ARGS+=	--enable-xcb
>+PLIST_SUB+=		XCB=""
>+.else
>+CONFIGURE_ARGS+=	--disable-xcb
>+PLIST_SUB+=		XCB="@comment "
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
> 		${WRKSRC}/test/Makefile.in
>diff -ruN cairo.orig/pkg-plist cairo/pkg-plist
>--- cairo.orig/pkg-plist	2007-03-19 01:13:33.000000000 -0400
>+++ cairo/pkg-plist	2008-08-31 01:27:07.391337071 -0400
>@@ -5,6 +5,8 @@
> include/cairo/cairo-pdf.h
> include/cairo/cairo-ps.h
> include/cairo/cairo-svg.h
>+%%XCB%%include/cairo/cairo-xcb-xrender.h
>+%%XCB%%include/cairo/cairo-xcb.h
> %%X11%%include/cairo/cairo-xlib-xrender.h
> %%X11%%include/cairo/cairo-xlib.h
> include/cairo/cairo.h
>@@ -19,6 +21,7 @@
> libdata/pkgconfig/cairo-png.pc
> libdata/pkgconfig/cairo-ps.pc
> libdata/pkgconfig/cairo-svg.pc
>+%%XCB%%libdata/pkgconfig/cairo-xcb.pc
> %%X11%%libdata/pkgconfig/cairo-xlib.pc
> %%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc
> @dirrm include/cairo

Actions: View | Diff

Attachments on bug 126993: 89944