diff options
| author | adam <adam> | 2014-01-19 10:58:23 +0000 |
|---|---|---|
| committer | adam <adam> | 2014-01-19 10:58:23 +0000 |
| commit | 1917905e83adc95e964604bba109c961857a2ad2 (patch) | |
| tree | 46a942320e83065e32d082f198479a99944aa118 /emulators/wine-devel | |
| parent | d9e55f20f93ff8cf1b636a3bcd2940a4cfbc6d6d (diff) | |
| download | pkgsrc-1917905e83adc95e964604bba109c961857a2ad2.tar.gz | |
Changes 1.7.11:
- Uniscribe support in the RichEdit control.
- Support for condition variables and Slim Reader/Writer locks.
- More D3D command stream preparation work.
- Optional Start Menu in desktop mode.
- Improved support for vertical fonts metrics.
- Various bug fixes.
Diffstat (limited to 'emulators/wine-devel')
31 files changed, 708 insertions, 758 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index b05b96e57b1..1c387057e16 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,26 +1,26 @@ -# $NetBSD: Makefile,v 1.43 2014/01/01 11:52:15 wiz Exp $ +# $NetBSD: Makefile,v 1.44 2014/01/19 10:58:23 adam Exp $ -DISTNAME= wine-1.3.26 -PKGREVISION= 17 +DISTNAME= wine-1.7.11 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 @@ -30,7 +30,6 @@ REPLACE_PERL+= tools/winemaker tools/winedump/function_grep.pl # The Wine configure script has problems locating the libraries in the # buildlink directory, so prepend all of the LDFLAGS necessary to link # against the libraries. -# CONFIGURE_ENV+= X_LIBS=${LDFLAGS:M*:Q} CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q}\ -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\"" CONFIGURE_ENV+= LDD=${LDD:Q} @@ -47,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-devel/PLIST.common b/emulators/wine-devel/PLIST.common index 41f768a62e0..7146164e2d0 100644 --- a/emulators/wine-devel/PLIST.common +++ b/emulators/wine-devel/PLIST.common @@ -1,5 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.14 2011/08/20 20:47:35 adam Exp $ -bin/fnt2bdf +@comment $NetBSD: PLIST.common,v 1.15 2014/01/19 10:58:23 adam Exp $ bin/function_grep.pl bin/msiexec bin/notepad @@ -88,13 +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 @@ -110,15 +112,22 @@ include/wine/windows/axextend.idl include/wine/windows/basetsd.h include/wine/windows/basetyps.h include/wine/windows/bcrypt.h +include/wine/windows/bdaiface.h +include/wine/windows/bdaiface.idl +include/wine/windows/bdaiface_enums.h +include/wine/windows/bdatypes.h include/wine/windows/binres.idl include/wine/windows/bits.h include/wine/windows/bits.idl include/wine/windows/bits1_5.h include/wine/windows/bits1_5.idl +include/wine/windows/bits3_0.h +include/wine/windows/bits3_0.idl include/wine/windows/bitsmsg.h include/wine/windows/cderr.h include/wine/windows/cfgmgr32.h include/wine/windows/cguid.h +include/wine/windows/chprst.idl include/wine/windows/cierror.h include/wine/windows/clusapi.h include/wine/windows/cmdbas.idl @@ -135,6 +144,8 @@ 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 @@ -147,6 +158,9 @@ include/wine/windows/ctxtcall.h include/wine/windows/ctxtcall.idl include/wine/windows/custcntl.h include/wine/windows/cvconst.h +include/wine/windows/d2d1.h +include/wine/windows/d2d1.idl +include/wine/windows/d2dbasetypes.h include/wine/windows/d3d.h include/wine/windows/d3d10.h include/wine/windows/d3d10.idl @@ -158,6 +172,8 @@ include/wine/windows/d3d10misc.h include/wine/windows/d3d10shader.h include/wine/windows/d3d11.h include/wine/windows/d3d11.idl +include/wine/windows/d3d11sdklayers.h +include/wine/windows/d3d11sdklayers.idl include/wine/windows/d3d11shader.h include/wine/windows/d3d8.h include/wine/windows/d3d8caps.h @@ -197,7 +213,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 @@ -211,6 +229,8 @@ include/wine/windows/ddk/usb.h include/wine/windows/ddk/usb100.h include/wine/windows/ddk/usb200.h include/wine/windows/ddk/usbdlib.h +include/wine/windows/ddk/usbioctl.h +include/wine/windows/ddk/usbiodef.h include/wine/windows/ddk/wdm.h include/wine/windows/ddk/winddiui.h include/wine/windows/ddk/winsplp.h @@ -219,16 +239,19 @@ include/wine/windows/ddrawgdi.h include/wine/windows/ddrawi.h include/wine/windows/ddstream.h include/wine/windows/ddstream.idl +include/wine/windows/delayloadhandler.h include/wine/windows/devenum.idl include/wine/windows/devguid.h 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 @@ -237,6 +260,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 @@ -259,13 +283,16 @@ 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 @@ -279,6 +306,7 @@ include/wine/windows/endpointvolume.h include/wine/windows/endpointvolume.idl include/wine/windows/errorrep.h include/wine/windows/errors.h +include/wine/windows/errrec.idl include/wine/windows/evcode.h include/wine/windows/evntprov.h include/wine/windows/evntrace.h @@ -288,6 +316,7 @@ include/wine/windows/exdisp.idl include/wine/windows/exdispid.h include/wine/windows/fci.h include/wine/windows/fdi.h +include/wine/windows/fileapi.h include/wine/windows/fltdefs.h include/wine/windows/fusion.h include/wine/windows/fusion.idl @@ -309,6 +338,8 @@ 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 @@ -327,6 +358,7 @@ 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 @@ -338,10 +370,13 @@ include/wine/windows/inaddr.h include/wine/windows/indexsrv.h include/wine/windows/indexsrv.idl include/wine/windows/initguid.h +include/wine/windows/inputscope.h +include/wine/windows/inputscope.idl 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 @@ -352,6 +387,7 @@ 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 @@ -389,6 +425,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 @@ -409,6 +447,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 @@ -417,6 +457,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 @@ -440,6 +482,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 @@ -481,6 +524,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 @@ -520,6 +564,8 @@ include/wine/windows/rmxftmpl.h include/wine/windows/rmxftmpl.x include/wine/windows/row.idl include/wine/windows/rowchg.idl +include/wine/windows/rowpos.idl +include/wine/windows/rowpsc.idl include/wine/windows/rpc.h include/wine/windows/rpcasync.h include/wine/windows/rpcdce.h @@ -531,6 +577,7 @@ 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 @@ -568,6 +615,7 @@ include/wine/windows/softpub.h include/wine/windows/sql.h include/wine/windows/sqlext.h include/wine/windows/sqltypes.h +include/wine/windows/srcrst.idl include/wine/windows/srrestoreptapi.h include/wine/windows/sspi.h include/wine/windows/stdole2.idl @@ -581,16 +629,34 @@ include/wine/windows/structuredquerycondition.idl include/wine/windows/svrapi.h include/wine/windows/t2embapi.h include/wine/windows/tapi.h +include/wine/windows/taskschd.h +include/wine/windows/taskschd.idl 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 @@ -603,6 +669,7 @@ 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 @@ -612,6 +679,10 @@ include/wine/windows/vsstyle.h include/wine/windows/vssym32.h include/wine/windows/wbemcli.h include/wine/windows/wbemcli.idl +include/wine/windows/wbemdisp.h +include/wine/windows/wbemdisp.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 @@ -622,6 +693,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 @@ -630,6 +703,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 @@ -640,12 +714,14 @@ 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 include/wine/windows/winsafer.h include/wine/windows/winscard.h include/wine/windows/winsmcrd.h +include/wine/windows/winsnmp.h include/wine/windows/winsock.h include/wine/windows/winsock2.h include/wine/windows/winspool.h @@ -660,6 +736,12 @@ 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 @@ -696,9 +778,37 @@ 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-debug-l1-1-1.dll.so +lib/wine/api-ms-win-core-errorhandling-l1-1-1.dll.so +lib/wine/api-ms-win-core-interlocked-l1-2-0.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-processthreads-l1-1-1.dll.so +lib/wine/api-ms-win-core-profile-l1-1-0.dll.so +lib/wine/api-ms-win-core-string-l1-1-0.dll.so +lib/wine/api-ms-win-core-sysinfo-l1-2-0.dll.so +lib/wine/api-ms-win-core-util-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/arp.exe.so lib/wine/aspnet_regiis.exe.so lib/wine/atl.dll.so +lib/wine/atl100.dll.so +lib/wine/atl110.dll.so +lib/wine/atl80.dll.so +lib/wine/atl90.dll.so lib/wine/attrib.exe.so lib/wine/authz.dll.so lib/wine/avicap32.dll.so @@ -723,6 +833,8 @@ lib/wine/comm.drv16.so lib/wine/commdlg.dll16.so lib/wine/compobj.dll16.so lib/wine/compstui.dll.so +lib/wine/comsvcs.dll.so +lib/wine/conhost.exe.so lib/wine/control.exe.so lib/wine/credui.dll.so lib/wine/crtdll.dll.so @@ -731,12 +843,14 @@ 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 @@ -763,6 +877,8 @@ 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/d3dx11_42.dll.so +lib/wine/d3dx11_43.dll.so lib/wine/d3dx9_24.dll.so lib/wine/d3dx9_25.dll.so lib/wine/d3dx9_26.dll.so @@ -791,6 +907,8 @@ 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 @@ -818,6 +936,7 @@ 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 @@ -833,9 +952,37 @@ 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-debug-l1-1-1.dll +lib/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-1.dll +lib/wine/fakedlls/api-ms-win-core-interlocked-l1-2-0.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-processthreads-l1-1-1.dll +lib/wine/fakedlls/api-ms-win-core-profile-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-core-string-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-core-sysinfo-l1-2-0.dll +lib/wine/fakedlls/api-ms-win-core-util-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/arp.exe lib/wine/fakedlls/aspnet_regiis.exe lib/wine/fakedlls/atl.dll +lib/wine/fakedlls/atl100.dll +lib/wine/fakedlls/atl110.dll +lib/wine/fakedlls/atl80.dll +lib/wine/fakedlls/atl90.dll lib/wine/fakedlls/attrib.exe lib/wine/fakedlls/authz.dll lib/wine/fakedlls/avicap32.dll @@ -860,6 +1007,8 @@ lib/wine/fakedlls/comm.drv16 lib/wine/fakedlls/commdlg.dll16 lib/wine/fakedlls/compobj.dll16 lib/wine/fakedlls/compstui.dll +lib/wine/fakedlls/comsvcs.dll +lib/wine/fakedlls/conhost.exe lib/wine/fakedlls/control.exe lib/wine/fakedlls/credui.dll lib/wine/fakedlls/crtdll.dll @@ -868,12 +1017,14 @@ 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 @@ -900,6 +1051,8 @@ 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/d3dx11_42.dll +lib/wine/fakedlls/d3dx11_43.dll lib/wine/fakedlls/d3dx9_24.dll lib/wine/fakedlls/d3dx9_25.dll lib/wine/fakedlls/d3dx9_26.dll @@ -928,6 +1081,8 @@ 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 @@ -955,6 +1110,7 @@ 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 @@ -964,6 +1120,7 @@ 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 @@ -971,7 +1128,7 @@ lib/wine/fakedlls/gameux.dll lib/wine/fakedlls/gdi.exe16 lib/wine/fakedlls/gdi32.dll lib/wine/fakedlls/gdiplus.dll -${PLIST.opengl}lib/wine/fakedlls/glu32.dll +lib/wine/fakedlls/glu32.dll lib/wine/fakedlls/gphoto2.ds lib/wine/fakedlls/gpkcsp.dll lib/wine/fakedlls/hal.dll @@ -1003,6 +1160,7 @@ 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 @@ -1021,8 +1179,10 @@ 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 @@ -1049,12 +1209,14 @@ 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 @@ -1062,13 +1224,17 @@ 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 @@ -1089,7 +1255,9 @@ lib/wine/fakedlls/msxml6.dll lib/wine/fakedlls/nddeapi.dll lib/wine/fakedlls/net.exe lib/wine/fakedlls/netapi32.dll +lib/wine/fakedlls/netcfgx.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 @@ -1102,6 +1270,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 @@ -1120,12 +1289,14 @@ lib/wine/fakedlls/olesvr.dll16 lib/wine/fakedlls/olesvr32.dll lib/wine/fakedlls/olethk32.dll lib/wine/fakedlls/oleview.exe -${PLIST.opengl}lib/wine/fakedlls/opengl32.dll +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 @@ -1142,6 +1313,7 @@ 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 @@ -1162,6 +1334,9 @@ 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 @@ -1199,7 +1374,9 @@ lib/wine/fakedlls/system.drv16 lib/wine/fakedlls/t2embed.dll lib/wine/fakedlls/tapi32.dll lib/wine/fakedlls/taskkill.exe +lib/wine/fakedlls/tasklist.exe lib/wine/fakedlls/taskmgr.exe +lib/wine/fakedlls/taskschd.dll lib/wine/fakedlls/termsv.exe lib/wine/fakedlls/toolhelp.dll16 lib/wine/fakedlls/traffic.dll @@ -1220,10 +1397,13 @@ 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 @@ -1231,14 +1411,18 @@ lib/wine/fakedlls/vtdapi.vxd lib/wine/fakedlls/vwin32.vxd lib/wine/fakedlls/w32skrnl.dll lib/wine/fakedlls/w32sys.dll16 +lib/wine/fakedlls/wbemdisp.dll 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/windowscodecsext.dll lib/wine/fakedlls/wineboot.exe lib/wine/fakedlls/winebrowser.exe lib/wine/fakedlls/winecfg.exe @@ -1246,17 +1430,17 @@ lib/wine/fakedlls/wineconsole.exe lib/wine/fakedlls/wined3d.dll lib/wine/fakedlls/winedbg.exe lib/wine/fakedlls/winedevice.exe -${PLIST.esd}lib/wine/fakedlls/wineesd.drv lib/wine/fakedlls/winefile.exe lib/wine/fakedlls/winemapi.dll lib/wine/fakedlls/winemenubuilder.exe lib/wine/fakedlls/winemine.exe lib/wine/fakedlls/winemsibuilder.exe +lib/wine/fakedlls/wineoss.drv lib/wine/fakedlls/winepath.exe lib/wine/fakedlls/wineps.drv -${PLIST.x11}lib/wine/fakedlls/winex11.drv lib/wine/fakedlls/wineps16.drv16 lib/wine/fakedlls/winevdm.exe +lib/wine/fakedlls/winex11.drv lib/wine/fakedlls/wing.dll16 lib/wine/fakedlls/wing32.dll lib/wine/fakedlls/winhelp.exe16 @@ -1280,6 +1464,7 @@ 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 @@ -1287,18 +1472,25 @@ 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/xinput1_4.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 @@ -1306,8 +1498,8 @@ 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 -${PLIST.x11}lib/wine/gphoto2.ds.so +lib/wine/glu32.dll.so +lib/wine/gphoto2.ds.so lib/wine/gpkcsp.dll.so lib/wine/hal.dll.so lib/wine/hh.exe.so @@ -1338,6 +1530,7 @@ 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 @@ -1349,6 +1542,8 @@ 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 @@ -1360,6 +1555,7 @@ lib/wine/libclusapi.def lib/wine/libcomctl32.def lib/wine/libcomdlg32.def lib/wine/libcompstui.def +lib/wine/libcomsvcs.def lib/wine/libcredui.def lib/wine/libcrtdll.def lib/wine/libcrypt32.def @@ -1390,6 +1586,7 @@ 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 @@ -1397,10 +1594,10 @@ 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 @@ -1420,8 +1617,12 @@ lib/wine/libmsdmo.def lib/wine/libmshtml.def lib/wine/libmsi.def lib/wine/libmsimg32.def +lib/wine/libmsvcr100.def +lib/wine/libmsvcr110.def lib/wine/libmsvcr70.def lib/wine/libmsvcr71.def +lib/wine/libmsvcr80.def +lib/wine/libmsvcr90.def lib/wine/libmsvcrt.def lib/wine/libmsvcrt20.def lib/wine/libmsvcrt40.def @@ -1444,7 +1645,6 @@ 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 @@ -1474,6 +1674,7 @@ 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 @@ -1486,8 +1687,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 @@ -1502,6 +1705,7 @@ lib/wine/libwldap32.def lib/wine/libwnaspi32.def lib/wine/libwow32.def lib/wine/libws2_32.def +lib/wine/libwsnmp32.def lib/wine/libwsock32.def lib/wine/libwtsapi32.def lib/wine/libxinput.def @@ -1518,8 +1722,10 @@ 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 @@ -1546,12 +1752,14 @@ 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 @@ -1559,13 +1767,17 @@ 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 @@ -1586,7 +1798,9 @@ lib/wine/msxml6.dll.so lib/wine/nddeapi.dll.so lib/wine/net.exe.so lib/wine/netapi32.dll.so +lib/wine/netcfgx.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 @@ -1599,6 +1813,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 @@ -1617,12 +1832,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 @@ -1639,6 +1856,7 @@ 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 @@ -1659,6 +1877,9 @@ 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 @@ -1696,7 +1917,9 @@ lib/wine/system.drv16.so lib/wine/t2embed.dll.so lib/wine/tapi32.dll.so lib/wine/taskkill.exe.so +lib/wine/tasklist.exe.so lib/wine/taskmgr.exe.so +lib/wine/taskschd.dll.so lib/wine/termsv.exe.so lib/wine/toolhelp.dll16.so lib/wine/traffic.dll.so @@ -1717,10 +1940,13 @@ 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 @@ -1728,14 +1954,18 @@ lib/wine/vtdapi.vxd.so lib/wine/vwin32.vxd.so lib/wine/w32skrnl.dll.so lib/wine/w32sys.dll16.so +lib/wine/wbemdisp.dll.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/windowscodecsext.dll.so lib/wine/wineboot.exe.so lib/wine/winebrowser.exe.so lib/wine/winecfg.exe.so @@ -1743,17 +1973,17 @@ lib/wine/wineconsole.exe.so lib/wine/wined3d.dll.so lib/wine/winedbg.exe.so lib/wine/winedevice.exe.so -${PLIST.esd}lib/wine/wineesd.drv.so lib/wine/winefile.exe.so lib/wine/winemapi.dll.so lib/wine/winemenubuilder.exe.so lib/wine/winemine.exe.so lib/wine/winemsibuilder.exe.so +lib/wine/wineoss.drv.so lib/wine/winepath.exe.so lib/wine/wineps.drv.so -${PLIST.x11}lib/wine/winex11.drv.so lib/wine/wineps16.drv16.so lib/wine/winevdm.exe.so +lib/wine/winex11.drv.so lib/wine/wing.dll16.so lib/wine/wing32.dll.so lib/wine/winhelp.exe16.so @@ -1777,6 +2007,7 @@ 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 @@ -1784,17 +2015,23 @@ 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/xinput1_4.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 @@ -1825,49 +2062,60 @@ 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/symbol.ttf -${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/generic.ppd +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/l_intl.nls share/wine/wine.inf diff --git a/emulators/wine-devel/buildlink3.mk b/emulators/wine-devel/buildlink3.mk index d4d3cc8a0e2..209a3c9030e 100644 --- a/emulators/wine-devel/buildlink3.mk +++ b/emulators/wine-devel/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2013/07/05 13:29:30 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2014/01/19 10:58:23 adam Exp $ BUILDLINK_TREE+= wine @@ -6,7 +6,7 @@ BUILDLINK_TREE+= wine WINE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.wine+= wine>=1.3.0 -BUILDLINK_ABI_DEPENDS.wine+= wine>=1.3.26nb16 +BUILDLINK_ABI_DEPENDS.wine+= wine>=1.3.26nb1 BUILDLINK_PKGSRCDIR.wine?= ../../emulators/wine pkgbase:= wine diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 99838f1d30b..4676134c44d 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,28 +1,9 @@ -$NetBSD: distinfo,v 1.20 2012/05/25 18:45:26 marino Exp $ +$NetBSD: distinfo,v 1.21 2014/01/19 10:58:23 adam Exp $ -SHA1 (wine-1.3.26.tar.bz2) = a609ebb1f8c0908fb86948edcb1f7f9ccca47e7f -RMD160 (wine-1.3.26.tar.bz2) = c1d98690ff16a63cea6c04c64444c075ad7ab472 -Size (wine-1.3.26.tar.bz2) = 19540784 bytes -SHA1 (patch-aa) = d3dfe9fe061271e83b75fcfd10fb0ed85e6549b1 -SHA1 (patch-ab) = fec11cd5dda20d326b35e36178e2ac0ac22ac9ae -SHA1 (patch-ac) = e6c17647c0102c686814880c1bc372d1fedf7730 -SHA1 (patch-ad) = 84e7965539f47aca8dca88080466114c0226d7be -SHA1 (patch-ae) = 9d216294340483f37223c186e5d76ae34880b0a6 -SHA1 (patch-af) = 32a23d042a2d4f76898dff76e981166ade9e0275 -SHA1 (patch-ai) = 54453ed21f52d1da6a7f89bc437f7b318db5058f -SHA1 (patch-ak) = ff41f617d2ae7bbff57af52dda85647bc4fba354 -SHA1 (patch-ba) = 6a8756059b07278398cf6ee83ec94c50e25b6a67 -SHA1 (patch-bc) = 8132bdc30e665ecf8dacad52a2b06c48d4aa553f -SHA1 (patch-bd) = a60f7353f838bb3bf5e554bf80b1751b7d9d2138 -SHA1 (patch-be) = f4d11193a364f3ebcd33825e850addb1638cef30 -SHA1 (patch-bf) = 75c37d9889d535a2c46c0a21f0c9cd49271d96a4 -SHA1 (patch-ca) = 90df667407765c473f1331ec8113088fdddc58e5 -SHA1 (patch-cd) = aec27ca5616625e80123e92b3db1abdd90d212a0 -SHA1 (patch-ce) = 23088aac01e74164ec6d4a42f96ab7fa34d002c3 -SHA1 (patch-cf) = 6a1c8ce2c77de0eebb9aad9cd5078cf18538d8d8 -SHA1 (patch-cg) = a4ed965470b150f619e5ca673138fe07094963b2 -SHA1 (patch-dlls_kernel32_heap.c) = 46faf6b31182b88de2260190113098512f00c108 -SHA1 (patch-dlls_ntdll_file.c) = df3aa27b5d4ffc24b9bd0f8272ab273a3d4cb559 -SHA1 (patch-dlls_ntdll_nt.c) = 4e47a00b3f7303425a8f64825a23675acf1325d1 -SHA1 (patch-dlls_ntdll_server.c) = 7c7051fdae3f5c6b4671219932c517f460e05dda -SHA1 (patch-libs_wine_ldt.c) = f2575c80599229eda197726797b2432d2fba0228 +SHA1 (wine-1.7.11.tar.bz2) = ebe30cf1a93782a958e8b1e3ed898310c37676fe +RMD160 (wine-1.7.11.tar.bz2) = ea565f9f46eeabf803cc5ab319469831a4afa93d +Size (wine-1.7.11.tar.bz2) = 21359534 bytes +SHA1 (patch-configure) = 2d540b149e59298ca0fcc43d50873c986fbe0140 +SHA1 (patch-dlls_wbemprox_builtin.c) = a11f910d8b94047f2dcf8b45c27fb1c6c3f3ce59 +SHA1 (patch-dlls_wineoss.drv_mmdevdrv.c) = fc44346b889ee7486a92e9704a8447334f48f4d1 +SHA1 (patch-dlls_ws2__32_socket.c) = 98ebaa7b0831e558f49a484ffb3a1b28adb9bcf2 diff --git a/emulators/wine-devel/patches/patch-aa b/emulators/wine-devel/patches/patch-aa deleted file mode 100644 index 037933648b2..00000000000 --- a/emulators/wine-devel/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2011/05/02 21:23:01 adam Exp $ - ---- dlls/ntdll/signal_x86_64.c.orig 2011-04-29 18:04:41.000000000 +0000 -+++ dlls/ntdll/signal_x86_64.c -@@ -2450,7 +2450,7 @@ void signal_init_thread( TEB *teb ) - #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) - 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-devel/patches/patch-ab b/emulators/wine-devel/patches/patch-ab deleted file mode 100644 index 271e886d5fc..00000000000 --- a/emulators/wine-devel/patches/patch-ab +++ /dev/null @@ -1,161 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2012/05/23 17:48:54 marino 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> -@@ -473,7 +483,8 @@ static NTSTATUS CDROM_SyncCache(int dev, - cdrom_cache[dev].toc_good = 1; - return STATUS_SUCCESS; - --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__NetBSD__) || defined(__DragonFly__) - - int i, tsz; - struct ioc_toc_header hdr; -@@ -784,7 +795,8 @@ static NTSTATUS CDROM_ResetAudio(int fd) - { - #if defined(linux) - return CDROM_GetStatusCode(ioctl(fd, CDROMRESET)); --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__NetBSD__) || defined(__DragonFly__) - return CDROM_GetStatusCode(ioctl(fd, CDIOCRESET, NULL)); - #else - FIXME("not supported on this O/S\n"); -@@ -801,7 +813,8 @@ static NTSTATUS CDROM_SetTray(int fd, BO - { - #if defined(linux) - return CDROM_GetStatusCode(ioctl(fd, doEject ? CDROMEJECT : CDROMCLOSETRAY)); --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__NetBSD__) || defined(__DragonFly__) - return CDROM_GetStatusCode((ioctl(fd, CDIOCALLOW, NULL)) || - (ioctl(fd, doEject ? CDIOCEJECT : CDIOCCLOSE, NULL)) || - (ioctl(fd, CDIOCPREVENT, NULL))); -@@ -823,7 +836,8 @@ static NTSTATUS CDROM_ControlEjection(in - { - #if defined(linux) - return CDROM_GetStatusCode(ioctl(fd, CDROM_LOCKDOOR, rmv->PreventMediaRemoval)); --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__NetBSD__) || defined(__DragonFly__) - return CDROM_GetStatusCode(ioctl(fd, (rmv->PreventMediaRemoval) ? CDIOCPREVENT : CDIOCALLOW, NULL)); - #else - FIXME("not supported on this O/S\n"); -@@ -978,7 +992,8 @@ static NTSTATUS CDROM_ReadQChannel(int d - - end: - ret = CDROM_GetStatusCode(io); --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__NetBSD__) || defined(__DragonFly__) - SUB_Q_HEADER* hdr = (SUB_Q_HEADER*)data; - int io; - struct ioc_read_subchannel read_sc; -@@ -1134,7 +1149,8 @@ static NTSTATUS CDROM_Verify(int dev, in - return STATUS_SUCCESS; - else - return STATUS_NO_MEDIA_IN_DEVICE; --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__DragonFly__) - int ret; - ret = ioctl(fd, CDIOCSTART, NULL); - if(ret == 0) -@@ -1187,7 +1203,8 @@ static NTSTATUS CDROM_PlayAudioMSF(int f - msf.cdmsf_min1, msf.cdmsf_sec1, msf.cdmsf_frame1); - end: - ret = CDROM_GetStatusCode(io); --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__NetBSD__) || defined(__DragonFly__) - struct ioc_play_msf msf; - int io; - -@@ -1232,7 +1249,8 @@ static NTSTATUS CDROM_SeekAudioMSF(int d - #if defined(linux) - struct cdrom_msf0 msf; - struct cdrom_subchnl sc; --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__NetBSD__) || defined(__DragonFly__) - struct ioc_play_msf msf; - struct ioc_read_subchannel read_sc; - struct cd_sub_channel_info sc; -@@ -1285,7 +1303,8 @@ static NTSTATUS CDROM_SeekAudioMSF(int d - return CDROM_GetStatusCode(ioctl(fd, CDROMSEEK, &msf)); - } - return STATUS_SUCCESS; --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__NetBSD__) || defined(__DragonFly__) - read_sc.address_format = CD_MSF_FORMAT; - read_sc.track = 0; - read_sc.data_len = sizeof(sc); -@@ -1326,7 +1345,8 @@ static NTSTATUS CDROM_PauseAudio(int fd) - { - #if defined(linux) - return CDROM_GetStatusCode(ioctl(fd, CDROMPAUSE)); --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__NetBSD__) || defined(__DragonFly__) - return CDROM_GetStatusCode(ioctl(fd, CDIOCPAUSE, NULL)); - #else - FIXME(": not supported on this O/S\n"); -@@ -1343,7 +1363,8 @@ static NTSTATUS CDROM_ResumeAudio(int fd - { - #if defined(linux) - return CDROM_GetStatusCode(ioctl(fd, CDROMRESUME)); --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__NetBSD__) || defined(__DragonFly__) - return CDROM_GetStatusCode(ioctl(fd, CDIOCRESUME, NULL)); - #else - FIXME("not supported on this O/S\n"); -@@ -1360,7 +1381,8 @@ static NTSTATUS CDROM_StopAudio(int fd) - { - #if defined(linux) - return CDROM_GetStatusCode(ioctl(fd, CDROMSTOP)); --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__NetBSD__) || defined(__DragonFly__) - return CDROM_GetStatusCode(ioctl(fd, CDIOCSTOP, NULL)); - #else - FIXME("not supported on this O/S\n"); -@@ -1388,7 +1410,8 @@ static NTSTATUS CDROM_GetVolume(int fd, - vc->PortVolume[3] = volc.channel3; - } - return CDROM_GetStatusCode(io); --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__NetBSD__) || defined(__DragonFly__) - struct ioc_vol volc; - int io; - -@@ -1423,7 +1446,8 @@ static NTSTATUS CDROM_SetVolume(int fd, - volc.channel3 = vc->PortVolume[3]; - - return CDROM_GetStatusCode(ioctl(fd, CDROMVOLCTRL, &volc)); --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__NetBSD__) || defined(__DragonFly__) - struct ioc_vol volc; - - volc.vol[0] = vc->PortVolume[0]; diff --git a/emulators/wine-devel/patches/patch-ac b/emulators/wine-devel/patches/patch-ac deleted file mode 100644 index 4611b39689e..00000000000 --- a/emulators/wine-devel/patches/patch-ac +++ /dev/null @@ -1,85 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2012/05/23 17:48:54 marino Exp $ - ---- dlls/ntdll/directory.c.orig 2010-06-18 17:36:58.000000000 +0000 -+++ dlls/ntdll/directory.c -@@ -129,6 +129,20 @@ static inline int getdents64( int fd, ch - #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 '*','?','<','>','|','"' -@@ -313,7 +327,8 @@ static char *get_default_com_device( int - strcpy( ret, "/dev/ttyS0" ); - ret[strlen(ret) - 1] = '0' + num - 1; - } --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__DragonFly__) - ret = RtlAllocateHeap( GetProcessHeap(), 0, sizeof("/dev/cuad0") ); - if (ret) - { -@@ -486,7 +501,8 @@ static char *parse_mount_entries( FILE * - } - #endif - --#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__DragonFly__) - #include <fstab.h> - static char *parse_mount_entries( FILE *f, dev_t dev, ino_t ino ) - { -@@ -587,7 +603,8 @@ static char *get_default_drive_device( c - } - RtlLeaveCriticalSection( &dir_section ); - --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__ ) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__ ) \ -+ || defined(__DragonFly__) - char *device = NULL; - int fd, res = -1; - struct stat st; -@@ -920,7 +937,8 @@ static int get_dir_case_sensitivity_attr - */ - static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) - { --#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__DragonFly__) - struct statfs stfs; - - if (statfs( dir, &stfs ) == -1) return FALSE; -@@ -1667,6 +1685,9 @@ static int read_directory_getdirentries( - BOOLEAN single_entry, const UNICODE_STRING *mask, - BOOLEAN restart_scan, FILE_INFORMATION_CLASS class ) - { -+#ifdef __DragonFly__ -+#define d_reclen d_namlen -+#endif - long restart_pos; - ULONG_PTR restart_info_pos = 0; - size_t size, initial_size = length; -@@ -1799,6 +1820,9 @@ done: - return res; - } - -+#ifdef __DragonFly__ -+#undef d_reclen -+#endif - #ifdef _DARWIN_FEATURE_64_BIT_INODE - #undef getdirentries - #undef dirent diff --git a/emulators/wine-devel/patches/patch-ad b/emulators/wine-devel/patches/patch-ad deleted file mode 100644 index 6f3b58489bb..00000000000 --- a/emulators/wine-devel/patches/patch-ad +++ /dev/null @@ -1,64 +0,0 @@ -$NetBSD: patch-ad,v 1.7 2012/05/23 17:48:54 marino Exp $ - ---- dlls/iphlpapi/ipstats.c.orig 2010-12-10 22:33:07.000000000 +0300 -+++ dlls/iphlpapi/ipstats.c -@@ -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 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP - } - 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,9 @@ DWORD WINAPI GetIpStatistics(PMIB_IPSTAT - } - 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__) \ -+ && !defined(__DragonFly__) - { - int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS}; - #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) -@@ -804,7 +810,9 @@ DWORD WINAPI GetTcpStatistics(PMIB_TCPST - } - 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__) \ -+ && !defined(__DragonFly__) - { - #ifndef TCPTV_MIN /* got removed in Mac OS X for some reason */ - #define TCPTV_MIN 2 -@@ -915,7 +923,7 @@ DWORD WINAPI GetUdpStatistics(PMIB_UDPST - } - 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 +1355,7 @@ DWORD WINAPI AllocateAndGetIpNetTableFro - } - 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-devel/patches/patch-ae b/emulators/wine-devel/patches/patch-ae deleted file mode 100644 index 0fe7ab35137..00000000000 --- a/emulators/wine-devel/patches/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2011/05/02 21:23:01 adam Exp $ - ---- dlls/winex11.drv/opengl.c.orig 2010-06-18 17:36:58.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-devel/patches/patch-af b/emulators/wine-devel/patches/patch-af deleted file mode 100644 index 591997b7954..00000000000 --- a/emulators/wine-devel/patches/patch-af +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-af,v 1.7 2011/05/02 21:23:01 adam Exp $ - ---- dlls/ntdll/signal_i386.c.orig 2009-07-03 18:28:33.000000000 +0200 -+++ dlls/ntdll/signal_i386.c -@@ -448,8 +448,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-devel/patches/patch-ai b/emulators/wine-devel/patches/patch-ai deleted file mode 100644 index 8123a60d608..00000000000 --- a/emulators/wine-devel/patches/patch-ai +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $ - ---- include/winternl.h.orig 2008-09-19 18:05:36.000000000 +0200 -+++ include/winternl.h -@@ -22,6 +22,9 @@ - #define __WINE_WINTERNL_H - - #include <windef.h> -+#ifndef va_list -+#define va_list __builtin_va_list -+#endif - - #ifdef __cplusplus - extern "C" { diff --git a/emulators/wine-devel/patches/patch-ak b/emulators/wine-devel/patches/patch-ak deleted file mode 100644 index 19c8197c96a..00000000000 --- a/emulators/wine-devel/patches/patch-ak +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ak,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $ - ---- include/winbase.h.orig 2008-09-19 18:05:36.000000000 +0200 -+++ include/winbase.h -@@ -20,6 +20,9 @@ - #define __WINE_WINBASE_H - - #include <winerror.h> -+#ifndef va_list -+#define va_list __builtin_va_list -+#endif - - #ifdef __cplusplus - extern "C" { diff --git a/emulators/wine-devel/patches/patch-ba b/emulators/wine-devel/patches/patch-ba deleted file mode 100644 index c94e9305950..00000000000 --- a/emulators/wine-devel/patches/patch-ba +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ba,v 1.10 2011/05/02 21:23:01 adam Exp $ - ---- configure.orig 2010-06-18 17:36:58.000000000 +0000 -+++ configure -@@ -4204,11 +4204,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-devel/patches/patch-bc b/emulators/wine-devel/patches/patch-bc deleted file mode 100644 index 2a2f76f556c..00000000000 --- a/emulators/wine-devel/patches/patch-bc +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-bc,v 1.3 2011/05/02 21:23:01 adam Exp $ - ---- dlls/wineoss.drv/audio.c.orig 2008-12-05 17:57:45.000000000 +0100 -+++ dlls/wineoss.drv/audio.c -@@ -83,6 +83,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) */ -@@ -1168,12 +1174,12 @@ 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-devel/patches/patch-bd b/emulators/wine-devel/patches/patch-bd deleted file mode 100644 index 45c92692c12..00000000000 --- a/emulators/wine-devel/patches/patch-bd +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bd,v 1.1 2011/05/02 21:23:01 adam Exp $ - ---- dlls/Makedll.rules.in.orig 2010-06-18 17:36:58.000000000 +0000 -+++ dlls/Makedll.rules.in -@@ -84,7 +84,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-devel/patches/patch-be b/emulators/wine-devel/patches/patch-be deleted file mode 100644 index 47a417cf173..00000000000 --- a/emulators/wine-devel/patches/patch-be +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-be,v 1.1 2011/05/02 21:23:01 adam Exp $ - ---- programs/Makeprog.rules.in.orig 2010-06-18 17:36:58.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-devel/patches/patch-bf b/emulators/wine-devel/patches/patch-bf deleted file mode 100644 index 932f0576599..00000000000 --- a/emulators/wine-devel/patches/patch-bf +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-bf,v 1.1 2011/05/02 21:23:01 adam Exp $ - ---- libs/wine/Makefile.in.orig 2009-10-09 18:05:57.000000000 +0200 -+++ libs/wine/Makefile.in -@@ -144,14 +144,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-devel/patches/patch-ca b/emulators/wine-devel/patches/patch-ca deleted file mode 100644 index 63f8c4f0c27..00000000000 --- a/emulators/wine-devel/patches/patch-ca +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ca,v 1.2 2009/01/17 10:11:14 adam Exp $ - ---- dlls/winex11.drv/settings.c.orig 2009-01-16 17:28:07.000000000 +0100 -+++ dlls/winex11.drv/settings.c -@@ -432,6 +432,16 @@ LONG CDECL X11DRV_ChangeDisplaySettingsE - 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-devel/patches/patch-cd b/emulators/wine-devel/patches/patch-cd deleted file mode 100644 index 65a0b494e1d..00000000000 --- a/emulators/wine-devel/patches/patch-cd +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-cd,v 1.1 2009/09/07 20:27:25 reinoud 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-devel/patches/patch-ce b/emulators/wine-devel/patches/patch-ce deleted file mode 100644 index 50bf9000cf8..00000000000 --- a/emulators/wine-devel/patches/patch-ce +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ce,v 1.1 2009/09/07 20:27:25 reinoud 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-devel/patches/patch-cf b/emulators/wine-devel/patches/patch-cf deleted file mode 100644 index b4b72cf107d..00000000000 --- a/emulators/wine-devel/patches/patch-cf +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-cf,v 1.1 2009/09/07 20:27:25 reinoud 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-devel/patches/patch-cg b/emulators/wine-devel/patches/patch-cg deleted file mode 100644 index d58026531c3..00000000000 --- a/emulators/wine-devel/patches/patch-cg +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-cg,v 1.2 2011/05/02 21:23:01 adam Exp $ - ---- dlls/ws2_32/socket.c.orig 2010-12-10 22:33:07.000000000 +0300 -+++ dlls/ws2_32/socket.c 2010-12-22 02:33:54.000000000 +0300 -@@ -440,7 +440,9 @@ - MAP_OPTION( AI_PASSIVE ), - MAP_OPTION( AI_CANONNAME ), - MAP_OPTION( AI_NUMERICHOST ), -+#if !defined(__NetBSD__) - MAP_OPTION( AI_ADDRCONFIG ), -+#endif - }; - - static const int ws_niflag_map[][2] = diff --git a/emulators/wine-devel/patches/patch-configure b/emulators/wine-devel/patches/patch-configure new file mode 100644 index 00000000000..ae205939d07 --- /dev/null +++ b/emulators/wine-devel/patches/patch-configure @@ -0,0 +1,32 @@ +$NetBSD: patch-configure,v 1.1 2014/01/19 10:58:23 adam Exp $ + +Configure for OSS v3 support for NetBSD. + +--- configure.orig 2014-01-03 19:00:47.000000000 +0000 ++++ configure +@@ -12325,14 +12325,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-devel/patches/patch-dlls_kernel32_heap.c b/emulators/wine-devel/patches/patch-dlls_kernel32_heap.c deleted file mode 100644 index f8cbeeb0779..00000000000 --- a/emulators/wine-devel/patches/patch-dlls_kernel32_heap.c +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-dlls_kernel32_heap.c,v 1.1 2012/05/23 17:48:54 marino Exp $ - ---- dlls/kernel32/heap.c.orig 2011-08-05 17:24:22.000000000 +0000 -+++ dlls/kernel32/heap.c -@@ -1146,7 +1146,8 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMO - SYSTEM_INFO si; - #ifdef linux - FILE *f; --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) - unsigned long val; - int mib[2]; - size_t size_sys; -@@ -1218,7 +1219,9 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMO - } - fclose( f ); - } --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) \ -+ || defined(__DragonFly__) - mib[0] = CTL_HW; - mib[1] = HW_PHYSMEM; - size_sys = sizeof(val); diff --git a/emulators/wine-devel/patches/patch-dlls_ntdll_file.c b/emulators/wine-devel/patches/patch-dlls_ntdll_file.c deleted file mode 100644 index c2771ca9e9c..00000000000 --- a/emulators/wine-devel/patches/patch-dlls_ntdll_file.c +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-dlls_ntdll_file.c,v 1.1 2012/05/23 17:48:54 marino Exp $ - ---- dlls/ntdll/file.c.orig 2011-08-05 17:24:22.000000000 +0000 -+++ dlls/ntdll/file.c -@@ -2256,7 +2256,9 @@ NTSTATUS WINAPI NtQueryAttributesFile( c - } - - --#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) \ -+ || defined(__DragonFly__) - /* helper for FILE_GetDeviceInfo to hide some platform differences in fstatfs */ - static inline void get_device_info_fstatfs( FILE_FS_DEVICE_INFORMATION *info, const char *fstypename, - unsigned int flags ) -@@ -2377,7 +2379,8 @@ static NTSTATUS get_device_info( int fd, - info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; - break; - } --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__APPLE__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) - struct statfs stfs; - - if (fstatfs( fd, &stfs ) < 0) diff --git a/emulators/wine-devel/patches/patch-dlls_ntdll_nt.c b/emulators/wine-devel/patches/patch-dlls_ntdll_nt.c deleted file mode 100644 index c8f334e3ea8..00000000000 --- a/emulators/wine-devel/patches/patch-dlls_ntdll_nt.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-dlls_ntdll_nt.c,v 1.1 2012/05/23 17:48:54 marino Exp $ - ---- dlls/ntdll/nt.c.orig 2011-08-05 17:24:22.000000000 +0000 -+++ dlls/ntdll/nt.c -@@ -1172,7 +1172,8 @@ void fill_cpu_info(void) - fclose(f); - } - } --#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) -+#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) \ -+ || defined(__DragonFly__) - { - int ret, num; - size_t len; diff --git a/emulators/wine-devel/patches/patch-dlls_ntdll_server.c b/emulators/wine-devel/patches/patch-dlls_ntdll_server.c deleted file mode 100644 index 3fc2b952cf9..00000000000 --- a/emulators/wine-devel/patches/patch-dlls_ntdll_server.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dlls_ntdll_server.c,v 1.1 2012/05/23 17:48:54 marino Exp $ - ---- dlls/ntdll/server.c.orig 2011-08-05 17:24:22.000000000 +0000 -+++ dlls/ntdll/server.c -@@ -946,7 +946,7 @@ static int get_unix_tid(void) - int ret = -1; - #ifdef linux - ret = syscall( SYS_gettid ); --#elif defined(__sun) -+#elif defined(__sun) || defined(__DragonFly__) - ret = pthread_self(); - #elif defined(__APPLE__) - ret = mach_thread_self(); diff --git a/emulators/wine-devel/patches/patch-dlls_wbemprox_builtin.c b/emulators/wine-devel/patches/patch-dlls_wbemprox_builtin.c new file mode 100644 index 00000000000..ebeac340716 --- /dev/null +++ b/emulators/wine-devel/patches/patch-dlls_wbemprox_builtin.c @@ -0,0 +1,20 @@ +$NetBSD: patch-dlls_wbemprox_builtin.c,v 1.1 2014/01/19 10:58:23 adam Exp $ + +Reorder includes to fix 'select' being redefined error on NetBSD. + +--- dlls/wbemprox/builtin.c.orig 2014-01-03 19:00:47.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-devel/patches/patch-dlls_wineoss.drv_mmdevdrv.c b/emulators/wine-devel/patches/patch-dlls_wineoss.drv_mmdevdrv.c new file mode 100644 index 00000000000..be703b14461 --- /dev/null +++ b/emulators/wine-devel/patches/patch-dlls_wineoss.drv_mmdevdrv.c @@ -0,0 +1,311 @@ +$NetBSD: patch-dlls_wineoss.drv_mmdevdrv.c,v 1.1 2014/01/19 10:58:23 adam Exp $ + +Restore OSSv3 support for NetBSD. + +--- dlls/wineoss.drv/mmdevdrv.c.orig 2014-01-03 19:00:47.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; +@@ -112,7 +116,9 @@ struct ACImpl { + float *vols; + + int fd; ++#ifdef HAVE_OSSv4 + oss_audioinfo ai; ++#endif + char devnode[OSS_DEVNODE_SIZE]; + + BOOL initted, playing; +@@ -270,7 +276,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 +@@ -283,6 +291,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){ +@@ -290,9 +299,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; +@@ -301,6 +312,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"); + +@@ -407,29 +419,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; +@@ -440,6 +457,7 @@ static UINT get_default_index(EDataFlow + ++i; + } + } ++#endif + + WARN("Couldn't find default device! Choosing first.\n"); + return 0; +@@ -449,7 +467,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}; +@@ -463,6 +483,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); + +@@ -575,6 +596,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); +@@ -634,6 +704,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, +@@ -642,9 +713,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); +@@ -657,6 +730,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; +@@ -807,10 +881,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; + } +@@ -1254,10 +1330,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, +@@ -1267,7 +1347,9 @@ static HRESULT WINAPI AudioClient_IsForm + + ret = setup_oss_device(mode, fd, pwfx, outpwfx); + ++#ifndef __NetBSD__ + close(fd); ++#endif + + return ret; + } +@@ -1285,11 +1367,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)); +@@ -1308,12 +1398,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); +@@ -1322,16 +1414,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); + diff --git a/emulators/wine-devel/patches/patch-dlls_ws2__32_socket.c b/emulators/wine-devel/patches/patch-dlls_ws2__32_socket.c new file mode 100644 index 00000000000..d78fcba847d --- /dev/null +++ b/emulators/wine-devel/patches/patch-dlls_ws2__32_socket.c @@ -0,0 +1,17 @@ +$NetBSD: patch-dlls_ws2__32_socket.c,v 1.1 2014/01/19 10:58:23 adam Exp $ + +Fix AI_V4MAPPED confusion on NetBSD. + +--- dlls/ws2_32/socket.c.orig 2014-01-03 19:00:47.000000000 +0000 ++++ dlls/ws2_32/socket.c +@@ -173,6 +173,10 @@ + #define INADDR_NONE ~0UL + #endif + ++#ifdef USE_WS_PREFIX ++#define AI_V4MAPPED WS_AI_V4MAPPED ++#endif ++ + WINE_DEFAULT_DEBUG_CHANNEL(winsock); + WINE_DECLARE_DEBUG_CHANNEL(winediag); + diff --git a/emulators/wine-devel/patches/patch-libs_wine_ldt.c b/emulators/wine-devel/patches/patch-libs_wine_ldt.c deleted file mode 100644 index f3491ae1d74..00000000000 --- a/emulators/wine-devel/patches/patch-libs_wine_ldt.c +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-libs_wine_ldt.c,v 1.1 2012/05/23 17:48:54 marino Exp $ - ---- libs/wine/ldt.c.orig 2011-08-05 17:24:22.000000000 +0000 -+++ libs/wine/ldt.c -@@ -87,7 +87,8 @@ static inline int set_thread_area( struc - #endif - #endif - --#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) - #include <machine/segments.h> - #include <machine/sysarch.h> - #endif /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ */ -@@ -175,7 +176,8 @@ static int internal_set_entry( unsigned - if ((ret = modify_ldt(0x11, &ldt_info, sizeof(ldt_info))) < 0) - perror( "modify_ldt" ); - } --#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) - { - LDT_ENTRY entry_copy = *entry; - /* The kernel will only let us set LDTs with user priority level */ |