Change source. Other modifications.

Upstream wine-staging hosted at
'https://github.com/wine-compholio/wine-staging/' is no more
maintained. A community fork is now maintained at
'https://github.com/wine-staging/wine-staging/'. This fork was
received by mainstream Arch Linux in it's official repositories
in the stable wine-staging package, so it seems to be safe to
use it here too. Probably other mainstream Linux distributions
will follow this fork too, like Gentoo.

Other modifications on this commit:
-----------------------------------
- added freetype harmony fix
- added wine binfmt
- makedepends: added {lib32-}vulkan-icd-loader and {lib32-}sdl2
- optdepends : added {lib32-}sdl2
- optdepends : removed {lib32-}libtxc_dxtn

Note:
-----
libtxc_dxtn is now integrated into mesa. Packages libtxc_dxtn and
lib32-libtxc_dxtn were dropped from the official repositories.

References:
-----------
https://wine-staging.com/news/2018-02-17-future-wine-staging.html
https://www.winehq.org/pipermail/wine-devel/2018-February/122848.html
https://www.winehq.org/pipermail/wine-devel/2018-February/123080.html
https://git.archlinux.org/svntogit/community.git/commit/trunk?h=packages/wine-staging&id=1a48e921ac7aa7f9c622f20e384e14324a609fa3
https://lists.freedesktop.org/archives/mesa-dev/2017-October/171265.html
https://cgit.freedesktop.org/mesa/mesa/commit/?id=04396a134f003aece573df593acfa1ab4418ffe8
https://cgit.freedesktop.org/mesa/mesa/commit/?id=f7daa737d17df6d0a847e5c61e48d25e598671f4
https://cgit.freedesktop.org/mesa/mesa/commit/?id=d400348c73f0901eb24ff4d1562043d3119ef439
https://bugs.archlinux.org/task/56660
https://git.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/mesa&id=8b2dc9909803d680f67bb3d559d3e1c0a5f1e2ec

5 files changed, 108 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e4ba9f708434..508cda4e3285 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
-# Generated by mksrcinfo v8
-# Sat Dec  9 01:42:42 UTC 2017
 pkgbase = wine-staging-git
 	pkgdesc = A compatibility layer for running Windows programs (staging branch, git version)
-	pkgver = 2.21.r0.g90679f2f+wine.2.21.r0.g53290d2ec4
+	pkgver = 3.3.r0.ge09e1fd3+wine.3.3.r0.gf17120d11b
 	pkgrel = 1
 	url = https://www.wine-staging.com/
+	install = wine-staging-git.install
 	arch = i686
 	arch = x86_64
 	license = LGPL
@@ -58,6 +57,10 @@ pkgbase = wine-staging-git
 	makedepends = lib32-gtk3
 	makedepends = gst-plugins-base-libs
 	makedepends = lib32-gst-plugins-base-libs
+	makedepends = vulkan-icd-loader
+	makedepends = lib32-vulkan-icd-loader
+	makedepends = sdl2
+	makedepends = lib32-sdl2
 	makedepends = samba
 	makedepends = opencl-headers
 	makedepends = attr
@@ -121,8 +124,6 @@ pkgbase = wine-staging-git
 	optdepends = lib32-opencl-icd-loader
 	optdepends = libxslt
 	optdepends = lib32-libxslt
-	optdepends = libtxc_dxtn
-	optdepends = lib32-libtxc_dxtn
 	optdepends = libva
 	optdepends = lib32-libva
 	optdepends = gtk3
@@ -131,24 +132,30 @@ pkgbase = wine-staging-git
 	optdepends = lib32-gst-plugins-base-libs
 	optdepends = vulkan-icd-loader
 	optdepends = lib32-vulkan-icd-loader
+	optdepends = sdl2
+	optdepends = lib32-sdl2
 	optdepends = cups
 	optdepends = samba
 	optdepends = dosbox
-	provides = wine=2.21.r0.g53290d2ec4
-	provides = wine-wow64=2.21.r0.g53290d2ec4
-	provides = wine-git=2.21.r0.g53290d2ec4
-	provides = wine-staging=2.21.r0.g90679f2f
+	provides = wine=3.3.r0.gf17120d11b
+	provides = wine-wow64=3.3.r0.gf17120d11b
+	provides = wine-git=3.3.r0.gf17120d11b
+	provides = wine-staging=3.3.r0.ge09e1fd3
 	conflicts = wine
 	conflicts = wine-wow64
 	conflicts = wine-git
 	conflicts = wine-staging
 	options = staticlibs
 	source = wine-git::git://source.winehq.org/git/wine.git
