diff options
| -rw-r--r-- | .SRCINFO | 38 | ||||
| -rw-r--r-- | .gitignore | 9 | ||||
| -rw-r--r-- | PKGBUILD | 116 |
3 files changed, 103 insertions, 60 deletions
@@ -1,19 +1,33 @@ pkgbase = vulkan-caps-viewer pkgdesc = Vulkan Hardware Capability Viewer - pkgver = 2.03 - pkgrel = 2 - url = http://vulkan.gpuinfo.org/ + pkgver = 3.40 + pkgrel = 1 + epoch = 1 + url = https://vulkan.gpuinfo.org arch = x86_64 - license = GPL2 - makedepends = qt5-base + arch = aarch64 + license = LGPL-3.0-or-later makedepends = git + makedepends = qt5-wayland + makedepends = qt5-x11extras + makedepends = vulkan-icd-loader + source = git+https://github.com/SaschaWillems/VulkanCapsViewer.git#commit=78eda4b0e3929371821bae8263fd087c21673d25 + source = git+https://github.com/KhronosGroup/Vulkan-Headers.git + sha256sums = d413e09d8b3e9409e96cc1e7001f1acb5515d8f11af2b043e23ee48c06bcc95d + sha256sums = SKIP + +pkgname = vulkan-caps-viewer-x11 + pkgdesc = Vulkan Hardware Capability Viewer (X11) + depends = hicolor-icon-theme depends = vulkan-icd-loader - depends = qt5-base depends = qt5-x11extras - source = https://github.com/SaschaWillems/VulkanCapsViewer/archive/2.03.tar.gz - source = https://github.com/KhronosGroup/Vulkan-Headers - sha1sums = 2cecf6fa42a21060171c974af607a79ad490162c - sha1sums = SKIP - -pkgname = vulkan-caps-viewer + provides = vulkan-caps-viewer + conflicts = vulkan-caps-viewer +pkgname = vulkan-caps-viewer-wayland + pkgdesc = Vulkan Hardware Capability Viewer (Wayland) + depends = hicolor-icon-theme + depends = vulkan-icd-loader + depends = qt5-wayland + provides = vulkan-caps-viewer + conflicts = vulkan-caps-viewer diff --git a/.gitignore b/.gitignore index 9b8b451e90e1..4dab8d6386e3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,7 @@ -*.pkg.* -*.tar.gz +# Ignore everything +* + +# But not these files... +!.gitignore +!PKGBUILD +!.SRCINFO @@ -1,56 +1,80 @@ -# Maintainer: Eric Engestrom <aur [at] engestrom [dot] ch> - -pkgname=vulkan-caps-viewer -pkgver=2.03 -pkgrel=2 -pkgdesc='Vulkan Hardware Capability Viewer' -url='http://vulkan.gpuinfo.org/' -arch=('x86_64') -license=('GPL2') -source=("https://github.com/SaschaWillems/VulkanCapsViewer/archive/$pkgver.tar.gz" - "git+https://github.com/KhronosGroup/Vulkan-Headers") -sha1sums=('2cecf6fa42a21060171c974af607a79ad490162c' - 'SKIP') -makedepends=(qt5-base) -depends=(vulkan-icd-loader qt5-base qt5-x11extras) - -#HACK: github doesn't package submodules, so we need to manually fetch the vulkan headers -makedepends+=(git) +# Maintainer: Mark Wagie <mark dot wagie at proton dot me> +# Contributor: Eric Engestrom <aur [at] engestrom [dot] ch> +pkgname=('vulkan-caps-viewer-x11' 'vulkan-caps-viewer-wayland') +pkgbase=vulkan-caps-viewer +pkgver=3.40 +pkgrel=1 +epoch=1 +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=78eda4b0e3929371821bae8263fd087c21673d25 # tags/3.40^0 +source=("git+https://github.com/SaschaWillems/VulkanCapsViewer.git#commit=$_commit" + 'git+https://github.com/KhronosGroup/Vulkan-Headers.git') +sha256sums=('d413e09d8b3e9409e96cc1e7001f1acb5515d8f11af2b043e23ee48c06bcc95d' + 'SKIP') + +pkgver() { + cd VulkanCapsViewer + git describe --tags | sed 's/_fixed//;s/-/+/g' +} prepare() { - if [ -d build ] - then - msg2 "Build dir already exist; performing an incremental build" - msg2 "If you want to perform a clean build, please delete $(realpath build)" - return - fi - - #HACK: github doesn't package submodules... - cp -r Vulkan-Headers/include VulkanCapsViewer-$pkgver/Vulkan-Headers/ - - #HACK: the last commit of 2.02 explicitely breaks the build; probably wasn't intended to be pushed out - sed 's#"/Vulkan-Headers/include"#"./Vulkan-Headers/include"#' \ - -i VulkanCapsViewer-$pkgver/vulkanCapsViewer.pro - - mkdir build - cd build - export PREFIX="$pkgdir" - qmake \ - QMAKE_CFLAGS="$CFLAGS" \ - QMAKE_CXXFLAGS="$CXXFLAGS" \ - QMAKE_LFLAGS="$LDFLAGS" \ - PREFIX=/usr \ - ../VulkanCapsViewer-$pkgver + + # Create build directories + mkdir -p build-x11 build-wayland + + cd VulkanCapsViewer + git submodule init + git config submodule.Vulkan-Headers.url "$srcdir/Vulkan-Headers" + git -c protocol.file.allow=always submodule update } build() { - make -C build + + # X11 + pushd build-x11 + qmake-qt5 ../VulkanCapsViewer \ + DEFINES+=X11 \ + CONFIG+=release \ + PREFIX=/usr + make + popd + + # Wayland + pushd build-wayland + qmake-qt5 ../VulkanCapsViewer \ + DEFINES+=WAYLAND \ + CONFIG+=release \ + PREFIX=/usr + make + popd } -package() { - make -C build INSTALL_ROOT="$pkgdir" install +package_vulkan-caps-viewer-x11() { + pkgdesc+=" (X11)" + depends=('hicolor-icon-theme' 'vulkan-icd-loader' 'qt5-x11extras') + provides=('vulkan-caps-viewer') + conflicts=('vulkan-caps-viewer') + + cd build-x11 + make INSTALL_ROOT="$pkgdir/" install + + install -m644 ../VulkanCapsViewer/gfx/android_icon_256.png \ + "$pkgdir"/usr/share/icons/hicolor/256x256/apps/vulkanCapsViewer.png +} + +package_vulkan-caps-viewer-wayland() { + pkgdesc+=" (Wayland)" + depends=('hicolor-icon-theme' 'vulkan-icd-loader' 'qt5-wayland') + provides=('vulkan-caps-viewer') + conflicts=('vulkan-caps-viewer') + + cd build-wayland + make INSTALL_ROOT="$pkgdir/" install - # There's a bug preventing this from being installed automatically - install -Dm644 VulkanCapsViewer-$pkgver/gfx/android_icon_256.png \ + install -m644 ../VulkanCapsViewer/gfx/android_icon_256.png \ "$pkgdir"/usr/share/icons/hicolor/256x256/apps/vulkanCapsViewer.png } |