From nobody Sun Oct 16 23:24:26 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MrGRZ6T11z4gLZQ; Sun, 16 Oct 2022 23:24:26 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MrGRZ5pjdz3dQb; Sun, 16 Oct 2022 23:24:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665962666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eTguxDBbcCUafo5e2g7hasnnicBpyrgUFMMJkW+O5XE=; b=MmHAADo0PtfiEgKikE/xKLEJK+8i4J1KZd4dA2pokd/6wntcP3uxATp0HgZObWTjoMJ2QN 1llIxb5i6rU1JlXFQ0OVfGv9W1sDlXobII7miKIgbnPtIY5z/XSorjhUy/P18sncpQPWzr OUbc3B4UqKhxf3bVbH3KiioCxF/tN8nI2/AWu085FwisNUPrlCOvLJIQdHgl7RJcOZc8dc lXa8p+F/kfEntprJ0AOnIcHgSPtH2NSMRsb8r59M5BQ6InnFnft37x+3PgeOgqx8w358XH oXKEAEmnNFKm9E6CT49eJ+ennDd3flO0Whpe2GF72P8Ij5fjjnlqMNaMdHqJrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MrGRZ4tY7zcst; Sun, 16 Oct 2022 23:24:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29GNOQPI096721; Sun, 16 Oct 2022 23:24:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29GNOQla096720; Sun, 16 Oct 2022 23:24:26 GMT (envelope-from git) Date: Sun, 16 Oct 2022 23:24:26 GMT Message-Id: <202210162324.29GNOQla096720@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 4e3e9a9363be - main - emulators/wine: Update to Wine 7.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e3e9a9363be07def97619a44955157b4ee9ba45 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665962666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eTguxDBbcCUafo5e2g7hasnnicBpyrgUFMMJkW+O5XE=; b=jC9ZjB8ievSDlgJVdb3oxom3/oGF+/KNcUZEo6NyNVx1qLKfB18D++2kVKbjAejQR+CgtJ oTMMz834pIsgohp41c4lrd8QrwuXKtr7XXeO5lrqjzcxwFOzAm+yTQ7j8yHIiVktIyCDYj C8wPqOEVeFM/BVzaf8Puf4UuGxTOGTBJgGfUTDZnOcRIQ8LqmxWaTQoXByZKVQnnywfjz3 WRfQNLa8IGdWQM9Y3RP3w+2vGSPSbFSTrYov4wnZ3JzL2YNrUASHUDOmu6n9+QG+fakR2U ICbXhnf+B+rz5fDw51jnU5avw7KSqEXmuGmJSGkqNHOpUq072BEvz5epfW3p5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665962666; a=rsa-sha256; cv=none; b=uZdH9uW1V+ejFB2v8j+mY6fuyr7Q31DUhIJOfIvm8ddBO8uctaxrnwWO/bpB5F9khDG0pF Ozs1HoMSp2yKNdg8Ino7RABSPl43CCgwK2x6ajsa33B3c08v1oH6q5QSEgV5OKOu2QxKZM /MTftP6hrWEq3Cf8KmnlReIGL1qkqwkKiq8h7sXQ+EmS3JxUfp7kqLzzRKfa3MvCmQQcrQ NuJOm1ez8lt9PSalUjK8VqTegoaBH8/wph/TkX3IR7voNzWLupwni1qhxc1C3LH/1kQSid CfPITteIWDJVyYk7anGy3H4V7TlR0bLjirlbawvZR54smpJg8icanZXij5UZZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=4e3e9a9363be07def97619a44955157b4ee9ba45 commit 4e3e9a9363be07def97619a44955157b4ee9ba45 Author: Gerald Pfeifer AuthorDate: 2022-10-16 23:08:03 +0000 Commit: Gerald Pfeifer CommitDate: 2022-10-16 23:24:01 +0000 emulators/wine: Update to Wine 7.0 Move from the Wine 6.0 to the Wine 7.0 release series, specifically (still) Wine 7.0 there. This represents a year of development effort and over 9,100 individual changes. It contains a large number of improvements. Areas of major changes are: - Most modules have been converted to PE format. - Better theming support, with a bundled theme for a more modern look. All builtin applications support theming, as well as High DPI rendering. - Vastly improved HID stack and joystick support. - New WoW64 architecture (which supports running a 32-bit Windows application inside a 64-bit Unix host process, using thunks to map 32-bit NT system calls to the 64-bit NTDLL). - Direct3D has seen significant improvements. Specifically on FreeBSD more low-level system information queries like memory and battery status are now supported. And we no longer need to refer to /proc and procfs in our installation message. The Mono engine is now at version 7.0.0 with quite some changes, Packaging changes come on two levels: Firstly, many support libraries such as FAudio, GSM, LCMS2, libjpeg, libjxr, libmpg123, libpng, libtiff, libxml, libxslt, zlib are now directly bundled in where we used many of those via other ports (or completely disabled their use). On the way we shed the LIBXSLT and MPG123 options. Secondly, the directory structure under lib/ has been completely revamped. Update MASTER_SITES to the new winehq.org download site. Extensive release notes are at https://www.winehq.org/announce/7.0 . PR: 266976 --- emulators/wine-mono/Makefile | 2 +- emulators/wine-mono/distinfo | 6 +- emulators/wine/Makefile | 36 +- emulators/wine/distinfo | 6 +- emulators/wine/files/pkg-message.in | 5 - emulators/wine/pkg-plist | 4570 ++++++++++++++++++----------------- 6 files changed, 2390 insertions(+), 2235 deletions(-) diff --git a/emulators/wine-mono/Makefile b/emulators/wine-mono/Makefile index f213d5bae6f7..3ce5672b84ef 100644 --- a/emulators/wine-mono/Makefile +++ b/emulators/wine-mono/Makefile @@ -1,5 +1,5 @@ PORTNAME= wine-mono -DISTVERSION= 5.1.1 +DISTVERSION= 7.0.0 DISTVERSIONSUFFIX=-x86 CATEGORIES= emulators MASTER_SITES= http://dl.winehq.org/wine/wine-mono/${DISTVERSION}/ diff --git a/emulators/wine-mono/distinfo b/emulators/wine-mono/distinfo index 47de7d67c069..5f5f410216f5 100644 --- a/emulators/wine-mono/distinfo +++ b/emulators/wine-mono/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1627285628 -SHA256 (wine-mono-5.1.1-x86.msi) = 74541265b9385842bc22bba2bb4b90bf1d3fd8b4788b6676140700bebacb9227 -SIZE (wine-mono-5.1.1-x86.msi) = 84130304 +TIMESTAMP = 1665958948 +SHA256 (wine-mono-7.0.0-x86.msi) = b37e6fc9e590e582243dc25d72a5fcc330c3a7970dfdc98a7a81d23845ba8900 +SIZE (wine-mono-7.0.0-x86.msi) = 86433280 diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 38338226acda..e6f94e504d29 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,10 +1,8 @@ PORTNAME= wine -DISTVERSION= 6.0.4 -PORTREVISION= 1 +DISTVERSION= 7.0 PORTEPOCH= 1 CATEGORIES= emulators -MASTER_SITES= SF/${PORTNAME}/Source \ - http://mirrors.ibiblio.org/wine/source/6.0/ +MASTER_SITES= https://dl.winehq.org/wine/source/7.0/ MAINTAINER= gerald@FreeBSD.org COMMENT= Microsoft Windows compatibility environment @@ -17,8 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 i386 BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex -LIB_DEPENDS= libFAudio.so:audio/faudio \ - libxml2.so:textproc/libxml2 USES= bison cpe desktop-file-utils gmake localbase \ pkgconfig sdl shebangfix tar:xz @@ -38,10 +34,8 @@ CONFIGURE_ARGS+=--verbose \ --without-dbus \ --without-gettext --without-gettextpo \ --without-gphoto \ - --without-gsm \ --without-gssapi \ --without-gstreamer \ - --without-hal \ --without-inotify \ --without-krb5 \ --without-mingw \ @@ -51,10 +45,8 @@ CONFIGURE_ARGS+=--verbose \ --with-pcap \ --with-pthread \ --without-pulse \ - --without-quicktime \ --without-sane \ --with-sdl \ - --without-tiff \ --without-udev \ --without-unwind \ --without-usb @@ -70,19 +62,18 @@ SUB_FILES= pkg-message PORTDATA= wine.inf -OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS LDAP LIBXSLT MPG123 OPENAL V4L WINEMAKER X11 GECKO MONO +OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS LDAP OPENAL V4L WINEMAKER X11 GECKO MONO OPTIONS_DEFAULT=GNUTLS OPENAL OSS X11 OPTIONS_RADIO= AUDIO OPTIONS_RADIO_AUDIO= ALSA OSS OPTIONS_SUB= yes DOSBOX_DESC= Use DOSBox to run MS-DOS programs -LIBXSLT_DESC= Use libxslt (only used by msxml3.dll) WINEMAKER_DESC= Fully support winemaker (requires Perl) GECKO_DESC= Bundle Gecko MSI package for Wine MONO_DESC= Bundle Mono MSI package for Wine -PORTSCOUT= limit:^6\.0 +PORTSCOUT= limit:^7\.0 ALSA_CONFIGURE_ON= --with-alsa --without-oss ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib @@ -100,14 +91,8 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes -LIBXSLT_CONFIGURE_WITH= xslt -LIBXSLT_LIB_DEPENDS= libxslt.so:textproc/libxslt - MONO_RUN_DEPENDS= wine-mono>0:emulators/wine-mono -MPG123_CONFIGURE_WITH= mpg123 -MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 - OPENAL_CONFIGURE_WITH= openal OPENAL_USES= openal @@ -119,13 +104,11 @@ V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l WINEMAKER_RUN_DEPENDS= p5-XML-LibXML>0:textproc/p5-XML-LibXML -X11_CONFIGURE_WITH= x cms fontconfig freetype jpeg opengl png vkd3d xinerama xinput2 xrandr xrender -X11_USES= gl jpeg xorg +X11_CONFIGURE_WITH= x fontconfig freetype opengl vkd3d xinerama xinput2 xrandr xrender +X11_USES= gl xorg X11_USE= GL=glu XORG=x11,xext,xcomposite,xcursor,xi,xinerama,xrandr,xrender X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ - liblcms2.so:graphics/lcms2 \ - libpng.so:graphics/png \ libvulkan.so:graphics/vulkan-loader \ libvkd3d.so:graphics/vkd3d @@ -142,7 +125,7 @@ X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ # --libdir is required since Wine defaults to "${PREFIX}/lib64" on amd64. CONFIGURE_ARGS+= --enable-win64 --libdir=${PREFIX}/lib -PLIST_SUB+= WINE32="@comment " WINE64="" +PLIST_SUB+= WINE32="@comment " WINE64="" WINEARCH="x86_64" # Wine assumes a WoW64 package is available, which is not the case on # FreeBSD yet. @@ -150,7 +133,7 @@ post-patch: ${REINPLACE_CMD} '/Exec/s|wine|wine64|g' ${WRKSRC}/loader/wine.desktop .else -PLIST_SUB+= WINE32="" WINE64="@comment " +PLIST_SUB+= WINE32="" WINE64="@comment " WINEARCH="i386" .endif pre-build: @@ -169,9 +152,6 @@ post-install: ${INSTALL_SCRIPT} ${FILESDIR}/wine-wow64.sh ${STAGEDIR}${PREFIX}/bin/wine ${INSTALL_SCRIPT} ${FILESDIR}/pkg32.sh ${STAGEDIR}${DATADIR}/pkg32.sh .endif - @${MV} -f ${STAGEDIR}${WINELIBDIR}/libwine.so.1.0 \ - ${STAGEDIR}${WINELIBDIR}/libwine.so.1 - @${LN} -sf libwine.so.1 ${STAGEDIR}/${WINELIBDIR}/libwine.so @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in README ANNOUNCE AUTHORS ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index 6cf00d641535..bc599abe3f23 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1649982531 -SHA256 (wine-6.0.4.tar.xz) = 13ce79c3f5e42d70c0c141b500b040591aa958580431877afcb3c28f62856359 -SIZE (wine-6.0.4.tar.xz) = 24238992 +TIMESTAMP = 1663068834 +SHA256 (wine-7.0.tar.xz) = 5b43e27d5c085cb18f97394e46180310d5eef7c1d91c6895432a3889b2de086b +SIZE (wine-7.0.tar.xz) = 27120912 diff --git a/emulators/wine/files/pkg-message.in b/emulators/wine/files/pkg-message.in index a5ad45d39574..a8632c68958b 100644 --- a/emulators/wine/files/pkg-message.in +++ b/emulators/wine/files/pkg-message.in @@ -1,11 +1,6 @@ [ { type: install message: <