From owner-svn-ports-head@freebsd.org Fri Sep 25 06:54:38 2020 Return-Path: Delivered-To: svn-ports-head@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 40AEE3ECE3D; Fri, 25 Sep 2020 06:54:38 +0000 (UTC) (envelope-from manu@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 4ByN260yFHz4jtd; Fri, 25 Sep 2020 06:54:38 +0000 (UTC) (envelope-from manu@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 042EDEFE0; Fri, 25 Sep 2020 06:54:38 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08P6sbGB071431; Fri, 25 Sep 2020 06:54:37 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08P6sbrq071429; Fri, 25 Sep 2020 06:54:37 GMT (envelope-from manu@FreeBSD.org) Message-Id: <202009250654.08P6sbrq071429@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Fri, 25 Sep 2020 06:54:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549990 - head/graphics/cairo X-SVN-Group: ports-head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/graphics/cairo X-SVN-Commit-Revision: 549990 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Sep 2020 06:54:38 -0000 Author: manu Date: Fri Sep 25 06:54:37 2020 New Revision: 549990 URL: https://svnweb.freebsd.org/changeset/ports/549990 Log: graphics/cairo: Allow GLESv2 backend as an options This is useful for X11-less setups. Reviewed by: tcberner Approved by: desktop (tcberner@) Differential Revision: https://reviews.freebsd.org/D26437 Modified: head/graphics/cairo/Makefile head/graphics/cairo/pkg-plist Modified: head/graphics/cairo/Makefile ============================================================================== --- head/graphics/cairo/Makefile Fri Sep 25 06:50:17 2020 (r549989) +++ head/graphics/cairo/Makefile Fri Sep 25 06:54:37 2020 (r549990) @@ -4,6 +4,7 @@ PORTNAME= cairo PORTVERSION= 1.16.0 # update to 1.17.2 causes problems, see bug#249290 PORTEPOCH= 3 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ \ http://cairographics.org/snapshots/ @@ -32,11 +33,12 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \ --disable-directfb \ --disable-gallium \ - --disable-glesv2 \ --disable-wgl \ --enable-tee -OPTIONS_DEFINE= OPENGL XCB GLIB X11 DOCS +OPTIONS_SINGLE= GL +OPTIONS_SINGLE_GL= OPENGL GLESV2 +OPTIONS_DEFINE= XCB GLIB X11 DOCS OPTIONS_DEFAULT=OPENGL XCB GLIB X11 OPTIONS_SLAVE= ${ARCH:tu} OPTIONS_SUB= yes @@ -49,6 +51,11 @@ X11_CONFIGURE_OFF=--disable-glx OPENGL_USES= gl OPENGL_USE= gl=egl OPENGL_CONFIGURE_ENABLE=gl egl + +GLESV2_USES= gl +GLESV2_USE= gl=glesv2 +GLESV2_DESC= Enable GLESv2 rendering +GLESV2_CONFIGURE_ENABLE=glesv2 GLIB_DESC= Enable GObject Functions Feature GLIB_USES= gettext-runtime Modified: head/graphics/cairo/pkg-plist ============================================================================== --- head/graphics/cairo/pkg-plist Fri Sep 25 06:50:17 2020 (r549989) +++ head/graphics/cairo/pkg-plist Fri Sep 25 06:54:37 2020 (r549990) @@ -38,6 +38,7 @@ lib/libcairo.so.%%LIBVER%% libdata/pkgconfig/cairo-fc.pc libdata/pkgconfig/cairo-ft.pc %%OPENGL%%libdata/pkgconfig/cairo-gl.pc +%%GLESV2%%libdata/pkgconfig/cairo-glesv2.pc %%OPENGL%%%%X11%%libdata/pkgconfig/cairo-glx.pc %%GLIB%%libdata/pkgconfig/cairo-gobject.pc libdata/pkgconfig/cairo-pdf.pc