Date: Sun, 31 Jul 2016 18:59:23 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r419406 - branches/2016Q3/graphics/cairo Message-ID: <201607311859.u6VIxNpD098603@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Jul 31 18:59:23 2016 New Revision: 419406 URL: https://svnweb.freebsd.org/changeset/ports/419406 Log: MFH: r419084 graphics/cairo: clean up - Convert to option helpers - Fix LICENSE combination - Add missing X11 dependencies [1] PR: 198996 [1] Submitted by: yuri@rawbw.com [1] Approved by: portmgr blanket Approved by: ports-secteam (feld) Modified: branches/2016Q3/graphics/cairo/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/graphics/cairo/Makefile ============================================================================== --- branches/2016Q3/graphics/cairo/Makefile Sun Jul 31 18:56:04 2016 (r419405) +++ branches/2016Q3/graphics/cairo/Makefile Sun Jul 31 18:59:23 2016 (r419406) @@ -3,6 +3,7 @@ PORTNAME= cairo PORTVERSION= 1.14.6 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ @@ -11,7 +12,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Vector graphics library with cross-device output support LICENSE= LGPL21 MPL -LICENSE_COMB= multi +LICENSE_COMB= dual USES= tar:xz @@ -43,35 +44,28 @@ CONFIGURE_ARGS= --with-html-dir=${DOCSDI OPTIONS_DEFINE= OPENGL XCB GLIB X11 OPTIONS_DEFAULT=OPENGL XCB GLIB X11 +OPTIONS_SLAVE= ${ARCH:tu} XCB_DESC= Enable XCB (X C-language Binding) Support GLIB_DESC= Enable GObject Functions Feature OPTIONS_SUB= yes -X11_USE= xorg=xrender,xext +X11_USE= xorg=x11,xext,xrender X11_CONFIGURE_ENABLE=xlib OPENGL_USE= gl=gl,egl xorg=glproto:both,dri2proto:both OPENGL_CONFIGURE_ENABLE=gl egl +OPENGL_IMPLIES= X11 GLIB_USE= gnome=glib20 GLIB_CONFIGURE_ENABLE= gobject XCB_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil XCB_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil +XCB_USE= xorg=xcb XCB_CONFIGURE_ENABLE= xcb # this has another option --enable-xlib-xcb=auto but it is buggy. +MIPS_BUILD_DEPENDS= ${LOCALBASE}/include/atomic_ops.h:devel/libatomic_ops +MIPS_USES= localbase +MIPS_CONFIGURE_ENV= cairo_cv_atomic_primitives="libatomic-ops" PLIST_SUB+= LIBVER=2.11400.6 -.include <bsd.port.options.mk> - -.if ${ARCH} == "mips" -BUILD_DEPENDS+= ${LOCALBASE}/include/atomic_ops.h: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 - post-patch: @${REINPLACE_CMD} -e '/strings/s/ - / -a /' \ -e '/test/s/==/=/g' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607311859.u6VIxNpD098603>