-	source = wine-staging-git::git+https://github.com/wine-compholio/wine-staging.git
+	source = wine-staging-git::git+https://github.com/wine-staging/wine-staging.git
+	source = harmony-fix.diff
 	source = 30-win32-aliases.conf
+	source = wine-binfmt.conf
 	sha256sums = SKIP
 	sha256sums = SKIP
+	sha256sums = 50ccb5bd2067e5d2739c5f7abcef11ef096aa246f5ceea11d2c3b508fc7f77a1
 	sha256sums = 9901a5ee619f24662b241672a7358364617227937d5f6d3126f70528ee5111e7
+	sha256sums = 6dfdefec305024ca11f35ad7536565f5551f09119dda2028f194aee8f77077a4
 
 pkgname = wine-staging-git
 	depends = attr
diff --git a/PKGBUILD b/PKGBUILD
index 1ec5c9469eeb..fa8f5217e58a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Daniel Bermond < yahoo-com: danielbermond >
 
 pkgname=wine-staging-git
-pkgver=2.21.r0.g90679f2f+wine.2.21.r0.g53290d2ec4
+pkgver=3.3.r0.ge09e1fd3+wine.3.3.r0.gf17120d11b
 pkgrel=1
 pkgdesc='A compatibility layer for running Windows programs (staging branch, git version)'
 arch=('i686' 'x86_64')
@@ -47,6 +47,8 @@ makedepends=('git' 'autoconf' 'ncurses' 'bison' 'perl' 'fontforge' 'flex'
     'libva'                 'lib32-libva'
     'gtk3'                  'lib32-gtk3'
     'gst-plugins-base-libs' 'lib32-gst-plugins-base-libs'
+    'vulkan-icd-loader'     'lib32-vulkan-icd-loader'
+    'sdl2'                  'lib32-sdl2'
     'samba'
     'opencl-headers'
 )
@@ -67,22 +69,27 @@ optdepends=(
     'ncurses'               'lib32-ncurses'
     'opencl-icd-loader'     'lib32-opencl-icd-loader'
     'libxslt'               'lib32-libxslt'
-    'libtxc_dxtn'           'lib32-libtxc_dxtn'
     'libva'                 'lib32-libva'
     'gtk3'                  'lib32-gtk3'
     'gst-plugins-base-libs' 'lib32-gst-plugins-base-libs'
     'vulkan-icd-loader'     'lib32-vulkan-icd-loader'
+    'sdl2'                  'lib32-sdl2'
     'cups'
     'samba'
     'dosbox'
 )
 options=('staticlibs')
+install="$pkgname".install
 source=('wine-git'::'git://source.winehq.org/git/wine.git'
-        "$pkgname"::'git+https://github.com/wine-compholio/wine-staging.git'
-        '30-win32-aliases.conf')
+        "$pkgname"::'git+https://github.com/wine-staging/wine-staging.git'
+        'harmony-fix.diff'
+        '30-win32-aliases.conf'
+        'wine-binfmt.conf')
 sha256sums=('SKIP'
             'SKIP'
-            '9901a5ee619f24662b241672a7358364617227937d5f6d3126f70528ee5111e7')
+            '50ccb5bd2067e5d2739c5f7abcef11ef096aa246f5ceea11d2c3b508fc7f77a1'
+            '9901a5ee619f24662b241672a7358364617227937d5f6d3126f70528ee5111e7'
+            '6dfdefec305024ca11f35ad7536565f5551f09119dda2028f194aee8f77077a4')
 
 if [ "$CARCH" = 'i686' ] 
 then
