[pkgsrc/trunk]: pkgsrc/emulators/wine-devel Changes 1.7.36:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/emulators/wine-devel Changes 1.7.36:
From: adam <adam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 17:19:20 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/cf04a1d69a5d
branches:  trunk
changeset: 646481:cf04a1d69a5d
user:      adam <adam%pkgsrc.org@localhost>
date:      Mon Feb 09 13:30:44 2015 +0000

description:
Changes 1.7.36:
Some preliminary 64-bit support for Mac OS X.
Support for configuring speakers in Winecfg.
Improved support for Mac OS X Trash folder.
Support for typographic features in DirectWrite.
Various bug fixes.

diffstat:

 emulators/wine-devel/Makefile                                   |   30 +-
 emulators/wine-devel/PLIST.Darwin                               |    6 +-
 emulators/wine-devel/PLIST.common                               |  494 ++++++---
 emulators/wine-devel/distinfo                                   |   18 +-
 emulators/wine-devel/options.mk                                 |    9 +-
 emulators/wine-devel/patches/patch-configure                    |   40 +-
 emulators/wine-devel/patches/patch-dlls_ntdll_signal__x86__64.c |   65 +-
 emulators/wine-devel/patches/patch-dlls_wbemprox_builtin.c      |   20 -
 emulators/wine-devel/patches/patch-dlls_wineoss.drv_mmdevdrv.c  |   42 +-
 emulators/wine-devel/patches/patch-include_msvcrt_crtdefs.h     |   13 +
 emulators/wine-devel/patches/patch-include_windef.h             |   16 +
 emulators/wine-devel/patches/patch-include_wine_test.h          |   22 +
 12 files changed, 530 insertions(+), 245 deletions(-)

diffs (truncated from 1898 to 300 lines):

diff -r fb1c3f21369b -r cf04a1d69a5d emulators/wine-devel/Makefile
--- a/emulators/wine-devel/Makefile     Mon Feb 09 12:57:50 2015 +0000
+++ b/emulators/wine-devel/Makefile     Mon Feb 09 13:30:44 2015 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2014/06/18 09:28:16 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2015/02/09 13:30:44 adam Exp $
 
-DISTNAME=      wine-1.7.11
-PKGREVISION=   4
+DISTNAME=      wine-1.7.36
 CATEGORIES=    emulators
 MASTER_SITES=  http://ibiblio.org/pub/linux/system/emulators/wine/ \
                ${MASTER_SITE_SOURCEFORGE:=wine/}
@@ -24,6 +23,7 @@
 USE_TOOLS+=            bison flex gmake mktemp msgfmt
 FLEX_REQD=             2.5.33
 GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --disable-tests
 UNLIMIT_RESOURCES=     datasize
 
 REPLACE_PERL+=         tools/winemaker tools/winedump/function_grep.pl
@@ -36,25 +36,36 @@
 CONFIGURE_ENV+=                LDD=${LDD:Q}
 LIBS+=                 ${LDFLAGS}
 
+PLIST_VARS+=           oss wine16 wine32 wine64
 # If we're doing a 32-bit build, make sure that the appropriate multilib
 # options are passed through as these values are used with winegcc
 # (which wrapper doesn't handle).
+# XXX seems not needed anymore; to be removed on next update
 .include "../../mk/bsd.prefs.mk"
 .if !empty(MACHINE_ARCH:Mi386)
-CONFIGURE_ENV+=                ac_cv_prog_CC=${CC:Q}\ -m32
-CONFIGURE_ENV+=                ac_cv_prog_CXX=${CXX:Q}\ -m32
-CONFIGURE_ENV+=                ac_cv_prog_AS=${AS:Q}\ --32
-CONFIGURE_ENV+=                ac_cv_prog_LD=${LD:Q}\ -m\ elf_i386
+#CONFIGURE_ENV+=               ac_cv_prog_CC=${CC:Q}\ -m32
+#CONFIGURE_ENV+=               ac_cv_prog_CXX=${CXX:Q}\ -m32
+#CONFIGURE_ENV+=               ac_cv_prog_AS=${AS:Q}\ --32
+#CONFIGURE_ENV+=               ac_cv_prog_LD=${LD:Q}\ -m\ elf_i386
+PLIST.wine16=          yes
+PLIST.wine32=          yes
 .endif
-# Needs GCC >= 4.4
+# Needs GCC >= 4.4; Experimental
 .if !empty(MACHINE_ARCH:Mx86_64)
-CONFIGURE_ARGS+=       --disable-win16
 CONFIGURE_ARGS+=       --enable-win64
+PLIST.wine64=          yes
+.endif
+
+.if ${OPSYS} != "Darwin"
+PLIST.oss=             yes
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
 .endif
 
 .include "options.mk"
 
 .include "../../devel/ncurses/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
