From owner-dev-commits-ports-all@freebsd.org Thu Jul 15 19:48:49 2021 Return-Path: Delivered-To: dev-commits-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 C64BC64D06A; Thu, 15 Jul 2021 19:48:49 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GQlL90Kygz3krH; Thu, 15 Jul 2021 19:48:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BBCD376C7; Thu, 15 Jul 2021 19:48:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16FJmmkc014178; Thu, 15 Jul 2021 19:48:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16FJmmvA014177; Thu, 15 Jul 2021 19:48:48 GMT (envelope-from git) Date: Thu, 15 Jul 2021 19:48:48 GMT Message-Id: <202107151948.16FJmmvA014177@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kevin Bowling Subject: git: 5343f55d8757 - main - Mk/bsd.default-versions: Remove libglvnd optionality MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5343f55d875779eca78236446cd19d67f58c4bce Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jul 2021 19:48:49 -0000 The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=5343f55d875779eca78236446cd19d67f58c4bce commit 5343f55d875779eca78236446cd19d67f58c4bce Author: Kevin Bowling AuthorDate: 2021-07-15 19:45:28 +0000 Commit: Kevin Bowling CommitDate: 2021-07-15 19:48:27 +0000 Mk/bsd.default-versions: Remove libglvnd optionality glvnd is becoming increasingly required by mesa and various FreeBSD Ports implementation decisions. Remove the tuple to avoid unexpected and unsupported combinations. Reviewed by: x11 (manu, zeising) Differential Revision: https://reviews.freebsd.org/D30930 --- Mk/Uses/gl.mk | 10 +++++----- Mk/bsd.default-versions.mk | 4 ++-- graphics/mesa-devel/Makefile | 3 +-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Mk/Uses/gl.mk b/Mk/Uses/gl.mk index 2c6e36d86bd1..8ecd95a4403a 100644 --- a/Mk/Uses/gl.mk +++ b/Mk/Uses/gl.mk @@ -13,12 +13,12 @@ .if !defined(_INCLUDE_USES_GL_MK) _INCLUDE_USES_GL_MK=yes -_GL_egl_LIB_DEPENDS= libEGL.so:graphics/${GL_DEFAULT:S/,/ /g:[1]} -_GL_gbm_LIB_DEPENDS= libgbm.so:graphics/${GL_DEFAULT:S/,/ /g:[-1]} -_GL_gl_LIB_DEPENDS= libGL.so:graphics/${GL_DEFAULT:S/,/ /g:[1]} +_GL_egl_LIB_DEPENDS= libEGL.so:graphics/libglvnd +_GL_gbm_LIB_DEPENDS= libgbm.so:graphics/${GL_DEFAULT} +_GL_gl_LIB_DEPENDS= libGL.so:graphics/libglvnd _GL_gl_USE_XORG= xorgproto -_GL_glesv1_LIB_DEPENDS= libGLESv1_CM.so:graphics/${GL_DEFAULT:S/,/ /g:[1]} -_GL_glesv2_LIB_DEPENDS= libGLESv2.so:graphics/${GL_DEFAULT:S/,/ /g:[1]} +_GL_glesv1_LIB_DEPENDS= libGLESv1_CM.so:graphics/libglvnd +_GL_glesv2_LIB_DEPENDS= libGLESv2.so:graphics/libglvnd _GL_glew_LIB_DEPENDS= libGLEW.so:graphics/glew _GL_glu_LIB_DEPENDS= libGLU.so:graphics/libGLU _GL_glu_USE_XORG= xorgproto diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 73d4a908c65c..d68d453170c4 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -52,8 +52,8 @@ GCC_DEFAULT?= 8 .else GCC_DEFAULT?= 10 .endif -# Possible values (tuple): libglvnd, mesa-libs, mesa-devel -GL_DEFAULT?= libglvnd,mesa-libs +# Possible values: mesa-libs, mesa-devel +GL_DEFAULT?= mesa-libs # Possible values: 7, 8, 9, agpl GHOSTSCRIPT_DEFAULT?= agpl # Possible values: 6, 6-nox11, 7, 7-nox11 diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 87a4ed3532fe..b77533fa2818 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -63,9 +63,8 @@ OPTIONS_EXCLUDE_powerpc64= ${"${/usr/bin/ld:L:tA}"==/usr/bin/ld.lld:?LTO:} # LLV OPTIONS_EXCLUDE+= ${ARCH:Namd64:Ni386:Nx86_64:C/.+/anv crocus i965 iris/} OPTIONS_EXCLUDE+= ${ARCH:Naarch64:Namd64:Ni386:Npowerpc64:Npowerpc64le:Nx86_64:C/.+/LIBUNWIND/} OPTIONS_EXCLUDE+= ${"${GL_DEFAULT:S/,/ /g:[-1]}"==${.CURDIR:T}:?COINST:} -OPTIONS_EXCLUDE+= ${"${GL_DEFAULT:S/,/ /g:[1]}"!=libglvnd:?GLVND:} OPTIONS_SLAVE+= ${"${GL_DEFAULT:S/,/ /g:[-1]}"!=${.CURDIR:T}:?COINST:} -OPTIONS_SLAVE+= ${"${GL_DEFAULT:S/,/ /g:[1]}"==libglvnd:?GLVND:} +OPTIONS_SLAVE+= GLVND OPTIONS_SUB= yes # Convert options to -D-drivers=