Match latest base package changes. Update sources.

2 files changed, 23 insertions, 103 deletions

diff --git a/.SRCINFO b/.SRCINFO
index efb739f4801d..5070a45101dc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,38 +1,24 @@
 pkgbase = wine-staging-git
 	pkgdesc = A compatibility layer for running Windows programs (staging branch, git version)
-	pkgver = 7.20.r4.g4303e3ee
+	pkgver = 8.1.r3.g87f33695
 	pkgrel = 1
 	url = https://www.wine-staging.com/
 	install = wine-staging-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 = alsa-lib
@@ -41,12 +27,10 @@ pkgbase = wine-staging-git
 	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
@@ -59,60 +43,36 @@ pkgbase = wine-staging-git
 	makedepends = lib32-vulkan-icd-loader
 	makedepends = sdl2
 	makedepends = lib32-sdl2
-	makedepends = vkd3d
-	makedepends = lib32-vkd3d
 	makedepends = libcups
 	makedepends = lib32-libcups
 	makedepends = sane
 	makedepends = libgphoto2
-	makedepends = gsm
 	makedepends = ffmpeg
 	makedepends = samba
 	makedepends = opencl-headers
-	makedepends = vulkan-headers
 	depends = attr
 	depends = lib32-attr
 	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
@@ -121,16 +81,12 @@ pkgbase = wine-staging-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
@@ -141,24 +97,21 @@ pkgbase = wine-staging-git
 	optdepends = lib32-vulkan-icd-loader
 	optdepends = sdl2
 	optdepends = lib32-sdl2
-	optdepends = vkd3d
-	optdepends = lib32-vkd3d
 	optdepends = sane
 	optdepends = libgphoto2
-	optdepends = gsm
 	optdepends = ffmpeg
 	optdepends = cups
 	optdepends = samba
 	optdepends = dosbox
-	provides = wine-staging=7.20.r4.g4303e3ee
-	provides = wine=7.20
+	provides = wine-staging=8.1.r3.g87f33695
+	provides = wine=8.1
 	provides = wine-wow64
 	conflicts = wine
 	conflicts = wine-wow64
 	options = staticlibs
 	options = !lto
-	source = git+https://github.com/wine-staging/wine-staging.git
-	source = git://source.winehq.org/git/wine.git
+	source = git+https://gitlab.winehq.org/wine/wine-staging.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 78e9c0268991..cc07ce5fa15e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,89 +1,66 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=wine-staging-git
-pkgver=7.20.r4.g4303e3ee
+pkgver=8.1.r3.g87f33695
 pkgrel=1
 pkgdesc='A compatibility layer for running Windows programs (staging branch, git version)'
 arch=('x86_64')
 url='https://www.wine-staging.com/'
 license=('LGPL')
 depends=(
-    'attr'                  'lib32-attr'
-    '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'
+    'attr'             'lib32-attr'
+    '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'
     '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'
     'sdl2'                  'lib32-sdl2'
-    'vkd3d'                 'lib32-vkd3d'
     'libcups'               'lib32-libcups'
     'sane'
     'libgphoto2'
-    'gsm'
     'ffmpeg'
     'samba'
     'opencl-headers'
-    'vulkan-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'
     'sdl2'                  'lib32-sdl2'
-    'vkd3d'                 'lib32-vkd3d'
     'sane'
     'libgphoto2'
-    'gsm'
     'ffmpeg'
     'cups'
     'samba'
@@ -93,8 +70,8 @@ options=('staticlibs' '!lto')
 install="${pkgname}.install"
 provides=("wine-staging=${pkgver}" "wine=${pkgver%%.r*}" 'wine-wow64')
 conflicts=('wine' 'wine-wow64')
-source=('git+https://github.com/wine-staging/wine-staging.git'
-        'git://source.winehq.org/git/wine.git'
+source=('git+https://gitlab.winehq.org/wine/wine-staging.git'
+        'git+https://gitlab.winehq.org/wine/wine.git'
         '30-win32-aliases.conf'
         'wine-binfmt.conf')
 sha256sums=('SKIP'
@@ -116,29 +93,19 @@ prepare() {
     git -C wine config --local advice.detachedHead false
     git -C wine checkout "$(wine-staging/patches/patchinstall.sh --upstream-commit)"
     
-    # 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
-    
     # apply all wine-staging patches
     printf '%s\n' '  -> Applying wine-staging patches...'
     wine-staging/patches/patchinstall.sh DESTDIR="${srcdir}/wine" --all
 }
 
 pkgver() {
-    local _tag
-    local _ver
-    _tag="$(git -C wine-staging tag --sort='version:refname' | sed '$s/-/./g;s/^v//;s/\.rc/rc/')"
-    _ver="$(git -C wine-staging describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//;s/\.rc/rc/')"
-    printf '%s' "${_ver/latest.release/"$_tag"}"
+    git -C wine-staging describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^wine.//;s/^v//;s/\.rc/rc/'
 }
 
 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-staging 64-bit
     # (according to the wine wiki, this 64-bit/32-bit building order is mandatory)