Date: Thu, 6 Aug 2015 07:50:30 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393636 - head/graphics/cairo Message-ID: <201508060750.t767oUvQ002224@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Thu Aug 6 07:50:29 2015 New Revision: 393636 URL: https://svnweb.freebsd.org/changeset/ports/393636 Log: Collapse the EGL option into the OPENGL option. The build fails if EGL is selected but OPENGL isn't. Modified: head/graphics/cairo/Makefile head/graphics/cairo/pkg-plist Modified: head/graphics/cairo/Makefile ============================================================================== --- head/graphics/cairo/Makefile Thu Aug 6 07:07:33 2015 (r393635) +++ head/graphics/cairo/Makefile Thu Aug 6 07:50:29 2015 (r393636) @@ -38,18 +38,15 @@ CONFIGURE_ARGS= --with-html-dir=${DOCSDI --disable-wgl \ --enable-tee -OPTIONS_DEFINE= OPENGL XCB GLIB X11 EGL -OPTIONS_DEFAULT=OPENGL XCB GLIB X11 EGL +OPTIONS_DEFINE= OPENGL XCB GLIB X11 +OPTIONS_DEFAULT=OPENGL XCB GLIB X11 XCB_DESC= Enable XCB (X C-language Binding) Support GLIB_DESC= Enable GObject Functions Feature -EGL_DESC= 2D/3D rendering support via EGL OPTIONS_SUB= yes X11_USE= xorg=xrender,xext X11_CONFIGURE_ENABLE=xlib -OPENGL_USE= gl=gl xorg=glproto:both,dri2proto:both -OPENGL_CONFIGURE_ENABLE=gl -EGL_USE= gl=egl -EGL_CONFIGURE_ENABLE=egl +OPENGL_USE= gl=gl,egl xorg=glproto:both,dri2proto:both +OPENGL_CONFIGURE_ENABLE=gl egl GLIB_USE= gnome=glib20 GLIB_CONFIGURE_ENABLE= gobject XCB_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil Modified: head/graphics/cairo/pkg-plist ============================================================================== --- head/graphics/cairo/pkg-plist Thu Aug 6 07:07:33 2015 (r393635) +++ head/graphics/cairo/pkg-plist Thu Aug 6 07:50:29 2015 (r393636) @@ -41,7 +41,7 @@ lib/libcairo.so lib/libcairo.so.2 lib/libcairo.so.%%LIBVER%% libdata/pkgconfig/cairo.pc -%%EGL%%libdata/pkgconfig/cairo-egl.pc +%%OPENGL%%libdata/pkgconfig/cairo-egl.pc libdata/pkgconfig/cairo-fc.pc libdata/pkgconfig/cairo-ft.pc %%OPENGL%%libdata/pkgconfig/cairo-gl.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508060750.t767oUvQ002224>