From owner-svn-ports-all@freebsd.org Thu Jun 11 16:39:04 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BB7C23395FD; Thu, 11 Jun 2020 16:39:04 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49jV1N4XtBz42bT; Thu, 11 Jun 2020 16:39:04 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9746B1B2CD; Thu, 11 Jun 2020 16:39:04 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05BGd4sg095880; Thu, 11 Jun 2020 16:39:04 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05BGd4Rd095878; Thu, 11 Jun 2020 16:39:04 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006111639.05BGd4Rd095878@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 11 Jun 2020 16:39:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538507 - head/graphics/cairo X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/graphics/cairo X-SVN-Commit-Revision: 538507 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jun 2020 16:39:04 -0000 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 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