Date: Sun, 31 Aug 2008 05:46:11 GMT From: bf <bf2006a@yahoo.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/126993: [PATCH]:graphics/cairo: enable xcb backend as non-default option Message-ID: <200808310546.m7V5kB3n074040@www.freebsd.org> Resent-Message-ID: <200808310550.m7V5o2xn042896@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 126993 >Category: ports >Synopsis: [PATCH]:graphics/cairo: enable xcb backend as non-default option >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Aug 31 05:50:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: bf >Release: 7-STABLE i386 >Organization: - >Environment: >Description: >How-To-Repeat: >Fix: Patch attached with submission follows: 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 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808310546.m7V5kB3n074040>