Merge branch '3.2' into 3.3

3 files changed, 22 insertions, 7 deletions

diff --git a/wine/.footprint b/wine/.footprint
index e1f38ac56..8a3121f47 100644
--- a/wine/.footprint
+++ b/wine/.footprint
@@ -292,6 +292,7 @@ drwxr-xr-x	root/root	usr/include/wine/windows/ddk/
 -rw-r--r--	root/root	usr/include/wine/windows/devicetopology.idl
 -rw-r--r--	root/root	usr/include/wine/windows/devpkey.h
 -rw-r--r--	root/root	usr/include/wine/windows/devpropdef.h
+-rw-r--r--	root/root	usr/include/wine/windows/dhcpcsdk.h
 -rw-r--r--	root/root	usr/include/wine/windows/difxapi.h
 -rw-r--r--	root/root	usr/include/wine/windows/digitalv.h
 -rw-r--r--	root/root	usr/include/wine/windows/dimm.h
@@ -1626,6 +1627,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/mciseq.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/mciwave.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/mf.dll
+-rw-r--r--	root/root	usr/lib/wine/fakedlls/mf3216.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/mfplat.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/mfreadwrite.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/mgmtapi.dll
@@ -1788,6 +1790,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/schannel.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/schedsvc.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/schtasks.exe
+-rw-r--r--	root/root	usr/lib/wine/fakedlls/scrobj.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/scrrun.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/scsiport.sys
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/sdbinst.exe
@@ -1898,6 +1901,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/winsta.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/wintab32.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/wintrust.dll
+-rw-r--r--	root/root	usr/lib/wine/fakedlls/winusb.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/winver.exe
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/wlanapi.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/wldap32.dll
@@ -2175,6 +2179,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib/wine/libwinspool.def
 -rw-r--r--	root/root	usr/lib/wine/libwintab32.def
 -rw-r--r--	root/root	usr/lib/wine/libwintrust.def
+-rw-r--r--	root/root	usr/lib/wine/libwlanapi.def
 -rw-r--r--	root/root	usr/lib/wine/libwldap32.def
 -rw-r--r--	root/root	usr/lib/wine/libwnaspi32.def
 -rw-r--r--	root/root	usr/lib/wine/libws2_32.def
@@ -2196,6 +2201,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rwxr-xr-x	root/root	usr/lib/wine/mciseq.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/mciwave.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/mf.dll.so
+-rwxr-xr-x	root/root	usr/lib/wine/mf3216.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/mfplat.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/mfreadwrite.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/mgmtapi.dll.so
@@ -2358,6 +2364,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rwxr-xr-x	root/root	usr/lib/wine/schannel.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/schedsvc.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/schtasks.exe.so
+-rwxr-xr-x	root/root	usr/lib/wine/scrobj.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/scrrun.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/scsiport.sys.so
 -rwxr-xr-x	root/root	usr/lib/wine/sdbinst.exe.so
@@ -2468,6 +2475,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rwxr-xr-x	root/root	usr/lib/wine/winsta.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/wintab32.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/wintrust.dll.so
+-rwxr-xr-x	root/root	usr/lib/wine/winusb.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/winver.exe.so
 -rwxr-xr-x	root/root	usr/lib/wine/wlanapi.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/wldap32.dll.so
@@ -3296,6 +3304,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/mciseq.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/mciwave.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/mf.dll
+-rw-r--r--	root/root	usr/lib32/wine/fakedlls/mf3216.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/mfplat.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/mfreadwrite.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/mgmtapi.dll
@@ -3474,6 +3483,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/schannel.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/schedsvc.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/schtasks.exe
+-rw-r--r--	root/root	usr/lib32/wine/fakedlls/scrobj.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/scrrun.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/scsiport.sys
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/sdbinst.exe
@@ -3615,6 +3625,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/wintab.dll16
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/wintab32.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/wintrust.dll
+-rw-r--r--	root/root	usr/lib32/wine/fakedlls/winusb.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/winver.exe
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/wlanapi.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/wldap32.dll
@@ -3899,6 +3910,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib32/wine/libwinspool.def
 -rw-r--r--	root/root	usr/lib32/wine/libwintab32.def
 -rw-r--r--	root/root	usr/lib32/wine/libwintrust.def
