3.02

5 files changed, 28 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f89ad5bf180e..388d5d340312 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,15 @@
 pkgbase = vulkan-caps-viewer-wayland-bin
-	pkgdesc = Vulkan Hardware Capability Viewer (prebuilt, for use on Wayland)
-	pkgver = 3.01
+	pkgdesc = Vulkan Hardware Capability Viewer
+	pkgver = 3.02
 	pkgrel = 1
 	url = http://vulkan.gpuinfo.org/
 	arch = x86_64
 	license = GPL2
 	depends = vulkan-icd-loader
-	depends = qt5-base
 	depends = qt5-wayland
 	provides = vulkan-caps-viewer
 	conflicts = vulkan-caps-viewer
-	conflicts = vulkan-caps-viewer-bin
-	options = !strip
-	source = vulkan-caps-viewer.desktop
-	source = android_icon_256.png
-	sha1sums = 7ccdb4b4487b43bb428c32994092c00ca14f594a
-	sha1sums = 96c802c82c45626f3b6bdbb846d0f1f7e67ab28e
-	source_x86_64 = https://vulkan.gpuinfo.org/downloads/vulkancapsviewer_3.01_linux64_wayland.AppImage
-	sha1sums_x86_64 = eaf4da42454ece66ace44923d4fdfc459c809380
+	source = https://vulkan.gpuinfo.org/downloads/vulkancapsviewer_3.02_linux64_wayland.AppImage
+	sha256sums = f2f99f77e7a59c49fe6b68e5144a3f57cb18c1d4ac37aadf61b1ed8dafd4f52c
 
 pkgname = vulkan-caps-viewer-wayland-bin
-
diff --git a/.gitignore b/.gitignore
index cc97c0d17715..4dab8d6386e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
+# Ignore everything
 *
+
+# But not these files...
 !.gitignore
 !PKGBUILD
 !.SRCINFO
-!vulkan-caps-viewer.desktop
-!android_icon_256.png
diff --git a/PKGBUILD b/PKGBUILD
index 90d3982af73c..157ca677a138 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,28 @@
-# Maintainer: Eric Engestrom <aur [at] engestrom [dot] ch>
-
+# Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
+# Contributor: Eric Engestrom <aur [at] engestrom [dot] ch>
 pkgname=vulkan-caps-viewer-wayland-bin
-pkgver=3.01
+pkgver=3.02
 pkgrel=1
-pkgdesc='Vulkan Hardware Capability Viewer (prebuilt, for use on Wayland)'
-url='http://vulkan.gpuinfo.org/'
+pkgdesc="Vulkan Hardware Capability Viewer"
 arch=('x86_64')
+url="http://vulkan.gpuinfo.org/"
 license=('GPL2')
-source=('vulkan-caps-viewer.desktop'
-        'android_icon_256.png')
-sha1sums=('7ccdb4b4487b43bb428c32994092c00ca14f594a'
-          '96c802c82c45626f3b6bdbb846d0f1f7e67ab28e')
-sha1sums_x86_64=('eaf4da42454ece66ace44923d4fdfc459c809380')
-source_x86_64=("https://vulkan.gpuinfo.org/downloads/vulkancapsviewer_${pkgver}_linux64_wayland.AppImage")
-depends=('vulkan-icd-loader' 'qt5-base' 'qt5-wayland')
-conflicts=(vulkan-caps-viewer vulkan-caps-viewer-bin)
-provides=(vulkan-caps-viewer)
-options=('!strip')
+depends=('vulkan-icd-loader' 'qt5-wayland')
+provides=("${pkgname%-*-*}")
+conflicts=("${pkgname%-*-*}")
+source=("https://vulkan.gpuinfo.org/downloads/vulkancapsviewer_${pkgver}_linux64_wayland.AppImage")
+sha256sums=('f2f99f77e7a59c49fe6b68e5144a3f57cb18c1d4ac37aadf61b1ed8dafd4f52c')
 
-package() {
-  # App
-  install -dm755 "$pkgdir"/usr/bin
-  install -m755 *.AppImage "$pkgdir"/usr/bin/vulkanCapsViewer
+prepare() {
+  chmod +x *.AppImage
+  ./*.AppImage --appimage-extract
+}
 
-  # Desktop shortcut
-  install -Dm644 vulkan-caps-viewer.desktop "$pkgdir"/usr/share/applications/vulkan-caps-viewer.desktop
-  install -Dm644 android_icon_256.png "$pkgdir"/usr/share/icons/hicolor/256x256/apps/vulkanCapsViewer.png
+package() {
+  cd "$srcdir/squashfs-root"
+  install -Dm755 usr/bin/vulkanCapsViewer -t "$pkgdir/usr/bin"
+  install -Dm644 usr/share/applications/vulkanCapsViewer.desktop -t \
+    "$pkgdir/usr/share/applications"
+  install -Dm644 usr/share/icons/hicolor/256x256/apps/vulkanCapsViewer.png -t \
+    "$pkgdir/usr/share/icons/hicolor/256x256/apps"
 }
diff --git a/android_icon_256.png b/android_icon_256.png
deleted file mode 100644
index f1a9ce9a31d6..000000000000
--- a/android_icon_256.png
+++ /dev/null
diff --git a/vulkan-caps-viewer.desktop b/vulkan-caps-viewer.desktop
deleted file mode 100644
index 8ecf50b9a1c2..000000000000
--- a/vulkan-caps-viewer.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Vulkan Caps Viewer
-Comment=Vulkan Hardware Capability Viewer
-Exec=vulkanCapsViewer
-Icon=vulkanCapsViewer
-Terminal=false
-StartupNotify=false
-Categories=Application;Graphics;Development;