update

2 files changed, 66 insertions, 75 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82a451948dfd..5d9494558640 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = vulkan-tools-git
 	pkgdesc = Vulkan Utilities and Tools (git version)
-	pkgver = 1.3.254.r11.g07924a8
+	pkgver = 1.3.275
 	pkgrel = 1
 	url = https://github.com/KhronosGroup/Vulkan-Tools
 	arch = x86_64
-	license = custom
+	license = Apache-2.0
 	makedepends = cmake
 	makedepends = python
-	makedepends = vulkan-headers-git
-	makedepends = vulkan-icd-loader-git
+	makedepends = vulkan-headers
+	makedepends = vulkan-icd-loader
 	makedepends = wayland-protocols
 	makedepends = glslang
 	makedepends = spirv-tools
 	makedepends = git
-	makedepends = ninja
 	makedepends = make
+	makedepends = volk
 	depends = libx11
 	depends = wayland
 	depends = libvulkan.so
@@ -22,6 +22,6 @@ pkgbase = vulkan-tools-git
 	provides = vulkan-tools-git
 	conflicts = vulkan-tools
 	source = git+https://github.com/KhronosGroup/Vulkan-Tools.git
-	md5sums = SKIP
+	sha256sums = SKIP
 
 pkgname = vulkan-tools-git
diff --git a/PKGBUILD b/PKGBUILD
index 2b0d43bc5882..d3ebeddcff08 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,98 +1,89 @@
-#_     _            _                                _____
-#| |__ | | __ _  ___| | ___ __ ___   ___   ___  _ __ |___ /
-#| '_ \| |/ _` |/ __| |/ / '_ ` _ \ / _ \ / _ \| '_ \  |_ \
-#| |_) | | (_| | (__|   <| | | | | | (_) | (_) | | | |___) |
-#|_.__/|_|\__,_|\___|_|\_\_| |_| |_|\___/ \___/|_| |_|____/
-
-#Maintainer: blackmoon3 <https://github.com/blacksky3>
+#Maintainer: archdevlab <https://github.com/archdevlab>
 #Credits: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=vulkan-tools-git
 pkgdesc='Vulkan Utilities and Tools (git version)'
-pkgver=1.3.254.r11.g07924a8
+pkgver=1.3.275
 pkgrel=1
 arch=(x86_64)
 url='https://github.com/KhronosGroup/Vulkan-Tools'
