git: af6f5b25dae5 - main - emulators/wine-devel: Remove the STAGING option

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Gerald Pfeifer <gerald_at_FreeBSD.org>
Date: Mon, 10 Jul 2023 08:50:24 UTC
The branch main has been updated by gerald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=af6f5b25dae5b50b05a6b525e64e38370581317b

commit af6f5b25dae5b50b05a6b525e64e38370581317b
Author:     Gerald Pfeifer <gerald@FreeBSD.org>
AuthorDate: 2023-07-10 08:49:17 +0000
Commit:     Gerald Pfeifer <gerald@FreeBSD.org>
CommitDate: 2023-07-10 08:49:17 +0000

    emulators/wine-devel: Remove the STAGING option
    
    The Wine Staging patchset is experimental and goes on top of bi-weekly
    development snapshots of Wine on top of a non-standard (in the world of
    Wine) operating system. That's a lot of moving parts and has proven too
    much to reasonably handle and user uptake has been limited at best.
    
    Plus upstream has completely reinvented the mechanism to apply this
    patchset and adjusting to that (and the additional dependencies) would
    further slow down finally upgrading this port. [1]
    
    (files/extra-gitapply was about the previous mechanism around Wine
    Staging.)
    
    PR:             271201 [1]
    Discussed with: Damjan Jovanovic <damjan.jov@gmail.org>
---
 emulators/wine-devel/Makefile             | 31 +--------------
 emulators/wine-devel/distinfo             |  4 +-
 emulators/wine-devel/files/extra-gitapply | 66 -------------------------------
 emulators/wine-devel/pkg-plist            | 18 ---------
 4 files changed, 2 insertions(+), 117 deletions(-)

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 5a4537341928..5b3b4f538b53 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -68,14 +68,13 @@ SUB_FILES=	pkg-message
 
 PORTDATA=	wine.inf
 
-OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS STAGING V4L WINEMAKER X11 GECKO MONO
+OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS V4L WINEMAKER X11 GECKO MONO
 OPTIONS_DEFAULT=GNUTLS OSS X11
 OPTIONS_RADIO=	AUDIO
 OPTIONS_RADIO_AUDIO=	ALSA OSS
 OPTIONS_SUB=	yes
 
 DOSBOX_DESC=	Use DOSBox to run MS-DOS programs
-STAGING_DESC=	Include Wine Staging patchset (experimental&unsupported)
 WINEMAKER_DESC=	Fully support winemaker (requires Perl)
 GECKO_DESC=	Bundle Gecko MSI package for Wine
 MONO_DESC=	Bundle Mono MSI package for Wine
@@ -97,15 +96,6 @@ MONO_RUN_DEPENDS=	wine-mono-devel>0:emulators/wine-mono-devel
 
 OSS_CONFIGURE_ON=	--without-alsa --with-oss
 
-STAGING_MASTER_SITES=	https://github.com/wine-staging/wine-staging/archive/:staging
-STAGING_DIST=		v${DISTVERSION}.tar.gz
-STAGING_DISTFILES=	${STAGING_DIST}:staging
-STAGING_EXTRACT_DEPENDS=	bash:shells/bash \
-				git:devel/git \
-				autoconf>0:devel/autoconf \
-				gawk:lang/gawk
-STAGING_LIB_DEPENDS=	libtxc_dxtn.so:graphics/s2tc
-
 V4L_CONFIGURE_WITH=	v4l2
 V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
@@ -121,10 +111,6 @@ X11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MSTAGING} && ${OSVERSION} < 1300000
-BROKEN=		build failure
-.endif
-
 .if (${LLVM_DEFAULT} == 10 || ${LLVM_DEFAULT} == 11)
 _LLVM_VERSION=	12
 .else
@@ -153,13 +139,6 @@ post-patch:
 PLIST_SUB+=		WINE32="" WINE64="@comment " WINEARCH="i386"
 .endif
 
-post-extract-STAGING-on: fix-shebang
-	@${LN} -s ${WRKDIR}/${PORTNAME}-staging-${DISTVERSION}/patches ${WRKSRC}/patches
-
-post-patch-STAGING-on:
-	cd ${WRKSRC} && ${PATCH} -p0 < ${PATCHDIR}/extra-gitapply
-	cd ${WRKSRC} && bash ./patches/patchinstall.sh --backend=patch DESTDIR=${WRKSRC} --all
-
 pre-build:
 	cd ${WRKSRC} && ${MAKE_CMD} depend
 