@@ -123,6 +130,9 @@ prepare() {
     
     # fix path of opencl headers
     sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure*
+    
+    # freetype harmony fix
+    patch -Np1 -i "${srcdir}/harmony-fix.diff"
 }
 
 pkgver() {
@@ -213,5 +223,8 @@ package() {
     # font aliasing settings for Win32 applications
     install -d "$pkgdir"/etc/fonts/conf.{avail,d}
     install -m644 "${srcdir}/30-win32-aliases.conf" "${pkgdir}/etc/fonts/conf.avail"
-    ln -s ../conf.avail/30-win32-aliases.conf "${pkgdir}/etc/fonts/conf.d/30-win32-aliases.conf"
+    ln -s ../conf.avail/30-win32-aliases.conf       "${pkgdir}/etc/fonts/conf.d/30-win32-aliases.conf"
+    
+    # wine binfmt
+    install -D -m644 "${srcdir}/wine-binfmt.conf"   "${pkgdir}/usr/lib/binfmt.d/wine.conf"
 }
diff --git a/harmony-fix.diff b/harmony-fix.diff
new file mode 100644
index 000000000000..fe0c8c929d4a
--- /dev/null
+++ b/harmony-fix.diff
@@ -0,0 +1,63 @@
+diff -u -r wine/dlls/gdi32/freetype.c wine-ft281/dlls/gdi32/freetype.c
+--- wine/dlls/gdi32/freetype.c	2017-10-04 18:01:36.000000000 +0200
++++ wine-ft281/dlls/gdi32/freetype.c	2017-10-10 10:29:17.506632615 +0200
+@@ -996,18 +996,23 @@
+ 
+ static BOOL is_subpixel_rendering_enabled( void )
+ {
+-#ifdef FT_LCD_FILTER_H
+     static int enabled = -1;
+     if (enabled == -1)
+     {
+-        enabled = (pFT_Library_SetLcdFilter &&
+-                   pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature);
++        /* >= 2.8.1 provides LCD rendering without filters */
++        if (FT_Version.major > 2 ||
++            FT_Version.major == 2 && FT_Version.minor > 8 ||
++            FT_Version.major == 2 && FT_Version.minor == 8 && FT_Version.patch >= 1)
++            enabled = TRUE;
++#ifdef FT_LCD_FILTER_H
++        else if (pFT_Library_SetLcdFilter &&
++                 pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature)
++            enabled = TRUE;
++#endif
++        else enabled = FALSE;
+         TRACE("subpixel rendering is %senabled\n", enabled ? "" : "NOT ");
+     }
+     return enabled;
+-#else
+-    return FALSE;
+-#endif
+ }
+ 
+ 
+@@ -7271,7 +7276,6 @@
+     case WINE_GGO_HBGR_BITMAP:
+     case WINE_GGO_VRGB_BITMAP:
+     case WINE_GGO_VBGR_BITMAP:
+-#ifdef FT_LCD_FILTER_H
+       {
+         switch (ft_face->glyph->format)
+         {
+@@ -7357,8 +7361,11 @@
+             if ( needsTransform )
+                 pFT_Outline_Transform (&ft_face->glyph->outline, &transMatTategaki);
+ 
++#ifdef FT_LCD_FILTER_H
+             if ( pFT_Library_SetLcdFilter )
+                 pFT_Library_SetLcdFilter( library, FT_LCD_FILTER_DEFAULT );
++#endif
++
+             pFT_Render_Glyph (ft_face->glyph, render_mode);
+ 
+             src = ft_face->glyph->bitmap.buffer;
+@@ -7439,9 +7446,6 @@
+ 
+         break;
+       }
+-#else
+-      return GDI_ERROR;
+-#endif
+ 
+     case GGO_NATIVE:
+       {
diff --git a/wine-binfmt.conf b/wine-binfmt.conf
new file mode 100644
index 000000000000..4d4307336587
--- /dev/null
+++ b/wine-binfmt.conf
@@ -0,0 +1,2 @@
+# Start WINE on Windows executables
+:DOSWin:M::MZ::/usr/bin/wine:
diff --git a/wine-staging-git.install b/wine-staging-git.install
new file mode 100644
index 000000000000..88a31c4353e6
--- /dev/null
+++ b/wine-staging-git.install
@@ -0,0 +1,7 @@
+post_install() {
+  printf '%s\n' "Run 'systemctl restart systemd-binfmt' in order to make the wine binfmt available on your system."
+}
+
+post_remove() {
+  printf '%s\n' "binfmt binary formats will be updated at reboot"
+}