Readd 64bit dependencies (they contain the includes)

2 files changed, 120 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8df46d3244ab..34081209478f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,29 +13,53 @@ pkgbase = wine-lol
 	makedepends = fontforge
 	makedepends = flex
 	makedepends = gcc>=4.5.0-2
+	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
 	makedepends = lib32-alsa-lib
+	makedepends = libxcomposite
 	makedepends = lib32-libxcomposite
+	makedepends = mesa
 	makedepends = lib32-mesa
+	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 = sdl2
 	makedepends = lib32-sdl2
+	makedepends = vkd3d
 	makedepends = lib32-vkd3d
 	makedepends = sane
 	makedepends = libgphoto2
@@ -43,43 +67,79 @@ pkgbase = wine-lol
 	makedepends = ffmpeg
 	makedepends = samba
 	makedepends = opencl-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 = desktop-file-utils
 	depends = wine-lol-glibc
+	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
 	optdepends = lib32-libpulse
+	optdepends = alsa-plugins
 	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 = ncurses
 	optdepends = lib32-ncurses
+	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 = sdl2
 	optdepends = lib32-sdl2
+	optdepends = vkd3d
 	optdepends = lib32-vkd3d
 	optdepends = sane
 	optdepends = libgphoto2
diff --git a/PKGBUILD b/PKGBUILD
index 8b65c9421356..5e332de51006 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -36,50 +36,50 @@ options=(staticlibs)
 license=(LGPL)
 
 depends=(
-  lib32-attr
-  lib32-fontconfig
-  lib32-lcms2
-  lib32-libxml2
-  lib32-libxcursor
-  lib32-libxrandr
-  lib32-libxdamage
-  lib32-libxi
-  lib32-gettext
-  lib32-freetype2
-  lib32-glu
-  lib32-libsm
-  lib32-gcc-libs
-  lib32-libpcap
+  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
   desktop-file-utils
   wine-lol-glibc
 )
 
 makedepends=(autoconf ncurses bison perl fontforge flex
   'gcc>=4.5.0-2'
-  lib32-giflib
-  lib32-libpng
-  lib32-gnutls
-  lib32-libxinerama
-  lib32-libxcomposite
-  lib32-libxmu
-  lib32-libxxf86vm
-  lib32-libldap
-  lib32-mpg123
-  lib32-openal
-  lib32-v4l-utils
-  lib32-alsa-lib
-  lib32-libxcomposite
-  lib32-mesa
-  lib32-mesa-libgl
-  lib32-opencl-icd-loader
-  lib32-libxslt
-  lib32-libpulse
-  lib32-libva
-  lib32-gtk3
-  lib32-gst-plugins-base-libs
-  lib32-vulkan-icd-loader
-  lib32-sdl2
-  lib32-vkd3d
+  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
+  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
   sane
   libgphoto2
   gsm
@@ -89,28 +89,28 @@ makedepends=(autoconf ncurses bison perl fontforge flex
 )
 
 optdepends=(
-  lib32-giflib
-  lib32-libpng
-  lib32-libldap
-  lib32-gnutls
-  lib32-mpg123
-  lib32-openal
-  lib32-v4l-utils
-  lib32-libpulse
-  lib32-alsa-plugins
-  lib32-alsa-lib
-  lib32-libjpeg-turbo
-  lib32-libxcomposite
-  lib32-libxinerama
-  lib32-ncurses
-  lib32-opencl-icd-loader
-  lib32-libxslt
-  lib32-libva
-  lib32-gtk3
-  lib32-gst-plugins-base-libs
-  lib32-vulkan-icd-loader
-  lib32-sdl2
-  lib32-vkd3d
+  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
+  ncurses               lib32-ncurses
+  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