Browse Source

[trunk] -> [extra] 'vulkan-icd-loader-1.2.174-2' add

master
Nathan Owens 1 year ago
parent
commit
bbb8f90753
  1. 15
      trunk/PKGBUILD
  2. 28
      trunk/verfix.diff
  3. 15
      x86_64/extra/PKGBUILD
  4. 28
      x86_64/extra/verfix.diff

15
trunk/PKGBUILD

@ -2,7 +2,7 @@
pkgname=vulkan-icd-loader
pkgver=1.2.174
pkgrel=1
pkgrel=2
arch=(x86_64)
pkgdesc="Vulkan Installable Client Driver (ICD) Loader"
url="https://www.khronos.org/vulkan/"
@ -11,9 +11,11 @@ makedepends=('cmake' 'python-lxml' 'libx11' 'libxrandr' 'wayland' 'vulkan-header
depends=(glibc)
optdepends=('vulkan-driver: packaged vulkan driver') # vulkan-driver: vulkan-intel/vulkan-radeon/nvidia-utils/....
provides=('libvulkan.so')
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/Vulkan-Loader/archive/v${pkgver}.tar.gz")
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/Vulkan-Loader/archive/v${pkgver}.tar.gz"
verfix.diff)
#source=("git+https://github.com/KhronosGroup/Vulkan-Loader.git#commit=8df99b31f01ef1ef7fb17082dd577e77f20cb050")
sha256sums=('c39a660da13450cb5e2d1dc571749d0e9a4f831998b20a7ad9fc7f2c99e1bb0b')
sha256sums=('c39a660da13450cb5e2d1dc571749d0e9a4f831998b20a7ad9fc7f2c99e1bb0b'
'19c25bfcaf063bc1601ee4613328925b1724ca37c158ac96e50149e4b88a1c0a')
#pkgver() {
# cd "${srcdir}"/Vulkan-Loader*
@ -21,6 +23,13 @@ sha256sums=('c39a660da13450cb5e2d1dc571749d0e9a4f831998b20a7ad9fc7f2c99e1bb0b')
# echo 1.1.106+$(git rev-list --count HEAD)+$(git rev-parse --short HEAD)
#}
prepare() {
cd "${srcdir}"/Vulkan-Loader*
# Fix version in .pc file
patch -Np1 -i ../verfix.diff
}
build() {
cd "${srcdir}"/Vulkan-Loader*

28
trunk/verfix.diff

@ -0,0 +1,28 @@
diff -u -r Vulkan-Loader-1.2.174/cmake/FindVulkanHeaders.cmake Vulkan-Loader-1.2.174-verfix/cmake/FindVulkanHeaders.cmake
--- Vulkan-Loader-1.2.174/cmake/FindVulkanHeaders.cmake 2021-03-29 20:05:47.000000000 +0000
+++ Vulkan-Loader-1.2.174-verfix/cmake/FindVulkanHeaders.cmake 2021-04-16 14:08:29.582548243 +0000
@@ -114,19 +114,19 @@
file(STRINGS
${VulkanHeaders_main_header}
VulkanHeaders_lines
- REGEX "^#define (VK_API_VERSION.*VK_MAKE_VERSION|VK_HEADER_VERSION)")
+ REGEX "^#define (VK_API_VERSION.*VK_MAKE_API_VERSION|VK_HEADER_VERSION)")
foreach(VulkanHeaders_line ${VulkanHeaders_lines})
# First, handle the case where we have a major/minor version
# Format is:
- # #define VK_API_VERSION_X_Y VK_MAKE_VERSION(X, Y, 0)
+ # #define VK_API_VERSION_X_Y VK_MAKE_API_VERSION(0, X, Y, 0)
# We grab the major version (X) and minor version (Y) out of the parentheses
- string(REGEX MATCH "VK_MAKE_VERSION\\(.*\\)" VulkanHeaders_out ${VulkanHeaders_line})
+ string(REGEX MATCH "VK_MAKE_API_VERSION\\(.*\\)" VulkanHeaders_out ${VulkanHeaders_line})
string(REGEX MATCHALL "[0-9]+" VulkanHeaders_MAJOR_MINOR "${VulkanHeaders_out}")
if (VulkanHeaders_MAJOR_MINOR)
- list (GET VulkanHeaders_MAJOR_MINOR 0 VulkanHeaders_cur_major)
- list (GET VulkanHeaders_MAJOR_MINOR 1 VulkanHeaders_cur_minor)
+ list (GET VulkanHeaders_MAJOR_MINOR 1 VulkanHeaders_cur_major)
+ list (GET VulkanHeaders_MAJOR_MINOR 2 VulkanHeaders_cur_minor)
if (${VulkanHeaders_cur_major} GREATER ${VulkanHeaders_VERSION_MAJOR})
set(VulkanHeaders_VERSION_MAJOR ${VulkanHeaders_cur_major})
set(VulkanHeaders_VERSION_MINOR ${VulkanHeaders_cur_minor})

