bump and add lib32 support

2 files changed, 83 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 25a09a4f590a..bbf1fc161761 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,5 @@
 pkgbase = vkd3d-git
-	pkgdesc = D3D12 to Vulkan translation library. (GIT version)
-	pkgver = 1.2.79.ga9abb0d
+	pkgver = 1.2.493.g4509f08
 	pkgrel = 1
 	url = https://source.winehq.org/git/vkd3d.git
 	arch = x86_64
@@ -9,13 +8,31 @@ pkgbase = vkd3d-git
 	makedepends = vulkan-headers
 	makedepends = xcb-proto
 	makedepends = wine
-	depends = spirv-tools
-	depends = vulkan-icd-loader
-	depends = libxcb
+	makedepends = spirv-tools
+	makedepends = lib32-spirv-tools
+	makedepends = vulkan-icd-loader
+	makedepends = lib32-vulkan-icd-loader
+	makedepends = libxcb
+	makedepends = lib32-libxcb
 	provides = vkd3d
 	conflicts = vkd3d
 	source = git://source.winehq.org/git/vkd3d.git
 	sha256sums = SKIP
 
 pkgname = vkd3d-git
+	pkgdesc = D3D12 to Vulkan translation library. (GIT version)
+	depends = spirv-tools
+	depends = libvulkan.so
+	depends = libxcb
+	provides = vkd3d
+	provides = vkd3d=1.2.493.g4509f08
+	conflicts = vkd3d
 
+pkgname = lib32-vkd3d-git
+	pkgdesc = D3D12 to Vulkan translation library. (GIT version) (32-bits)
+	depends = vkd3d=1.2.493.g4509f08
+	depends = lib32-spirv-tools
+	depends = libvulkan.so
+	depends = lib32-libxcb
+	provides = lib32-vkd3d
+	conflicts = lib32-vkd3d
diff --git a/PKGBUILD b/PKGBUILD
index 320eadc41c0e..b0be3e4c58b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,24 @@
 # Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
 
-pkgname=vkd3d-git
-pkgver=1.2.79.ga9abb0d
+pkgbase=vkd3d-git
+pkgname=('vkd3d-git'
+         'lib32-vkd3d-git'
+         )
+pkgver=1.2.493.g4509f08
 pkgrel=1
-pkgdesc='D3D12 to Vulkan translation library. (GIT version)'
 arch=('x86_64')
 url='https://source.winehq.org/git/vkd3d.git'
 license=('LGPL')
-depends=('spirv-tools'
-         'vulkan-icd-loader'
-         'libxcb'
-         )
 makedepends=('spirv-headers'
              'vulkan-headers'
              'xcb-proto'
              'wine'
+             'spirv-tools'
+             'lib32-spirv-tools'
+             'vulkan-icd-loader'
+             'lib32-vulkan-icd-loader'
+             'libxcb'
+             'lib32-libxcb'
             )
 conflicts=('vkd3d')
 provides=('vkd3d')
@@ -27,22 +31,66 @@ pkgver() {
 }
 
 prepare() {
-  mkdir -p build
+  mkdir -p build{32,64}
 
-  cd vkd3d
-  ./autogen.sh
+  git clone "${srcdir}/vkd3d" vkd3d32
 }
 
 build() {
-  cd build
+
+  cd "${srcdir}/vkd3d"
+  ./autogen.sh
+
+  cd "${srcdir}/build64"
   ../vkd3d/configure \
     --prefix=/usr \
     --with-spirv-tools \
     --enable-tests=no
 
   make
+
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  cd "${srcdir}/vkd3d32"
+  ./autogen.sh
+
+  cd "${srcdir}/build32"
+  ../vkd3d32/configure \
+    --prefix=/usr \
+    --libdir=/usr/lib32 \
+    --with-spirv-tools \
+    --enable-tests=no \
+    --host=i686-linux-gnu
+
+  make
+}
+
+package_vkd3d-git() {
+  pkgdesc='D3D12 to Vulkan translation library. (GIT version)'
+  depends=('spirv-tools'
+           'libvulkan.so'
+           'libxcb'
+           )
+  provides=('vkd3d'
+            "vkd3d=${pkgver}"
+             )
+  conflicts=('vkd3d')
+  make -C build64 DESTDIR="${pkgdir}" install
 }
 
-package() {
-  make -C build DESTDIR="${pkgdir}" install
+package_lib32-vkd3d-git() {
+  pkgdesc='D3D12 to Vulkan translation library. (GIT version) (32-bits)'
+  depends=("vkd3d=${pkgver}"
+           'lib32-spirv-tools'
+           'libvulkan.so'
+           'lib32-libxcb'
+           )
+  provides=('lib32-vkd3d')
+  conflicts=('lib32-vkd3d')
+  make -C build32 DESTDIR="${pkgdir}" install
+
+  rm -fr "${pkgdir}/usr/include"
+  mv "${pkgdir}/usr/bin/vkd3d-compiler" "${pkgdir}/usr/bin/vkd3d-compiler-32"
 }