-license=(custom)
-makedepends=(cmake python vulkan-headers-git vulkan-icd-loader-git wayland-protocols glslang spirv-tools git ninja make)
+license=(Apache-2.0)
+makedepends=(cmake python vulkan-headers vulkan-icd-loader wayland-protocols glslang spirv-tools git make volk)
 depends=(libx11 wayland libvulkan.so)
 conflicts=(vulkan-tools)
 provides=(vulkan-tools vulkan-tools-git)
 source=(git+https://github.com/KhronosGroup/Vulkan-Tools.git)
-md5sums=(SKIP)
 
 pkgver(){
- cd ${srcdir}/Vulkan-Tools
-
+ cd "${srcdir}"/Vulkan-Tools
  # cutting off 'foo-' prefix that presents in the git tag
- git describe --long --tags --abbrev=7 --exclude sdk-* | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+ git describe --long --tags --abbrev=7 --exclude sdk-* --exclude vulkan-* | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-#prepapre(){
-#  ${srcdir}/cd Vulkan-Tools
-#
-#  ./scripts/update_deps.py
-#}
-
 build(){
-  cd ${srcdir}/Vulkan-Tools
+  rm -rf "${srcdir}"/{build,build-wayland}
 
-  rm -rf build
-  rm -rf build-wayland
+  #"${srcdir}"/Vulkan-Tools/scripts/update_deps.py --config release
 
-  ./scripts/update_deps.py
+  #cmake -C helper.cmake -B "${srcdir}"/build -S "${srcdir}"/Vulkan-Tools \
+  cmake -B "${srcdir}"/build -S "${srcdir}"/Vulkan-Tools \
+  -G "Unix Makefiles" \
+  -D CMAKE_BUILD_TYPE=Release \
+  -D CMAKE_INSTALL_PREFIX=/usr \
+  -D CMAKE_INSTALL_BINDIR=bin \
+  -D CMAKE_INSTALL_LIBDIR=lib \
+  -D CMAKE_INSTALL_INCLUDEDIR=include \
+  -D CMAKE_INSTALL_SYSCONFDIR=/etc \
+  -D CMAKE_INSTALL_DATADIR=share \
+  -D VULKAN_HEADERS_INSTALL_DIR=/usr \
+  -D VOLK_INSTALL_DIR=/usr \
+  -D VULKAN_LOADER_INSTALL_DIR=/usr \
+  -D CMAKE_SKIP_RPATH=True \
+  -D BUILD_WSI_XCB_SUPPORT=ON \
+  -D BUILD_WSI_XLIB_SUPPORT=ON \
+  -D BUILD_WSI_WAYLAND_SUPPORT=ON \
+  -D BUILD_CUBE=ON \
+  -D BUILD_VULKANINFO=ON \
+  -D BUILD_ICD=OFF \
+  -Wno-dev
 
-  cmake -H. -G Ninja -Bbuild \
-  -DCMAKE_C_FLAGS=-m64 \
-  -DCMAKE_CXX_FLAGS=-m64 \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DCMAKE_INSTALL_SYSCONFDIR=/etc \
-  -DCMAKE_INSTALL_DATADIR=/usr/share \
-  -DCMAKE_SKIP_RPATH=True \
-  -DBUILD_WSI_XCB_SUPPORT=On \
-  -DBUILD_WSI_XLIB_SUPPORT=On \
-  -DBUILD_WSI_WAYLAND_SUPPORT=On \
-  -DBUILD_CUBE=ON \
-  -DBUILD_VULKANINFO=ON \
-  -DBUILD_ICD=OFF \
-  -DGLSLANG_INSTALL_DIR=/usr \
-  -DVULKAN_HEADERS_INSTALL_DIR=/usr \
-  -DVULKAN_LOADER_INSTALL_DIR=/usr \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DUSE_CCACHE=OFF
+  #cmake -C helper.cmake -B "${srcdir}"/build-wayland -S "${srcdir}"/Vulkan-Tools \
+  cmake -B "${srcdir}"/build-wayland -S "${srcdir}"/Vulkan-Tools \
+  -G "Unix Makefiles" \
+  -D CMAKE_BUILD_TYPE=Release \
+  -D CMAKE_INSTALL_PREFIX=/usr \
+  -D CMAKE_INSTALL_BINDIR=bin \
+  -D CMAKE_INSTALL_LIBDIR=lib \
+  -D CMAKE_INSTALL_INCLUDEDIR=include \
+  -D CMAKE_INSTALL_SYSCONFDIR=/etc \
+  -D CMAKE_INSTALL_DATADIR=share \
+  -D VULKAN_HEADERS_INSTALL_DIR=/usr \
+  -D VOLK_INSTALL_DIR=/usr \
+  -D VULKAN_LOADER_INSTALL_DIR=/usr \
+  -D CMAKE_SKIP_RPATH=True \
+  -D BUILD_WSI_XCB_SUPPORT=OFF \
+  -D BUILD_WSI_XLIB_SUPPORT=OFF \
+  -D BUILD_WSI_WAYLAND_SUPPORT=ON \
+  -D BUILD_CUBE=ON \
+  -D CUBE_WSI_SELECTION=WAYLAND \
+  -D BUILD_VULKANINFO=OFF \
+  -D BUILD_ICD=OFF \
+  -Wno-dev
 
-  cmake -H. -G Ninja -Bbuild-wayland \
-  -DCMAKE_C_FLAGS=-m64 \
-  -DCMAKE_CXX_FLAGS=-m64 \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DCMAKE_INSTALL_SYSCONFDIR=/etc \
-  -DCMAKE_INSTALL_DATADIR=/usr/share \
-  -DCMAKE_SKIP_RPATH=True \
-  -DBUILD_WSI_XCB_SUPPORT=OFF \
-  -DBUILD_WSI_XLIB_SUPPORT=OFF \
-  -DBUILD_WSI_WAYLAND_SUPPORT=On \
-  -DBUILD_CUBE=ON \
-  -DCUBE_WSI_SELECTION=WAYLAND \
-  -DBUILD_VULKANINFO=OFF \
-  -DBUILD_ICD=OFF \
-  -DGLSLANG_INSTALL_DIR=/usr \
-  -DVULKAN_HEADERS_INSTALL_DIR=/usr \
-  -DVULKAN_LOADER_INSTALL_DIR=/usr \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DUSE_CCACHE=OFF
-
-  ninja -C build/
-  ninja -C build-wayland/
+  make -j$(nproc) -C "${srcdir}"/build
+  make -j$(nproc) -C "${srcdir}"/build-wayland
 }
 
 package(){
-  DESTDIR="$pkgdir" ninja -C ${srcdir}/Vulkan-Tools/build/ install
+  make -j$(nproc) -C "${srcdir}"/build DESTDIR="${pkgdir}" install
 
-  install -m755 ${srcdir}/Vulkan-Tools/build-wayland/cube/vkcube-wayland "${pkgdir}"/usr/bin/
+  install -m755 "${srcdir}"/build-wayland/cube/vkcube-wayland "${pkgdir}"/usr/bin/
 
-  # install licence
-  install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname}
-  install -m644 "${srcdir}"/Vulkan-Tools/LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/
+  # install license
+  install -dm755 "${pkgdir}"/usr/share/licenses/"${pkgname}"
+  install -m644 "${srcdir}"/Vulkan-Tools/LICENSE.txt "${pkgdir}"/usr/share/licenses/"${pkgname}"/
 }
 
+sha256sums=(SKIP)
+
 # vim:set ts=8 sts=2 sw=2 et: