svn commit: r538521 - head/graphics/cairo

[Jan Beich]

Author: jbeich
Date: Thu Jun 11 18:13:22 2020
New Revision: 538521
URL: https://svnweb.freebsd.org/changeset/ports/538521

Log:
  graphics/cairo: drop xorgproto from OPENGL
  
  X11 already depends on xorgproto while GLX requires X11.
  
  $ pkg info -ql xorgproto | sed '/include/!d; s,.*include/,,' |
    fgrep --exclude='*config*' --exclude='*ChangeLog*' -rnf - .
  ./boilerplate/cairo-boilerplate-glx.c:37:#include <X11/X.h>
  ./src/cairo-xlib-surface-shm.c:145:#include <X11/Xproto.h>
  ./src/cairo-xlib-surface-shm.c:148:#include <X11/extensions/shmproto.h>
  ./src/cairo-xlib-surface-shm.c:150:#include <X11/extensions/shmstr.h>
  ./src/cairo-xlib-xrender-private.h:56:#include <X11/extensions/renderproto.h>
  ./src/cairo-xlib-xrender-private.h:219:/* Copied from X11/extensions/render.h */
  ./src/cairo-xlib-xrender-private.h:533:/* Copied from X11/extensions/renderproto.h */
  ./src/cairo-xlib-xrender-private.h:535:#include <X11/Xmd.h>
  
  Submitted by:	manu (based on)

Modified:
  head/graphics/cairo/Makefile   (contents, props changed)

Modified: head/graphics/cairo/Makefile
==============================================================================
--- head/graphics/cairo/Makefile	Thu Jun 11 18:12:55 2020	(r538520)
+++ head/graphics/cairo/Makefile	Thu Jun 11 18:13:22 2020	(r538521)
@@ -42,11 +42,11 @@ OPTIONS_SLAVE=	${ARCH:tu}
 OPTIONS_SUB=	yes
 
 X11_USES=	xorg
-X11_USE=	xorg=x11,xext,xrender
+X11_USE=	xorg=x11,xext,xorgproto:both,xrender
 X11_CONFIGURE_ENABLE=xlib
 
-OPENGL_USES=	gl xorg
-OPENGL_USE=	gl=egl xorg=xorgproto:both
+OPENGL_USES=	gl
+OPENGL_USE=	gl=egl
 OPENGL_CONFIGURE_ENABLE=gl egl
 
 GLIB_DESC=	Enable GObject Functions Feature