Update to Wine 1.9.6. This includes the following changes:

 - Better video card detection when using Mesa.
 - Support for Shader Model 5 shaders.
 - C++ exception handling improvements.
 - Various bug fixes.

Add the multimedia/v4l_compat port as a build dependency for V4L
(i.e., V4L_BUILD_DEPENDS). [1]

PR:		208079 [1]
Submitted by:	dbn [1]
Reported by:	bapt [1]

3 files changed, 23 insertions, 7 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 911b093b10f5..85f477cc28f0 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-DISTVERSION=	1.9.5
-PORTREVISION=	1
+DISTVERSION=	1.9.6
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -92,6 +91,7 @@ OPENAL_CONFIGURE_WITH=	openal
 OPENAL_USES=		openal
 
 V4L_CONFIGURE_WITH=	v4l
+V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l1.so:${PORTSDIR}/multimedia/libv4l
 
 WINEMAKER_RUN_DEPENDS=	p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 4f829b751ea7..050552870bda 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,4 +1,4 @@
-SHA256 (wine-1.9.5.tar.bz2) = fb526308e7ac5e202c0f0b663d4c7a943419d9eec766af6831caf23914300f09
-SIZE (wine-1.9.5.tar.bz2) = 23034629
-SHA256 (v1.9.5.tar.gz) = e12c5fb741e6c5b55b99c37d6bba1746b0f40317f27198406e63f260ede3600c
-SIZE (v1.9.5.tar.gz) = 9889302
+SHA256 (wine-1.9.6.tar.bz2) = 3d2b862feefd89eca954c1cbc16a28e0ce851aeea1555bc1842ffc9aab2c1557
+SIZE (wine-1.9.6.tar.bz2) = 23071838
+SHA256 (v1.9.6.tar.gz) = e9eb9990aa7f3f07931bfe158c883ebad595e58239855c7f6c01758b4d195db9
+SIZE (v1.9.6.tar.gz) = 9959130
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index d903e1ff5497..6cec38f68ee3 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -109,6 +109,7 @@ include/wine/windows/audiopolicy.idl
 include/wine/windows/audiosessiontypes.h
 include/wine/windows/austream.h
 include/wine/windows/austream.idl
+include/wine/windows/authz.h
 include/wine/windows/aviriff.h
 include/wine/windows/avrt.h
 include/wine/windows/axcore.idl
@@ -132,6 +133,8 @@ include/wine/windows/bits2_5.idl
 include/wine/windows/bits3_0.h
 include/wine/windows/bits3_0.idl
 include/wine/windows/bitsmsg.h
+include/wine/windows/bluetoothapis.h
+include/wine/windows/bthsdpdef.h
 include/wine/windows/cderr.h
 include/wine/windows/cfgmgr32.h
 include/wine/windows/cguid.h
@@ -884,6 +887,7 @@ lib/wine/api-ms-win-core-fibers-l1-1-0.dll.so
 lib/wine/api-ms-win-core-fibers-l1-1-1.dll.so
 lib/wine/api-ms-win-core-file-l1-1-0.dll.so
 lib/wine/api-ms-win-core-file-l1-2-0.dll.so
+lib/wine/api-ms-win-core-file-l1-2-1.dll.so
 lib/wine/api-ms-win-core-file-l2-1-0.dll.so
 lib/wine/api-ms-win-core-file-l2-1-1.dll.so
 lib/wine/api-ms-win-core-handle-l1-1-0.dll.so
@@ -925,6 +929,7 @@ lib/wine/api-ms-win-core-rtlsupport-l1-2-0.dll.so
 lib/wine/api-ms-win-core-shlwapi-legacy-l1-1-0.dll.so
 %%STAGING%%lib/wine/api-ms-win-core-shlwapi-obsolete-l1-2-0.dll.so
 lib/wine/api-ms-win-core-string-l1-1-0.dll.so
+lib/wine/api-ms-win-core-string-l2-1-0.dll.so
 lib/wine/api-ms-win-core-synch-l1-1-0.dll.so
 lib/wine/api-ms-win-core-synch-l1-2-0.dll.so
 lib/wine/api-ms-win-core-sysinfo-l1-1-0.dll.so
@@ -935,6 +940,7 @@ lib/wine/api-ms-win-core-threadpool-legacy-l1-1-0.dll.so
 lib/wine/api-ms-win-core-timezone-l1-1-0.dll.so
 lib/wine/api-ms-win-core-url-l1-1-0.dll.so
 lib/wine/api-ms-win-core-util-l1-1-0.dll.so
+lib/wine/api-ms-win-core-version-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-error-l1-1-1.dll.so
 lib/wine/api-ms-win-core-winrt-l1-1-0.dll.so
