diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2015-08-06 07:50:29 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2015-08-06 07:50:29 +0000 |
| commit | 5a8f50c9e3bf64e28854ac86ca2c544dc80b8f18 (patch) | |
| tree | fb161f23b2f01ee32b26bbad0b1acf05e8e02ad6 /graphics/cairo | |
| parent | e782507e7f96221b9c48e1c3bc5d76a316955cfa (diff) | |
| download | ports-5a8f50c9e3bf64e28854ac86ca2c544dc80b8f18.tar.gz ports-5a8f50c9e3bf64e28854ac86ca2c544dc80b8f18.zip | |
Collapse the EGL option into the OPENGL option.
The build fails if EGL is selected but OPENGL isn't.
Notes
Notes:
svn path=/head/; revision=393636
Diffstat (limited to 'graphics/cairo')
| -rw-r--r-- | graphics/cairo/Makefile | 11 | ||||
| -rw-r--r-- | graphics/cairo/pkg-plist | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index b4bb90e0d8aa..97949fa36358 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -38,18 +38,15 @@ CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \ --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 diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist index 74fbbcfdb0b8..790e29b3a8db 100644 --- a/graphics/cairo/pkg-plist +++ b/graphics/cairo/pkg-plist @@ -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 |