Match latest base package changes. Update source.

2 files changed, 45 insertions, 105 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a867cc35d1b3..603a6937eeb4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,111 +1,76 @@
 pkgbase = wine-git
 	pkgdesc = A compatibility layer for running Windows programs (git version)
-	pkgver = 7.20.r331.g384b0b35c35
+	pkgver = 8.1.r108.g9070f0d572e
 	pkgrel = 1
 	url = https://www.winehq.org/
 	install = wine-git.install
 	arch = x86_64
 	license = LGPL
 	makedepends = git
-	makedepends = autoconf
-	makedepends = bison
 	makedepends = perl
-	makedepends = fontforge
-	makedepends = flex
 	makedepends = mingw-w64-gcc
 	makedepends = giflib
 	makedepends = lib32-giflib
-	makedepends = libpng
-	makedepends = lib32-libpng
 	makedepends = gnutls
 	makedepends = lib32-gnutls
 	makedepends = libxinerama
 	makedepends = lib32-libxinerama
 	makedepends = libxcomposite
 	makedepends = lib32-libxcomposite
-	makedepends = libxmu
-	makedepends = lib32-libxmu
 	makedepends = libxxf86vm
 	makedepends = lib32-libxxf86vm
-	makedepends = libldap
-	makedepends = lib32-libldap
-	makedepends = mpg123
-	makedepends = lib32-mpg123
-	makedepends = openal
-	makedepends = lib32-openal
 	makedepends = v4l-utils
 	makedepends = lib32-v4l-utils
-	makedepends = libpulse
-	makedepends = lib32-libpulse
 	makedepends = alsa-lib
 	makedepends = lib32-alsa-lib
 	makedepends = libxcomposite
 	makedepends = lib32-libxcomposite
 	makedepends = mesa
 	makedepends = lib32-mesa
-	makedepends = libgl
-	makedepends = lib32-libgl
+	makedepends = mesa-libgl
+	makedepends = lib32-mesa-libgl
 	makedepends = opencl-icd-loader
 	makedepends = lib32-opencl-icd-loader
-	makedepends = libxslt
-	makedepends = lib32-libxslt
+	makedepends = libpulse
+	makedepends = lib32-libpulse
+	makedepends = libva
+	makedepends = lib32-libva
+	makedepends = gtk3
+	makedepends = lib32-gtk3
 	makedepends = gst-plugins-base-libs
 	makedepends = lib32-gst-plugins-base-libs
 	makedepends = vulkan-icd-loader
 	makedepends = lib32-vulkan-icd-loader
-	makedepends = vkd3d
-	makedepends = lib32-vkd3d
 	makedepends = sdl2
 	makedepends = lib32-sdl2
 	makedepends = libcups
 	makedepends = lib32-libcups
-	makedepends = libgphoto2
 	makedepends = sane
-	makedepends = gsm
-	makedepends = vulkan-headers
-	makedepends = opencl-headers
+	makedepends = libgphoto2
+	makedepends = ffmpeg
 	makedepends = samba
+	makedepends = opencl-headers
 	depends = fontconfig
 	depends = lib32-fontconfig
-	depends = lcms2
-	depends = lib32-lcms2
-	depends = libxml2
-	depends = lib32-libxml2
 	depends = libxcursor
 	depends = lib32-libxcursor
 	depends = libxrandr
 	depends = lib32-libxrandr
-	depends = libxdamage
-	depends = lib32-libxdamage
 	depends = libxi
 	depends = lib32-libxi
 	depends = gettext
 	depends = lib32-gettext
 	depends = freetype2
 	depends = lib32-freetype2
-	depends = glu
-	depends = lib32-glu
-	depends = libsm
-	depends = lib32-libsm
 	depends = gcc-libs
 	depends = lib32-gcc-libs
 	depends = libpcap
 	depends = lib32-libpcap
-	depends = faudio
-	depends = lib32-faudio
 	depends = desktop-file-utils
 	optdepends = giflib
 	optdepends = lib32-giflib
-	optdepends = libpng
-	optdepends = lib32-libpng
-	optdepends = libldap
-	optdepends = lib32-libldap
 	optdepends = gnutls
 	optdepends = lib32-gnutls
