From owner-svn-ports-all@freebsd.org Fri Mar 20 15:23:44 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 CB1AE26A423; Fri, 20 Mar 2020 15:23:44 +0000 (UTC) (envelope-from salvadore@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 48kSGm30h6z3GTl; Fri, 20 Mar 2020 15:23:44 +0000 (UTC) (envelope-from salvadore@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 0ACFD25A02; Fri, 20 Mar 2020 15:23:43 +0000 (UTC) (envelope-from salvadore@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02KFNg3o041444; Fri, 20 Mar 2020 15:23:42 GMT (envelope-from salvadore@FreeBSD.org) Received: (from salvadore@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02KFNgTt041443; Fri, 20 Mar 2020 15:23:42 GMT (envelope-from salvadore@FreeBSD.org) Message-Id: <202003201523.02KFNgTt041443@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: salvadore set sender to salvadore@FreeBSD.org using -f From: Lorenzo Salvadore Date: Fri, 20 Mar 2020 15:23:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528784 - head/emulators/i386-wine-devel/files X-SVN-Group: ports-head X-SVN-Commit-Author: salvadore X-SVN-Commit-Paths: head/emulators/i386-wine-devel/files X-SVN-Commit-Revision: 528784 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.29 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: Fri, 20 Mar 2020 15:23:44 -0000 Author: salvadore Date: Fri Mar 20 15:23:42 2020 New Revision: 528784 URL: https://svnweb.freebsd.org/changeset/ports/528784 Log: Update i386-wine-devel/files/nvidia.sh Do not try to install any 32-bit nvidia driver if nvidia-driver version is 440.59 or higher: 440.59 is the first version included in the FreeBSD ports tree that packages 32-bit drivers together with 64-bit drivers. PR: 244547 Reported by: maxtesciuc@gmail.com Approved by: gerald (mentor) Modified: head/emulators/i386-wine-devel/files/nvidia.sh Modified: head/emulators/i386-wine-devel/files/nvidia.sh ============================================================================== --- head/emulators/i386-wine-devel/files/nvidia.sh Fri Mar 20 15:18:03 2020 (r528783) +++ head/emulators/i386-wine-devel/files/nvidia.sh Fri Mar 20 15:23:42 2020 (r528784) @@ -1,6 +1,7 @@ #!/bin/sh # Copyright 2010 to 2015 David Naylor # Copyright 2012 Jan Beich +# Copyright 2020 Lorenzo Salvadore # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -74,6 +75,8 @@ # - remove support for old pkg_ tools # Version 1.16 - 2017/06/04 # - use https download site +# Version 1.17 - 2020/03/02 +# - do not do anything if nvidia-driver version >= 440.59 set -e @@ -167,6 +170,11 @@ echo "=> Detected nvidia-driver: ${NV}" NVIDIA=${NV} NV=`echo ${NV} | cut -f 1 -d _ | cut -f 1 -d ,` + +if [ ! "$(pkg version -t ${NV} 440.59)" == "<" ] +then + terminate 0 "nvidia-driver 440.59+ already includes 32-bit drivers: nothing to do" +fi if [ ! -f NVIDIA-FreeBSD-x86-${NV}.tar.gz ] || !(tar -tf NVIDIA-FreeBSD-x86-${NV}.tar.gz > /dev/null 2>&1) then