summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Haag2020-05-03 23:17:33 +0200
committerChristoph Haag2020-05-03 23:17:54 +0200
commit3642c0b8ad1c0dc9ef30766c441beb94eef6b4e5 (patch)
tree603688e299bf261ebce065cfcd0bae43b0c0f848
parentc33183767fb374b49c74097306df80e62a825949 (diff)
downloadaur-3642c0b8ad1c0dc9ef30766c441beb94eef6b4e5.tar.gz
Remove patch after upstream applied it
https://github.com/KhronosGroup/OpenXR-SDK-Source/commit/a013fcd3bee509a7d95ce7602a6f53ef91dc3274
-rw-r--r--.SRCINFO4
-rw-r--r--0001-hello_xr-vulkan-Fix-build-with-Vulkan-headers-1.2.13.patch27
-rw-r--r--PKGBUILD8
3 files changed, 4 insertions, 35 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4f88be803339..af35c174b930 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = openxr-loader-git
- pkgver = 1.0.8.r0.g76c144d
+ pkgver = 1.0.8.r22.ga179a05
pkgrel = 1
url = https://github.com/KhronosGroup/OpenXR-SDK-Source
arch = i686
@@ -14,9 +14,7 @@ pkgbase = openxr-loader-git
makedepends = python
makedepends = vulkan-icd-loader
source = openxr-loader::git+https://github.com/KhronosGroup/OpenXR-SDK-Source.git#branch=master
- source = 0001-hello_xr-vulkan-Fix-build-with-Vulkan-headers-1.2.13.patch
md5sums = SKIP
- md5sums = 0ec4cb88a02b2e2e8c78dde8dc4f5a8a
pkgname = openxr-loader-git
pkgdesc = OpenXR loader
diff --git a/0001-hello_xr-vulkan-Fix-build-with-Vulkan-headers-1.2.13.patch b/0001-hello_xr-vulkan-Fix-build-with-Vulkan-headers-1.2.13.patch
deleted file mode 100644
index 59e3a806c8d1..000000000000
--- a/0001-hello_xr-vulkan-Fix-build-with-Vulkan-headers-1.2.13.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 73c4f317b89450bac3b546cc2e212439147a323c Mon Sep 17 00:00:00 2001
-From: Lubosz Sarnecki <lubosz.sarnecki@collabora.com>
-Date: Thu, 2 Apr 2020 15:53:51 +0200
-Subject: [PATCH] hello_xr/vulkan: Fix build with Vulkan headers 1.2.136.
-
----
- src/tests/hello_xr/graphicsplugin_vulkan.cpp | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/tests/hello_xr/graphicsplugin_vulkan.cpp b/src/tests/hello_xr/graphicsplugin_vulkan.cpp
-index 5c68b00..198592f 100644
---- a/src/tests/hello_xr/graphicsplugin_vulkan.cpp
-+++ b/src/tests/hello_xr/graphicsplugin_vulkan.cpp
-@@ -1634,9 +1634,7 @@ struct VulkanGraphicsPlugin : public IGraphicsPlugin {
- _(SURFACE_KHR) \
- _(SWAPCHAIN_KHR) \
- _(DISPLAY_KHR) \
-- _(DISPLAY_MODE_KHR) \
-- _(OBJECT_TABLE_NVX) \
-- _(INDIRECT_COMMANDS_LAYOUT_NVX)
-+ _(DISPLAY_MODE_KHR)
-
- switch (objectType) {
- default:
---
-2.26.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 89cf8a657cd3..d0092dbaf2b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,20 @@
pkgname=("openxr-loader-git" "openxr-headers-git" "openxr-layers-git" "openxr-utils-git")
_dirname="openxr-loader"
-pkgver=1.0.8.r0.g76c144d
+pkgver=1.0.8.r22.ga179a05
pkgrel=1
arch=('i686' 'x86_64')
url='https://github.com/KhronosGroup/OpenXR-SDK-Source'
depends=()
makedepends=('cmake' 'git' 'vulkan-headers' 'libx11' 'libxxf86vm' 'libxrandr' 'python' 'vulkan-icd-loader')
license=('apache')
-source=("$_dirname::git+https://github.com/KhronosGroup/OpenXR-SDK-Source.git#branch=master"
- "0001-hello_xr-vulkan-Fix-build-with-Vulkan-headers-1.2.13.patch")
-md5sums=('SKIP' '0ec4cb88a02b2e2e8c78dde8dc4f5a8a')
+source=("$_dirname::git+https://github.com/KhronosGroup/OpenXR-SDK-Source.git#branch=master")
+md5sums=('SKIP')
#options=('debug' '!strip')
prepare() {
cd "$_dirname"
- patch -p1 < ../0001-hello_xr-vulkan-Fix-build-with-Vulkan-headers-1.2.13.patch
}
pkgver() {