From owner-svn-ports-all@freebsd.org Thu Jun 11 16:53:08 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 9B43C339F1C; Thu, 11 Jun 2020 16:53:08 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (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 (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49jVKb1QW8z43dP; Thu, 11 Jun 2020 16:53:06 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1591894379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=arcAe4aSJFqKfMEu4wnPEBsMDMnePUPUKyY3xKbJZcQ=; b=LD3rUZl4DMWxgs36gEeiaAes0xF+3dodSX5YKi0YYTo0P8dCKDPiKMQIq6bUiFOdmcxzCf 4vZRrjteCuVDhTUtxxu8D8wEvtCzbguwveIkpCadCl7nFnFynwGit5nCJao7nnbcoqWiY0 k2HvIIICfqPpdaoMMFMKbn1YS9XsyNs= Received: from skull.home.blih.net (lfbn-idf2-1-900-181.w86-238.abo.wanadoo.fr [86.238.131.181]) by mx.blih.net (OpenSMTPD) with ESMTPSA id a87401b0 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 11 Jun 2020 16:52:59 +0000 (UTC) Date: Thu, 11 Jun 2020 18:52:58 +0200 From: Emmanuel Vadot To: Jan Beich Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r538507 - head/graphics/cairo Message-Id: <20200611185258.b083749ce37c8125dcc87f54@bidouilliste.com> In-Reply-To: <202006111639.05BGd4Rd095878@repo.freebsd.org> References: <202006111639.05BGd4Rd095878@repo.freebsd.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 49jVKb1QW8z43dP X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mx header.b=LD3rUZl4; dmarc=pass (policy=none) header.from=bidouilliste.com; spf=pass (mx1.freebsd.org: domain of manu@bidouilliste.com designates 212.83.155.74 as permitted sender) smtp.mailfrom=manu@bidouilliste.com X-Spamd-Result: default: False [-2.54 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mx]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; R_SPF_ALLOW(-0.20)[+mx]; NEURAL_HAM_LONG(-0.99)[-0.991]; TO_DN_SOME(0.00)[]; NEURAL_HAM_MEDIUM(-1.05)[-1.046]; DKIM_TRACE(0.00)[bidouilliste.com:+]; DMARC_POLICY_ALLOW(-0.50)[bidouilliste.com,none]; NEURAL_HAM_SHORT(-0.01)[-0.006]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] 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:53:08 -0000 On Thu, 11 Jun 2020 16:39:04 +0000 (UTC) Jan Beich wrote: > 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 Why not passing --disable-glx when x11 is off ? -- Emmanuel Vadot