[arch-commits] Commit in glslang/repos/extra-x86_64 (1963.patch PKGBUILD PKGBUILD)

Sven-Hendrik Haase svenstaro at archlinux.org
Tue Nov 26 15:17:59 UTC 2019


    Date: Tuesday, November 26, 2019 @ 15:17:59
  Author: svenstaro
Revision: 369808

archrelease: copy trunk to extra-x86_64

Added:
  glslang/repos/extra-x86_64/1963.patch
    (from rev 369807, glslang/trunk/1963.patch)
  glslang/repos/extra-x86_64/PKGBUILD
    (from rev 369807, glslang/trunk/PKGBUILD)
Deleted:
  glslang/repos/extra-x86_64/PKGBUILD

------------+
 1963.patch |   30 +++++++++++++++++
 PKGBUILD   |  103 +++++++++++++++++++++++++++++++----------------------------
 2 files changed, 85 insertions(+), 48 deletions(-)

Copied: glslang/repos/extra-x86_64/1963.patch (from rev 369807, glslang/trunk/1963.patch)
===================================================================
--- 1963.patch	                        (rev 0)
+++ 1963.patch	2019-11-26 15:17:59 UTC (rev 369808)
@@ -0,0 +1,30 @@
+From 199d115e1542fe0a8427efda5fa36158474fb6cf Mon Sep 17 00:00:00 2001
+From: John Kessenich <cepheus at frii.com>
+Date: Tue, 5 Nov 2019 18:05:42 -0700
+Subject: [PATCH] Fix #1959 by reverting 7b0e236 to put files in two places.
+
+---
+ SPIRV/CMakeLists.txt | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+ mode change 100644 => 100755 SPIRV/CMakeLists.txt
+
+diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
+old mode 100644
+new mode 100755
+index e25ec0a13..9869bafdc
+--- a/SPIRV/CMakeLists.txt
++++ b/SPIRV/CMakeLists.txt
+@@ -90,9 +90,10 @@ if(ENABLE_GLSLANG_INSTALL)
+         install(TARGETS SPIRV EXPORT SPIRVTargets
+                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+     endif()
+-	
+-	install(EXPORT SPVRemapperTargets DESTINATION lib/cmake)
+-	install(EXPORT SPIRVTargets DESTINATION lib/cmake)
+ 
++    install(EXPORT SPVRemapperTargets DESTINATION lib/cmake)
++    install(EXPORT SPIRVTargets DESTINATION lib/cmake)
++
++    install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SPIRV/)
+     install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
+ endif(ENABLE_GLSLANG_INSTALL)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-26 15:17:44 UTC (rev 369807)
+++ PKGBUILD	2019-11-26 15:17:59 UTC (rev 369808)
@@ -1,48 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
-
-# Careful when upgrading this package! It usually breaks ABI without bumping soname.
-pkgname=glslang
-pkgver=7.13.3496
-pkgrel=1
-pkgdesc='OpenGL and OpenGL ES shader front end and validator'
-arch=('x86_64')
-url='https://github.com/KhronosGroup/glslang'
-license=('BSD')
-depends=('gcc-libs' 'spirv-tools' 'python')
-makedepends=('cmake' 'ninja')
-options=('staticlibs')
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz)
-sha256sums=('170d1538a670af4cae300e875d7cda9744b1acee1ab7252ecf7c4004186bb922')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  mkdir -p build-{shared,static}
-  (cd build-shared
-    cmake .. \
-      -GNinja \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DBUILD_SHARED_LIBS=ON
-    ninja
-  )
-  (cd build-static
-    cmake .. \
-      -GNinja \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DBUILD_SHARED_LIBS=OFF
-    ninja
-  )
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  DESTDIR="${pkgdir}" ninja -C build-shared install
-  DESTDIR="${pkgdir}" ninja -C build-static install
-  cd "${pkgdir}"/usr/lib
-  for lib in *.so; do
-    ln -sf "${lib}" "${lib}.0"
-  done
-}
-
-# vim: ts=2 sw=2 et:

Copied: glslang/repos/extra-x86_64/PKGBUILD (from rev 369807, glslang/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-11-26 15:17:59 UTC (rev 369808)
@@ -0,0 +1,55 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+
+# Careful when upgrading this package! It usually breaks ABI without bumping soname.
+pkgname=glslang
+pkgver=7.13.3496
+pkgrel=2
+pkgdesc='OpenGL and OpenGL ES shader front end and validator'
+arch=('x86_64')
+url='https://github.com/KhronosGroup/glslang'
+license=('BSD')
+depends=('gcc-libs' 'spirv-tools' 'python')
+makedepends=('cmake' 'ninja')
+options=('staticlibs')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz
+        1963.patch)
+sha256sums=('170d1538a670af4cae300e875d7cda9744b1acee1ab7252ecf7c4004186bb922'
+            '12515d00e3b026307c18cb08e3e9d99c43119048ef02e73eae5ac1ea585b025d')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i "$srcdir"/1963.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  mkdir -p build-{shared,static}
+  (cd build-shared
+    cmake .. \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DBUILD_SHARED_LIBS=ON
+    ninja
+  )
+  (cd build-static
+    cmake .. \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DBUILD_SHARED_LIBS=OFF
+    ninja
+  )
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  DESTDIR="${pkgdir}" ninja -C build-shared install
+  DESTDIR="${pkgdir}" ninja -C build-static install
+  cd "${pkgdir}"/usr/lib
+  for lib in *.so; do
+    ln -sf "${lib}" "${lib}.0"
+  done
+}
+
+# vim: ts=2 sw=2 et:



More information about the arch-commits mailing list