Date: Tue, 16 Jun 2020 22:38:56 +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: r539385 - in head/emulators/i386-wine-devel: . files Message-ID: <202006162238.05GMcuY7034082@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: salvadore Date: Tue Jun 16 22:38:55 2020 New Revision: 539385 URL: https://svnweb.freebsd.org/changeset/ports/539385 Log: emulators/i386-wine-devel: Fix conflict with x11/nvidia-driver Fix a conflict with x11/nvidia-driver involving the file ${PREFIX}/lib32/libGL.so.1. While here, also stop tracking a parallel and redundant history in nvidia.sh: the existing history in that file is removed so that the svn logs are now the only history source (but of course the histoty in the file can be retrieved from older revisions if needed). PR: 245496 Submitted by: iwtcex@gmail.com Reported by: daemonpup@tuta.io Tested by: daemonpup@tuta.io Approved by: gerald (mentor) Modified: head/emulators/i386-wine-devel/Makefile head/emulators/i386-wine-devel/Makefile.amd64 head/emulators/i386-wine-devel/distinfo head/emulators/i386-wine-devel/files/binbounce head/emulators/i386-wine-devel/files/nvidia.sh head/emulators/i386-wine-devel/files/pkg-install head/emulators/i386-wine-devel/pkg-plist Modified: head/emulators/i386-wine-devel/Makefile ============================================================================== --- head/emulators/i386-wine-devel/Makefile Tue Jun 16 22:25:28 2020 (r539384) +++ head/emulators/i386-wine-devel/Makefile Tue Jun 16 22:38:55 2020 (r539385) @@ -9,6 +9,9 @@ PORTNAME= wine # define a dummy DISTVERSION to avoid errors with poudriere bulk -a # on architectures unsupported by this port DISTVERSION?= 0 +# define PORTREVISION with ?= to allow it to be overriden by +# wine-devel's PORTREVISION when cross building +PORTREVISION?= 1 PKGNAMEPREFIX= i386- PKGNAMESUFFIX= -devel CATEGORIES= emulators Modified: head/emulators/i386-wine-devel/Makefile.amd64 ============================================================================== --- head/emulators/i386-wine-devel/Makefile.amd64 Tue Jun 16 22:25:28 2020 (r539384) +++ head/emulators/i386-wine-devel/Makefile.amd64 Tue Jun 16 22:38:55 2020 (r539385) @@ -4,7 +4,7 @@ DISTVERSION= 5.8 PORTEPOCH= 1 MASTER_SITES= LOCAL/salvadore/i386-wine-devel/${DIST_SUBDIR}/ -DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION},${PORTEPOCH} +DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION} DIST_SUBDIR= FreeBSD:${OSREL:C/\..*//}:amd64 LICENSE= LGPL21 LGPL3 Modified: head/emulators/i386-wine-devel/distinfo ============================================================================== --- head/emulators/i386-wine-devel/distinfo Tue Jun 16 22:25:28 2020 (r539384) +++ head/emulators/i386-wine-devel/distinfo Tue Jun 16 22:38:55 2020 (r539385) @@ -1,7 +1,7 @@ -TIMESTAMP = 1590229926 -SHA256 (FreeBSD:11:amd64/i386-wine-devel-5.8,1.txz) = bbb31835ff02a80cc6113ee5adda82723ed2e37dde77c07d7200d40cb9f7e7f3 -SIZE (FreeBSD:11:amd64/i386-wine-devel-5.8,1.txz) = 72862352 -SHA256 (FreeBSD:12:amd64/i386-wine-devel-5.8,1.txz) = 929e0d6366afb0ffe1be5051ef5e1df86e37d9ccbcc7c0db660a98ccff7aab65 -SIZE (FreeBSD:12:amd64/i386-wine-devel-5.8,1.txz) = 73104324 -SHA256 (FreeBSD:13:amd64/i386-wine-devel-5.8,1.txz) = 22e78c3e39c473179742d8b5e2f08c8f3274d46bca1fa5d01db882633c912896 -SIZE (FreeBSD:13:amd64/i386-wine-devel-5.8,1.txz) = 75179216 +TIMESTAMP = 1592263837 +SHA256 (FreeBSD:11:amd64/i386-wine-devel-5.8_1,1.txz) = 83a2f737811bbf15bc2573b0bd9f8be561d7405daa7dbdb8c3ba7e3b63ff524b +SIZE (FreeBSD:11:amd64/i386-wine-devel-5.8_1,1.txz) = 72849764 +SHA256 (FreeBSD:12:amd64/i386-wine-devel-5.8_1,1.txz) = fd372de4a96a4e501466525561debcccdcb701fde8dc947fe86fc93067f2ce7e +SIZE (FreeBSD:12:amd64/i386-wine-devel-5.8_1,1.txz) = 73141456 +SHA256 (FreeBSD:13:amd64/i386-wine-devel-5.8_1,1.txz) = 8c7053bad1d19ac93ebbaac175fe4924ba7009ac7aa6bf56df39804a2fa5d28d +SIZE (FreeBSD:13:amd64/i386-wine-devel-5.8_1,1.txz) = 74894708 Modified: head/emulators/i386-wine-devel/files/binbounce ============================================================================== --- head/emulators/i386-wine-devel/files/binbounce Tue Jun 16 22:25:28 2020 (r539384) +++ head/emulators/i386-wine-devel/files/binbounce Tue Jun 16 22:38:55 2020 (r539385) @@ -10,10 +10,10 @@ then export LIBGL_DRIVERS_PATH=$LOCALBASE/lib32/dri if [ `uname -p` = i386 ] then - export LD_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_LIBRARY_PATH":"$LOCALBASE/lib32/.libGL" export LD_LIBRARY_PATH_RPATH=y else - export LD_32_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_32_LIBRARY_PATH":/usr/lib32 + export LD_32_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_32_LIBRARY_PATH":"$LOCALBASE/lib32/.libGL":/usr/lib32 export LD_32_LIBRARY_PATH_RPATH=y fi export PATH="$LOCALBASE/bin32":"$PATH" Modified: head/emulators/i386-wine-devel/files/nvidia.sh ============================================================================== --- head/emulators/i386-wine-devel/files/nvidia.sh Tue Jun 16 22:25:28 2020 (r539384) +++ head/emulators/i386-wine-devel/files/nvidia.sh Tue Jun 16 22:38:55 2020 (r539385) @@ -29,55 +29,6 @@ # those of the authors and should not be interpreted as representing official # policies, either expressed or implied, of David Naylor. -# Version 1.0 - 2010/05/28 -# - initial release -# Version 1.1 - 2010/10/04 -# - add support for 256 driver series -# - use passive connections for FTP -# - allow resuming of downloads if they were interrupted -# - add license and copyright notice -# Version 1.2 - 2010/10/17 -# - try to save the NVIDIA tarball under $PORTSDIR/distfiles -# - obay $PREFIX -# - extract files directly to destination (avoids using /tmp) -# Version 1.3 - 2010/11/02 -# - add support for future driver series -# Version 1.4 - 2011/05/23 -# - add support for legacy drivers -# Version 1.5 - 2011/10/23 -# - add support for no-fetch mode -# - backup the original openGL.so.1 library -# Version 1.6 - 2012/06/06 -# - add support for pkgng -# Version 1.7 - 2012/06/23 -# - make nVidia detection more robust -# - allow mixed pkg/pkgng operation -# Version 1.8 - 2012/07/02 -# - fix mixed pkg/pkgng operation -# Version 1.9 - 2012/10/31 -# - fix permission of extracts files -# Version 1.10 - 2013/05/06 -# - s/wine-fbsd64/i386-wine/g -# - fix unwanted failures due to `set -e` -# Version 1.11 - 2013/05/26 -# - install libGL.so.1 to ${PREFIX}/lib32/.nvidia and link to it -# - add deinstall option -# Version 1.12 - 2013/11/03 -# - add detection for i386-wine-devel -# Version 1.13 - 2014/08/05 -# - add detection for i386-wine-compholio -# Version 1.14 - 2014/12/26 -# - gracefully handle a corrupt nVidia tarball -# - provide checksum and size information for nVidia tarball -# Version 1.15 - 2015/03/10 -# - handle nvidia-driver with package name suffix -# - handle i386-wine with arbitary package name suffix -# - 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 PORTSDIR=${PORTSDIR:-/usr/ports} @@ -115,12 +66,6 @@ do rm -f ${PREFIX}/lib32/libGLcore.so.1 ${PREFIX}/lib32/libnvidia-tls.so.1 rm -f ${PREFIX}/lib32/libnvidia-glcore.so.1 ${PREFIX}/lib32/libnvidia-tls.so.1 rm -rf ${PREFIX}/lib32/.nvidia/ - if [ -d ${PREFIX}/lib32/.libGL-new ] - then - ln -s .libGL-new/libGL.so.1 ${PREFIX}/lib32/libGL.so.1 - else - ln -s .libGL/libGL.so.1 ${PREFIX}/lib32/libGL.so.1 - fi exit 0 ;; -n) Modified: head/emulators/i386-wine-devel/files/pkg-install ============================================================================== --- head/emulators/i386-wine-devel/files/pkg-install Tue Jun 16 22:25:28 2020 (r539384) +++ head/emulators/i386-wine-devel/files/pkg-install Tue Jun 16 22:38:55 2020 (r539385) @@ -3,20 +3,14 @@ export PREFIX=${PKG_PREFIX:-/usr/local} export WINE=$1 -if [ -d ${PREFIX}/lib32/.libGL-new ] -then - LIBGLDIR=.libGL-new -else - LIBGLDIR=.libGL -fi +LIBGLDIR=.libGL case "$2" in DEINSTALL) sh ${PREFIX}/share/wine/patch-nvidia.sh -d - rm -r ${PREFIX}/lib32/libGL.so.1 ${PREFIX}/lib32/dri + rm -r ${PREFIX}/lib32/dri ;; POST-INSTALL) - ln -s ${LIBGLDIR}/libGL.so.1 ${PREFIX}/lib32/libGL.so.1 mkdir -p ${PREFIX}/lib32/dri for dri in $(cd ${PREFIX}/lib32/${LIBGLDIR}/dri/; echo *.so) do Modified: head/emulators/i386-wine-devel/pkg-plist ============================================================================== --- head/emulators/i386-wine-devel/pkg-plist Tue Jun 16 22:25:28 2020 (r539384) +++ head/emulators/i386-wine-devel/pkg-plist Tue Jun 16 22:38:55 2020 (r539385) @@ -1096,11 +1096,11 @@ lib32/libfreetype.so.6 lib32/libglapi.so.0 lib32/libgmp.so.10 lib32/libgnutls.so.30 -lib32/libhogweed.so.5 +lib32/libhogweed.so.6 lib32/libidn2.so.0 %%NOOSREL13%%lib32/libjpeg.so.8 lib32/liblcms2.so.2 -lib32/libnettle.so.7 +lib32/libnettle.so.8 lib32/libp11-kit.so.0 lib32/libpciaccess.so.0 %%NOOSREL13%%lib32/libpng16.so.16
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006162238.05GMcuY7034082>