15
x86_64/extra/PKGBUILD

@ -2,7 +2,7 @@
pkgname=vulkan-icd-loader
pkgver=1.2.174
pkgrel=1
pkgrel=2
arch=(x86_64)
pkgdesc="Vulkan Installable Client Driver (ICD) Loader"
url="https://www.khronos.org/vulkan/"
@ -11,9 +11,11 @@ makedepends=('cmake' 'python-lxml' 'libx11' 'libxrandr' 'wayland' 'vulkan-header
depends=(glibc)
optdepends=('vulkan-driver: packaged vulkan driver') # vulkan-driver: vulkan-intel/vulkan-radeon/nvidia-utils/....
provides=('libvulkan.so')
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/Vulkan-Loader/archive/v${pkgver}.tar.gz")
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/Vulkan-Loader/archive/v${pkgver}.tar.gz"
verfix.diff)
#source=("git+https://github.com/KhronosGroup/Vulkan-Loader.git#commit=8df99b31f01ef1ef7fb17082dd577e77f20cb050")
sha256sums=('c39a660da13450cb5e2d1dc571749d0e9a4f831998b20a7ad9fc7f2c99e1bb0b')
sha256sums=('c39a660da13450cb5e2d1dc571749d0e9a4f831998b20a7ad9fc7f2c99e1bb0b'
'19c25bfcaf063bc1601ee4613328925b1724ca37c158ac96e50149e4b88a1c0a')
#pkgver() {
# cd "${srcdir}"/Vulkan-Loader*
@ -21,6 +23,13 @@ sha256sums=('c39a660da13450cb5e2d1dc571749d0e9a4f831998b20a7ad9fc7f2c99e1bb0b')
# echo 1.1.106+$(git rev-list --count HEAD)+$(git rev-parse --short HEAD)
#}
prepare() {
cd "${srcdir}"/Vulkan-Loader*
# Fix version in .pc file
patch -Np1 -i ../verfix.diff
}
build() {
cd "${srcdir}"/Vulkan-Loader*

28
x86_64/extra/verfix.diff

@ -0,0 +1,28 @@
diff -u -r Vulkan-Loader-1.2.174/cmake/FindVulkanHeaders.cmake Vulkan-Loader-1.2.174-verfix/cmake/FindVulkanHeaders.cmake
--- Vulkan-Loader-1.2.174/cmake/FindVulkanHeaders.cmake 2021-03-29 20:05:47.000000000 +0000
+++ Vulkan-Loader-1.2.174-verfix/cmake/FindVulkanHeaders.cmake 2021-04-16 14:08:29.582548243 +0000
@@ -114,19 +114,19 @@
file(STRINGS
${VulkanHeaders_main_header}
VulkanHeaders_lines
- REGEX "^#define (VK_API_VERSION.*VK_MAKE_VERSION|VK_HEADER_VERSION)")
+ REGEX "^#define (VK_API_VERSION.*VK_MAKE_API_VERSION|VK_HEADER_VERSION)")
foreach(VulkanHeaders_line ${VulkanHeaders_lines})
# First, handle the case where we have a major/minor version
# Format is:
- # #define VK_API_VERSION_X_Y VK_MAKE_VERSION(X, Y, 0)
+ # #define VK_API_VERSION_X_Y VK_MAKE_API_VERSION(0, X, Y, 0)
# We grab the major version (X) and minor version (Y) out of the parentheses
- string(REGEX MATCH "VK_MAKE_VERSION\\(.*\\)" VulkanHeaders_out ${VulkanHeaders_line})
+ string(REGEX MATCH "VK_MAKE_API_VERSION\\(.*\\)" VulkanHeaders_out ${VulkanHeaders_line})
string(REGEX MATCHALL "[0-9]+" VulkanHeaders_MAJOR_MINOR "${VulkanHeaders_out}")
if (VulkanHeaders_MAJOR_MINOR)
- list (GET VulkanHeaders_MAJOR_MINOR 0 VulkanHeaders_cur_major)
- list (GET VulkanHeaders_MAJOR_MINOR 1 VulkanHeaders_cur_minor)
+ list (GET VulkanHeaders_MAJOR_MINOR 1 VulkanHeaders_cur_major)
+ list (GET VulkanHeaders_MAJOR_MINOR 2 VulkanHeaders_cur_minor)
if (${VulkanHeaders_cur_major} GREATER ${VulkanHeaders_VERSION_MAJOR})
set(VulkanHeaders_VERSION_MAJOR ${VulkanHeaders_cur_major})
set(VulkanHeaders_VERSION_MINOR ${VulkanHeaders_cur_minor})
Loading…
Cancel
Save