Using Guy1524 fork

2 files changed, 35 insertions, 81 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f79b99abc67..fe7505f63ec8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vk9-git
 	pkgdesc = Direct3D 9 compatibility layer using Vulkan.
-	pkgver = 0.29.0.9.ga5d3536
+	pkgver = 0.29.0.67.gd9654c8
 	pkgrel = 1
 	url = https://github.com/disks86/VK9
 	arch = x86_64
@@ -12,16 +12,13 @@ pkgbase = vk9-git
 	makedepends = shaderc
 	makedepends = util-linux
 	makedepends = cmake
+	makedepends = mingw-w64-meson
 	makedepends = mingw-w64-cmake
-	makedepends = mingw-w64-boost
-	makedepends = mingw-w64-vulkan-headers
 	makedepends = mingw-w64-eigen
-	makedepends = mingw-w64-vulkan-loader
-	makedepends = spirv-headers
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = vk9::git+https://github.com/disks86/VK9.git
+	source = vk9::git+https://github.com/Guy1524/VK9.git
 	sha256sums = SKIP
 
 pkgname = vk9-git
diff --git a/PKGBUILD b/PKGBUILD
index 88ef04595858..8256e6203039 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 project=vk9
 pkgbase=vk9-git
 pkgname=('vk9-git' 'lib32-vk9-git')
-pkgver=0.29.0.9.ga5d3536
+pkgver=0.29.0.67.gd9654c8
 pkgrel=1
 pkgdesc='Direct3D 9 compatibility layer using Vulkan.'
 arch=('x86_64')
@@ -13,9 +13,8 @@ url='https://github.com/disks86/VK9'
 license=('zlib')
 options=(!strip !buildflags staticlibs)
 makedepends=('ninja' 'meson>=0.43' 'git' 'wine>=3.5' 'shaderc' 'util-linux' 'cmake'
-		'mingw-w64-cmake' 'mingw-w64-boost' 'mingw-w64-vulkan-headers'
-		'mingw-w64-eigen' 'mingw-w64-vulkan-loader' 'spirv-headers')
-source=($project::'git+https://github.com/disks86/VK9.git')
+		'mingw-w64-meson' 'mingw-w64-cmake' 'mingw-w64-eigen')
+source=($project::'git+https://github.com/Guy1524/VK9.git')
 sha256sums=('SKIP')
 
 
@@ -24,72 +23,26 @@ pkgver() {
   git describe --tags | sed s/"-"/"."/g
 }
 
