Date: Sunday, September 24, 2017 @ 11:39:09 Author: lcarlier Revision: 260426
archrelease: copy trunk to multilib-x86_64 Added: lib32-vulkan-loader-layers/repos/multilib-x86_64/PKGBUILD (from rev 260425, lib32-vulkan-loader-layers/trunk/PKGBUILD) Deleted: lib32-vulkan-loader-layers/repos/multilib-x86_64/0001-loader-Remove-executable-stack-from-libvulkan.so.patch lib32-vulkan-loader-layers/repos/multilib-x86_64/PKGBUILD -------------------------------------------------------------+ 0001-loader-Remove-executable-stack-from-libvulkan.so.patch | 28 - PKGBUILD | 161 ++++------ 2 files changed, 76 insertions(+), 113 deletions(-) Deleted: 0001-loader-Remove-executable-stack-from-libvulkan.so.patch =================================================================== --- 0001-loader-Remove-executable-stack-from-libvulkan.so.patch 2017-09-24 11:38:57 UTC (rev 260425) +++ 0001-loader-Remove-executable-stack-from-libvulkan.so.patch 2017-09-24 11:39:09 UTC (rev 260426) @@ -1,28 +0,0 @@ -From 3152f2a5056077d3e1061ac61e3ef7888ff96dc7 Mon Sep 17 00:00:00 2001 -From: Lenny Komow <le...@lunarg.com> -Date: Thu, 20 Jul 2017 16:07:14 -0600 -Subject: [PATCH] loader: Remove executable stack from libvulkan.so - -Change-Id: Id77d5560479cbbc6f5453a6362c5a20dd721fdd0 ---- - loader/unknown_ext_chain_gas.asm | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/loader/unknown_ext_chain_gas.asm b/loader/unknown_ext_chain_gas.asm -index e463f45b..798760bd 100644 ---- a/loader/unknown_ext_chain_gas.asm -+++ b/loader/unknown_ext_chain_gas.asm -@@ -108,6 +108,10 @@ vkdev_ext\num: - - .endif - -+#if defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif -+ - .data - - termin_error_string: --- -2.13.2 - Deleted: PKGBUILD =================================================================== --- PKGBUILD 2017-09-24 11:38:57 UTC (rev 260425) +++ PKGBUILD 2017-09-24 11:39:09 UTC (rev 260426) @@ -1,85 +0,0 @@ -# $Id$ -# Maintainer: Laurent Carlier <lordhea...@gmail.com> - -pkgbase=lib32-vulkan-loader-layers -pkgname=(lib32-vulkan-icd-loader lib32-vulkan-validation-layers) -_pkgname=Vulkan-LoaderAndValidationLayers -pkgver=1.0.54.0 -pkgrel=1 -arch=(x86_64) -url="https://www.khronos.org/vulkan/" -license=('custom') -depends=() -makedepends=(git cmake python-lxml lib32-libx11 lib32-libxrandr lib32-wayland) -source=("https://github.com/KhronosGroup/${_pkgname}/archive/sdk-${pkgver}.tar.gz" - 0001-loader-Remove-executable-stack-from-libvulkan.so.patch) -sha256sums=('f2556963f27309485c4d6bd9acece58d51df6a1b13699cc3a2c8d2579e6a3831' - '01c1e96916a9fc0ef6f62703cd968c14031ad75f64f61409f108bc9e427977a1') - -prepare() { - cd "${srcdir}/${_pkgname}-sdk-${pkgver}" - - # https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/issues/1956 - patch -Np1 -i ../0001-loader-Remove-executable-stack-from-libvulkan.so.patch -} - -build() { - export ASFLAGS=--32 - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgname}-sdk-${pkgver}" - - ./update_external_sources.sh - - rm -rf build ; mkdir build ; cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_SYSCONFDIR=/etc \ - -DCMAKE_INSTALL_LIBDIR=lib32 \ - -DCMAKE_INSTALL_DATADIR=/share \ - -DCMAKE_SKIP_RPATH=True \ - -DBUILD_TESTS=Off \ - -DBUILD_WSI_XCB_SUPPORT=On \ - -DBUILD_WSI_XLIB_SUPPORT=On \ - -DBUILD_WSI_WAYLAND_SUPPORT=On \ - -DBUILD_WSI_MIR_SUPPORT=Off \ - -DCMAKE_BUILD_TYPE=Release \ - .. - make -} - -package_lib32-vulkan-icd-loader() { - pkgdesc="Vulkan Installable Client Driver (ICD) Loader (32-bit)" - depends=(lib32-glibc) - optdepends=(lib32-vulkan-driver: packaged vulkan driver) - cd "${srcdir}/${_pkgname}-sdk-${pkgver}/build" - - make DESTDIR="${pkgdir}" install - - rm -r ${pkgdir}/etc - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/include - rm ${pkgdir}/usr/lib32/libVkLayer*.so - - install -dm755 ${pkgdir}/usr/share/licenses/${pkgname} - install -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/ -} - -package_lib32-vulkan-validation-layers() { - pkgdesc="Vulkan Software Development Kit (32-bit)" - depends=(lib32-gcc-libs lib32-vulkan-icd-loader vulkan-headers) - cd "${srcdir}/${_pkgname}-sdk-${pkgver}/build" - - make DESTDIR="${pkgdir}" install - - rm -r ${pkgdir}/etc - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/include - rm -r ${pkgdir}/usr/lib32/pkgconfig - rm ${pkgdir}/usr/lib32/libvulkan.so* - - install -dm755 ${pkgdir}/usr/share/licenses/${pkgname} - install -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/ -} - Copied: lib32-vulkan-loader-layers/repos/multilib-x86_64/PKGBUILD (from rev 260425, lib32-vulkan-loader-layers/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-09-24 11:39:09 UTC (rev 260426) @@ -0,0 +1,76 @@ +# $Id$ +# Maintainer: Laurent Carlier <lordhea...@gmail.com> + +pkgbase=lib32-vulkan-loader-layers +pkgname=(lib32-vulkan-icd-loader lib32-vulkan-validation-layers) +_pkgname=Vulkan-LoaderAndValidationLayers +pkgver=1.0.61.1 +pkgrel=1 +arch=(x86_64) +url="https://www.khronos.org/vulkan/" +license=('custom') +depends=() +makedepends=(git cmake python-lxml lib32-libx11 lib32-libxrandr lib32-wayland) +source=("https://github.com/KhronosGroup/${_pkgname}/archive/sdk-${pkgver}.tar.gz") +sha256sums=('47a2e56e4721ffac7df6a4e8ce2189da41331b7ed91e3879266c69302604e615') + +build() { + export ASFLAGS=--32 + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/${_pkgname}-sdk-${pkgver}" + + ./update_external_sources.sh + + rm -rf build ; mkdir build ; cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DCMAKE_INSTALL_LIBDIR=lib32 \ + -DCMAKE_INSTALL_DATADIR=/share \ + -DCMAKE_SKIP_RPATH=True \ + -DBUILD_TESTS=Off \ + -DBUILD_WSI_XCB_SUPPORT=On \ + -DBUILD_WSI_XLIB_SUPPORT=On \ + -DBUILD_WSI_WAYLAND_SUPPORT=On \ + -DBUILD_WSI_MIR_SUPPORT=Off \ + -DCMAKE_BUILD_TYPE=Release \ + .. + make +} + +package_lib32-vulkan-icd-loader() { + pkgdesc="Vulkan Installable Client Driver (ICD) Loader (32-bit)" + depends=(lib32-glibc) + optdepends=(lib32-vulkan-driver: packaged vulkan driver) + cd "${srcdir}/${_pkgname}-sdk-${pkgver}/build" + + make DESTDIR="${pkgdir}" install + + rm -r ${pkgdir}/etc + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/include + rm ${pkgdir}/usr/lib32/libVkLayer*.so + + install -dm755 ${pkgdir}/usr/share/licenses/${pkgname} + install -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/ +} + +package_lib32-vulkan-validation-layers() { + pkgdesc="Vulkan Software Development Kit (32-bit)" + depends=(lib32-gcc-libs lib32-vulkan-icd-loader vulkan-headers) + cd "${srcdir}/${_pkgname}-sdk-${pkgver}/build" + + make DESTDIR="${pkgdir}" install + + rm -r ${pkgdir}/etc + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/include + rm -r ${pkgdir}/usr/lib32/pkgconfig + rm ${pkgdir}/usr/lib32/libvulkan.so* + + install -dm755 ${pkgdir}/usr/share/licenses/${pkgname} + install -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/ +} +