@@ -184,12 +163,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${STAGEDIR}${DOCSDIR}/README.winedbg
 	${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${STAGEDIR}${DOCSDIR}/README.winedump
 
-check-wine-devel-vs-staging:
-	@${GREP} %%STAGING%% pkg-plist | while read f; do \
-	  f=`echo $$f | ${SED} -e 's:%%STAGING%%::' -e "s:%%DATADIR%%:${DATADIR}:"`; \
-	  if [ -f "$$STAGEDIR/$$PREFIX/$$f" ] || [ -f "$$STAGEDIR/$$f" ]; then \
-	    ${PRINTF} "%s no longer contingent on %%STAGING%%?\n" "$$f"; \
-	  fi \
-	done
-
 .include <bsd.port.post.mk>
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 7869c0bdb3d5..c391ed55307e 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1669625505
+TIMESTAMP = 1688851219
 SHA256 (wine-7.22.tar.xz) = 1f2ac3b2cdf66c49bf145b43e7a3f30e6d8176d0ae498056c903fef8a6ccfc3a
 SIZE (wine-7.22.tar.xz) = 28974052
-SHA256 (v7.22.tar.gz) = 74104b902d2f60c019c62a15b1f475773f939aedafe05cc937d3ba89973bf00f
-SIZE (v7.22.tar.gz) = 9528424
diff --git a/emulators/wine-devel/files/extra-gitapply b/emulators/wine-devel/files/extra-gitapply
deleted file mode 100644
index a3423526d95c..000000000000
--- a/emulators/wine-devel/files/extra-gitapply
+++ /dev/null
@@ -1,66 +0,0 @@
---- patches/gitapply.sh	2021-10-23 11:20:53.385792000 +0200
-+++ patches/gitapply.sh	2021-10-23 11:21:40.952836000 +0200
-@@ -22,6 +22,13 @@
- nogit=0
- tmpfile=""
- 
-+patch="patch"
-+sha1sum="sha1sum"
-+if [ `uname -s` = "FreeBSD" ]; then
-+	patch="gpatch"
-+	sha1sum="sha1"
-+fi
-+
- # Show usage information about gitapply script
- usage()
- {
-@@ -57,7 +64,7 @@
- gitsha1()
- {
- 	if [ -f "$1" ]; then
--		echo -en "blob $(du -b "$1" | cut -f1)\x00" | cat - "$1" | sha1sum | cut -d' ' -f1
-+		echo -en "blob $(wc -c < "$1" | xargs | cut -d' ' -f1)\x00" | cat - "$1" | $sha1sum | cut -d' ' -f1
- 	else
- 		echo "0000000000000000000000000000000000000000"
- 	fi
-@@ -66,7 +73,7 @@
- # Determine size of a file (or zero, if it doesn't exist)
- filesize()
- {
--	local size=$(du -b "$1" | cut -f1)
-+	local size=$(wc -c < "$1" | xargs | cut -d' ' -f1)
- 	if [ -z "$size" ]; then
- 		size="0"
- 	fi
-@@ -114,13 +121,6 @@
- 	exit 1
- fi
- 
--# Detect BSD - we check this first to error out as early as possible
--if gzip -V 2>&1 | grep -q "BSD"; then
--	echo "This script is not compatible with *BSD utilities. Please install git," >&2
--	echo "which provides the same functionality and will be used instead." >&2
--	exit 1
--fi
--
- # Check if GNU Awk is available
- if ! command -v gawk >/dev/null 2>&1; then
- 	if ! awk -V 2>/dev/null | grep -q "GNU Awk"; then
-@@ -135,7 +135,7 @@
- fi
- 
- # Check for missing depdencies
--for dependency in gawk cut dd du grep gzip hexdump patch sha1sum; do
-+for dependency in gawk cut dd grep gzip hexdump $patch $sha1sum; do
- 	if ! command -v "$dependency" >/dev/null 2>&1; then
- 		echo "Missing dependency: $dependency - please install this program and try again." >&2
- 		exit 1
-@@ -358,7 +358,7 @@
- 
- 		# Apply textual patch
- 		tmpoffset=$((lastoffset - 1))
--		if ! sed -n "$offset,$tmpoffset p" "$tmpfile" | patch -p1 -s -f; then
-+		if ! sed -n "$offset,$tmpoffset p" "$tmpfile" | $patch -p1 -s -f; then
- 			abort "Textual patch did not apply, aborting."
- 		fi
- 
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 1ab982c53fe2..e34643724910 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -716,7 +716,6 @@ include/wine/windows/ntddvdeo.h
 include/wine/windows/ntdef.h
 include/wine/windows/ntdsapi.h
 include/wine/windows/ntgdi.h
-%%STAGING%%include/wine/windows/ntifs.h
 include/wine/windows/ntlsa.h
 include/wine/windows/ntquery.h
 include/wine/windows/ntsecapi.h
@@ -888,7 +887,6 @@ include/wine/windows/sqlucode.h
 include/wine/windows/srcrst.idl
 include/wine/windows/srrestoreptapi.h
 include/wine/windows/sspi.h
-%%STAGING%%include/wine/windows/stdole32.idl
 include/wine/windows/stgprop.h
 include/wine/windows/sti.h
 include/wine/windows/storage.h
@@ -1042,10 +1040,6 @@ include/wine/windows/windows.media.speechrecognition.h
 include/wine/windows/windows.media.speechrecognition.idl
 include/wine/windows/windows.media.speechsynthesis.h
 include/wine/windows/windows.media.speechsynthesis.idl
-%%STAGING%%include/wine/windows/windows.networking.connectivity.h
-%%STAGING%%include/wine/windows/windows.networking.connectivity.idl
-%%STAGING%%include/wine/windows/windows.networking.h
-%%STAGING%%include/wine/windows/windows.networking.idl
 include/wine/windows/windows.security.cryptography.h
 include/wine/windows/windows.security.cryptography.idl
 include/wine/windows/windows.storage.streams.h
@@ -1284,7 +1278,6 @@ lib/wine/%%WINEARCH%%-unix/libdxguid.a
 lib/wine/%%WINEARCH%%-unix/libdxva2.a
 lib/wine/%%WINEARCH%%-unix/libevr.a
 lib/wine/%%WINEARCH%%-unix/libfaultrep.a
-%%STAGING%%lib/wine/%%WINEARCH%%-unix/libfltmgr.a
 lib/wine/%%WINEARCH%%-unix/libgdi32.a
 lib/wine/%%WINEARCH%%-unix/libgdiplus.a
 lib/wine/%%WINEARCH%%-unix/libglu32.a
@@ -1440,7 +1433,6 @@ lib/wine/%%WINEARCH%%-unix/libwsdapi.a
 lib/wine/%%WINEARCH%%-unix/libwsnmp32.a
 lib/wine/%%WINEARCH%%-unix/libwsock32.a
 lib/wine/%%WINEARCH%%-unix/libwtsapi32.a
-%%STAGING%%lib/wine/%%WINEARCH%%-unix/libx3daudio1_7.a
 lib/wine/%%WINEARCH%%-unix/libxinput.a
 lib/wine/%%WINEARCH%%-unix/libxmllite.a
 lib/wine/%%WINEARCH%%-unix/mountmgr.so
@@ -1650,8 +1642,6 @@ lib/wine/%%WINEARCH%%-windows/dx8vb.dll
 lib/wine/%%WINEARCH%%-windows/dxdiag.exe
 lib/wine/%%WINEARCH%%-windows/dxdiagn.dll
 lib/wine/%%WINEARCH%%-windows/dxgi.dll
-%%STAGING%%lib/wine/%%WINEARCH%%-windows/dxgkrnl.sys
-%%STAGING%%lib/wine/%%WINEARCH%%-windows/dxgmms1.sys
 lib/wine/%%WINEARCH%%-windows/dxtrans.dll
 lib/wine/%%WINEARCH%%-windows/dxva2.dll
 lib/wine/%%WINEARCH%%-windows/eject.exe
@@ -1804,7 +1794,6 @@ lib/wine/%%WINEARCH%%-windows/libdxguid.a
 lib/wine/%%WINEARCH%%-windows/libdxva2.a
 lib/wine/%%WINEARCH%%-windows/libevr.a
 lib/wine/%%WINEARCH%%-windows/libfaultrep.a
-%%STAGING%%lib/wine/%%WINEARCH%%-windows/libfltmgr.a
 lib/wine/%%WINEARCH%%-windows/libgdi32.a
 lib/wine/%%WINEARCH%%-windows/libgdiplus.a
 lib/wine/%%WINEARCH%%-windows/libglu32.a
@@ -1958,7 +1947,6 @@ lib/wine/%%WINEARCH%%-windows/libwsdapi.a
 lib/wine/%%WINEARCH%%-windows/libwsnmp32.a
 lib/wine/%%WINEARCH%%-windows/libwsock32.a
 lib/wine/%%WINEARCH%%-windows/libwtsapi32.a
-%%STAGING%%lib/wine/%%WINEARCH%%-windows/libx3daudio1_7.a
 lib/wine/%%WINEARCH%%-windows/libxinput.a
 lib/wine/%%WINEARCH%%-windows/libxmllite.a
 lib/wine/%%WINEARCH%%-windows/light.msstyles
@@ -2307,7 +2295,6 @@ lib/wine/%%WINEARCH%%-windows/where.exe
 lib/wine/%%WINEARCH%%-windows/whoami.exe
 lib/wine/%%WINEARCH%%-windows/wiaservc.dll
 lib/wine/%%WINEARCH%%-windows/wimgapi.dll
-%%STAGING%%%%WINE32%%lib/wine/%%WINEARCH%%-windows/win32k.sys
 %%WINE32%%lib/wine/%%WINEARCH%%-windows/win32s16.dll16
 lib/wine/%%WINEARCH%%-windows/win32u.dll
 %%WINE32%%lib/wine/%%WINEARCH%%-windows/win87em.dll16
@@ -2320,7 +2307,6 @@ lib/wine/%%WINEARCH%%-windows/windows.globalization.dll
 lib/wine/%%WINEARCH%%-windows/windows.media.devices.dll
 lib/wine/%%WINEARCH%%-windows/windows.media.dll
 lib/wine/%%WINEARCH%%-windows/windows.media.speech.dll
-%%STAGING%%lib/wine/%%WINEARCH%%-windows/windows.networking.connectivity
 lib/wine/%%WINEARCH%%-windows/windows.networking.dll
 lib/wine/%%WINEARCH%%-windows/windowscodecs.dll
 lib/wine/%%WINEARCH%%-windows/windowscodecsext.dll
@@ -2558,11 +2544,9 @@ share/applications/wine.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.winedbg
 %%PORTDOCS%%%%DOCSDIR%%/README.winedump
-%%STAGING%%%%X11%%%%DATADIR%%/fonts/arial.ttf
 %%X11%%%%DATADIR%%/fonts/coue1255.fon
 %%X11%%%%DATADIR%%/fonts/coue1256.fon
 %%X11%%%%DATADIR%%/fonts/coue1257.fon
-%%STAGING%%%%X11%%%%DATADIR%%/fonts/cour.ttf
 %%X11%%%%DATADIR%%/fonts/coure.fon
 %%X11%%%%DATADIR%%/fonts/couree.fon
 %%X11%%%%DATADIR%%/fonts/coureg.fon
@@ -2574,7 +2558,6 @@ share/applications/wine.desktop
 %%X11%%%%DATADIR%%/fonts/jvgafix.fon
 %%X11%%%%DATADIR%%/fonts/jvgasys.fon
 %%X11%%%%DATADIR%%/fonts/marlett.ttf
-%%STAGING%%%%X11%%%%DATADIR%%/fonts/msyh.ttf
 %%X11%%%%DATADIR%%/fonts/smae1255.fon
 %%X11%%%%DATADIR%%/fonts/smae1256.fon
 %%X11%%%%DATADIR%%/fonts/smae1257.fon
@@ -2605,7 +2588,6 @@ share/applications/wine.desktop
 %%X11%%%%DATADIR%%/fonts/symbol.ttf
 %%X11%%%%DATADIR%%/fonts/tahoma.ttf
 %%X11%%%%DATADIR%%/fonts/tahomabd.ttf
-%%STAGING%%%%X11%%%%DATADIR%%/fonts/times.ttf
 %%X11%%%%DATADIR%%/fonts/vgafix.fon
 %%X11%%%%DATADIR%%/fonts/vgas1255.fon
 %%X11%%%%DATADIR%%/fonts/vgas1256.fon