From owner-svn-ports-head@freebsd.org Mon Dec 14 09:28:08 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1228D4B47B2; Mon, 14 Dec 2020 09:28:08 +0000 (UTC) (envelope-from gerald@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CvbfH75h5z4dWy; Mon, 14 Dec 2020 09:28:07 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D7DA11F0E2; Mon, 14 Dec 2020 09:28:07 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BE9S7wH064386; Mon, 14 Dec 2020 09:28:07 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BE9S7FX064385; Mon, 14 Dec 2020 09:28:07 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <202012140928.0BE9S7FX064385@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Mon, 14 Dec 2020 09:28:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r558081 - in head/emulators/wine-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: gerald X-SVN-Commit-Paths: in head/emulators/wine-devel: . files X-SVN-Commit-Revision: 558081 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Dec 2020 09:28:08 -0000 Author: gerald Date: Mon Dec 14 09:28:07 2020 New Revision: 558081 URL: https://svnweb.freebsd.org/changeset/ports/558081 Log: Update to Wine 6.0 RC2, which brings bug fixes only since we're in code freeze. Wine Staging now uses the same version designation as Wine itself after a report of mine, so revert special casing STAGING_DISTFILES; similarly my two patches files/extrapatch-dlls-ntdll-unix-file.c and files/extrapatch-staging-server-fd.c are now upstream, so remove them. Deleted: head/emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-file.c head/emulators/wine-devel/files/extrapatch-staging-server-fd.c Modified: head/emulators/wine-devel/Makefile head/emulators/wine-devel/distinfo Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Mon Dec 14 08:45:46 2020 (r558080) +++ head/emulators/wine-devel/Makefile Mon Dec 14 09:28:07 2020 (r558081) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wine -DISTVERSION= 6.0-rc1 +DISTVERSION= 6.0-rc2 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ @@ -107,14 +107,12 @@ SDL_USES= sdl SDL_USE= SDL=sdl2 STAGING_MASTER_SITES= https://github.com/wine-staging/wine-staging/archive/:staging -STAGING_DIST= v${DISTVERSION:S/-//}.tar.gz +STAGING_DIST= v${DISTVERSION}.tar.gz STAGING_DISTFILES= ${STAGING_DIST}:staging STAGING_EXTRACT_DEPENDS= bash:shells/bash \ git:devel/git \ autoconf>0:devel/autoconf STAGING_LIB_DEPENDS= libtxc_dxtn.so:graphics/s2tc -STAGING_EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-dlls-ntdll-unix-file.c \ - ${PATCHDIR}/extrapatch-staging-server-fd.c V4L_CONFIGURE_WITH= v4l2 V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat Modified: head/emulators/wine-devel/distinfo ============================================================================== --- head/emulators/wine-devel/distinfo Mon Dec 14 08:45:46 2020 (r558080) +++ head/emulators/wine-devel/distinfo Mon Dec 14 09:28:07 2020 (r558081) @@ -1,5 +1,5 @@ -TIMESTAMP = 1607184256 -SHA256 (wine-6.0-rc1.tar.xz) = 78ddc948f946c662779bd5943d91812740480021bc951cbcadeb102c38b53bc8 -SIZE (wine-6.0-rc1.tar.xz) = 24194552 -SHA256 (v6.0rc1.tar.gz) = 8de3866030ccd2e8387a3079dd543406c739850ab0fcc16e3bf66b55d2d230c6 -SIZE (v6.0rc1.tar.gz) = 10331511 +TIMESTAMP = 1607854914 +SHA256 (wine-6.0-rc2.tar.xz) = f20887cbe62cc42539b21f5823d64fdc310018b1533ebf042da81927f3920d76 +SIZE (wine-6.0-rc2.tar.xz) = 24190236 +SHA256 (v6.0-rc2.tar.gz) = 35b3790a7d8260cfc3e19c09b7868b46187c059b8c35d758934579e6344e710f +SIZE (v6.0-rc2.tar.gz) = 9815463