Date: Thu, 11 Jun 2020 16:39:04 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538507 - head/graphics/cairo Message-ID: <202006111639.05BGd4Rd095878@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Jun 11 16:39:03 2020 New Revision: 538507 URL: https://svnweb.freebsd.org/changeset/ports/538507 Log: 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 Modified: head/graphics/cairo/Makefile (contents, props changed) head/graphics/cairo/pkg-plist (contents, props changed) Modified: head/graphics/cairo/Makefile ============================================================================== --- head/graphics/cairo/Makefile Thu Jun 11 16:36:20 2020 (r538506) +++ head/graphics/cairo/Makefile Thu Jun 11 16:39:03 2020 (r538507) @@ -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 @@ -84,5 +83,9 @@ post-patch: 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> Modified: head/graphics/cairo/pkg-plist ============================================================================== --- head/graphics/cairo/pkg-plist Thu Jun 11 16:36:20 2020 (r538506) +++ head/graphics/cairo/pkg-plist Thu Jun 11 16:39:03 2020 (r538507) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006111639.05BGd4Rd095878>