+-rw-r--r--	root/root	usr/lib32/wine/libwlanapi.def
 -rw-r--r--	root/root	usr/lib32/wine/libwldap32.def
 -rw-r--r--	root/root	usr/lib32/wine/libwnaspi32.def
 -rw-r--r--	root/root	usr/lib32/wine/libwow32.def
@@ -3922,6 +3934,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/fakedlls/
 -rwxr-xr-x	root/root	usr/lib32/wine/mciseq.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/mciwave.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/mf.dll.so
+-rwxr-xr-x	root/root	usr/lib32/wine/mf3216.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/mfplat.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/mfreadwrite.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/mgmtapi.dll.so
@@ -4100,6 +4113,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/fakedlls/
 -rwxr-xr-x	root/root	usr/lib32/wine/schannel.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/schedsvc.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/schtasks.exe.so
+-rwxr-xr-x	root/root	usr/lib32/wine/scrobj.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/scrrun.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/scsiport.sys.so
 -rwxr-xr-x	root/root	usr/lib32/wine/sdbinst.exe.so
@@ -4241,6 +4255,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/fakedlls/
 -rwxr-xr-x	root/root	usr/lib32/wine/wintab.dll16.so
 -rwxr-xr-x	root/root	usr/lib32/wine/wintab32.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/wintrust.dll.so
+-rwxr-xr-x	root/root	usr/lib32/wine/winusb.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/winver.exe.so
 -rwxr-xr-x	root/root	usr/lib32/wine/wlanapi.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/wldap32.dll.so
diff --git a/wine/.md5sum b/wine/.md5sum
index fd5257255..e0e11aecf 100644
--- a/wine/.md5sum
+++ b/wine/.md5sum
@@ -1,4 +1,4 @@
-fde8a855080279f74fb2e9ccec926db7  wine-2.0.tar.bz2
+ff793738a8274af3ae71dc143dda89e8  wine-2.1.tar.xz
 b0760cf51527b70435c3e4d0361a129a  wine-mono-4.6.4.msi
 5ebc4ec71c92b3db3d84b334a1db385d  wine_gecko-2.47-x86.msi
 d93ac0d2e6aceafe9113a9918916df45  wine_gecko-2.47-x86_64.msi
diff --git a/wine/Pkgfile b/wine/Pkgfile
index 49f8b9588..f604451a1 100644
--- a/wine/Pkgfile
+++ b/wine/Pkgfile
@@ -1,16 +1,16 @@
 # Description: WINE - Implementation of Windows DLL's and core.
-# URL: http://www.winehq.com/
+# URL: https://www.winehq.com/
 # Maintainer: Danny Rawlins, crux at romster dot me
 # Packager: Daniel Walpole, daniel at walpole dot id dot au
 # Depends on: fontconfig-32 freeglut-32 gnutls-32 lcms2-32 mpg123-32 openal-32 prelink xorg-libxcomposite-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxxf86dga-32 xorg-libxxf86vm-32
 
 name=wine
-version=2.0
+version=2.1
 release=1
-source=(http://dl.winehq.org/wine/source/2.0/$name-$version.tar.bz2
-	http://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86.msi
-	http://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86_64.msi
-	http://dl.winehq.org/wine/wine-mono/4.6.4/wine-mono-4.6.4.msi)
+source=(https://dl.winehq.org/wine/source/2.x/$name-$version.tar.xz
+	https://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86.msi
+	https://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86_64.msi
+	https://dl.winehq.org/wine/wine-mono/4.6.4/wine-mono-4.6.4.msi)
 
 build() {
 	install -d wine32 wine64