-	optdepends = mpg123
-	optdepends = lib32-mpg123
-	optdepends = openal
-	optdepends = lib32-openal
 	optdepends = v4l-utils
 	optdepends = lib32-v4l-utils
 	optdepends = libpulse
@@ -114,40 +79,38 @@ pkgbase = wine-git
 	optdepends = lib32-alsa-plugins
 	optdepends = alsa-lib
 	optdepends = lib32-alsa-lib
-	optdepends = libjpeg-turbo
-	optdepends = lib32-libjpeg-turbo
 	optdepends = libxcomposite
 	optdepends = lib32-libxcomposite
 	optdepends = libxinerama
 	optdepends = lib32-libxinerama
 	optdepends = opencl-icd-loader
 	optdepends = lib32-opencl-icd-loader
-	optdepends = libxslt
-	optdepends = lib32-libxslt
+	optdepends = libva
+	optdepends = lib32-libva
+	optdepends = gtk3
+	optdepends = lib32-gtk3
 	optdepends = gst-plugins-base-libs
 	optdepends = lib32-gst-plugins-base-libs
 	optdepends = vulkan-icd-loader
 	optdepends = lib32-vulkan-icd-loader
-	optdepends = vkd3d
-	optdepends = lib32-vkd3d
 	optdepends = sdl2
 	optdepends = lib32-sdl2
-	optdepends = libgphoto2
 	optdepends = sane
-	optdepends = gsm
+	optdepends = libgphoto2
+	optdepends = ffmpeg
 	optdepends = cups
 	optdepends = samba
 	optdepends = dosbox
-	provides = wine=7.20.r331.g384b0b35c35
-	provides = bin32-wine=7.20.r331.g384b0b35c35
-	provides = wine-wow64=7.20.r331.g384b0b35c35
+	provides = wine=8.1.r108.g9070f0d572e
+	provides = bin32-wine=8.1.r108.g9070f0d572e
+	provides = wine-wow64=8.1.r108.g9070f0d572e
 	conflicts = wine
 	conflicts = bin32-wine
 	conflicts = wine-wow64
 	replaces = bin32-wine
 	options = staticlibs
 	options = !lto
-	source = git://source.winehq.org/git/wine.git
+	source = git+https://gitlab.winehq.org/wine/wine.git
 	source = 30-win32-aliases.conf
 	source = wine-binfmt.conf
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 43ce52d87e59..2abea6986671 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,83 +3,66 @@
 # Contributor: sxe <sxxe@gmx.de>
 
 pkgname=wine-git
-pkgver=7.20.r331.g384b0b35c35
+pkgver=8.1.r108.g9070f0d572e
 pkgrel=1
 pkgdesc='A compatibility layer for running Windows programs (git version)'
 arch=('x86_64')
 url='https://www.winehq.org/'
 license=('LGPL')
 depends=(
-    'fontconfig'            'lib32-fontconfig'
-    'lcms2'                 'lib32-lcms2'
-    'libxml2'               'lib32-libxml2'
-    'libxcursor'            'lib32-libxcursor'
-    'libxrandr'             'lib32-libxrandr'
-    'libxdamage'            'lib32-libxdamage'
-    'libxi'                 'lib32-libxi'
-    'gettext'               'lib32-gettext'
-    'freetype2'             'lib32-freetype2'
-    'glu'                   'lib32-glu'
-    'libsm'                 'lib32-libsm'
-    'gcc-libs'              'lib32-gcc-libs'
-    'libpcap'               'lib32-libpcap'
-    'faudio'                'lib32-faudio'
+    'fontconfig'      'lib32-fontconfig'
+    'libxcursor'      'lib32-libxcursor'
+    'libxrandr'       'lib32-libxrandr'
+    'libxi'           'lib32-libxi'
+    'gettext'         'lib32-gettext'
+    'freetype2'       'lib32-freetype2'
+    'gcc-libs'        'lib32-gcc-libs'
+    'libpcap'         'lib32-libpcap'
     'desktop-file-utils'
 )