-prepare(){
-  mkdir -p "$srcdir/wine/VK9-build"
-
-  cat > "$srcdir/fix-build.sh" << EOF
-#!/usr/bin/env bash
-sed -i'' -E 's/-isystem\/usr\/[^-]+-w64-mingw32\/include/-I\/usr\/include\/spirv\/unified1/g' build.ninja
-EOF
-  chmod +x "$srcdir/fix-build.sh"
-
-  cd "$srcdir/$project"
-  cat > dep64/boost.sh << EOF
-#!/usr/bin/env bash
-export BOOST_INCLUDEDIR=/usr/x86_64-w64-mingw32/include
-export BOOST_LIBRARYDIR=$srcdir/boost64
-EOF
-  cat > dep32/boost.sh << EOF
-#!/usr/bin/env bash
-export BOOST_INCLUDEDIR=/usr/i686-w64-mingw32/include
-export BOOST_LIBRARYDIR=$srcdir/boost32
-EOF
-  cat > dep64/eigen.pc << EOF
-# Package Information for pkg-config
-
-prefix=/usr/x86_64-w64-mingw32
-exec_prefix=${prefix}
-includedir=${prefix}/include
-
-Name: Eigen3
-Description: A C++ template library for linear algebra: vectors, matrices, and related algorithms
-Version: 3.3.5
-Cflags: -I${includedir}
-EOF
-  cat > dep32/eigen.pc << EOF
-# Package Information for pkg-config
-
-prefix=/usr/i686-w64-mingw32
-exec_prefix=${prefix}
-includedir=${prefix}/include
-
-Name: Eigen3
-Description: A C++ template library for linear algebra: vectors, matrices, and related algorithms
-Version: 3.3.5
-Cflags: -I${includedir}
-EOF
-  rm dep{32,64}/vulkan-1.pc
-
-  sed -i'' -E 's/ninja install/..\/..\/fix-build.sh\nninja install/g' package-release.sh
-
-  cd "VK9-Library/Shaders"
-  sparam="s/.VertexBuffer_XYZ_TEX2\.vert./\'VertexBuffer_XYZ_TEX2.vert\',\'PixelPassthrough.frag\'/g"
-  sed -i'' -E $sparam meson.build
-  
-  mkdir -p "$srcdir/boost"{32,64}
-  cd "$srcdir/boost32"
-  cp /usr/i686-w64-mingw32/lib/libboost*.a ./
-  rename -- .a -mt.a ./libboost*
-
-  cd "$srcdir/boost64"
-  cp /usr/x86_64-w64-mingw32/lib/libboost*.a ./
-  rename -- .a -mt.a ./libboost*
-}
-
 build() {
   cd "$srcdir/$project"
   export WINEPREFIX="$srcdir/wine/VK9-build"
-  ./package-release.sh $pkgver '..' --no-package --keep-builddir
+  mkdir -p "$WINEPREFIX"
+  
+  #./package-release.sh $pkgver '..' --no-package --keep-builddir
+  VK9_BUILD_DIR="$srcdir/$project-$pkgver"
+  for arch in 'x86_64' 'i686'; do
+    $arch-w64-mingw32-meson \
+        --buildtype 'release' \
+        --unity off \
+        --strip \
+        -Db_pch=true \
+        -Denable_tests=false \
+        "$VK9_BUILD_DIR/build.$arch"
+
+    pushd "$VK9_BUILD_DIR/build.$arch"
+    ninja
+    popd
+  done
 }
 
 # TODO: Make it compatible with archlinux32 too
@@ -98,10 +51,12 @@ package_vk9-git() {
   provides=('vk9')
   depends=('vulkan-icd-loader' 'wine')
   
-  cd "$srcdir/$project-$pkgver"
-  install -Dm644 'x64/d3d9.dll' "$pkgdir/usr/lib/d3d9.dll"
-  install -Dm755 'setup_vk9' "$pkgdir/usr/bin/setup_vk9"
-  install -Dm644 'setup_vk9-x86_64.verb' "$pkgdir/usr/share/vk9/setup_vk9.verb"
+  cd "$srcdir/$project-$pkgver/build.x86_64"
+  install -Dm644 'VK9-Library/d3d9.dll' "$pkgdir/usr/share/VK9/x64/d3d9.dll"
+  install -Dm755 'wine_utils/setup_vk9.sh' "$pkgdir/usr/share/VK9/x64/setup_vk9.sh"
+
+  cd "$srcdir/$project"
+  install -Dm644 'wine_utils/setup_vk9.verb' "$pkgdir/usr/share/VK9/setup_vk9.verb"
 }
 
 package_lib32-vk9-git() {
@@ -110,8 +65,10 @@ package_lib32-vk9-git() {
   provides=('lib32-vk9')
   depends=('lib32-vulkan-icd-loader' 'wine')
   
-  cd "$srcdir/$project-$pkgver"
-  install -Dm644 'x32/d3d9.dll' "$pkgdir/usr/lib32/d3d9.dll"
-  install -Dm755 'setup_vk9-32' "$pkgdir/usr/bin/setup_vk9-32"
-  install -Dm644 'setup_vk9-i686.verb' "$pkgdir/usr/share/lib32-vk9/setup_vk9.verb"
+  cd "$srcdir/$project-$pkgver/build.i686"
+  install -Dm644 'VK9-Library/d3d9.dll' "$pkgdir/usr/share/VK9/x32/d3d9.dll"
+  install -Dm755 'wine_utils/setup_vk9.sh' "$pkgdir/usr/share/VK9/x32/setup_vk9.sh"
+  
+  cd "$srcdir/$project"
+  install -Dm644 'wine_utils/setup_vk9.verb' "$pkgdir/usr/share/VK9/setup_vk9-32.verb"
 }