publish split package

1 files changed, 59 insertions, 66 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 48a63b0fea3c..1b98632db567 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,7 @@
-## Placeholder for split package
-
 # Maintainer: Mark Wagie <mark dot wagie at proton dot me>
-# Co-Maintainer: Eric Engestrom <aur [at] engestrom [dot] ch>
-#pkgname=('vulkan-caps-viewer-x11' 'vulkan-caps-viewer-wayland')
-pkgname=vulkan-caps-viewer
-#pkgbase=vulkan-caps-viewer
+# Contributor: Eric Engestrom <aur [at] engestrom [dot] ch>
+pkgname=('vulkan-caps-viewer-x11' 'vulkan-caps-viewer-wayland')
+pkgbase=vulkan-caps-viewer
 pkgver=3.33
 pkgrel=2
 epoch=1
@@ -12,76 +9,72 @@ pkgdesc="Vulkan Hardware Capability Viewer"
 arch=('x86_64' 'aarch64')
 url="https://vulkan.gpuinfo.org"
 license=('LGPL-3.0-or-later')
-#makedepends=('git' 'qt5-wayland' 'qt5-x11extras' 'vulkan-icd-loader')
-#_commit=1008cecb054ab15acf51353ac85ffd8ebb135cc4  # tags/3.33^0
-#source=("git+https://github.com/SaschaWillems/VulkanCapsViewer.git#commit=$_commit"
-#        'git+https://github.com/KhronosGroup/Vulkan-Headers.git')
-#sha256sums=('SKIP'
-#            'SKIP')
-
-#pkgver() {
-#  cd VulkanCapsViewer
-#  git describe --tags | sed 's/_fixed//;s/-/+/g'
-#}
+makedepends=('git' 'qt5-wayland' 'qt5-x11extras' 'vulkan-icd-loader')
+_commit=1008cecb054ab15acf51353ac85ffd8ebb135cc4  # tags/3.33^0
+source=("git+https://github.com/SaschaWillems/VulkanCapsViewer.git#commit=$_commit"
+        'git+https://github.com/KhronosGroup/Vulkan-Headers.git')
+sha256sums=('SKIP'
+            'SKIP')
 
-#prepare() {
-#  cd VulkanCapsViewer
-#  git submodule init
-#  git config submodule.Vulkan-Headers.url "$srcdir/Vulkan-Headers"
-#  git -c protocol.file.allow=always submodule update
+pkgver() {
+  cd VulkanCapsViewer
+  git describe --tags | sed 's/_fixed//;s/-/+/g'
+}
 
-#  # Create build directories
-#  mkdir -p build-x11 build-wayland
-#}
+prepare() {
+  cd VulkanCapsViewer
+  git submodule init
+  git config submodule.Vulkan-Headers.url "$srcdir/Vulkan-Headers"
+  git -c protocol.file.allow=always submodule update
 
-#build() {
-#  cd VulkanCapsViewer
+  # Create build directories
+  mkdir -p build-x11 build-wayland
+}
 
-#  # X11
-#  pushd build-x11
-#  qmake-qt5 \
-#    DEFINES+=X11 \
-#    CONFIG+=release \
-#    PREFIX=/usr
-#  make
-#  popd
+build() {
+  cd VulkanCapsViewer
 
-#  # Wayland
-#  pushd build-wayland
-#  qmake-qt5 \
-#    DEFINES+=WAYLAND \
-#    CONFIG+=release \
-#    PREFIX=/usr
-#  make
-#  popd
-#}
+  # X11
+  pushd build-x11
+  qmake-qt5 \
+    DEFINES+=X11 \
+    CONFIG+=release \
+    PREFIX=/usr
+  make
+  popd
 
-package() {
-  return 0
+  # Wayland
+  pushd build-wayland
+  qmake-qt5 \
+    DEFINES+=WAYLAND \
+    CONFIG+=release \
+    PREFIX=/usr
+  make
+  popd
 }
 
-#package_vulkan-caps-viewer-x11() {
-#  pkgdesc+=" (X11)"
-#  depends=('vulkan-icd-loader' 'qt5-x11extras')
-#  provides=('vulkan-caps-viewer')
-#  conflicts=('vulkan-caps-viewer')
+package_vulkan-caps-viewer-x11() {
+  pkgdesc+=" (X11)"
+  depends=('vulkan-icd-loader' 'qt5-x11extras')
+  provides=('vulkan-caps-viewer')
+  conflicts=('vulkan-caps-viewer')
 
-#  cd VulkanCapsViewer/build-x11
-#  make INSTALL_ROOT="$pkgdir/" install
+  cd VulkanCapsViewer/build-x11
+  make INSTALL_ROOT="$pkgdir/" install
 
-#  install -m644 gfx/android_icon_256.png \
-#    "$pkgdir"/usr/share/icons/hicolor/256x256/apps/vulkanCapsViewer.png
-#}
+  install -m644 gfx/android_icon_256.png \
+    "$pkgdir"/usr/share/icons/hicolor/256x256/apps/vulkanCapsViewer.png
+}
 
-#package_vulkan-caps-viewer-wayland() {
-#  pkgdesc+=" (Wayland)"
-#  depends=('vulkan-icd-loader' 'qt5-wayland')
-#  provides=('vulkan-caps-viewer')
-#  conflicts=('vulkan-caps-viewer')
+package_vulkan-caps-viewer-wayland() {
+  pkgdesc+=" (Wayland)"
+  depends=('vulkan-icd-loader' 'qt5-wayland')
+  provides=('vulkan-caps-viewer')
+  conflicts=('vulkan-caps-viewer')
 
-#  cd VulkanCapsViewer/build-wayland
-#  make INSTALL_ROOT="$pkgdir/" install
+  cd VulkanCapsViewer/build-wayland
+  make INSTALL_ROOT="$pkgdir/" install
 
-#  install -m644 gfx/android_icon_256.png \
-#    "$pkgdir"/usr/share/icons/hicolor/256x256/apps/vulkanCapsViewer.png
-#}
+  install -m644 gfx/android_icon_256.png \
+    "$pkgdir"/usr/share/icons/hicolor/256x256/apps/vulkanCapsViewer.png
+}