-makedepends=('git' 'autoconf' 'bison' 'perl' 'fontforge' 'flex' 'mingw-w64-gcc'
+makedepends=('git' 'perl' 'mingw-w64-gcc'
     'giflib'                'lib32-giflib'
-    'libpng'                'lib32-libpng'
     'gnutls'                'lib32-gnutls'
     'libxinerama'           'lib32-libxinerama'
     'libxcomposite'         'lib32-libxcomposite'
-    'libxmu'                'lib32-libxmu'
     'libxxf86vm'            'lib32-libxxf86vm'
-    'libldap'               'lib32-libldap'
-    'mpg123'                'lib32-mpg123'
-    'openal'                'lib32-openal'
     'v4l-utils'             'lib32-v4l-utils'
-    'libpulse'              'lib32-libpulse'
     'alsa-lib'              'lib32-alsa-lib'
     'libxcomposite'         'lib32-libxcomposite'
     'mesa'                  'lib32-mesa'
-    'libgl'                 'lib32-libgl'
+    'mesa-libgl'            'lib32-mesa-libgl'
     'opencl-icd-loader'     'lib32-opencl-icd-loader'
-    'libxslt'               'lib32-libxslt'
+    'libpulse'              'lib32-libpulse'
+    'libva'                 'lib32-libva'
+    'gtk3'                  'lib32-gtk3'
     'gst-plugins-base-libs' 'lib32-gst-plugins-base-libs'
     'vulkan-icd-loader'     'lib32-vulkan-icd-loader'
-    'vkd3d'                 'lib32-vkd3d'
     'sdl2'                  'lib32-sdl2'
     'libcups'               'lib32-libcups'
-    'libgphoto2'
     'sane'
-    'gsm'
-    'vulkan-headers'
-    'opencl-headers'
+    'libgphoto2'
+    'ffmpeg'
     'samba'
+    'opencl-headers'
 )
 optdepends=(
     'giflib'                'lib32-giflib'
-    'libpng'                'lib32-libpng'
-    'libldap'               'lib32-libldap'
     'gnutls'                'lib32-gnutls'
-    'mpg123'                'lib32-mpg123'
-    'openal'                'lib32-openal'
     'v4l-utils'             'lib32-v4l-utils'
     'libpulse'              'lib32-libpulse'
     'alsa-plugins'          'lib32-alsa-plugins'
     'alsa-lib'              'lib32-alsa-lib'
-    'libjpeg-turbo'         'lib32-libjpeg-turbo'
     'libxcomposite'         'lib32-libxcomposite'
     'libxinerama'           'lib32-libxinerama'
     'opencl-icd-loader'     'lib32-opencl-icd-loader'
-    'libxslt'               'lib32-libxslt'
+    'libva'                 'lib32-libva'
+    'gtk3'                  'lib32-gtk3'
     'gst-plugins-base-libs' 'lib32-gst-plugins-base-libs'
     'vulkan-icd-loader'     'lib32-vulkan-icd-loader'
-    'vkd3d'                 'lib32-vkd3d'
     'sdl2'                  'lib32-sdl2'
-    'libgphoto2'
     'sane'
-    'gsm'
+    'libgphoto2'
+    'ffmpeg'
     'cups'
     'samba'
     'dosbox'
@@ -89,7 +72,7 @@ install="${pkgname}.install"
 provides=("wine=${pkgver}" "bin32-wine=${pkgver}" "wine-wow64=${pkgver}")
 conflicts=('wine' 'bin32-wine' 'wine-wow64')
 replaces=('bin32-wine')
-source=('git://source.winehq.org/git/wine.git'
+source=('git+https://gitlab.winehq.org/wine/wine.git'
         '30-win32-aliases.conf'
         'wine-binfmt.conf')
 sha256sums=('SKIP'
@@ -99,12 +82,6 @@ sha256sums=('SKIP'
 prepare() {
     rm -rf build-{32,64}
     mkdir -p build-{32,64}
-    
-    # fix path of opencl headers
-    sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i wine/configure*
-    
-    # fix openldap 2.5+ detection
-    sed 's/-lldap_r/-lldap/' -i wine/configure
 }
 
 pkgver() {
@@ -114,7 +91,7 @@ pkgver() {
 build() {
     # does not compile without remove these flags as of 4.10
     export CFLAGS="${CFLAGS/-fno-plt/}"
-    export LDFLAGS="${LDFLAGS/,-z,relro,-z,now/}"
+    export LDFLAGS="${LDFLAGS/,-z,now/}"
     
     # build wine 64-bit
     # (according to the wine wiki, this 64-bit/32-bit building order is mandatory)