@@ -63,7 +74,6 @@
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r fb1c3f21369b -r cf04a1d69a5d emulators/wine-devel/PLIST.Darwin
--- a/emulators/wine-devel/PLIST.Darwin Mon Feb 09 12:57:50 2015 +0000
+++ b/emulators/wine-devel/PLIST.Darwin Mon Feb 09 13:30:44 2015 +0000
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2011/05/02 21:23:28 adam Exp $
+@comment $NetBSD: PLIST.Darwin,v 1.2 2015/02/09 13:30:44 adam Exp $
 lib/wine/fakedlls/openal32.dll
 lib/wine/fakedlls/opencl.dll
 lib/wine/fakedlls/winecoreaudio.drv
+lib/wine/fakedlls/winemac.drv
 lib/wine/fakedlls/winemp3.acm
 lib/wine/fakedlls/wineqtdecoder.dll
-lib/wine/fakedlls/winequartz.drv
 lib/wine/openal32.dll.so
 lib/wine/opencl.dll.so
 lib/wine/winecoreaudio.drv.so
+lib/wine/winemac.drv.so
 lib/wine/winemp3.acm.so
 lib/wine/wineqtdecoder.dll.so
-lib/wine/winequartz.drv.so
diff -r fb1c3f21369b -r cf04a1d69a5d emulators/wine-devel/PLIST.common
--- a/emulators/wine-devel/PLIST.common Mon Feb 09 12:57:50 2015 +0000
+++ b/emulators/wine-devel/PLIST.common Mon Feb 09 13:30:44 2015 +0000
@@ -1,25 +1,26 @@
-@comment $NetBSD: PLIST.common,v 1.15 2014/01/19 10:58:23 adam Exp $
+@comment $NetBSD: PLIST.common,v 1.16 2015/02/09 13:30:44 adam Exp $
 bin/function_grep.pl
 bin/msiexec
 bin/notepad
 bin/regedit
 bin/regsvr32
 bin/widl
-bin/wine
-bin/wineboot
-bin/winebuild
-bin/winecfg
-bin/wineconsole
-bin/winecpp
-bin/winedbg
-bin/winedump
-bin/winefile
-bin/wineg++
-bin/winegcc
-bin/winemaker
-bin/winemine
-bin/winepath
-bin/wineserver
+${PLIST.wine32}bin/wine
+${PLIST.wine64}bin/wine64
+${PLIST.wine32}bin/wineboot
+${PLIST.wine32}bin/winebuild
+${PLIST.wine32}bin/winecfg
+${PLIST.wine32}bin/wineconsole
+${PLIST.wine32}bin/winecpp
+${PLIST.wine32}bin/winedbg
+${PLIST.wine32}bin/winedump
+${PLIST.wine32}bin/winefile
+${PLIST.wine32}bin/wineg++
+${PLIST.wine32}bin/winegcc
+${PLIST.wine32}bin/winemaker
+${PLIST.wine32}bin/winemine
+${PLIST.wine32}bin/winepath
+${PLIST.wine32}bin/wineserver
 bin/wmc
 bin/wrc
 include/wine/debug.h
@@ -94,6 +95,7 @@
 include/wine/windows/asynot.idl
 include/wine/windows/asysta.idl
 include/wine/windows/atlbase.h
+include/wine/windows/atlcom.h
 include/wine/windows/atliface.h
 include/wine/windows/atliface.idl
 include/wine/windows/atlwin.h
@@ -161,6 +163,7 @@
 include/wine/windows/d2d1.h
 include/wine/windows/d2d1.idl
 include/wine/windows/d2dbasetypes.h
+include/wine/windows/d2derr.h
 include/wine/windows/d3d.h
 include/wine/windows/d3d10.h
 include/wine/windows/d3d10.idl
@@ -172,6 +175,8 @@
 include/wine/windows/d3d10shader.h
 include/wine/windows/d3d11.h
 include/wine/windows/d3d11.idl
+include/wine/windows/d3d11_1.h
+include/wine/windows/d3d11_1.idl
 include/wine/windows/d3d11sdklayers.h
 include/wine/windows/d3d11sdklayers.idl
 include/wine/windows/d3d11shader.h
@@ -218,6 +223,7 @@
 include/wine/windows/dde.rh
 include/wine/windows/ddeml.h
 include/wine/windows/ddk/compstui.h
+include/wine/windows/ddk/csq.h
 include/wine/windows/ddk/hidsdi.h
 include/wine/windows/ddk/imm.h
 include/wine/windows/ddk/mountmgr.h
@@ -225,6 +231,7 @@
 include/wine/windows/ddk/ntddk.h
 include/wine/windows/ddk/ntddser.h
 include/wine/windows/ddk/ntddtape.h
+include/wine/windows/ddk/ntifs.h
 include/wine/windows/ddk/usb.h
 include/wine/windows/ddk/usb100.h
 include/wine/windows/ddk/usb200.h
@@ -288,19 +295,26 @@
 include/wine/windows/dsound.h
 include/wine/windows/dsrole.h
 include/wine/windows/dvdmedia.h
+include/wine/windows/dvoice.h
 include/wine/windows/dwmapi.h
 include/wine/windows/dwrite.h
 include/wine/windows/dwrite.idl
 include/wine/windows/dwrite_1.h
 include/wine/windows/dwrite_1.idl
