Date: Fri, 20 Mar 2020 15:23:42 +0000 (UTC) From: Lorenzo Salvadore <salvadore@FreeBSD.org> 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 Message-ID: <202003201523.02KFNgTt041443@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <dbn@FreeBSD.org> # Copyright 2012 Jan Beich <jbeich@tormail.org> +# Copyright 2020 Lorenzo Salvadore <salvadore@FreeBSD.org> # 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003201523.02KFNgTt041443>