diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2020-06-11 16:39:03 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2020-06-11 16:39:03 +0000 |
commit | 91eae87396a9418bb702e7e724246666774179d1 (patch) | |
tree | 5104f05e54276d543d02dcf605d0ddbe04100da7 /graphics/cairo | |
parent | 1bf860d0af2cad4a743312e4a7f82690cce8f73d (diff) | |
download | ports-91eae87396a9418bb702e7e724246666774179d1.tar.gz ports-91eae87396a9418bb702e7e724246666774179d1.zip |
graphics/cairo: divorce OPENGL from X11
- OPENGL enables EGL, so don't require GLX
- cairo-gl uses libOpenGL with libglvnd
- libglvnd lacks libGL if built without X11
Notes
Notes:
svn path=/head/; revision=538507
Diffstat (limited to 'graphics/cairo')
-rw-r--r-- | graphics/cairo/Makefile | 7 | ||||
-rw-r--r-- | graphics/cairo/pkg-plist | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index 55dbfa59b70b..25407e6c7afa 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -46,9 +46,8 @@ X11_USE= xorg=x11,xext,xrender X11_CONFIGURE_ENABLE=xlib OPENGL_USES= gl xorg -OPENGL_USE= gl=gl,egl xorg=xorgproto:both +OPENGL_USE= gl=egl xorg=xorgproto:both OPENGL_CONFIGURE_ENABLE=gl egl -OPENGL_IMPLIES= X11 GLIB_DESC= Enable GObject Functions Feature GLIB_USES= gettext-runtime @@ -85,4 +84,8 @@ post-patch-DOCS-off: @${REINPLACE_CMD} -e 's|public||g' \ ${WRKSRC}/doc/Makefile.in +post-patch-X11-off: + @${REINPLACE_CMD} -e '/need_glx_functions=yes/d' \ + ${WRKSRC}/configure + .include <bsd.port.mk> diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist index 1d8deae275f6..00022c2b9172 100644 --- a/graphics/cairo/pkg-plist +++ b/graphics/cairo/pkg-plist @@ -38,7 +38,7 @@ lib/libcairo.so.%%LIBVER%% libdata/pkgconfig/cairo-fc.pc libdata/pkgconfig/cairo-ft.pc %%OPENGL%%libdata/pkgconfig/cairo-gl.pc -%%OPENGL%%libdata/pkgconfig/cairo-glx.pc +%%OPENGL%%%%X11%%libdata/pkgconfig/cairo-glx.pc %%GLIB%%libdata/pkgconfig/cairo-gobject.pc libdata/pkgconfig/cairo-pdf.pc libdata/pkgconfig/cairo-png.pc |