diff options
| author | adam <adam@pkgsrc.org> | 2014-01-17 09:01:58 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2014-01-17 09:01:58 +0000 |
| commit | ad28b487c42b7792f09ce14d27fcb646523ba7cd (patch) | |
| tree | f03e9b46af73ca750c19c28e00bb262e9a0e10c3 /emulators/wine | |
| parent | 06074aa54943877781c26ff1cdb9faaa6666c56e (diff) | |
| download | pkgsrc-ad28b487c42b7792f09ce14d27fcb646523ba7cd.tar.gz | |
Changes 1.6.2:
- Color management support updated to liblcms version 2.
- Various bug fixes.
Diffstat (limited to 'emulators/wine')
26 files changed, 821 insertions, 481 deletions
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 8aad84220f4..07b735fdaa0 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,26 +1,26 @@ -# $NetBSD: Makefile,v 1.179 2014/01/01 11:52:14 wiz Exp $ +# $NetBSD: Makefile,v 1.180 2014/01/17 09:01:58 adam Exp $ -DISTNAME= wine-1.2.3 -PKGREVISION= 16 +DISTNAME= wine-1.6.2 CATEGORIES= emulators MASTER_SITES= http://ibiblio.org/pub/linux/system/emulators/wine/ \ ${MASTER_SITE_SOURCEFORGE:=wine/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= adam@NetBSD.org -HOMEPAGE= http://www.winehq.com/ +HOMEPAGE= http://www.winehq.org/ COMMENT= Free implementation of Windows on Unix LICENSE= gnu-lgpl-v2.1 BUILD_DEPENDS+= fontforge-[0-9]*:../../fonts/fontforge -ONLY_FOR_PLATFORM+= *-*-i386 -#ONLY_FOR_PLATFORM+= *-*-x86_64 +ONLY_FOR_PLATFORM+= *-*-i386 #*-*-x86_64 + +PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= c USE_LIBTOOL= yes USE_NCURSES= yes -USE_TOOLS+= bison flex gmake mktemp +USE_TOOLS+= bison flex gmake mktemp msgfmt FLEX_REQD= 2.5.33 GNU_CONFIGURE= yes UNLIMIT_RESOURCES= datasize @@ -46,21 +46,15 @@ CONFIGURE_ENV+= ac_cv_prog_AS=${AS:Q}\ --32 CONFIGURE_ENV+= ac_cv_prog_LD=${LD:Q}\ -m\ elf_i386 .endif # Needs GCC >= 4.4 -#.if !empty(MACHINE_ARCH:Mx86_64) -#CONFIGURE_ARGS+= --disable-win16 -#CONFIGURE_ARGS+= --enable-win64 -#.endif +.if !empty(MACHINE_ARCH:Mx86_64) +CONFIGURE_ARGS+= --disable-win16 +CONFIGURE_ARGS+= --enable-win64 +.endif .include "options.mk" -post-install: -.for tool in fnt2bdf - ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/tools/${tool} \ - ${DESTDIR}${PREFIX}/bin -.endfor - .include "../../devel/ncurses/buildlink3.mk" -.include "../../graphics/lcms/buildlink3.mk" +.include "../../graphics/lcms2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../security/gnutls/buildlink3.mk" diff --git a/emulators/wine/PLIST.Darwin b/emulators/wine/PLIST.Darwin index ee0a3ebf4be..e64da379678 100644 --- a/emulators/wine/PLIST.Darwin +++ b/emulators/wine/PLIST.Darwin @@ -1,2 +1,13 @@ -@comment $NetBSD: PLIST.Darwin,v 1.1 2009/04/20 18:55:42 adam Exp $ +@comment $NetBSD: PLIST.Darwin,v 1.2 2014/01/17 09:01:58 adam Exp $ +lib/wine/fakedlls/openal32.dll +lib/wine/fakedlls/opencl.dll +lib/wine/fakedlls/winecoreaudio.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/winemp3.acm.so +lib/wine/wineqtdecoder.dll.so lib/wine/winequartz.drv.so diff --git a/emulators/wine/PLIST.Linux b/emulators/wine/PLIST.Linux index b16cb1c7ee3..e1aa4084e80 100644 --- a/emulators/wine/PLIST.Linux +++ b/emulators/wine/PLIST.Linux @@ -1,2 +1,4 @@ -@comment $NetBSD: PLIST.Linux,v 1.3 2011/05/04 20:31:39 adam Exp $ +@comment $NetBSD: PLIST.Linux,v 1.4 2014/01/17 09:01:58 adam Exp $ bin/wine-preloader +lib/wine/fakedlls/winejoystick.drv +lib/wine/winejoystick.drv.so diff --git a/emulators/wine/PLIST.common b/emulators/wine/PLIST.common index 4276193bd77..57145d2eac5 100644 --- a/emulators/wine/PLIST.common +++ b/emulators/wine/PLIST.common @@ -1,5 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.4 2011/05/04 20:31:39 adam Exp $ -bin/fnt2bdf +@comment $NetBSD: PLIST.common,v 1.5 2014/01/17 09:01:58 adam Exp $ bin/function_grep.pl bin/msiexec bin/notepad @@ -28,6 +27,7 @@ include/wine/exception.h include/wine/itss.h include/wine/itss.idl include/wine/library.h +include/wine/msvcrt/assert.h include/wine/msvcrt/conio.h include/wine/msvcrt/crtdbg.h include/wine/msvcrt/crtdefs.h @@ -87,11 +87,16 @@ include/wine/windows/amstream.h include/wine/windows/amstream.idl include/wine/windows/amvideo.h include/wine/windows/amvideo.idl +include/wine/windows/appcompatapi.h include/wine/windows/appmgmt.h include/wine/windows/asptlb.h include/wine/windows/asptlb.idl include/wine/windows/asynot.idl include/wine/windows/asysta.idl +include/wine/windows/atlbase.h +include/wine/windows/atliface.h +include/wine/windows/atliface.idl +include/wine/windows/atlwin.h include/wine/windows/audevcod.h include/wine/windows/audioclient.h include/wine/windows/audioclient.idl @@ -131,6 +136,9 @@ include/wine/windows/compobj.h include/wine/windows/control.h include/wine/windows/control.idl include/wine/windows/cor.h +include/wine/windows/cor.idl +include/wine/windows/cordebug.h +include/wine/windows/cordebug.idl include/wine/windows/corerror.h include/wine/windows/corhdr.h include/wine/windows/cpl.h @@ -146,9 +154,15 @@ include/wine/windows/cvconst.h include/wine/windows/d3d.h include/wine/windows/d3d10.h include/wine/windows/d3d10.idl +include/wine/windows/d3d10_1.h +include/wine/windows/d3d10_1.idl +include/wine/windows/d3d10_1shader.h include/wine/windows/d3d10effect.h include/wine/windows/d3d10misc.h include/wine/windows/d3d10shader.h +include/wine/windows/d3d11.h +include/wine/windows/d3d11.idl +include/wine/windows/d3d11shader.h include/wine/windows/d3d8.h include/wine/windows/d3d8caps.h include/wine/windows/d3d8types.h @@ -156,13 +170,18 @@ include/wine/windows/d3d9.h include/wine/windows/d3d9caps.h include/wine/windows/d3d9types.h include/wine/windows/d3dcaps.h +include/wine/windows/d3dcommon.h +include/wine/windows/d3dcommon.idl +include/wine/windows/d3dcompiler.h include/wine/windows/d3dhal.h include/wine/windows/d3drm.h include/wine/windows/d3drmdef.h include/wine/windows/d3drmobj.h +include/wine/windows/d3drmwin.h include/wine/windows/d3dtypes.h include/wine/windows/d3dvec.inl include/wine/windows/d3dx9.h +include/wine/windows/d3dx9anim.h include/wine/windows/d3dx9core.h include/wine/windows/d3dx9effect.h include/wine/windows/d3dx9math.h @@ -171,6 +190,7 @@ include/wine/windows/d3dx9mesh.h include/wine/windows/d3dx9shader.h include/wine/windows/d3dx9shape.h include/wine/windows/d3dx9tex.h +include/wine/windows/d3dx9xof.h include/wine/windows/dbccmd.idl include/wine/windows/dbcses.idl include/wine/windows/dbdsad.idl @@ -181,7 +201,9 @@ include/wine/windows/dbs.idl include/wine/windows/dbt.h include/wine/windows/dciddi.h include/wine/windows/dciman.h +include/wine/windows/dcommon.h include/wine/windows/dde.h +include/wine/windows/dde.rh include/wine/windows/ddeml.h include/wine/windows/ddk/compstui.h include/wine/windows/ddk/hidsdi.h @@ -209,10 +231,12 @@ include/wine/windows/devicetopology.h include/wine/windows/devicetopology.idl include/wine/windows/devpkey.h include/wine/windows/devpropdef.h +include/wine/windows/difxapi.h include/wine/windows/digitalv.h include/wine/windows/dimm.h include/wine/windows/dimm.idl include/wine/windows/dinput.h +include/wine/windows/dinputd.h include/wine/windows/dispdib.h include/wine/windows/dispex.h include/wine/windows/dispex.idl @@ -221,6 +245,7 @@ include/wine/windows/dls1.h include/wine/windows/dls2.h include/wine/windows/dmdls.h include/wine/windows/dmerror.h +include/wine/windows/dmksctrl.h include/wine/windows/dmo.h include/wine/windows/dmoreg.h include/wine/windows/dmort.h @@ -232,6 +257,8 @@ include/wine/windows/dmusici.h include/wine/windows/dmusics.h include/wine/windows/docobj.h include/wine/windows/docobj.idl +include/wine/windows/docobjectservice.h +include/wine/windows/docobjectservice.idl include/wine/windows/downloadmgr.h include/wine/windows/downloadmgr.idl include/wine/windows/dpaddr.h @@ -241,27 +268,31 @@ include/wine/windows/dplobby.h include/wine/windows/dplobby8.h include/wine/windows/dpnathlp.h include/wine/windows/dsconf.h -include/wine/windows/dsdriver.h include/wine/windows/dsgetdc.h include/wine/windows/dshow.h include/wine/windows/dsound.h include/wine/windows/dsrole.h include/wine/windows/dvdmedia.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/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/dxgiformat.h include/wine/windows/dxgitype.h -include/wine/windows/dxgitype.idl include/wine/windows/dyngraph.idl include/wine/windows/endpointvolume.h include/wine/windows/endpointvolume.idl include/wine/windows/errorrep.h include/wine/windows/errors.h include/wine/windows/evcode.h +include/wine/windows/evntprov.h include/wine/windows/evntrace.h include/wine/windows/excpt.h include/wine/windows/exdisp.h @@ -269,6 +300,7 @@ include/wine/windows/exdisp.idl include/wine/windows/exdispid.h include/wine/windows/fci.h include/wine/windows/fdi.h +include/wine/windows/fltdefs.h include/wine/windows/fusion.h include/wine/windows/fusion.idl include/wine/windows/gameux.h @@ -289,10 +321,15 @@ include/wine/windows/guiddef.h include/wine/windows/hlguids.h include/wine/windows/hlink.h include/wine/windows/hlink.idl +include/wine/windows/htiface.h +include/wine/windows/htiface.idl include/wine/windows/htiframe.h include/wine/windows/htiframe.idl include/wine/windows/htmlhelp.h include/wine/windows/http.h +include/wine/windows/httprequest.h +include/wine/windows/httprequest.idl +include/wine/windows/httprequestid.h include/wine/windows/i_cryptasn1tls.h include/wine/windows/iads.h include/wine/windows/iads.idl @@ -301,6 +338,10 @@ include/wine/windows/icftypes.idl include/wine/windows/icm.h include/wine/windows/icmpapi.h include/wine/windows/idispids.h +include/wine/windows/iextag.h +include/wine/windows/iextag.idl +include/wine/windows/ifdef.h +include/wine/windows/ifmib.h include/wine/windows/imagehlp.h include/wine/windows/imm.h include/wine/windows/imnact.h @@ -308,6 +349,7 @@ include/wine/windows/imnact.idl include/wine/windows/imnxport.h include/wine/windows/imnxport.idl include/wine/windows/in6addr.h +include/wine/windows/inaddr.h include/wine/windows/indexsrv.h include/wine/windows/indexsrv.idl include/wine/windows/initguid.h @@ -315,15 +357,18 @@ include/wine/windows/intshcut.h include/wine/windows/ipexport.h include/wine/windows/iphlpapi.h include/wine/windows/ipifcons.h +include/wine/windows/ipmib.h include/wine/windows/iprtrmib.h include/wine/windows/iptypes.h include/wine/windows/isguids.h +include/wine/windows/knownfolders.h include/wine/windows/ks.h include/wine/windows/ksguid.h include/wine/windows/ksmedia.h include/wine/windows/lm.h include/wine/windows/lmaccess.h include/wine/windows/lmapibuf.h +include/wine/windows/lmat.h include/wine/windows/lmbrowsr.h include/wine/windows/lmcons.h include/wine/windows/lmerr.h @@ -351,6 +396,8 @@ include/wine/windows/mcx.h include/wine/windows/mediaerr.h include/wine/windows/mediaobj.h include/wine/windows/mediaobj.idl +include/wine/windows/metahost.h +include/wine/windows/metahost.idl include/wine/windows/midles.h include/wine/windows/mimeinfo.h include/wine/windows/mimeinfo.idl @@ -359,6 +406,8 @@ include/wine/windows/mimeole.idl include/wine/windows/minmax.h include/wine/windows/mlang.h include/wine/windows/mlang.idl +include/wine/windows/mmc.h +include/wine/windows/mmc.idl include/wine/windows/mmddk.h include/wine/windows/mmdeviceapi.h include/wine/windows/mmdeviceapi.idl @@ -367,6 +416,7 @@ include/wine/windows/mmstream.h include/wine/windows/mmstream.idl include/wine/windows/mmsystem.h include/wine/windows/mprapi.h +include/wine/windows/mprerror.h include/wine/windows/msacm.h include/wine/windows/msacmdlg.h include/wine/windows/msacmdrv.h @@ -378,6 +428,8 @@ include/wine/windows/msctf.idl include/wine/windows/msdadc.h include/wine/windows/msdadc.idl include/wine/windows/msdaguid.h +include/wine/windows/msdasc.h +include/wine/windows/msdasc.idl include/wine/windows/mshtmcid.h include/wine/windows/mshtmdid.h include/wine/windows/mshtmhst.h @@ -386,6 +438,8 @@ include/wine/windows/mshtml.h include/wine/windows/mshtml.idl include/wine/windows/msi.h include/wine/windows/msidefs.h +include/wine/windows/msident.h +include/wine/windows/msident.idl include/wine/windows/msinkaut.h include/wine/windows/msinkaut.idl include/wine/windows/msiquery.h @@ -399,6 +453,9 @@ include/wine/windows/msxml.idl include/wine/windows/msxml2.h include/wine/windows/msxml2.idl include/wine/windows/msxml2did.h +include/wine/windows/msxml6.h +include/wine/windows/msxml6.idl +include/wine/windows/msxml6did.h include/wine/windows/msxmldid.h include/wine/windows/nb30.h include/wine/windows/ndrtypes.h @@ -406,6 +463,7 @@ include/wine/windows/netcon.h include/wine/windows/netcon.idl include/wine/windows/netfw.h include/wine/windows/netfw.idl +include/wine/windows/nldef.h include/wine/windows/npapi.h include/wine/windows/nspapi.h include/wine/windows/ntddcdrm.h @@ -420,6 +478,8 @@ include/wine/windows/ntstatus.h include/wine/windows/oaidl.h include/wine/windows/oaidl.idl include/wine/windows/objbase.h +include/wine/windows/objectarray.h +include/wine/windows/objectarray.idl include/wine/windows/objidl.h include/wine/windows/objidl.idl include/wine/windows/objsafe.h @@ -445,6 +505,7 @@ include/wine/windows/oleidl.idl include/wine/windows/opnrst.idl include/wine/windows/optary.h include/wine/windows/optary.idl +include/wine/windows/patchapi.h include/wine/windows/pdh.h include/wine/windows/pdhmsg.h include/wine/windows/perhist.h @@ -475,10 +536,13 @@ include/wine/windows/rasdlg.h include/wine/windows/raserror.h include/wine/windows/reason.h include/wine/windows/regstr.h +include/wine/windows/restartmanager.h include/wine/windows/richedit.h include/wine/windows/richole.h include/wine/windows/richole.idl include/wine/windows/rmxfguid.h +include/wine/windows/rmxftmpl.h +include/wine/windows/rmxftmpl.x include/wine/windows/row.idl include/wine/windows/rowchg.idl include/wine/windows/rpc.h @@ -488,9 +552,11 @@ include/wine/windows/rpcdcep.h include/wine/windows/rpcndr.h include/wine/windows/rpcnterr.h include/wine/windows/rpcproxy.h +include/wine/windows/rpcsal.h include/wine/windows/rstbas.idl include/wine/windows/rstinf.idl include/wine/windows/rstloc.idl +include/wine/windows/rstnot.idl include/wine/windows/rtutils.h include/wine/windows/scarderr.h include/wine/windows/schannel.h @@ -535,21 +601,38 @@ include/wine/windows/sti.h include/wine/windows/storage.h include/wine/windows/strmif.h include/wine/windows/strmif.idl +include/wine/windows/strsafe.h include/wine/windows/structuredquerycondition.h include/wine/windows/structuredquerycondition.idl include/wine/windows/svrapi.h include/wine/windows/t2embapi.h include/wine/windows/tapi.h include/wine/windows/tchar.h +include/wine/windows/tcpmib.h include/wine/windows/textserv.h include/wine/windows/textstor.h include/wine/windows/textstor.idl include/wine/windows/tlhelp32.h +include/wine/windows/tlogstg.h +include/wine/windows/tlogstg.idl include/wine/windows/tmschema.h include/wine/windows/tom.h include/wine/windows/tom.idl include/wine/windows/traffic.h +include/wine/windows/transact.h +include/wine/windows/transact.idl include/wine/windows/twain.h +include/wine/windows/txcoord.h +include/wine/windows/txcoord.idl +include/wine/windows/txdtc.h +include/wine/windows/txdtc.idl +include/wine/windows/udpmib.h +include/wine/windows/uiautomation.h +include/wine/windows/uiautomationclient.h +include/wine/windows/uiautomationclient.idl +include/wine/windows/uiautomationcore.h +include/wine/windows/uiautomationcore.idl +include/wine/windows/uiautomationcoreapi.h include/wine/windows/unknwn.h include/wine/windows/unknwn.idl include/wine/windows/urlhist.h @@ -562,13 +645,19 @@ include/wine/windows/uuids.h include/wine/windows/uxtheme.h include/wine/windows/vdmdbg.h include/wine/windows/ver.h +include/wine/windows/verrsrc.h include/wine/windows/vfw.h include/wine/windows/vfwmsgs.h include/wine/windows/vmr9.h include/wine/windows/vmr9.idl include/wine/windows/vmrender.idl +include/wine/windows/vsstyle.h +include/wine/windows/vssym32.h include/wine/windows/wbemcli.h include/wine/windows/wbemcli.idl +include/wine/windows/wbemprov.h +include/wine/windows/wbemprov.idl +include/wine/windows/werapi.h include/wine/windows/wfext.h include/wine/windows/wia.h include/wine/windows/wia_lh.h @@ -578,6 +667,8 @@ include/wine/windows/wia_xp.idl include/wine/windows/winbase.h include/wine/windows/wincodec.h include/wine/windows/wincodec.idl +include/wine/windows/wincodecsdk.h +include/wine/windows/wincodecsdk.idl include/wine/windows/wincon.h include/wine/windows/wincred.h include/wine/windows/wincrypt.h @@ -586,6 +677,7 @@ include/wine/windows/windns.h include/wine/windows/windows.h include/wine/windows/windowsx.h include/wine/windows/winerror.h +include/wine/windows/winevt.h include/wine/windows/wingdi.h include/wine/windows/winhttp.h include/wine/windows/wininet.h @@ -596,6 +688,7 @@ include/wine/windows/winnetwk.h include/wine/windows/winnls.h include/wine/windows/winnls32.h include/wine/windows/winnt.h +include/wine/windows/winnt.rh include/wine/windows/winperf.h include/wine/windows/winreg.h include/wine/windows/winresrc.h @@ -606,6 +699,8 @@ include/wine/windows/winsock.h include/wine/windows/winsock2.h include/wine/windows/winspool.h include/wine/windows/winsvc.h +include/wine/windows/winsxs.h +include/wine/windows/winsxs.idl include/wine/windows/wintab.h include/wine/windows/wintabx.h include/wine/windows/winternl.h @@ -614,8 +709,16 @@ include/wine/windows/winuser.h include/wine/windows/winuser.rh include/wine/windows/winver.h include/wine/windows/wmistr.h +include/wine/windows/wmiutils.h +include/wine/windows/wmiutils.idl +include/wine/windows/wmsbuffer.h +include/wine/windows/wmsbuffer.idl +include/wine/windows/wmsdkidl.h +include/wine/windows/wmsdkidl.idl include/wine/windows/wnaspi32.h include/wine/windows/wownt32.h +include/wine/windows/wpcapi.h +include/wine/windows/wpcapi.idl include/wine/windows/ws2def.h include/wine/windows/ws2ipdef.h include/wine/windows/ws2spi.h @@ -633,7 +736,6 @@ include/wine/windows/xinput.h include/wine/windows/xmldom.h include/wine/windows/xmldom.idl include/wine/windows/xmldomdid.h -include/wine/windows/xmldso.h include/wine/windows/xmldso.idl include/wine/windows/xmldsodid.h include/wine/windows/xmllite.h @@ -649,8 +751,26 @@ lib/wine/actxprxy.dll.so lib/wine/advapi32.dll.so lib/wine/advpack.dll.so lib/wine/amstream.dll.so +lib/wine/api-ms-win-core-localregistry-l1-1-0.dll.so +lib/wine/api-ms-win-core-processthreads-l1-1-0.dll.so +lib/wine/api-ms-win-core-winrt-error-l1-1-0.dll.so +lib/wine/api-ms-win-core-winrt-string-l1-1-0.dll.so +lib/wine/api-ms-win-downlevel-advapi32-l1-1-0.dll.so +lib/wine/api-ms-win-downlevel-advapi32-l2-1-0.dll.so +lib/wine/api-ms-win-downlevel-normaliz-l1-1-0.dll.so +lib/wine/api-ms-win-downlevel-ole32-l1-1-0.dll.so +lib/wine/api-ms-win-downlevel-shell32-l1-1-0.dll.so +lib/wine/api-ms-win-downlevel-shlwapi-l1-1-0.dll.so +lib/wine/api-ms-win-downlevel-shlwapi-l2-1-0.dll.so +lib/wine/api-ms-win-downlevel-user32-l1-1-0.dll.so +lib/wine/api-ms-win-downlevel-version-l1-1-0.dll.so +lib/wine/api-ms-win-security-base-l1-1-0.dll.so +lib/wine/apphelp.dll.so lib/wine/appwiz.cpl.so +lib/wine/aspnet_regiis.exe.so lib/wine/atl.dll.so +lib/wine/atl100.dll.so +lib/wine/atl80.dll.so lib/wine/attrib.exe.so lib/wine/authz.dll.so lib/wine/avicap32.dll.so @@ -659,6 +779,7 @@ lib/wine/avifile.dll16.so lib/wine/avrt.dll.so lib/wine/bcrypt.dll.so lib/wine/browseui.dll.so +lib/wine/cabarc.exe.so lib/wine/cabinet.dll.so lib/wine/cacls.exe.so lib/wine/capi2032.dll.so @@ -674,6 +795,7 @@ lib/wine/comm.drv16.so lib/wine/commdlg.dll16.so lib/wine/compobj.dll16.so lib/wine/compstui.dll.so +lib/wine/conhost.exe.so lib/wine/control.exe.so lib/wine/credui.dll.so lib/wine/crtdll.dll.so @@ -682,16 +804,40 @@ lib/wine/cryptdlg.dll.so lib/wine/cryptdll.dll.so lib/wine/cryptnet.dll.so lib/wine/cryptui.dll.so +lib/wine/cscript.exe.so lib/wine/ctapi32.dll.so lib/wine/ctl3d.dll16.so lib/wine/ctl3d32.dll.so lib/wine/ctl3dv2.dll16.so lib/wine/d3d10.dll.so lib/wine/d3d10core.dll.so +lib/wine/d3d11.dll.so lib/wine/d3d8.dll.so lib/wine/d3d9.dll.so +lib/wine/d3dcompiler_33.dll.so +lib/wine/d3dcompiler_34.dll.so +lib/wine/d3dcompiler_35.dll.so +lib/wine/d3dcompiler_36.dll.so +lib/wine/d3dcompiler_37.dll.so +lib/wine/d3dcompiler_38.dll.so +lib/wine/d3dcompiler_39.dll.so +lib/wine/d3dcompiler_40.dll.so +lib/wine/d3dcompiler_41.dll.so +lib/wine/d3dcompiler_42.dll.so +lib/wine/d3dcompiler_43.dll.so lib/wine/d3dim.dll.so lib/wine/d3drm.dll.so +lib/wine/d3dx10_33.dll.so +lib/wine/d3dx10_34.dll.so +lib/wine/d3dx10_35.dll.so +lib/wine/d3dx10_36.dll.so +lib/wine/d3dx10_37.dll.so +lib/wine/d3dx10_38.dll.so +lib/wine/d3dx10_39.dll.so +lib/wine/d3dx10_40.dll.so +lib/wine/d3dx10_41.dll.so +lib/wine/d3dx10_42.dll.so +lib/wine/d3dx10_43.dll.so lib/wine/d3dx9_24.dll.so lib/wine/d3dx9_25.dll.so lib/wine/d3dx9_26.dll.so @@ -711,13 +857,17 @@ lib/wine/d3dx9_39.dll.so lib/wine/d3dx9_40.dll.so lib/wine/d3dx9_41.dll.so lib/wine/d3dx9_42.dll.so +lib/wine/d3dx9_43.dll.so lib/wine/d3dxof.dll.so +lib/wine/dbgeng.dll.so lib/wine/dbghelp.dll.so lib/wine/dciman32.dll.so lib/wine/ddeml.dll16.so lib/wine/ddraw.dll.so lib/wine/ddrawex.dll.so lib/wine/devenum.dll.so +lib/wine/dhcpcsvc.dll.so +lib/wine/difxapi.dll.so lib/wine/dinput.dll.so lib/wine/dinput8.dll.so lib/wine/dispdib.dll16.so @@ -745,12 +895,14 @@ lib/wine/dsound.dll.so lib/wine/dssenh.dll.so lib/wine/dswave.dll.so lib/wine/dwmapi.dll.so +lib/wine/dwrite.dll.so lib/wine/dxdiag.exe.so lib/wine/dxdiagn.dll.so lib/wine/dxgi.dll.so lib/wine/eject.exe.so lib/wine/expand.exe.so lib/wine/explorer.exe.so +lib/wine/explorerframe.dll.so lib/wine/extrac32.exe.so lib/wine/fakedlls/acledit.dll lib/wine/fakedlls/aclui.dll @@ -759,8 +911,26 @@ lib/wine/fakedlls/actxprxy.dll lib/wine/fakedlls/advapi32.dll lib/wine/fakedlls/advpack.dll lib/wine/fakedlls/amstream.dll +lib/wine/fakedlls/api-ms-win-core-localregistry-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-core-processthreads-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-core-winrt-string-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-downlevel-advapi32-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-downlevel-advapi32-l2-1-0.dll +lib/wine/fakedlls/api-ms-win-downlevel-normaliz-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-downlevel-ole32-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-downlevel-shell32-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-downlevel-shlwapi-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-downlevel-shlwapi-l2-1-0.dll +lib/wine/fakedlls/api-ms-win-downlevel-user32-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-downlevel-version-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-security-base-l1-1-0.dll +lib/wine/fakedlls/apphelp.dll lib/wine/fakedlls/appwiz.cpl +lib/wine/fakedlls/aspnet_regiis.exe lib/wine/fakedlls/atl.dll +lib/wine/fakedlls/atl100.dll +lib/wine/fakedlls/atl80.dll lib/wine/fakedlls/attrib.exe lib/wine/fakedlls/authz.dll lib/wine/fakedlls/avicap32.dll @@ -769,6 +939,7 @@ lib/wine/fakedlls/avifile.dll16 lib/wine/fakedlls/avrt.dll lib/wine/fakedlls/bcrypt.dll lib/wine/fakedlls/browseui.dll +lib/wine/fakedlls/cabarc.exe lib/wine/fakedlls/cabinet.dll lib/wine/fakedlls/cacls.exe lib/wine/fakedlls/capi2032.dll @@ -784,6 +955,7 @@ lib/wine/fakedlls/comm.drv16 lib/wine/fakedlls/commdlg.dll16 lib/wine/fakedlls/compobj.dll16 lib/wine/fakedlls/compstui.dll +lib/wine/fakedlls/conhost.exe lib/wine/fakedlls/control.exe lib/wine/fakedlls/credui.dll lib/wine/fakedlls/crtdll.dll @@ -792,16 +964,40 @@ lib/wine/fakedlls/cryptdlg.dll lib/wine/fakedlls/cryptdll.dll lib/wine/fakedlls/cryptnet.dll lib/wine/fakedlls/cryptui.dll +lib/wine/fakedlls/cscript.exe lib/wine/fakedlls/ctapi32.dll lib/wine/fakedlls/ctl3d.dll16 lib/wine/fakedlls/ctl3d32.dll lib/wine/fakedlls/ctl3dv2.dll16 lib/wine/fakedlls/d3d10.dll lib/wine/fakedlls/d3d10core.dll +lib/wine/fakedlls/d3d11.dll lib/wine/fakedlls/d3d8.dll lib/wine/fakedlls/d3d9.dll +lib/wine/fakedlls/d3dcompiler_33.dll +lib/wine/fakedlls/d3dcompiler_34.dll +lib/wine/fakedlls/d3dcompiler_35.dll +lib/wine/fakedlls/d3dcompiler_36.dll +lib/wine/fakedlls/d3dcompiler_37.dll +lib/wine/fakedlls/d3dcompiler_38.dll +lib/wine/fakedlls/d3dcompiler_39.dll +lib/wine/fakedlls/d3dcompiler_40.dll +lib/wine/fakedlls/d3dcompiler_41.dll +lib/wine/fakedlls/d3dcompiler_42.dll +lib/wine/fakedlls/d3dcompiler_43.dll lib/wine/fakedlls/d3dim.dll lib/wine/fakedlls/d3drm.dll +lib/wine/fakedlls/d3dx10_33.dll +lib/wine/fakedlls/d3dx10_34.dll +lib/wine/fakedlls/d3dx10_35.dll +lib/wine/fakedlls/d3dx10_36.dll +lib/wine/fakedlls/d3dx10_37.dll +lib/wine/fakedlls/d3dx10_38.dll +lib/wine/fakedlls/d3dx10_39.dll +lib/wine/fakedlls/d3dx10_40.dll +lib/wine/fakedlls/d3dx10_41.dll +lib/wine/fakedlls/d3dx10_42.dll +lib/wine/fakedlls/d3dx10_43.dll lib/wine/fakedlls/d3dx9_24.dll lib/wine/fakedlls/d3dx9_25.dll lib/wine/fakedlls/d3dx9_26.dll @@ -821,13 +1017,17 @@ lib/wine/fakedlls/d3dx9_39.dll lib/wine/fakedlls/d3dx9_40.dll lib/wine/fakedlls/d3dx9_41.dll lib/wine/fakedlls/d3dx9_42.dll +lib/wine/fakedlls/d3dx9_43.dll lib/wine/fakedlls/d3dxof.dll +lib/wine/fakedlls/dbgeng.dll lib/wine/fakedlls/dbghelp.dll lib/wine/fakedlls/dciman32.dll lib/wine/fakedlls/ddeml.dll16 lib/wine/fakedlls/ddraw.dll lib/wine/fakedlls/ddrawex.dll lib/wine/fakedlls/devenum.dll +lib/wine/fakedlls/dhcpcsvc.dll +lib/wine/fakedlls/difxapi.dll lib/wine/fakedlls/dinput.dll lib/wine/fakedlls/dinput8.dll lib/wine/fakedlls/dispdib.dll16 @@ -855,17 +1055,21 @@ lib/wine/fakedlls/dsound.dll lib/wine/fakedlls/dssenh.dll lib/wine/fakedlls/dswave.dll lib/wine/fakedlls/dwmapi.dll +lib/wine/fakedlls/dwrite.dll lib/wine/fakedlls/dxdiag.exe lib/wine/fakedlls/dxdiagn.dll lib/wine/fakedlls/dxgi.dll lib/wine/fakedlls/eject.exe lib/wine/fakedlls/expand.exe lib/wine/fakedlls/explorer.exe +lib/wine/fakedlls/explorerframe.dll lib/wine/fakedlls/extrac32.exe lib/wine/fakedlls/faultrep.dll +lib/wine/fakedlls/findstr.exe lib/wine/fakedlls/fltlib.dll lib/wine/fakedlls/fusion.dll lib/wine/fakedlls/fwpuclnt.dll +lib/wine/fakedlls/gameux.dll lib/wine/fakedlls/gdi.exe16 lib/wine/fakedlls/gdi32.dll lib/wine/fakedlls/gdiplus.dll @@ -878,10 +1082,12 @@ lib/wine/fakedlls/hhctrl.ocx lib/wine/fakedlls/hid.dll lib/wine/fakedlls/hlink.dll lib/wine/fakedlls/hnetcfg.dll +lib/wine/fakedlls/hostname.exe lib/wine/fakedlls/httpapi.dll lib/wine/fakedlls/iccvid.dll lib/wine/fakedlls/icinfo.exe lib/wine/fakedlls/icmp.dll +lib/wine/fakedlls/ieframe.dll lib/wine/fakedlls/iexplore.exe lib/wine/fakedlls/ifsmgr.vxd lib/wine/fakedlls/imaadp32.acm @@ -889,18 +1095,22 @@ lib/wine/fakedlls/imagehlp.dll lib/wine/fakedlls/imm.dll16 lib/wine/fakedlls/imm32.dll lib/wine/fakedlls/inetcomm.dll +lib/wine/fakedlls/inetcpl.cpl lib/wine/fakedlls/inetmib1.dll lib/wine/fakedlls/infosoft.dll lib/wine/fakedlls/initpki.dll lib/wine/fakedlls/inkobj.dll lib/wine/fakedlls/inseng.dll +lib/wine/fakedlls/ipconfig.exe lib/wine/fakedlls/iphlpapi.dll lib/wine/fakedlls/itircl.dll lib/wine/fakedlls/itss.dll +lib/wine/fakedlls/joy.cpl lib/wine/fakedlls/jscript.dll lib/wine/fakedlls/kernel32.dll lib/wine/fakedlls/keyboard.drv16 lib/wine/fakedlls/krnl386.exe16 +lib/wine/fakedlls/ktmw32.dll lib/wine/fakedlls/loadperf.dll lib/wine/fakedlls/localspl.dll lib/wine/fakedlls/localui.dll @@ -914,11 +1124,14 @@ lib/wine/fakedlls/mcicda.dll lib/wine/fakedlls/mciqtz32.dll lib/wine/fakedlls/mciseq.dll lib/wine/fakedlls/mciwave.dll +lib/wine/fakedlls/mgmtapi.dll lib/wine/fakedlls/midimap.dll lib/wine/fakedlls/mlang.dll +lib/wine/fakedlls/mmcndmgr.dll lib/wine/fakedlls/mmdevapi.dll lib/wine/fakedlls/mmdevldr.vxd lib/wine/fakedlls/mmsystem.dll16 +lib/wine/fakedlls/mofcomp.exe lib/wine/fakedlls/monodebg.vxd lib/wine/fakedlls/mountmgr.sys lib/wine/fakedlls/mouse.drv16 @@ -941,18 +1154,32 @@ lib/wine/fakedlls/mshta.exe lib/wine/fakedlls/mshtml.dll lib/wine/fakedlls/mshtml.tlb lib/wine/fakedlls/msi.dll +lib/wine/fakedlls/msident.dll lib/wine/fakedlls/msiexec.exe lib/wine/fakedlls/msimg32.dll +lib/wine/fakedlls/msimsg.dll lib/wine/fakedlls/msimtf.dll lib/wine/fakedlls/msisip.dll lib/wine/fakedlls/msisys.ocx +lib/wine/fakedlls/msls31.dll lib/wine/fakedlls/msnet32.dll +lib/wine/fakedlls/mspatcha.dll lib/wine/fakedlls/msrle32.dll lib/wine/fakedlls/mssign32.dll lib/wine/fakedlls/mssip32.dll lib/wine/fakedlls/mstask.dll lib/wine/fakedlls/msvcirt.dll +lib/wine/fakedlls/msvcm80.dll +lib/wine/fakedlls/msvcm90.dll +lib/wine/fakedlls/msvcp100.dll +lib/wine/fakedlls/msvcp110.dll +lib/wine/fakedlls/msvcp60.dll +lib/wine/fakedlls/msvcp70.dll +lib/wine/fakedlls/msvcp71.dll +lib/wine/fakedlls/msvcp80.dll +lib/wine/fakedlls/msvcp90.dll lib/wine/fakedlls/msvcr100.dll +lib/wine/fakedlls/msvcr110.dll lib/wine/fakedlls/msvcr70.dll lib/wine/fakedlls/msvcr71.dll lib/wine/fakedlls/msvcr80.dll @@ -965,14 +1192,21 @@ lib/wine/fakedlls/msvfw32.dll lib/wine/fakedlls/msvidc32.dll lib/wine/fakedlls/msvideo.dll16 lib/wine/fakedlls/mswsock.dll +lib/wine/fakedlls/msxml.dll +lib/wine/fakedlls/msxml2.dll lib/wine/fakedlls/msxml3.dll lib/wine/fakedlls/msxml4.dll +lib/wine/fakedlls/msxml6.dll lib/wine/fakedlls/nddeapi.dll lib/wine/fakedlls/net.exe lib/wine/fakedlls/netapi32.dll +lib/wine/fakedlls/netsh.exe +lib/wine/fakedlls/netstat.exe lib/wine/fakedlls/newdev.dll lib/wine/fakedlls/ngen.exe +lib/wine/fakedlls/normaliz.dll lib/wine/fakedlls/notepad.exe +lib/wine/fakedlls/npmshtml.dll lib/wine/fakedlls/ntdll.dll lib/wine/fakedlls/ntdsapi.dll lib/wine/fakedlls/ntoskrnl.exe @@ -980,6 +1214,7 @@ lib/wine/fakedlls/ntprint.dll lib/wine/fakedlls/objsel.dll lib/wine/fakedlls/odbc32.dll lib/wine/fakedlls/odbccp32.dll +lib/wine/fakedlls/odbccu32.dll lib/wine/fakedlls/ole2.dll16 lib/wine/fakedlls/ole2conv.dll16 lib/wine/fakedlls/ole2disp.dll16 @@ -1000,9 +1235,12 @@ lib/wine/fakedlls/olethk32.dll lib/wine/fakedlls/oleview.exe lib/wine/fakedlls/opengl32.dll lib/wine/fakedlls/pdh.dll +lib/wine/fakedlls/photometadatahandler.dll lib/wine/fakedlls/pidgen.dll lib/wine/fakedlls/ping.exe +lib/wine/fakedlls/plugplay.exe lib/wine/fakedlls/powrprof.dll +lib/wine/fakedlls/presentationfontcache.exe lib/wine/fakedlls/printui.dll lib/wine/fakedlls/progman.exe lib/wine/fakedlls/propsys.dll @@ -1018,7 +1256,10 @@ lib/wine/fakedlls/rasapi16.dll16 lib/wine/fakedlls/rasapi32.dll lib/wine/fakedlls/rasdlg.dll lib/wine/fakedlls/reg.exe +lib/wine/fakedlls/regapi.dll +lib/wine/fakedlls/regasm.exe lib/wine/fakedlls/regedit.exe +lib/wine/fakedlls/regsvcs.exe lib/wine/fakedlls/regsvr32.exe lib/wine/fakedlls/resutils.dll lib/wine/fakedlls/riched20.dll @@ -1027,18 +1268,25 @@ lib/wine/fakedlls/rpcrt4.dll lib/wine/fakedlls/rpcss.exe lib/wine/fakedlls/rsabase.dll lib/wine/fakedlls/rsaenh.dll +lib/wine/fakedlls/rstrtmgr.dll lib/wine/fakedlls/rtutils.dll +lib/wine/fakedlls/rundll.exe16 lib/wine/fakedlls/rundll32.exe lib/wine/fakedlls/samlib.dll lib/wine/fakedlls/sane.ds lib/wine/fakedlls/sc.exe +lib/wine/fakedlls/scarddlg.dll lib/wine/fakedlls/sccbase.dll lib/wine/fakedlls/schannel.dll +lib/wine/fakedlls/schtasks.exe +lib/wine/fakedlls/scrrun.dll +lib/wine/fakedlls/scsiport.sys lib/wine/fakedlls/secedit.exe lib/wine/fakedlls/secur32.dll lib/wine/fakedlls/security.dll lib/wine/fakedlls/sensapi.dll lib/wine/fakedlls/serialui.dll +lib/wine/fakedlls/servicemodelreg.exe lib/wine/fakedlls/services.exe lib/wine/fakedlls/setupapi.dll lib/wine/fakedlls/setupx.dll16 @@ -1069,6 +1317,7 @@ lib/wine/fakedlls/sxs.dll lib/wine/fakedlls/system.drv16 lib/wine/fakedlls/t2embed.dll lib/wine/fakedlls/tapi32.dll +lib/wine/fakedlls/taskkill.exe lib/wine/fakedlls/taskmgr.exe lib/wine/fakedlls/termsv.exe lib/wine/fakedlls/toolhelp.dll16 @@ -1088,10 +1337,15 @@ lib/wine/fakedlls/user32.dll lib/wine/fakedlls/userenv.dll lib/wine/fakedlls/usp10.dll lib/wine/fakedlls/uxtheme.dll +lib/wine/fakedlls/vbscript.dll +lib/wine/fakedlls/vcomp.dll +lib/wine/fakedlls/vcomp100.dll +lib/wine/fakedlls/vcomp90.dll lib/wine/fakedlls/vdhcp.vxd lib/wine/fakedlls/vdmdbg.dll lib/wine/fakedlls/ver.dll16 lib/wine/fakedlls/version.dll +lib/wine/fakedlls/view.exe lib/wine/fakedlls/vmm.vxd lib/wine/fakedlls/vnbt.vxd lib/wine/fakedlls/vnetbios.vxd @@ -1100,30 +1354,28 @@ lib/wine/fakedlls/vwin32.vxd lib/wine/fakedlls/w32skrnl.dll lib/wine/fakedlls/w32sys.dll16 lib/wine/fakedlls/wbemprox.dll +lib/wine/fakedlls/webservices.dll +lib/wine/fakedlls/wer.dll +lib/wine/fakedlls/wevtapi.dll lib/wine/fakedlls/wiaservc.dll lib/wine/fakedlls/win32s16.dll16 lib/wine/fakedlls/win87em.dll16 lib/wine/fakedlls/winaspi.dll16 lib/wine/fakedlls/windebug.dll16 lib/wine/fakedlls/windowscodecs.dll -lib/wine/fakedlls/winealsa.drv -lib/wine/fakedlls/wineaudioio.drv +lib/wine/fakedlls/windowscodecsext.dll lib/wine/fakedlls/wineboot.exe lib/wine/fakedlls/winebrowser.exe lib/wine/fakedlls/winecfg.exe lib/wine/fakedlls/wineconsole.exe -lib/wine/fakedlls/winecoreaudio.drv lib/wine/fakedlls/wined3d.dll lib/wine/fakedlls/winedbg.exe lib/wine/fakedlls/winedevice.exe -lib/wine/fakedlls/wineesd.drv lib/wine/fakedlls/winefile.exe -lib/wine/fakedlls/winejack.drv -lib/wine/fakedlls/winejoystick.drv lib/wine/fakedlls/winemapi.dll lib/wine/fakedlls/winemenubuilder.exe lib/wine/fakedlls/winemine.exe -lib/wine/fakedlls/winenas.drv +lib/wine/fakedlls/winemsibuilder.exe lib/wine/fakedlls/wineoss.drv lib/wine/fakedlls/winepath.exe lib/wine/fakedlls/wineps.drv @@ -1143,36 +1395,50 @@ lib/wine/fakedlls/winoldap.mod16 lib/wine/fakedlls/winscard.dll lib/wine/fakedlls/winsock.dll16 lib/wine/fakedlls/winspool.drv +lib/wine/fakedlls/winsta.dll lib/wine/fakedlls/wintab.dll16 lib/wine/fakedlls/wintab32.dll lib/wine/fakedlls/wintrust.dll lib/wine/fakedlls/winver.exe +lib/wine/fakedlls/wlanapi.dll lib/wine/fakedlls/wldap32.dll lib/wine/fakedlls/wmi.dll +lib/wine/fakedlls/wmic.exe lib/wine/fakedlls/wmiutils.dll +lib/wine/fakedlls/wmvcore.dll lib/wine/fakedlls/wnaspi32.dll lib/wine/fakedlls/wordpad.exe lib/wine/fakedlls/wow32.dll lib/wine/fakedlls/write.exe lib/wine/fakedlls/ws2_32.dll +lib/wine/fakedlls/wscript.exe +lib/wine/fakedlls/wshom.ocx +lib/wine/fakedlls/wsnmp32.dll lib/wine/fakedlls/wsock32.dll lib/wine/fakedlls/wtsapi32.dll lib/wine/fakedlls/wuapi.dll lib/wine/fakedlls/wuaueng.dll +lib/wine/fakedlls/wusa.exe +lib/wine/fakedlls/xapofx1_1.dll lib/wine/fakedlls/xcopy.exe lib/wine/fakedlls/xinput1_1.dll lib/wine/fakedlls/xinput1_2.dll lib/wine/fakedlls/xinput1_3.dll lib/wine/fakedlls/xinput9_1_0.dll lib/wine/fakedlls/xmllite.dll +lib/wine/fakedlls/xolehlp.dll +lib/wine/fakedlls/xpsprint.dll +lib/wine/fakedlls/xpssvcs.dll lib/wine/faultrep.dll.so +lib/wine/findstr.exe.so lib/wine/fltlib.dll.so lib/wine/fusion.dll.so lib/wine/fwpuclnt.dll.so +lib/wine/gameux.dll.so lib/wine/gdi.exe16.so lib/wine/gdi32.dll.so lib/wine/gdiplus.dll.so -${PLIST.opengl}lib/wine/glu32.dll.so +lib/wine/glu32.dll.so lib/wine/gphoto2.ds.so lib/wine/gpkcsp.dll.so lib/wine/hal.dll.so @@ -1181,10 +1447,12 @@ lib/wine/hhctrl.ocx.so lib/wine/hid.dll.so lib/wine/hlink.dll.so lib/wine/hnetcfg.dll.so +lib/wine/hostname.exe.so lib/wine/httpapi.dll.so lib/wine/iccvid.dll.so lib/wine/icinfo.exe.so lib/wine/icmp.dll.so +lib/wine/ieframe.dll.so lib/wine/iexplore.exe.so lib/wine/ifsmgr.vxd.so lib/wine/imaadp32.acm.so @@ -1192,24 +1460,30 @@ lib/wine/imagehlp.dll.so lib/wine/imm.dll16.so lib/wine/imm32.dll.so lib/wine/inetcomm.dll.so +lib/wine/inetcpl.cpl.so lib/wine/inetmib1.dll.so lib/wine/infosoft.dll.so lib/wine/initpki.dll.so lib/wine/inkobj.dll.so lib/wine/inseng.dll.so +lib/wine/ipconfig.exe.so lib/wine/iphlpapi.dll.so lib/wine/itircl.dll.so lib/wine/itss.dll.so +lib/wine/joy.cpl.so lib/wine/jscript.dll.so lib/wine/kernel32.dll.so lib/wine/keyboard.drv16.so lib/wine/krnl386.exe16.so +lib/wine/ktmw32.dll.so lib/wine/libaclui.def lib/wine/libactiveds.def lib/wine/libadsiid.a lib/wine/libadvapi32.def lib/wine/libadvpack.def lib/wine/libatl.def +lib/wine/libatl100.def +lib/wine/libatl80.def lib/wine/libavicap32.def lib/wine/libavifil32.def lib/wine/libavrt.def @@ -1232,10 +1506,12 @@ lib/wine/libd3d10.def lib/wine/libd3d10core.def lib/wine/libd3d8.def lib/wine/libd3d9.def +lib/wine/libd3dcompiler.def lib/wine/libd3dim.def lib/wine/libd3drm.def lib/wine/libd3dx9.def lib/wine/libd3dxof.def +lib/wine/libdbgeng.def lib/wine/libdbghelp.def lib/wine/libdciman32.def lib/wine/libddraw.def @@ -1249,15 +1525,19 @@ lib/wine/libdplayx.def lib/wine/libdpnet.def lib/wine/libdsound.def lib/wine/libdwmapi.def +lib/wine/libdwrite.def lib/wine/libdxerr8.a lib/wine/libdxerr9.a lib/wine/libdxgi.def lib/wine/libdxguid.a +lib/wine/libfaultrep.def lib/wine/libgdi32.def lib/wine/libgdiplus.def -${PLIST.opengl}lib/wine/libglu32.def +lib/wine/libglu32.def lib/wine/libhid.def lib/wine/libhlink.def +lib/wine/libhtmlhelp.def +lib/wine/libieframe.def lib/wine/libimagehlp.def lib/wine/libimm32.def lib/wine/libinetcomm.def @@ -1287,6 +1567,7 @@ lib/wine/libmswsock.def lib/wine/libnddeapi.def lib/wine/libnetapi32.def lib/wine/libnewdev.def +lib/wine/libnormaliz.def lib/wine/libntdll.def lib/wine/libntdsapi.def lib/wine/libntoskrnl.exe.def @@ -1299,9 +1580,10 @@ lib/wine/libolecli32.def lib/wine/liboledlg.def lib/wine/libolepro32.def lib/wine/libolesvr32.def -${PLIST.opengl}lib/wine/libopengl32.def +lib/wine/libopengl32.def lib/wine/libpdh.def lib/wine/libpowrprof.def +lib/wine/libpropsys.def lib/wine/libpsapi.def lib/wine/libquartz.def lib/wine/librasapi32.def @@ -1325,7 +1607,9 @@ lib/wine/libslc.def lib/wine/libsnmpapi.def lib/wine/libspoolss.def lib/wine/libsti.def +lib/wine/libstrmbase.a lib/wine/libstrmiids.a +lib/wine/libsxs.def lib/wine/libtapi32.def lib/wine/libunicows.def lib/wine/liburl.def @@ -1338,7 +1622,10 @@ lib/wine/libuuid.a lib/wine/libuxtheme.def lib/wine/libvdmdbg.def lib/wine/libversion.def +lib/wine/libwebservices.def +lib/wine/libwer.def lib/wine/libwindowscodecs.def +lib/wine/libwindowscodecsext.def lib/wine/libwinecrt0.a lib/wine/libwined3d.def lib/wine/libwinhttp.def @@ -1369,11 +1656,14 @@ lib/wine/mcicda.dll.so lib/wine/mciqtz32.dll.so lib/wine/mciseq.dll.so lib/wine/mciwave.dll.so +lib/wine/mgmtapi.dll.so lib/wine/midimap.dll.so lib/wine/mlang.dll.so +lib/wine/mmcndmgr.dll.so lib/wine/mmdevapi.dll.so lib/wine/mmdevldr.vxd.so lib/wine/mmsystem.dll16.so +lib/wine/mofcomp.exe.so lib/wine/monodebg.vxd.so lib/wine/mountmgr.sys.so lib/wine/mouse.drv16.so @@ -1396,18 +1686,32 @@ lib/wine/mshta.exe.so lib/wine/mshtml.dll.so lib/wine/mshtml.tlb.so lib/wine/msi.dll.so +lib/wine/msident.dll.so lib/wine/msiexec.exe.so lib/wine/msimg32.dll.so +lib/wine/msimsg.dll.so lib/wine/msimtf.dll.so lib/wine/msisip.dll.so lib/wine/msisys.ocx.so +lib/wine/msls31.dll.so lib/wine/msnet32.dll.so +lib/wine/mspatcha.dll.so lib/wine/msrle32.dll.so lib/wine/mssign32.dll.so lib/wine/mssip32.dll.so lib/wine/mstask.dll.so lib/wine/msvcirt.dll.so +lib/wine/msvcm80.dll.so +lib/wine/msvcm90.dll.so +lib/wine/msvcp100.dll.so +lib/wine/msvcp110.dll.so +lib/wine/msvcp60.dll.so +lib/wine/msvcp70.dll.so +lib/wine/msvcp71.dll.so +lib/wine/msvcp80.dll.so +lib/wine/msvcp90.dll.so lib/wine/msvcr100.dll.so +lib/wine/msvcr110.dll.so lib/wine/msvcr70.dll.so lib/wine/msvcr71.dll.so lib/wine/msvcr80.dll.so @@ -1420,14 +1724,21 @@ lib/wine/msvfw32.dll.so lib/wine/msvidc32.dll.so lib/wine/msvideo.dll16.so lib/wine/mswsock.dll.so +lib/wine/msxml.dll.so +lib/wine/msxml2.dll.so lib/wine/msxml3.dll.so lib/wine/msxml4.dll.so +lib/wine/msxml6.dll.so lib/wine/nddeapi.dll.so lib/wine/net.exe.so lib/wine/netapi32.dll.so +lib/wine/netsh.exe.so +lib/wine/netstat.exe.so lib/wine/newdev.dll.so lib/wine/ngen.exe.so +lib/wine/normaliz.dll.so lib/wine/notepad.exe.so +lib/wine/npmshtml.dll.so lib/wine/ntdll.dll.so lib/wine/ntdsapi.dll.so lib/wine/ntoskrnl.exe.so @@ -1435,6 +1746,7 @@ lib/wine/ntprint.dll.so lib/wine/objsel.dll.so lib/wine/odbc32.dll.so lib/wine/odbccp32.dll.so +lib/wine/odbccu32.dll.so lib/wine/ole2.dll16.so lib/wine/ole2conv.dll16.so lib/wine/ole2disp.dll16.so @@ -1453,11 +1765,14 @@ lib/wine/olesvr.dll16.so lib/wine/olesvr32.dll.so lib/wine/olethk32.dll.so lib/wine/oleview.exe.so -${PLIST.opengl}lib/wine/opengl32.dll.so +lib/wine/opengl32.dll.so lib/wine/pdh.dll.so +lib/wine/photometadatahandler.dll.so lib/wine/pidgen.dll.so lib/wine/ping.exe.so +lib/wine/plugplay.exe.so lib/wine/powrprof.dll.so +lib/wine/presentationfontcache.exe.so lib/wine/printui.dll.so lib/wine/progman.exe.so lib/wine/propsys.dll.so @@ -1473,7 +1788,10 @@ lib/wine/rasapi16.dll16.so lib/wine/rasapi32.dll.so lib/wine/rasdlg.dll.so lib/wine/reg.exe.so +lib/wine/regapi.dll.so +lib/wine/regasm.exe.so lib/wine/regedit.exe.so +lib/wine/regsvcs.exe.so lib/wine/regsvr32.exe.so lib/wine/resutils.dll.so lib/wine/riched20.dll.so @@ -1482,18 +1800,25 @@ lib/wine/rpcrt4.dll.so lib/wine/rpcss.exe.so lib/wine/rsabase.dll.so lib/wine/rsaenh.dll.so +lib/wine/rstrtmgr.dll.so lib/wine/rtutils.dll.so +lib/wine/rundll.exe16.so lib/wine/rundll32.exe.so lib/wine/samlib.dll.so lib/wine/sane.ds.so lib/wine/sc.exe.so +lib/wine/scarddlg.dll.so lib/wine/sccbase.dll.so lib/wine/schannel.dll.so +lib/wine/schtasks.exe.so +lib/wine/scrrun.dll.so +lib/wine/scsiport.sys.so lib/wine/secedit.exe.so lib/wine/secur32.dll.so lib/wine/security.dll.so lib/wine/sensapi.dll.so lib/wine/serialui.dll.so +lib/wine/servicemodelreg.exe.so lib/wine/services.exe.so lib/wine/setupapi.dll.so lib/wine/setupx.dll16.so @@ -1524,6 +1849,7 @@ lib/wine/sxs.dll.so lib/wine/system.drv16.so lib/wine/t2embed.dll.so lib/wine/tapi32.dll.so +lib/wine/taskkill.exe.so lib/wine/taskmgr.exe.so lib/wine/termsv.exe.so lib/wine/toolhelp.dll16.so @@ -1543,10 +1869,15 @@ lib/wine/user32.dll.so lib/wine/userenv.dll.so lib/wine/usp10.dll.so lib/wine/uxtheme.dll.so +lib/wine/vbscript.dll.so +lib/wine/vcomp.dll.so +lib/wine/vcomp100.dll.so +lib/wine/vcomp90.dll.so lib/wine/vdhcp.vxd.so lib/wine/vdmdbg.dll.so lib/wine/ver.dll16.so lib/wine/version.dll.so +lib/wine/view.exe.so lib/wine/vmm.vxd.so lib/wine/vnbt.vxd.so lib/wine/vnetbios.vxd.so @@ -1555,36 +1886,34 @@ lib/wine/vwin32.vxd.so lib/wine/w32skrnl.dll.so lib/wine/w32sys.dll16.so lib/wine/wbemprox.dll.so +lib/wine/webservices.dll.so +lib/wine/wer.dll.so +lib/wine/wevtapi.dll.so lib/wine/wiaservc.dll.so lib/wine/win32s16.dll16.so lib/wine/win87em.dll16.so lib/wine/winaspi.dll16.so lib/wine/windebug.dll16.so lib/wine/windowscodecs.dll.so -lib/wine/winealsa.drv.so -lib/wine/wineaudioio.drv.so +lib/wine/windowscodecsext.dll.so lib/wine/wineboot.exe.so lib/wine/winebrowser.exe.so lib/wine/winecfg.exe.so lib/wine/wineconsole.exe.so -lib/wine/winecoreaudio.drv.so lib/wine/wined3d.dll.so lib/wine/winedbg.exe.so lib/wine/winedevice.exe.so -lib/wine/wineesd.drv.so lib/wine/winefile.exe.so -lib/wine/winejack.drv.so -lib/wine/winejoystick.drv.so lib/wine/winemapi.dll.so lib/wine/winemenubuilder.exe.so lib/wine/winemine.exe.so -lib/wine/winenas.drv.so +lib/wine/winemsibuilder.exe.so lib/wine/wineoss.drv.so lib/wine/winepath.exe.so lib/wine/wineps.drv.so lib/wine/wineps16.drv16.so lib/wine/winevdm.exe.so -${PLIST.x11}lib/wine/winex11.drv.so +lib/wine/winex11.drv.so lib/wine/wing.dll16.so lib/wine/wing32.dll.so lib/wine/winhelp.exe16.so @@ -1598,28 +1927,40 @@ lib/wine/winoldap.mod16.so lib/wine/winscard.dll.so lib/wine/winsock.dll16.so lib/wine/winspool.drv.so +lib/wine/winsta.dll.so lib/wine/wintab.dll16.so lib/wine/wintab32.dll.so lib/wine/wintrust.dll.so lib/wine/winver.exe.so +lib/wine/wlanapi.dll.so lib/wine/wldap32.dll.so lib/wine/wmi.dll.so +lib/wine/wmic.exe.so lib/wine/wmiutils.dll.so +lib/wine/wmvcore.dll.so lib/wine/wnaspi32.dll.so lib/wine/wordpad.exe.so lib/wine/wow32.dll.so lib/wine/write.exe.so lib/wine/ws2_32.dll.so +lib/wine/wscript.exe.so +lib/wine/wshom.ocx.so +lib/wine/wsnmp32.dll.so lib/wine/wsock32.dll.so lib/wine/wtsapi32.dll.so lib/wine/wuapi.dll.so lib/wine/wuaueng.dll.so +lib/wine/wusa.exe.so +lib/wine/xapofx1_1.dll.so lib/wine/xcopy.exe.so lib/wine/xinput1_1.dll.so lib/wine/xinput1_2.dll.so lib/wine/xinput1_3.dll.so lib/wine/xinput9_1_0.dll.so lib/wine/xmllite.dll.so +lib/wine/xolehlp.dll.so +lib/wine/xpsprint.dll.so +lib/wine/xpssvcs.dll.so man/de.UTF-8/man1/wine.1 man/de.UTF-8/man1/winemaker.1 man/de.UTF-8/man1/wineserver.1 @@ -1648,50 +1989,63 @@ man/man1/winepath.1 man/man1/wineserver.1 man/man1/wmc.1 man/man1/wrc.1 +man/pl.UTF-8/man1/wine.1 share/applications/wine.desktop -${PLIST.x11}share/wine/fonts/coue1255.fon -${PLIST.x11}share/wine/fonts/coue1256.fon -${PLIST.x11}share/wine/fonts/coue1257.fon -${PLIST.x11}share/wine/fonts/coure.fon -${PLIST.x11}share/wine/fonts/couree.fon -${PLIST.x11}share/wine/fonts/coureg.fon -${PLIST.x11}share/wine/fonts/courer.fon -${PLIST.x11}share/wine/fonts/couret.fon -${PLIST.x11}share/wine/fonts/cvgasys.fon -${PLIST.x11}share/wine/fonts/hvgasys.fon -${PLIST.x11}share/wine/fonts/jsmalle.fon -${PLIST.x11}share/wine/fonts/jvgasys.fon -${PLIST.x11}share/wine/fonts/marlett.ttf -${PLIST.x11}share/wine/fonts/smae1255.fon -${PLIST.x11}share/wine/fonts/smae1256.fon -${PLIST.x11}share/wine/fonts/smae1257.fon -${PLIST.x11}share/wine/fonts/smalle.fon -${PLIST.x11}share/wine/fonts/smallee.fon -${PLIST.x11}share/wine/fonts/smalleg.fon -${PLIST.x11}share/wine/fonts/smaller.fon -${PLIST.x11}share/wine/fonts/smallet.fon -${PLIST.x11}share/wine/fonts/ssee1255.fon -${PLIST.x11}share/wine/fonts/ssee1256.fon -${PLIST.x11}share/wine/fonts/ssee1257.fon -${PLIST.x11}share/wine/fonts/ssee874.fon -${PLIST.x11}share/wine/fonts/sserife.fon -${PLIST.x11}share/wine/fonts/sserifee.fon -${PLIST.x11}share/wine/fonts/sserifeg.fon -${PLIST.x11}share/wine/fonts/sserifer.fon -${PLIST.x11}share/wine/fonts/sserifet.fon -${PLIST.x11}share/wine/fonts/svgasys.fon -${PLIST.x11}share/wine/fonts/tahoma.ttf -${PLIST.x11}share/wine/fonts/tahomabd.ttf -${PLIST.x11}share/wine/fonts/vgas1255.fon -${PLIST.x11}share/wine/fonts/vgas1256.fon -${PLIST.x11}share/wine/fonts/vgas1257.fon -${PLIST.x11}share/wine/fonts/vgas874.fon -${PLIST.x11}share/wine/fonts/vgasys.fon -${PLIST.x11}share/wine/fonts/vgasyse.fon -${PLIST.x11}share/wine/fonts/vgasysg.fon -${PLIST.x11}share/wine/fonts/vgasysr.fon -${PLIST.x11}share/wine/fonts/vgasyst.fon +share/wine/fonts/coue1255.fon +share/wine/fonts/coue1256.fon +share/wine/fonts/coue1257.fon +share/wine/fonts/coure.fon +share/wine/fonts/couree.fon +share/wine/fonts/coureg.fon +share/wine/fonts/courer.fon +share/wine/fonts/couret.fon +share/wine/fonts/cvgasys.fon +share/wine/fonts/hvgasys.fon +share/wine/fonts/jsmalle.fon +share/wine/fonts/jvgafix.fon +share/wine/fonts/jvgasys.fon +share/wine/fonts/marlett.ttf +share/wine/fonts/smae1255.fon +share/wine/fonts/smae1256.fon +share/wine/fonts/smae1257.fon +share/wine/fonts/smalle.fon +share/wine/fonts/smallee.fon +share/wine/fonts/smalleg.fon +share/wine/fonts/smaller.fon +share/wine/fonts/smallet.fon +share/wine/fonts/ssee1255.fon +share/wine/fonts/ssee1256.fon +share/wine/fonts/ssee1257.fon +share/wine/fonts/ssee874.fon +share/wine/fonts/ssef1255.fon +share/wine/fonts/ssef1256.fon +share/wine/fonts/ssef1257.fon +share/wine/fonts/ssef874.fon +share/wine/fonts/sserife.fon +share/wine/fonts/sserifee.fon +share/wine/fonts/sserifeg.fon +share/wine/fonts/sserifer.fon +share/wine/fonts/sserifet.fon +share/wine/fonts/sseriff.fon +share/wine/fonts/sseriffe.fon +share/wine/fonts/sseriffg.fon +share/wine/fonts/sseriffr.fon +share/wine/fonts/sserifft.fon +share/wine/fonts/svgasys.fon share/wine/fonts/symbol.ttf +share/wine/fonts/tahoma.ttf +share/wine/fonts/tahomabd.ttf +share/wine/fonts/vgafix.fon +share/wine/fonts/vgas1255.fon +share/wine/fonts/vgas1256.fon +share/wine/fonts/vgas1257.fon +share/wine/fonts/vgas874.fon +share/wine/fonts/vgasys.fon +share/wine/fonts/vgasyse.fon +share/wine/fonts/vgasysg.fon +share/wine/fonts/vgasysr.fon +share/wine/fonts/vgasyst.fon +share/wine/fonts/wingding.ttf share/wine/generic.ppd share/wine/l_intl.nls share/wine/wine.inf diff --git a/emulators/wine/buildlink3.mk b/emulators/wine/buildlink3.mk index bf6009aed97..6d8ea9637de 100644 --- a/emulators/wine/buildlink3.mk +++ b/emulators/wine/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.23 2013/07/05 13:29:30 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2014/01/17 09:01:58 adam Exp $ BUILDLINK_TREE+= wine .if !defined(WINE_BUILDLINK3_MK) WINE_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.wine+= wine>=1.2.0 -BUILDLINK_ABI_DEPENDS.wine+= wine>=1.2.3nb15 +BUILDLINK_API_DEPENDS.wine+= wine>=1.3.0 +BUILDLINK_ABI_DEPENDS.wine+= wine>=1.3.26nb1 BUILDLINK_PKGSRCDIR.wine?= ../../emulators/wine pkgbase:= wine diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index 89bedb32a0e..5f4b1f46d9f 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,21 +1,8 @@ -$NetBSD: distinfo,v 1.88 2011/05/04 20:31:39 adam Exp $ +$NetBSD: distinfo,v 1.89 2014/01/17 09:01:58 adam Exp $ -SHA1 (wine-1.2.3.tar.bz2) = 072184c492cc9d137138407732de3bb62ba6c091 -RMD160 (wine-1.2.3.tar.bz2) = 5bc41a4623ee087e57ebd424a15c6743d0874194 -Size (wine-1.2.3.tar.bz2) = 17651336 bytes -SHA1 (patch-ab) = 90cb810b02d22f8e96389e6c1d4f230c11fb1d8c -SHA1 (patch-ac) = c02f1ba14197efa109150850f47df19acb062cfb -SHA1 (patch-ad) = 54df859456f8f6efcddfcdbb5b3fd514e48e8045 -SHA1 (patch-ae) = 5edf543e7cb1614fe6393d5451d786a8ec70f4c7 -SHA1 (patch-af) = cb12614664d70d8393617590eb4cf2bbe111c0f1 -SHA1 (patch-ag) = 3bade676ea1229e35b671b00f75b08b441cf1814 -SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2 -SHA1 (patch-ba) = 4daf9a6494e1a9398bc27300dd90a1d573e30b7e -SHA1 (patch-bc) = 461a46e413d8933c3a9ec317ff17a1014379857f -SHA1 (patch-bd) = 3c71ee87aa835062a3362d984133d3c010a28d89 -SHA1 (patch-be) = a63f40b3fd18bb49825b048abb39fc2e2e634410 -SHA1 (patch-bf) = 59bce6a706789afe8aa3a8a5ab9e19014e4b198c -SHA1 (patch-ca) = 40508e7eb2171ea321fb44a2285138a1a17d14f4 -SHA1 (patch-cd) = aec27ca5616625e80123e92b3db1abdd90d212a0 -SHA1 (patch-ce) = 23088aac01e74164ec6d4a42f96ab7fa34d002c3 -SHA1 (patch-cf) = 6a1c8ce2c77de0eebb9aad9cd5078cf18538d8d8 +SHA1 (wine-1.6.2.tar.bz2) = 574b9ccedbf213622b7ee55f715764673fc27692 +RMD160 (wine-1.6.2.tar.bz2) = 7252851af5e9f748750685900c918e4fcb31c1f6 +Size (wine-1.6.2.tar.bz2) = 21252985 bytes +SHA1 (patch-configure) = dae045a6c4d3e8a8424567ea058e48e6fa08ed26 +SHA1 (patch-dlls_wbemprox_builtin.c) = a120531c3ac1e5eddc3c82424d96c0afae69cc7a +SHA1 (patch-dlls_wineoss.drv_mmdevdrv.c) = 9ea9ad05a32b3f684f22986b227534d87c7dafe7 diff --git a/emulators/wine/options.mk b/emulators/wine/options.mk index 245de5ff8b9..3d19de8334d 100644 --- a/emulators/wine/options.mk +++ b/emulators/wine/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.13 2011/05/04 20:31:39 adam Exp $ +# $NetBSD: options.mk,v 1.14 2014/01/17 09:01:58 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.wine PKG_SUPPORTED_OPTIONS= cups dbus esound hal ldap opengl sane ssl x11 diff --git a/emulators/wine/patches/patch-ab b/emulators/wine/patches/patch-ab deleted file mode 100644 index a8ef392935a..00000000000 --- a/emulators/wine/patches/patch-ab +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ab,v 1.21 2011/05/04 20:31:40 adam Exp $ - ---- dlls/ntdll/cdrom.c.orig 2008-06-27 16:24:42.000000000 +0200 -+++ dlls/ntdll/cdrom.c -@@ -65,6 +65,16 @@ - #endif - #ifdef HAVE_LINUX_CDROM_H - # include <linux/cdrom.h> -+#else -+# ifndef CD_FRAMES -+# define CD_FRAMES 75 -+# endif -+# ifndef CDROM_MSF -+# define CDROM_MSF 0x02 -+# endif -+# ifndef CD_SECS -+# define CD_SECS 60 -+# endif - #endif - #ifdef HAVE_LINUX_UCDROM_H - # include <linux/ucdrom.h> diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac deleted file mode 100644 index cca8580dcf5..00000000000 --- a/emulators/wine/patches/patch-ac +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ac,v 1.40 2011/05/04 20:31:40 adam Exp $ - ---- dlls/ntdll/directory.c.orig 2008-10-17 17:45:25.000000000 +0200 -+++ dlls/ntdll/directory.c 2010-02-19 23:38:56.000000000 +0100 -@@ -131,6 +131,20 @@ - #endif /* linux */ - - #define IS_OPTION_TRUE(ch) ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') -+#if defined(__NetBSD_Version__) && __NetBSD_Version__ >= 399000800 -+/* -+ * workaround for obsolete getdirentries() which returns -+ * the old 32-bit inode struct dirent, while dirent.h has the -+ * new 64-bit inode struct dirent inode since 3.99.8 -+ */ -+int compat_netbsd_getdirentries(int fd, char *buf, int nbytes, long *basep) -+{ -+ *basep = (long)lseek(fd, 0, SEEK_CUR); -+ return getdents(fd, buf, (size_t)nbytes); -+} -+#define getdirentries compat_netbsd_getdirentries -+#endif -+ - #define IS_SEPARATOR(ch) ((ch) == '\\' || (ch) == '/') - - #define INVALID_NT_CHARS '*','?','<','>','|','"' diff --git a/emulators/wine/patches/patch-ad b/emulators/wine/patches/patch-ad deleted file mode 100644 index b131f313036..00000000000 --- a/emulators/wine/patches/patch-ad +++ /dev/null @@ -1,60 +0,0 @@ -$NetBSD: patch-ad,v 1.15 2011/05/04 20:31:40 adam Exp $ - ---- dlls/iphlpapi/ipstats.c.orig 2010-12-10 22:33:07.000000000 +0300 -+++ dlls/iphlpapi/ipstats.c 2010-12-22 00:38:30.000000000 +0300 -@@ -27,6 +27,10 @@ - #include <string.h> - #include <errno.h> - #include <sys/types.h> -+#if defined(__NetBSD__) -+#include <sys/param.h> -+#endif -+#include <unistd.h> - #ifdef HAVE_ALIAS_H - #include <alias.h> - #endif -@@ -489,7 +493,7 @@ - } - if (kc) kstat_close( kc ); - } --#elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) -+#elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) && !defined(__NetBSD__) - { - int mib[] = {CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS}; - #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) -@@ -655,7 +659,7 @@ - } - if (kc) kstat_close( kc ); - } --#elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) -+#elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) && !defined(__NetBSD__) - { - int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS}; - #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) -@@ -804,7 +808,7 @@ - } - if (kc) kstat_close( kc ); - } --#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) -+#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && !defined(__NetBSD__) - { - #ifndef TCPTV_MIN /* got removed in Mac OS X for some reason */ - #define TCPTV_MIN 2 -@@ -915,7 +919,7 @@ - } - if (kc) kstat_close( kc ); - } --#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) -+#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && !defined(__NetBSD__) - { - int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS}; - #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) -@@ -1347,7 +1351,7 @@ - } - else ret = ERROR_NOT_SUPPORTED; - } --#elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) -+#elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) && !defined(__NetBSD__) - { - int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, RTF_LLINFO}; - #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) diff --git a/emulators/wine/patches/patch-ae b/emulators/wine/patches/patch-ae deleted file mode 100644 index 97d0fdeb45e..00000000000 --- a/emulators/wine/patches/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.14 2011/05/04 20:31:40 adam Exp $ - ---- dlls/winex11.drv/opengl.c.orig 2011-04-08 17:09:51.000000000 +0000 -+++ dlls/winex11.drv/opengl.c -@@ -55,6 +55,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); - #endif - #ifdef HAVE_GL_GLX_H - # include <GL/glx.h> -+# include <GL/glxext.h> - #endif - - #include "wine/wgl.h" diff --git a/emulators/wine/patches/patch-af b/emulators/wine/patches/patch-af deleted file mode 100644 index d74bc9bfe14..00000000000 --- a/emulators/wine/patches/patch-af +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-af,v 1.26 2011/05/04 20:31:40 adam Exp $ - ---- dlls/ntdll/signal_i386.c.orig 2009-07-03 18:28:33.000000000 +0200 -+++ dlls/ntdll/signal_i386.c -@@ -446,8 +446,13 @@ enum i386_trap_code - TRAP_x86_PAGEFLT = T_PAGEFLT, /* Page fault */ - TRAP_x86_ARITHTRAP = T_ARITHTRAP, /* Floating point exception */ - TRAP_x86_ALIGNFLT = T_ALIGNFLT, /* Alignment check exception */ -+#if defined(__NetBSD__) -+ TRAP_x86_MCHK = T_MCA, /* Machine check exception */ -+ TRAP_x86_CACHEFLT = T_XMM /* Cache flush exception */ -+#else - TRAP_x86_MCHK = T_MCHK, /* Machine check exception */ - TRAP_x86_CACHEFLT = T_XMMFLT /* Cache flush exception */ -+#endif - #else - TRAP_x86_DIVIDE = 0, /* Division by zero exception */ - TRAP_x86_TRCTRAP = 1, /* Single-step exception */ diff --git a/emulators/wine/patches/patch-ag b/emulators/wine/patches/patch-ag deleted file mode 100644 index 98ddaaaa4a4..00000000000 --- a/emulators/wine/patches/patch-ag +++ /dev/null @@ -1,67 +0,0 @@ -$NetBSD: patch-ag,v 1.8 2011/05/04 20:31:40 adam Exp $ - ---- dlls/ntdll/signal_x86_64.c.orig 2011-04-08 17:09:51.000000000 +0000 -+++ dlls/ntdll/signal_x86_64.c -@@ -212,6 +212,53 @@ extern int arch_prctl(int func, void *pt - #error You must define the signal context functions for your platform - #endif - -+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000) -+# include <sys/ucontext.h> -+# include <sys/types.h> -+# include <signal.h> -+ -+typedef ucontext_t SIGCONTEXT; -+ -+#define RAX_sig(context) ((context)->uc_mcontext.__gregs[_REG_RAX]) -+#define RBX_sig(context) ((context)->uc_mcontext.__gregs[_REG_RBX]) -+#define RCX_sig(context) ((context)->uc_mcontext.__gregs[_REG_RCX]) -+#define RDX_sig(context) ((context)->uc_mcontext.__gregs[_REG_RDX]) -+#define RSI_sig(context) ((context)->uc_mcontext.__gregs[_REG_RSI]) -+#define RDI_sig(context) ((context)->uc_mcontext.__gregs[_REG_RDI]) -+#define RBP_sig(context) ((context)->uc_mcontext.__gregs[_REG_RBP]) -+#define R8_sig(context) ((context)->uc_mcontext.__gregs[_REG_R8]) -+#define R9_sig(context) ((context)->uc_mcontext.__gregs[_REG_R9]) -+#define R10_sig(context) ((context)->uc_mcontext.__gregs[_REG_R10]) -+#define R11_sig(context) ((context)->uc_mcontext.__gregs[_REG_R11]) -+#define R12_sig(context) ((context)->uc_mcontext.__gregs[_REG_R12]) -+#define R13_sig(context) ((context)->uc_mcontext.__gregs[_REG_R13]) -+#define R14_sig(context) ((context)->uc_mcontext.__gregs[_REG_R14]) -+#define R15_sig(context) ((context)->uc_mcontext.__gregs[_REG_R15]) -+ -+#define CS_sig(context) ((context)->uc_mcontext.__gregs[_REG_CS]) -+#define DS_sig(context) ((context)->uc_mcontext.__gregs[_REG_DS]) -+#define ES_sig(context) ((context)->uc_mcontext.__gregs[_REG_ES]) -+#define FS_sig(context) ((context)->uc_mcontext.__gregs[_REG_FS]) -+#define GS_sig(context) ((context)->uc_mcontext.__gregs[_REG_GS]) -+#define SS_sig(context) ((context)->uc_mcontext.__gregs[_REG_SS]) -+ -+#define EFL_sig(context) ((context)->uc_mcontext.__gregs[_REG_RFL]) -+ -+#define RIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_RIP])) -+#define RSP_sig(context) (*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_URSP])) -+ -+#define TRAP_sig(context) ((context)->uc_mcontext.__gregs[_REG_TRAPNO]) -+#define ERROR_sig(context) ((context)->uc_mcontext.__gregs[_REG_ERR]) -+ -+#define FAULT_CODE (__siginfo->si_code) -+#define FAULT_ADDRESS (__siginfo->si_addr) -+ -+#define HANDLER_DEF(name) void name( int __signal, siginfo_t *__siginfo, SIGCONTEXT *__context ) -+#define HANDLER_CONTEXT (__context) -+ -+#define FPU_sig(context) ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.__fpregs)) -+#endif /* __NetBSD__ */ -+ - enum i386_trap_code - { - TRAP_x86_UNKNOWN = -1, /* Unknown fault (TRAP_sig not defined) */ -@@ -2338,7 +2338,7 @@ void signal_init_thread( TEB *teb ) - #elif defined __FreeBSD__ - amd64_set_gsbase( teb ); - #else --# error Please define setting %gs for your architecture -+# warning Please define setting %gs for your architecture - #endif - - ss.ss_sp = (char *)teb + teb_size; diff --git a/emulators/wine/patches/patch-ai b/emulators/wine/patches/patch-ai deleted file mode 100644 index 15924abad12..00000000000 --- a/emulators/wine/patches/patch-ai +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ai,v 1.8 2006/01/20 14:58:53 adam Exp $ - ---- include/winternl.h.orig 2005-11-11 09:56:44.000000000 +0100 -+++ include/winternl.h -@@ -22,6 +22,7 @@ - #define __WINE_WINTERNL_H - - #include <windef.h> -+#include <stdarg.h> - - #ifdef __cplusplus - extern "C" { diff --git a/emulators/wine/patches/patch-ba b/emulators/wine/patches/patch-ba deleted file mode 100644 index 6f945039cda..00000000000 --- a/emulators/wine/patches/patch-ba +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ba,v 1.2 2011/05/04 20:31:40 adam Exp $ - ---- configure.orig 2010-06-18 17:36:58.000000000 +0000 -+++ configure -@@ -4166,11 +4166,6 @@ fi - $as_echo "$wine_cv_toolsdir" >&6; } - TOOLSDIR=$wine_cv_toolsdir - --if test -n "$host_alias" -a "$host_alias" != "$build_alias" --then -- TARGETFLAGS="-b $host_alias $TARGETFLAGS" -- --fi - - for ac_prog in flex - do diff --git a/emulators/wine/patches/patch-bc b/emulators/wine/patches/patch-bc deleted file mode 100644 index 8c50fab999e..00000000000 --- a/emulators/wine/patches/patch-bc +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-bc,v 1.2 2011/05/04 20:31:40 adam Exp $ - ---- dlls/wineoss.drv/audio.c.orig 2011-04-08 17:09:51.000000000 +0000 -+++ dlls/wineoss.drv/audio.c -@@ -75,6 +75,12 @@ - - #include "audio.h" - -+#ifdef __NetBSD__ -+#define SOUND_DEV "/dev/sound" -+#else -+#define SOUND_DEV "/dev/dsp" -+#endif -+ - WINE_DEFAULT_DEBUG_CHANNEL(wave); - - /* Allow 1% deviation for sample rates (some ES137x cards) */ -@@ -1170,12 +1176,12 @@ static LRESULT OSS_WaveInit(void) - } - else - { -- WOutDev[0].ossdev.dev_name = WInDev[0].ossdev.dev_name = StrDup("/dev/dsp",NULL); -+ WOutDev[0].ossdev.dev_name = WInDev[0].ossdev.dev_name = StrDup(SOUND_DEV,NULL); - WOutDev[0].ossdev.mixer_name = WInDev[0].ossdev.mixer_name = StrDup("/dev/mixer",NULL); - for (i = 1; i < MAX_WAVEDRV; ++i) - { - WOutDev[i].ossdev.dev_name = WInDev[i].ossdev.dev_name = HeapAlloc(GetProcessHeap(),0,11); -- sprintf(WOutDev[i].ossdev.dev_name, "/dev/dsp%u", i); -+ sprintf(WOutDev[i].ossdev.dev_name, SOUND_DEV "%u", i); - WOutDev[i].ossdev.mixer_name = WInDev[i].ossdev.mixer_name = HeapAlloc(GetProcessHeap(),0,13); - sprintf(WOutDev[i].ossdev.mixer_name, "/dev/mixer%u", i); - } diff --git a/emulators/wine/patches/patch-bd b/emulators/wine/patches/patch-bd deleted file mode 100644 index 7500976e3ca..00000000000 --- a/emulators/wine/patches/patch-bd +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bd,v 1.2 2011/05/04 20:31:40 adam Exp $ - ---- dlls/Makedll.rules.in.orig 2010-06-18 17:36:58.000000000 +0000 -+++ dlls/Makedll.rules.in -@@ -85,7 +85,7 @@ install_dll: $(MODULE) $(DESTDIR)$(dlldi - $(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(dlldir)/$(MODULE) - - install_dll.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy -- $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so -+ $(BSD_INSTALL_LIB) $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so - - install_dll.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy - $(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE) diff --git a/emulators/wine/patches/patch-be b/emulators/wine/patches/patch-be deleted file mode 100644 index 701330af24c..00000000000 --- a/emulators/wine/patches/patch-be +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-be,v 1.2 2011/05/04 20:31:40 adam Exp $ - ---- programs/Makeprog.rules.in.orig 2011-04-08 17:09:51.000000000 +0000 -+++ programs/Makeprog.rules.in -@@ -26,7 +26,7 @@ $(MODULE) $(MODULE).so $(MODULE).fake: $ - .PHONY: install_prog install_prog.so install_prog.fake - - install_prog.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy -- $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so -+ ${BSD_INSTALL_LIB} $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so - - install_prog.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy - $(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE) diff --git a/emulators/wine/patches/patch-bf b/emulators/wine/patches/patch-bf deleted file mode 100644 index 803807a3438..00000000000 --- a/emulators/wine/patches/patch-bf +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-bf,v 1.2 2011/05/04 20:31:40 adam Exp $ - ---- libs/wine/Makefile.in.orig 2008-10-17 17:45:25.000000000 +0200 -+++ libs/wine/Makefile.in -@@ -149,14 +149,14 @@ libwine.dylib: libwine.$(SOVERSION).dyli - .PHONY: install-lib-so install-lib-dll install-lib-dylib install-dev-so install-dev-dll install-dev-dylib - - install-lib-so: libwine.so.$(VERSION) $(DESTDIR)$(libdir) dummy -- $(INSTALL_PROGRAM) libwine.so.$(VERSION) $(DESTDIR)$(libdir)/libwine.so.$(VERSION) -+ ${BSD_INSTALL_LIB} libwine.so.$(VERSION) $(DESTDIR)$(libdir)/libwine.so.$(VERSION) - cd $(DESTDIR)$(libdir) && $(RM) libwine.so.$(SOVERSION) && $(LN_S) libwine.so.$(VERSION) libwine.so.$(SOVERSION) - - install-lib-dll: libwine.dll $(DESTDIR)$(libdir) dummy - $(INSTALL_DATA) libwine.dll $(DESTDIR)$(libdir)/libwine.dll - - install-lib-dylib: libwine.$(VERSION).dylib $(DESTDIR)$(libdir) dummy -- $(INSTALL_PROGRAM) libwine.$(VERSION).dylib $(DESTDIR)$(libdir)/libwine.$(VERSION).dylib -+ ${BSD_INSTALL_LIB} libwine.$(VERSION).dylib $(DESTDIR)$(libdir)/libwine.$(VERSION).dylib - cd $(DESTDIR)$(libdir) && $(RM) libwine.$(SOVERSION).dylib && $(LN_S) libwine.$(VERSION).dylib libwine.$(SOVERSION).dylib - - install-dev-so: $(DESTDIR)$(libdir) dummy diff --git a/emulators/wine/patches/patch-ca b/emulators/wine/patches/patch-ca deleted file mode 100644 index fc11c9b732a..00000000000 --- a/emulators/wine/patches/patch-ca +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ca,v 1.2 2011/05/04 20:31:40 adam Exp $ - ---- dlls/winex11.drv/settings.c.orig 2008-06-27 11:42:50.000000000 -0400 -+++ dlls/winex11.drv/settings.c 2008-06-27 11:43:40.000000000 -0400 -@@ -432,6 +432,16 @@ - return DISP_CHANGE_SUCCESSFUL; - } - -+ if (devmode->dmPelsWidth == 800 && devmode->dmPelsHeight == 600) -+ { -+ DEVMODEW newdm = *devmode; -+ -+ ERR("800x600 not available, trying 800x480\n"); -+ newdm.dmPelsWidth = 800; -+ newdm.dmPelsHeight = 480; -+ return X11DRV_ChangeDisplaySettingsEx(devname, &newdm, hwnd, flags, lpvoid); -+ } -+ - /* no valid modes found */ - ERR("No matching mode found %ux%ux%u @%u! (%s)\n", - devmode->dmPelsWidth, devmode->dmPelsHeight, diff --git a/emulators/wine/patches/patch-cd b/emulators/wine/patches/patch-cd deleted file mode 100644 index 497973c7208..00000000000 --- a/emulators/wine/patches/patch-cd +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-cd,v 1.1 2011/05/04 20:31:40 adam Exp $ - ---- dlls/wsock32/socket.c.orig 2009-02-27 23:21:46.000000000 +0100 -+++ dlls/wsock32/socket.c -@@ -23,10 +23,10 @@ - #include "config.h" - #include <stdarg.h> - -+#include "winsock2.h" - #include "windef.h" - #include "winbase.h" - #include "wine/debug.h" --#include "winsock2.h" - #include "winnt.h" - #include "wscontrol.h" - #include "iphlpapi.h" diff --git a/emulators/wine/patches/patch-ce b/emulators/wine/patches/patch-ce deleted file mode 100644 index 4a1c8980fb0..00000000000 --- a/emulators/wine/patches/patch-ce +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ce,v 1.1 2011/05/04 20:31:40 adam Exp $ - ---- dlls/riched20/tests/editor.c.orig 2009-02-27 23:21:46.000000000 +0100 -+++ dlls/riched20/tests/editor.c -@@ -23,6 +23,7 @@ - #include <stdarg.h> - #include <stdio.h> - #include <assert.h> -+#include <winsock2.h> - #include <windef.h> - #include <winbase.h> - #include <wingdi.h> diff --git a/emulators/wine/patches/patch-cf b/emulators/wine/patches/patch-cf deleted file mode 100644 index 241508a98de..00000000000 --- a/emulators/wine/patches/patch-cf +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-cf,v 1.1 2011/05/04 20:31:40 adam Exp $ - ---- dlls/riched32/tests/editor.c.orig 2009-02-27 23:21:46.000000000 +0100 -+++ dlls/riched32/tests/editor.c -@@ -23,6 +23,7 @@ - - #include <stdarg.h> - #include <assert.h> -+#include <winsock2.h> - #include <windef.h> - #include <winbase.h> - #include <wingdi.h> diff --git a/emulators/wine/patches/patch-configure b/emulators/wine/patches/patch-configure new file mode 100644 index 00000000000..4a8171cf515 --- /dev/null +++ b/emulators/wine/patches/patch-configure @@ -0,0 +1,32 @@ +$NetBSD: patch-configure,v 1.1 2014/01/17 09:01:58 adam Exp $ + +Configure for OSS v3 support for NetBSD. + +--- configure.orig 2013-11-15 19:30:24.000000000 +0000 ++++ configure +@@ -11395,14 +11395,25 @@ then + if test "x$ac_cv_header_sys_soundcard_h" = xyes; then : + ac_fn_c_check_member "$LINENO" "oss_sysinfo" "numaudioengines" "ac_cv_member_oss_sysinfo_numaudioengines" "#include <sys/soundcard.h> + " ++if test x`echo "$host_alias" | grep -iv netbsd` = x; then : + if test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes; then : + + cat >>confdefs.h <<_ACEOF + #define HAVE_OSS_SYSINFO_NUMAUDIOENGINES 1 ++#define HAVE_OSSv4 1 + _ACEOF + + OSS4INCL="$ac_oss_incl" + ++else ++ac_cv_member_oss_sysinfo_numaudioengines=yes ++cat >>confdefs.h <<_ACEOF ++#define HAVE_OSS_SYSINFO_NUMAUDIOENGINES 1 ++_ACEOF ++ ++OSS4INCL="$ac_oss_incl" ++ ++fi + fi + + fi diff --git a/emulators/wine/patches/patch-dlls_wbemprox_builtin.c b/emulators/wine/patches/patch-dlls_wbemprox_builtin.c new file mode 100644 index 00000000000..f347d4981aa --- /dev/null +++ b/emulators/wine/patches/patch-dlls_wbemprox_builtin.c @@ -0,0 +1,20 @@ +$NetBSD: patch-dlls_wbemprox_builtin.c,v 1.1 2014/01/17 09:01:58 adam Exp $ + +Reorder includes to fix 'select' being redefined error on NetBSD. + +--- dlls/wbemprox/builtin.c.orig 2013-11-15 19:30:24.000000000 +0000 ++++ dlls/wbemprox/builtin.c +@@ -25,12 +25,12 @@ + + #include "ntstatus.h" + #define WIN32_NO_STATUS ++#include "winsock2.h" + #include "windef.h" + #include "winbase.h" + #include "initguid.h" + #include "wbemcli.h" + #include "wbemprov.h" +-#include "winsock2.h" + #include "iphlpapi.h" + #include "tlhelp32.h" + #include "d3d10.h" diff --git a/emulators/wine/patches/patch-dlls_wineoss.drv_mmdevdrv.c b/emulators/wine/patches/patch-dlls_wineoss.drv_mmdevdrv.c new file mode 100644 index 00000000000..a92ae6cd91d --- /dev/null +++ b/emulators/wine/patches/patch-dlls_wineoss.drv_mmdevdrv.c @@ -0,0 +1,311 @@ +$NetBSD: patch-dlls_wineoss.drv_mmdevdrv.c,v 1.1 2014/01/17 09:01:58 adam Exp $ + +Restore OSSv3 support for NetBSD. + +--- dlls/wineoss.drv/mmdevdrv.c.orig 2013-11-15 19:30:24.000000000 +0000 ++++ dlls/wineoss.drv/mmdevdrv.c +@@ -55,6 +55,10 @@ + + WINE_DEFAULT_DEBUG_CHANNEL(oss); + ++#ifndef HAVE_OSSv4 ++#define OSS_DEVNODE_SIZE 255 ++#endif ++ + #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) + + static const REFERENCE_TIME DefaultPeriod = 200000; +@@ -111,7 +115,9 @@ struct ACImpl { + float *vols; + + int fd; ++#ifdef HAVE_OSSv4 + oss_audioinfo ai; ++#endif + char devnode[OSS_DEVNODE_SIZE]; + + BOOL initted, playing; +@@ -269,7 +275,9 @@ enum DriverPriority { + int WINAPI AUDDRV_GetPriority(void) + { + int mixer_fd; ++#ifdef HAVE_OSSv4 + oss_sysinfo sysinfo; ++#endif + + /* Attempt to determine if we are running on OSS or ALSA's OSS + * compatibility layer. There is no official way to do that, so just check +@@ -282,6 +290,7 @@ int WINAPI AUDDRV_GetPriority(void) + return Priority_Unavailable; + } + ++#ifdef HAVE_OSSv4 + sysinfo.version[0] = 0xFF; + sysinfo.versionnum = ~0; + if(ioctl(mixer_fd, SNDCTL_SYSINFO, &sysinfo) < 0){ +@@ -289,9 +298,11 @@ int WINAPI AUDDRV_GetPriority(void) + close(mixer_fd); + return Priority_Unavailable; + } ++#endif + + close(mixer_fd); + ++#ifdef HAVE_OSSv4 + if(sysinfo.version[0] < '4' || sysinfo.version[0] > '9'){ + TRACE("Priority_Low: sysinfo.version[0]: %x\n", sysinfo.version[0]); + return Priority_Low; +@@ -300,6 +311,7 @@ int WINAPI AUDDRV_GetPriority(void) + TRACE("Priority_Low: sysinfo.versionnum: %x\n", sysinfo.versionnum); + return Priority_Low; + } ++#endif + + TRACE("Priority_Preferred: Seems like valid OSS!\n"); + +@@ -406,29 +418,34 @@ static UINT get_default_index(EDataFlow + { + int fd = -1, err; + UINT i; ++#ifdef HAVE_OSSv4 + oss_audioinfo ai; ++#endif + const char *devnode; + OSSDevice *dev_item; + + if(flow == eRender) +- fd = open("/dev/dsp", O_WRONLY | O_NONBLOCK); ++ fd = open("/dev/audio", O_WRONLY | O_NONBLOCK); + else +- fd = open("/dev/dsp", O_RDONLY | O_NONBLOCK); ++ fd = open("/dev/audio", O_RDONLY | O_NONBLOCK); + + if(fd < 0){ + WARN("Couldn't open default device!\n"); + return 0; + } + ++#ifdef HAVE_OSSv4 + ai.dev = -1; + if((err = ioctl(fd, SNDCTL_ENGINEINFO, &ai)) < 0){ + WARN("SNDCTL_ENGINEINFO failed: %d (%s)\n", err, strerror(errno)); + close(fd); + return 0; + } ++#endif + + close(fd); + ++#ifdef HAVE_OSSv4 + TRACE("Default devnode: %s\n", ai.devnode); + devnode = oss_clean_devnode(ai.devnode); + i = 0; +@@ -439,6 +456,7 @@ static UINT get_default_index(EDataFlow + ++i; + } + } ++#endif + + WARN("Couldn't find default device! Choosing first.\n"); + return 0; +@@ -448,7 +466,9 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDa + UINT *num, UINT *def_index) + { + int i, mixer_fd; ++#ifdef HAVE_OSSv4 + oss_sysinfo sysinfo; ++#endif + static int print_once = 0; + + static const WCHAR outW[] = {'O','u','t',':',' ',0}; +@@ -462,6 +482,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDa + return AUDCLNT_E_SERVICE_NOT_RUNNING; + } + ++#ifdef HAVE_OSSv4 + if(ioctl(mixer_fd, SNDCTL_SYSINFO, &sysinfo) < 0){ + close(mixer_fd); + +@@ -574,6 +595,55 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDa + } + } + ++#else ++ *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)); ++ *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); ++ ++ *num = 0; ++ const char *devnode; ++ OSSDevice *dev_item; ++ devnode = oss_clean_devnode("/dev/audio"); ++ size_t len, prefix_len; ++ const WCHAR *prefix; ++ ++ dev_item = HeapAlloc(GetProcessHeap(), 0, sizeof(*dev_item)); ++ ++ dev_item->flow = flow; ++ get_device_guid(flow, devnode, &dev_item->guid); ++ strcpy(dev_item->devnode, devnode); ++ ++ (*guids)[*num] = dev_item->guid; ++ ++ len = MultiByteToWideChar(CP_UNIXCP, 0, "OSS AUDIO", -1, NULL, 0); ++ if(flow == eRender){ ++ prefix = outW; ++ prefix_len = (sizeof(outW) / sizeof(*outW)) - 1; ++ len += prefix_len; ++ }else{ ++ prefix = inW; ++ prefix_len = (sizeof(inW) / sizeof(*inW)) - 1; ++ len += prefix_len; ++ } ++ (*ids)[*num] = HeapAlloc(GetProcessHeap(), 0, ++ len * sizeof(WCHAR)); ++ if(!(*ids)[*num]){ ++ for(i = 0; i < *num; ++i) ++ HeapFree(GetProcessHeap(), 0, (*ids)[i]); ++ HeapFree(GetProcessHeap(), 0, *ids); ++ HeapFree(GetProcessHeap(), 0, *guids); ++ HeapFree(GetProcessHeap(), 0, dev_item); ++ close(mixer_fd); ++ return E_OUTOFMEMORY; ++ } ++ memcpy((*ids)[*num], prefix, prefix_len * sizeof(WCHAR)); ++ MultiByteToWideChar(CP_UNIXCP, 0, "OSS_AUDIO", -1, ++ (*ids)[*num] + prefix_len, len - prefix_len); ++ ++ list_add_tail(&g_devices, &dev_item->entry); ++ ++ (*num)++; ++#endif ++ + close(mixer_fd); + + *def_index = get_default_index(flow); +@@ -625,6 +695,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(G + + This->dataflow = oss_dev->flow; + ++#ifdef HAVE_OSSv4 + This->ai.dev = -1; + if(ioctl(This->fd, SNDCTL_ENGINEINFO, &This->ai) < 0){ + WARN("Unable to get audio info for device %s: %d (%s)\n", oss_dev->devnode, +@@ -633,9 +704,11 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(G + HeapFree(GetProcessHeap(), 0, This); + return E_FAIL; + } ++#endif + + strcpy(This->devnode, oss_dev->devnode); + ++#ifdef HAVE_OSSv4 + TRACE("OSS audioinfo:\n"); + TRACE("devnode: %s\n", This->ai.devnode); + TRACE("name: %s\n", This->ai.name); +@@ -648,6 +721,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(G + TRACE("max_rate: %d\n", This->ai.max_rate); + TRACE("min_channels: %d\n", This->ai.min_channels); + TRACE("max_channels: %d\n", This->ai.max_channels); ++#endif + + This->IAudioClient_iface.lpVtbl = &AudioClient_Vtbl; + This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl; +@@ -794,10 +868,12 @@ static int get_oss_format(const WAVEFORM + return AFMT_U8; + case 16: + return AFMT_S16_LE; ++#ifdef HAVE_OSSv4 + case 24: + return AFMT_S24_LE; + case 32: + return AFMT_S32_LE; ++#endif + } + return -1; + } +@@ -1241,10 +1317,14 @@ static HRESULT WINAPI AudioClient_IsForm + outpwfx = NULL; + } + ++#ifndef __NetBSD__ + if(This->dataflow == eRender) + fd = open(This->devnode, O_WRONLY | O_NONBLOCK, 0); + else if(This->dataflow == eCapture) + fd = open(This->devnode, O_RDONLY | O_NONBLOCK, 0); ++#else ++ fd = This->fd; ++#endif + + if(fd < 0){ + WARN("Unable to open device %s: %d (%s)\n", This->devnode, errno, +@@ -1254,7 +1334,9 @@ static HRESULT WINAPI AudioClient_IsForm + + ret = setup_oss_device(mode, fd, pwfx, outpwfx); + ++#ifndef __NetBSD__ + close(fd); ++#endif + + return ret; + } +@@ -1272,11 +1354,19 @@ static HRESULT WINAPI AudioClient_GetMix + return E_POINTER; + *pwfx = NULL; + +- if(This->dataflow == eRender) ++ if(This->dataflow == eRender) { ++#if HAVE_OSSv4 + formats = This->ai.oformats; +- else if(This->dataflow == eCapture) ++#else ++ formats = AFMT_S16_LE; ++#endif ++ } else if(This->dataflow == eCapture) { ++#if HAVE_OSSv4 + formats = This->ai.iformats; +- else ++#else ++ formats = AFMT_S16_LE; ++#endif ++ } else + return E_UNEXPECTED; + + fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); +@@ -1295,12 +1385,14 @@ static HRESULT WINAPI AudioClient_GetMix + }else if(formats & AFMT_U8){ + fmt->Format.wBitsPerSample = 8; + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; ++#ifdef HAVE_OSSv4 + }else if(formats & AFMT_S32_LE){ + fmt->Format.wBitsPerSample = 32; + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + }else if(formats & AFMT_S24_LE){ + fmt->Format.wBitsPerSample = 24; + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; ++#endif + }else{ + WARN("Didn't recognize any available OSS formats: %x\n", formats); + CoTaskMemFree(fmt); +@@ -1309,16 +1401,22 @@ static HRESULT WINAPI AudioClient_GetMix + + /* some OSS drivers are buggy, so set reasonable defaults if + * the reported values seem wacky */ ++#ifdef HAVE_OSSv4 + fmt->Format.nChannels = max(This->ai.max_channels, This->ai.min_channels); + if(fmt->Format.nChannels == 0 || fmt->Format.nChannels > 8) ++#endif + fmt->Format.nChannels = 2; + ++#ifdef HAVE_OSSv4 + if(This->ai.max_rate == 0) ++#endif + fmt->Format.nSamplesPerSec = 44100; ++#ifdef HAVE_OSSv4 + else + fmt->Format.nSamplesPerSec = min(This->ai.max_rate, 44100); + if(fmt->Format.nSamplesPerSec < This->ai.min_rate) + fmt->Format.nSamplesPerSec = This->ai.min_rate; ++#endif + + fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels); + |