From owner-svn-ports-branches@freebsd.org Fri Oct 4 20:09:13 2019 Return-Path: Delivered-To: svn-ports-branches@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 579D513806C; Fri, 4 Oct 2019 20:09:13 +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) server-signature RSA-PSS (4096 bits) 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 46lLYj1jmzz3JWB; Fri, 4 Oct 2019 20:09:13 +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 1EDB7170E; Fri, 4 Oct 2019 20:09:13 +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 x94K9D8Y003685; Fri, 4 Oct 2019 20:09:13 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x94K9CY8003681; Fri, 4 Oct 2019 20:09:12 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201910042009.x94K9CY8003681@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 4 Oct 2019 20:09:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r513777 - in branches/2019Q4: graphics/libosmesa graphics/mesa-dri graphics/mesa-dri/files lang/clover X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2019Q4: graphics/libosmesa graphics/mesa-dri graphics/mesa-dri/files lang/clover X-SVN-Commit-Revision: 513777 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Oct 2019 20:09:13 -0000 Author: jbeich Date: Fri Oct 4 20:09:12 2019 New Revision: 513777 URL: https://svnweb.freebsd.org/changeset/ports/513777 Log: MFH: r513776 graphics/mesa-dri: revert r512573 and limit to llvm80 after r512440 Mesa 18.3 doesn't support LLVM 9. While some fixes were backported there're probably more issues. Apparently, Gnome shows black screen. As the port is unlikely to be ready for future LLVM_DEFAULT bumps without a version update just limit to previously tested value. PR: 239682 Requested by: imp Approved by: ports-secteam blanket Deleted: branches/2019Q4/graphics/mesa-dri/files/patch-0a7e767 branches/2019Q4/graphics/mesa-dri/files/patch-39d0c68 branches/2019Q4/graphics/mesa-dri/files/patch-3e249b8 branches/2019Q4/graphics/mesa-dri/files/patch-648dc52 branches/2019Q4/graphics/mesa-dri/files/patch-b5012a0 branches/2019Q4/graphics/mesa-dri/files/patch-dded2ed branches/2019Q4/graphics/mesa-dri/files/patch-e4803ab Modified: branches/2019Q4/graphics/libosmesa/Makefile branches/2019Q4/graphics/mesa-dri/Makefile branches/2019Q4/graphics/mesa-dri/Makefile.common branches/2019Q4/lang/clover/Makefile Directory Properties: branches/2019Q4/ (props changed) Modified: branches/2019Q4/graphics/libosmesa/Makefile ============================================================================== --- branches/2019Q4/graphics/libosmesa/Makefile Fri Oct 4 20:08:27 2019 (r513776) +++ branches/2019Q4/graphics/libosmesa/Makefile Fri Oct 4 20:09:12 2019 (r513777) @@ -3,7 +3,7 @@ PORTNAME= libosmesa PORTVERSION= ${MESAVERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics COMMENT= Off-Screen Mesa implementation of the OpenGL API Modified: branches/2019Q4/graphics/mesa-dri/Makefile ============================================================================== --- branches/2019Q4/graphics/mesa-dri/Makefile Fri Oct 4 20:08:27 2019 (r513776) +++ branches/2019Q4/graphics/mesa-dri/Makefile Fri Oct 4 20:09:12 2019 (r513777) @@ -3,7 +3,7 @@ PORTNAME= mesa-dri PORTVERSION= ${MESAVERSION} -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics COMMENT= OpenGL hardware acceleration drivers for DRI2+ Modified: branches/2019Q4/graphics/mesa-dri/Makefile.common ============================================================================== --- branches/2019Q4/graphics/mesa-dri/Makefile.common Fri Oct 4 20:08:27 2019 (r513776) +++ branches/2019Q4/graphics/mesa-dri/Makefile.common Fri Oct 4 20:09:12 2019 (r513777) @@ -74,6 +74,10 @@ INSTALL_TARGET= install-strip .include +.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 +LLVM_DEFAULT= 80 +.endif + .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marm*} || ${ARCH} == i386 || ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>=3.9.0_4:devel/llvm${LLVM_DEFAULT} .if ${COMPONENT} != libs Modified: branches/2019Q4/lang/clover/Makefile ============================================================================== --- branches/2019Q4/lang/clover/Makefile Fri Oct 4 20:08:27 2019 (r513776) +++ branches/2019Q4/lang/clover/Makefile Fri Oct 4 20:09:12 2019 (r513777) @@ -17,12 +17,6 @@ ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= Clover needs a GPU supported by the Radeon KMS driver .include - -# Keep in sync with devel/libclc -.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 -LLVM_DEFAULT= 80 -.endif - .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common" CONFIGURE_ARGS+= --enable-opencl --enable-opencl-icd --disable-dri \