Date: Wed, 2 Jun 2021 08:03:29 GMT From: Li-Wen Hsu <lwhsu@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ffe41e64464c - main - emulators/i386-wine: Update to 5.0.4 Message-ID: <202106020803.15283TdJ072662@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=ffe41e64464cb6f90919d1279033eef291946cf5 commit ffe41e64464cb6f90919d1279033eef291946cf5 Author: Alexander Vereeken <Alexander88207@protonmail.com> AuthorDate: 2021-06-02 08:01:50 +0000 Commit: Li-Wen Hsu <lwhsu@FreeBSD.org> CommitDate: 2021-06-02 08:03:18 +0000 emulators/i386-wine: Update to 5.0.4 Pass maintainership to submitter PR: 255402 Differential Revision: https://reviews.freebsd.org/D29980 --- emulators/i386-wine/Makefile | 5 ++-- emulators/i386-wine/Makefile.amd64 | 10 +++---- emulators/i386-wine/distinfo | 16 +++++----- emulators/i386-wine/files/binbounce | 4 +-- emulators/i386-wine/files/nvidia.sh | 55 ----------------------------------- emulators/i386-wine/files/pkg-install | 10 ++----- emulators/i386-wine/pkg-plist | 17 +++++++---- 7 files changed, 32 insertions(+), 85 deletions(-) diff --git a/emulators/i386-wine/Makefile b/emulators/i386-wine/Makefile index 719830454659..cbfb6e96d13c 100644 --- a/emulators/i386-wine/Makefile +++ b/emulators/i386-wine/Makefile @@ -8,11 +8,10 @@ PORTNAME= wine # define a dummy DISTVERSION to avoid errors with poudriere bulk -a # on architectures unsupported by this port DISTVERSION?= 0 -PORTREVISION= 1 PKGNAMEPREFIX= i386- CATEGORIES= emulators -MAINTAINER= ports@FreeBSD.org +MAINTAINER= Alexander88207@protonmail.com COMMENT= 32-bit Microsoft Windows compatibility environment for 64-bit FreeBSD ONLY_FOR_ARCHS= i386 amd64 @@ -24,7 +23,7 @@ PKGDEINSTALL= ${PKGINSTALL} distinfo-update: ${RM} ${.CURDIR}/distinfo ${.CURDIR}/distinfo~ -.for osrel in 11 12 13 +.for osrel in 11 12 13 14 ${MAKE} fetch OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel} ${MAKE} makesum OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel} ${CAT} ${.CURDIR}/distinfo >> ${.CURDIR}/distinfo~ diff --git a/emulators/i386-wine/Makefile.amd64 b/emulators/i386-wine/Makefile.amd64 index 0062c1e9ebcf..f7f55a20d38d 100644 --- a/emulators/i386-wine/Makefile.amd64 +++ b/emulators/i386-wine/Makefile.amd64 @@ -1,8 +1,8 @@ # Created by: David Naylor <dbn@FreeBSD.org> -DISTVERSION= 5.0 +DISTVERSION= 5.0.4 PORTEPOCH= 1 -MASTER_SITES= LOCAL/salvadore/i386-wine/${DIST_SUBDIR}/ +MASTER_SITES= http://Alexander88207.de/Homura/Winebuilds/${DIST_SUBDIR}/ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${DISTVERSION},${PORTEPOCH} DIST_SUBDIR= FreeBSD:${OSREL:C/\..*//}:amd64 @@ -22,7 +22,7 @@ BUNDLE_LIBS= yes PKGMESSAGE= ${WRKDIR}/pkg-message PORTSCOUT= limitw:1,even -.for osrel in 11 12 13 +.for osrel in 11 12 13 14 .if ${OSREL:C/\..*//} == ${osrel} PLIST_SUB+= OSREL${osrel}="" PLIST_SUB+= NOOSREL${osrel}="@comment " @@ -32,8 +32,8 @@ PLIST_SUB+= NOOSREL${osrel}="" .endif .endfor -.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1104000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1202000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300084 && ${OSVERSION} < 1400000)) -IGNORE= binaries compiled for FreeBSD 11.4+, 12.2+ and 13.0+ only +.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1104000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1202000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300139 && ${OSVERSION} < 1400000) && !(${OSVERSION} >= 1400013)) +IGNORE= binaries compiled for FreeBSD 11.4+, 12.2+, 13.0+ & 14.0+ only .endif OPTIONS_DEFINE= GECKO MONO diff --git a/emulators/i386-wine/distinfo b/emulators/i386-wine/distinfo index 1f763c3be31b..e969b69267b7 100644 --- a/emulators/i386-wine/distinfo +++ b/emulators/i386-wine/distinfo @@ -1,7 +1,9 @@ -TIMESTAMP = 1588246565 -SHA256 (FreeBSD:11:amd64/i386-wine-5.0,1.txz) = 18967945475b8b98f21ee0f0b063b3450c30241ff8127bfd8f829cbe614176e8 -SIZE (FreeBSD:11:amd64/i386-wine-5.0,1.txz) = 71647480 -SHA256 (FreeBSD:12:amd64/i386-wine-5.0,1.txz) = a32f4c10ca4062854d47c1a2052c2872458a5d669a00bd4bb52e75f48324af1c -SIZE (FreeBSD:12:amd64/i386-wine-5.0,1.txz) = 71924448 -SHA256 (FreeBSD:13:amd64/i386-wine-5.0,1.txz) = 0b402febf2caa60cfae326ed0f9830fb38eb74494f58bd4355db270dab7a9e43 -SIZE (FreeBSD:13:amd64/i386-wine-5.0,1.txz) = 73941832 +TIMESTAMP = 1620476085 +SHA256 (FreeBSD:11:amd64/i386-wine-5.0.4,1.txz) = 9273f16297c499f416e901df8fac2c965a4979ffb190019045ea74bddb58ef39 +SIZE (FreeBSD:11:amd64/i386-wine-5.0.4,1.txz) = 92755060 +SHA256 (FreeBSD:12:amd64/i386-wine-5.0.4,1.txz) = 743df3fd4a1a76148931217c13ce06c9b393258028ed2b72bce00d8494754270 +SIZE (FreeBSD:12:amd64/i386-wine-5.0.4,1.txz) = 93124636 +SHA256 (FreeBSD:13:amd64/i386-wine-5.0.4,1.txz) = efcec0f77e36a9252c64da7399b041467c6ecb385bb080f44c9d88f7818c6d15 +SIZE (FreeBSD:13:amd64/i386-wine-5.0.4,1.txz) = 93596936 +SHA256 (FreeBSD:14:amd64/i386-wine-5.0.4,1.txz) = 9b3c4568d888d32401a36b32bcb3fd027d20b4826d95a969cabe40f98aa55c94 +SIZE (FreeBSD:14:amd64/i386-wine-5.0.4,1.txz) = 93591812 diff --git a/emulators/i386-wine/files/binbounce b/emulators/i386-wine/files/binbounce index 6f950fa41556..9a63984b1d8c 100644 --- a/emulators/i386-wine/files/binbounce +++ b/emulators/i386-wine/files/binbounce @@ -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" diff --git a/emulators/i386-wine/files/nvidia.sh b/emulators/i386-wine/files/nvidia.sh index a6a832d7c73a..9d64ee9f8757 100644 --- a/emulators/i386-wine/files/nvidia.sh +++ b/emulators/i386-wine/files/nvidia.sh @@ -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) diff --git a/emulators/i386-wine/files/pkg-install b/emulators/i386-wine/files/pkg-install index d1199ce5460c..2fbe34b087d6 100644 --- a/emulators/i386-wine/files/pkg-install +++ b/emulators/i386-wine/files/pkg-install @@ -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 diff --git a/emulators/i386-wine/pkg-plist b/emulators/i386-wine/pkg-plist index 7eca5d6d890f..cb6630783bc7 100644 --- a/emulators/i386-wine/pkg-plist +++ b/emulators/i386-wine/pkg-plist @@ -1031,6 +1031,7 @@ include/wine/windows/xmllite.idl include/wine/windows/zmouse.h lib32/.libGL/dri/i915_dri.so lib32/.libGL/dri/i965_dri.so +lib32/.libGL/dri/iris_dri.so lib32/.libGL/dri/kms_swrast_dri.so lib32/.libGL/dri/r200_dri.so lib32/.libGL/dri/r300_dri.so @@ -1040,7 +1041,7 @@ lib32/.libGL/dri/radeonsi_dri.so lib32/.libGL/dri/swrast_dri.so lib32/.libGL/dri/vmwgfx_dri.so lib32/.libGL/libGL.so.1 -lib32/libLLVM-8.so +lib32/libLLVM-10.so lib32/libX11-xcb.so.1 lib32/libX11.so.6 lib32/libXau.so.6 @@ -1061,23 +1062,24 @@ lib32/libdrm_intel.so.1 lib32/libdrm_radeon.so.1 lib32/libedit.so.0 lib32/libexpat.so.1 -lib32/libffi.so.6 +lib32/libffi.so.7 lib32/libfontconfig.so.1 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 +lib32/libintl.so.8 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 lib32/libpng16.so.16 lib32/libtasn1.so.6 lib32/libunistring.so.2 -lib32/libunwind.so.8 +%%OSREL11%%lib32/libunwind.so.8 lib32/libwine.so lib32/libwine.so.1 lib32/libxcb-dri2.so.0 @@ -1089,6 +1091,7 @@ lib32/libxcb-xfixes.so.0 lib32/libxcb.so.1 lib32/libxml2.so.2 lib32/libxshmfence.so.1 +lib32/libzstd.so.1 lib32/wine/acledit.dll.so lib32/wine/aclui.dll.so lib32/wine/activeds.dll.so @@ -2361,6 +2364,8 @@ lib32/wine/fakedlls/webservices.dll lib32/wine/fakedlls/wer.dll lib32/wine/fakedlls/wevtapi.dll lib32/wine/fakedlls/wevtutil.exe +lib32/wine/fakedlls/where.exe +lib32/wine/fakedlls/whoami.exe lib32/wine/fakedlls/wiaservc.dll lib32/wine/fakedlls/wimgapi.dll lib32/wine/fakedlls/win32s16.dll16 @@ -3024,6 +3029,8 @@ lib32/wine/webservices.dll.so lib32/wine/wer.dll.so lib32/wine/wevtapi.dll.so lib32/wine/wevtutil.exe.so +lib32/wine/where.exe.so +lib32/wine/whoami.exe.so lib32/wine/wiaservc.dll.so lib32/wine/wimgapi.dll.so lib32/wine/win32s16.dll16.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106020803.15283TdJ072662>