+include/wine/windows/dwrite_2.h
+include/wine/windows/dwrite_2.idl
 include/wine/windows/dxdiag.h
 include/wine/windows/dxerr8.h
 include/wine/windows/dxerr9.h
 include/wine/windows/dxfile.h
 include/wine/windows/dxgi.h
 include/wine/windows/dxgi.idl
+include/wine/windows/dxgi1_2.h
+include/wine/windows/dxgi1_2.idl
 include/wine/windows/dxgiformat.h
 include/wine/windows/dxgitype.h
+include/wine/windows/dxva2api.h
+include/wine/windows/dxva2api.idl
 include/wine/windows/dyngraph.idl
 include/wine/windows/endpointvolume.h
 include/wine/windows/endpointvolume.idl
@@ -335,9 +349,13 @@
 include/wine/windows/gdipluspixelformats.h
 include/wine/windows/gdiplustypes.h
 include/wine/windows/guiddef.h
+include/wine/windows/hidusage.h
+include/wine/windows/highlevelmonitorconfigurationapi.h
 include/wine/windows/hlguids.h
 include/wine/windows/hlink.h
 include/wine/windows/hlink.idl
+include/wine/windows/hstring.h
+include/wine/windows/hstring.idl
 include/wine/windows/htiface.h
 include/wine/windows/htiface.idl
 include/wine/windows/htiframe.h
@@ -384,6 +402,7 @@
 include/wine/windows/ks.h
 include/wine/windows/ksguid.h
 include/wine/windows/ksmedia.h
+include/wine/windows/ksuuids.h
 include/wine/windows/lm.h
 include/wine/windows/lmaccess.h
 include/wine/windows/lmapibuf.h
@@ -400,6 +419,7 @@
 include/wine/windows/lmuseflg.h
 include/wine/windows/lmwksta.h
 include/wine/windows/loadperf.h
+include/wine/windows/lowlevelmonitorconfigurationapi.h
 include/wine/windows/lzexpand.h
 include/wine/windows/mapi.h
 include/wine/windows/mapicode.h
@@ -417,6 +437,7 @@
 include/wine/windows/mediaobj.idl
 include/wine/windows/metahost.h
 include/wine/windows/metahost.idl
+include/wine/windows/mferror.h
 include/wine/windows/midles.h
 include/wine/windows/mimeinfo.h
 include/wine/windows/mimeinfo.idl
@@ -478,10 +499,14 @@
 include/wine/windows/msxmldid.h
 include/wine/windows/nb30.h
 include/wine/windows/ndrtypes.h
+include/wine/windows/netcfgx.h
+include/wine/windows/netcfgx.idl
 include/wine/windows/netcon.h
 include/wine/windows/netcon.idl
 include/wine/windows/netfw.h
 include/wine/windows/netfw.idl
+include/wine/windows/netlistmgr.h
+include/wine/windows/netlistmgr.idl
 include/wine/windows/nldef.h
 include/wine/windows/npapi.h
 include/wine/windows/nspapi.h
@@ -489,6 +514,7 @@
 include/wine/windows/ntddndis.h
 include/wine/windows/ntddscsi.h
 include/wine/windows/ntddstor.h
+include/wine/windows/ntdef.h
 include/wine/windows/ntdsapi.h
 include/wine/windows/ntquery.h
 include/wine/windows/ntsecapi.h
@@ -529,6 +555,7 @@
 include/wine/windows/pdhmsg.h
 include/wine/windows/perhist.h
 include/wine/windows/perhist.idl
+include/wine/windows/physicalmonitorenumerationapi.h
 include/wine/windows/pktdef.h
 include/wine/windows/poppack.h
 include/wine/windows/powrprof.h
@@ -562,6 +589,7 @@
 include/wine/windows/rmxfguid.h
 include/wine/windows/rmxftmpl.h
 include/wine/windows/rmxftmpl.x
+include/wine/windows/roapi.h
 include/wine/windows/row.idl
 include/wine/windows/rowchg.idl
 include/wine/windows/rowpos.idl
@@ -675,8 +703,11 @@
 include/wine/windows/vmr9.h
 include/wine/windows/vmr9.idl
 include/wine/windows/vmrender.idl
+include/wine/windows/vss.h
+include/wine/windows/vss.idl
 include/wine/windows/vsstyle.h
 include/wine/windows/vssym32.h
+include/wine/windows/vswriter.h
 include/wine/windows/wbemcli.h
 include/wine/windows/wbemcli.idl
 include/wine/windows/wbemdisp.h
@@ -725,6 +756,7 @@
 include/wine/windows/winsock.h
 include/wine/windows/winsock2.h
 include/wine/windows/winspool.h
+include/wine/windows/winstring.h
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated devel/p5-glib2 to 1.307
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated www/firefox-l10n to 38.0
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated devel/p5-glib2 to 1.307
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated www/firefox-l10n to 38.0
Indexes:
Home | Main Index | Thread Index | Old Index