From owner-svn-ports-head@freebsd.org Mon Apr 4 16:26:59 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BDF46B025E8; Mon, 4 Apr 2016 16:26:59 +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 mx1.freebsd.org (Postfix) with ESMTPS id 91ADA1179; Mon, 4 Apr 2016 16:26:59 +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 u34GQwxM028657; Mon, 4 Apr 2016 16:26:58 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u34GQwMA028653; Mon, 4 Apr 2016 16:26:58 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <201604041626.u34GQwMA028653@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Mon, 4 Apr 2016 16:26:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412518 - in head/emulators/wine-devel: . files X-SVN-Group: ports-head 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.21 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, 04 Apr 2016 16:26:59 -0000 Author: gerald Date: Mon Apr 4 16:26:58 2016 New Revision: 412518 URL: https://svnweb.freebsd.org/changeset/ports/412518 Log: Update to Wine 1.9.7. This includes the following changes: - More work towards the WineD3D command stream. - More support for Shader Model 5 shaders. - C++ exception handling on x86-64. - Support for Windows-style static import libraries. - Performance fixes in the XML writer. - Various bug fixes. Adjust files/patch-dlls_kernel32_Makefile.in to upstream changes towards a different image base. Modified: head/emulators/wine-devel/Makefile head/emulators/wine-devel/distinfo head/emulators/wine-devel/files/patch-dlls_kernel32_Makefile.in head/emulators/wine-devel/pkg-plist Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Mon Apr 4 15:37:19 2016 (r412517) +++ head/emulators/wine-devel/Makefile Mon Apr 4 16:26:58 2016 (r412518) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= wine -DISTVERSION= 1.9.6 -PORTREVISION= 1 +DISTVERSION= 1.9.7 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ Modified: head/emulators/wine-devel/distinfo ============================================================================== --- head/emulators/wine-devel/distinfo Mon Apr 4 15:37:19 2016 (r412517) +++ head/emulators/wine-devel/distinfo Mon Apr 4 16:26:58 2016 (r412518) @@ -1,4 +1,4 @@ -SHA256 (wine-1.9.6.tar.bz2) = 3d2b862feefd89eca954c1cbc16a28e0ce851aeea1555bc1842ffc9aab2c1557 -SIZE (wine-1.9.6.tar.bz2) = 23071838 -SHA256 (v1.9.6.tar.gz) = e9eb9990aa7f3f07931bfe158c883ebad595e58239855c7f6c01758b4d195db9 -SIZE (v1.9.6.tar.gz) = 9959130 +SHA256 (wine-1.9.7.tar.bz2) = 49705fe02505e26ef8022c662dda702cfcd5c4fd73886e00b43d32dc2f8887ec +SIZE (wine-1.9.7.tar.bz2) = 23101883 +SHA256 (v1.9.7.tar.gz) = f1f0f76815c4d6f0011a6036400f2130809eb5b9b953cc505e187029a71ff69c +SIZE (v1.9.7.tar.gz) = 10006278 Modified: head/emulators/wine-devel/files/patch-dlls_kernel32_Makefile.in ============================================================================== --- head/emulators/wine-devel/files/patch-dlls_kernel32_Makefile.in Mon Apr 4 15:37:19 2016 (r412517) +++ head/emulators/wine-devel/files/patch-dlls_kernel32_Makefile.in Mon Apr 4 16:26:58 2016 (r412518) @@ -1,12 +1,13 @@ -commit 595a3ccfe8aa02ccc287f9a4b23a3f177ae220b9 Author: David Naylor Date: Mon Feb 2 22:10:55 2015 +0200 +Author: Gerald Pfeifer +Date: Sat Apr 2 17:11:55 UTC 2016 kernel32: force 4096 byte page alignment. FreeBSD prefers to use a 0x200000 (super) page alignment however this causes - the image base to be displaced from the requested 0x7b800000. Forcing a - smaller page size ensures FreeBSD can place the image startin at 0x7b800000. + the image base to be displaced from the requested 0x7b400000. Forcing a + smaller page size ensures FreeBSD can place the image startin at 0x7b400000. --- UTC diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in @@ -17,8 +18,8 @@ index c09771d..a006c2c 100644 IMPORTLIB = kernel32 IMPORTS = winecrt0 ntdll EXTRALIBS = $(COREFOUNDATION_LIBS) $(POLL_LIBS) --EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000 -+EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000 \ +-EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b400000 ++EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b400000 \ + -Wl,-z,max-page-size=0x1000 C_SRCS = \ Modified: head/emulators/wine-devel/pkg-plist ============================================================================== --- head/emulators/wine-devel/pkg-plist Mon Apr 4 15:37:19 2016 (r412517) +++ head/emulators/wine-devel/pkg-plist Mon Apr 4 16:26:58 2016 (r412518) @@ -213,6 +213,7 @@ include/wine/windows/d3dx10.h include/wine/windows/d3dx10async.h %%STAGING%%include/wine/windows/d3dx10core.h %%STAGING%%include/wine/windows/d3dx10core.idl +include/wine/windows/d3dx10tex.h include/wine/windows/d3dx9.h include/wine/windows/d3dx9anim.h include/wine/windows/d3dx9core.h @@ -333,6 +334,7 @@ include/wine/windows/fci.h include/wine/windows/fdi.h include/wine/windows/fileapi.h include/wine/windows/fltdefs.h +include/wine/windows/fontsub.h include/wine/windows/fusion.h include/wine/windows/fusion.idl include/wine/windows/gameux.h @@ -447,6 +449,8 @@ include/wine/windows/metahost.h include/wine/windows/metahost.idl include/wine/windows/mfapi.h include/wine/windows/mferror.h +%%STAGING%%include/wine/windows/mfidl.h +%%STAGING%%include/wine/windows/mfidl.idl include/wine/windows/mfobjects.h include/wine/windows/mfobjects.idl include/wine/windows/midles.h @@ -645,6 +649,8 @@ include/wine/windows/shdeprecated.idl include/wine/windows/shdispid.h include/wine/windows/shellapi.h %%STAGING%%include/wine/windows/shellscalingapi.h +include/wine/windows/shimgdata.h +include/wine/windows/shimgdata.idl include/wine/windows/shldisp.h include/wine/windows/shldisp.idl include/wine/windows/shlguid.h @@ -1455,6 +1461,7 @@ lib/wine/fakedlls/fltlib.dll %%STAGING%%lib/wine/fakedlls/fltmgr.sys lib/wine/fakedlls/fntcache.dll lib/wine/fakedlls/fontsub.dll +%%STAGING%%lib/wine/fakedlls/fsutil.exe lib/wine/fakedlls/fusion.dll lib/wine/fakedlls/fwpuclnt.dll lib/wine/fakedlls/gameux.dll @@ -1881,6 +1888,7 @@ lib/wine/fltlib.dll.so %%STAGING%%lib/wine/fltmgr.sys.so lib/wine/fntcache.dll.so lib/wine/fontsub.dll.so +%%STAGING%%lib/wine/fsutil.exe.so lib/wine/fusion.dll.so lib/wine/fwpuclnt.dll.so lib/wine/gameux.dll.so @@ -1977,9 +1985,8 @@ lib/wine/libdbgeng.def lib/wine/libdbghelp.def lib/wine/libdciman32.def lib/wine/libddraw.def -lib/wine/libdinput.def -lib/wine/libdinput.def.a lib/wine/libdinput8.def +lib/wine/libdinput.a lib/wine/libdmusic32.def lib/wine/libdnsapi.def lib/wine/libdplay.def @@ -2081,6 +2088,7 @@ lib/wine/libsti.def lib/wine/libstrmbase.a lib/wine/libstrmiids.a lib/wine/libsxs.def +lib/wine/libt2embed.def lib/wine/libtapi32.def lib/wine/libunicows.def lib/wine/liburl.def