@@ -1174,6 +1180,7 @@ lib/wine/fakedlls/api-ms-win-core-fibers-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-fibers-l1-1-1.dll
 lib/wine/fakedlls/api-ms-win-core-file-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-file-l1-2-0.dll
+lib/wine/fakedlls/api-ms-win-core-file-l1-2-1.dll
 lib/wine/fakedlls/api-ms-win-core-file-l2-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-file-l2-1-1.dll
 lib/wine/fakedlls/api-ms-win-core-handle-l1-1-0.dll
@@ -1215,6 +1222,7 @@ lib/wine/fakedlls/api-ms-win-core-rtlsupport-l1-2-0.dll
 lib/wine/fakedlls/api-ms-win-core-shlwapi-legacy-l1-1-0.dll
 %%STAGING%%lib/wine/fakedlls/api-ms-win-core-shlwapi-obsolete-l1-2-0.dll
 lib/wine/fakedlls/api-ms-win-core-string-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-string-l2-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-synch-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-synch-l1-2-0.dll
 lib/wine/fakedlls/api-ms-win-core-sysinfo-l1-1-0.dll
@@ -1225,6 +1233,7 @@ lib/wine/fakedlls/api-ms-win-core-threadpool-legacy-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-timezone-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-url-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-util-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-version-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-error-l1-1-1.dll
 lib/wine/fakedlls/api-ms-win-core-winrt-l1-1-0.dll
@@ -1775,6 +1784,8 @@ lib/wine/fakedlls/view.exe
 %%WINE32%%lib/wine/fakedlls/vnetbios.vxd
 lib/wine/fakedlls/vssapi.dll
 %%WINE32%%lib/wine/fakedlls/vtdapi.vxd
+%%STAGING%%lib/wine/fakedlls/vulkan-1.dll
+%%STAGING%%lib/wine/fakedlls/vulkan.dll
 %%WINE32%%lib/wine/fakedlls/vwin32.vxd
 %%WINE32%%lib/wine/fakedlls/w32skrnl.dll
 %%WINE32%%lib/wine/fakedlls/w32sys.dll16
@@ -1832,6 +1843,7 @@ lib/wine/fakedlls/wintrust.dll
 lib/wine/fakedlls/winver.exe
 lib/wine/fakedlls/wlanapi.dll
 lib/wine/fakedlls/wldap32.dll
+lib/wine/fakedlls/wmasf.dll
 lib/wine/fakedlls/wmi.dll
 lib/wine/fakedlls/wmic.exe
 lib/wine/fakedlls/wmiutils.dll
@@ -1851,6 +1863,7 @@ lib/wine/fakedlls/wsock32.dll
 lib/wine/fakedlls/wtsapi32.dll
 lib/wine/fakedlls/wuapi.dll
 lib/wine/fakedlls/wuaueng.dll
+%%STAGING%%lib/wine/fakedlls/wuauserv.exe
 lib/wine/fakedlls/wusa.exe
 lib/wine/fakedlls/xcopy.exe
 lib/wine/fakedlls/xinput1_1.dll
@@ -2082,7 +2095,6 @@ lib/wine/libvdmdbg.def
 lib/wine/libversion.def
 lib/wine/libwebservices.def
 lib/wine/libwer.def
-%%STAGING%%lib/wine/libwinealsa.drv.def
 lib/wine/libwindowscodecs.def
 lib/wine/libwindowscodecsext.def
 lib/wine/libwinecrt0.a
@@ -2383,6 +2395,8 @@ lib/wine/view.exe.so
 %%WINE32%%lib/wine/vnetbios.vxd.so
 lib/wine/vssapi.dll.so
 %%WINE32%%lib/wine/vtdapi.vxd.so
+%%STAGING%%lib/wine/vulkan-1.dll.so
+%%STAGING%%lib/wine/vulkan.dll.so
 %%WINE32%%lib/wine/vwin32.vxd.so
 %%WINE32%%lib/wine/w32skrnl.dll.so
 %%WINE32%%lib/wine/w32sys.dll16.so
@@ -2439,6 +2453,7 @@ lib/wine/wintrust.dll.so
 lib/wine/winver.exe.so
 lib/wine/wlanapi.dll.so
 lib/wine/wldap32.dll.so
+lib/wine/wmasf.dll.so
 lib/wine/wmi.dll.so
 lib/wine/wmic.exe.so
 lib/wine/wmiutils.dll.so
@@ -2458,6 +2473,7 @@ lib/wine/wsock32.dll.so
 lib/wine/wtsapi32.dll.so
 lib/wine/wuapi.dll.so
 lib/wine/wuaueng.dll.so
+%%STAGING%%lib/wine/wuauserv.exe.so
 lib/wine/wusa.exe.so
 lib/wine/xcopy.exe.so
 lib/wine/xinput1_1.dll.so