Date: Monday, January 2, 2023 @ 17:02:19
Author: svenstaro
Revision: 465155
archrelease: copy trunk to staging-x86_64
Added:
glslang/repos/staging-x86_64/PKGBUILD
(from rev 465154, glslang/trunk/PKGBUILD)
glslang/repos/staging-x86_64/glslang-11.13.0-cmake_include_dirs.patch
(from rev 465154, glslang/trunk/glslang-11.13.0-cmake_include_dirs.patch)
Deleted:
glslang/repos/staging-x86_64/PKGBUILD
------------------------------------------+
PKGBUILD | 137 +++++++++++++----------------
glslang-11.13.0-cmake_include_dirs.patch | 24 +++++
2 files changed, 89 insertions(+), 72 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-01-02 17:02:09 UTC (rev 465154)
+++ PKGBUILD 2023-01-02 17:02:19 UTC (rev 465155)
@@ -1,72 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <[email protected]>
-
-# Careful when upgrading this package! It usually breaks ABI without bumping
soname.
-pkgname=glslang
-pkgver=11.13.0
-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' 'python')
-makedepends=('cmake' 'ninja' 'git')
-options=('staticlibs')
-# Get the commits from known_good.json for every release
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz
-
git+https://github.com/KhronosGroup/SPIRV-Tools.git#commit=40f5bf59c6acb4754a0bffd3c53a715732883a12
-
git+https://github.com/KhronosGroup/SPIRV-Headers.git#commit=1d31a100405cf8783ca7a31e31cdd727c9fc54c3)
-sha256sums=('592c98aeb03b3e81597ddaf83633c4e63068d14b18a766fd11033bad73127162'
- 'SKIP'
- 'SKIP')
-
-prepare() {
- # Sadly, glslang requires super specific versions of SPIRV headers and
- # spirv-tools and so I'm afraid that for the time being we'll have to use
- # their vendored version until we figure out a good way to use system
- # libraries.
- cp -r SPIRV-Tools ${pkgname}-${pkgver}/External/spirv-tools
- cp -r SPIRV-Headers
${pkgname}-${pkgver}/External/spirv-tools/external/spirv-headers
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- cmake \
- -Bbuild-shared \
- -GNinja \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=None \
- -DBUILD_SHARED_LIBS=ON
- ninja -Cbuild-shared
- cmake \
- -Bbuild-static \
- -GNinja \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=None \
- -DBUILD_SHARED_LIBS=OFF
- ninja -Cbuild-static
-}
-
-check() {
- cd ${pkgname}-${pkgver}
- ninja -Cbuild-shared test
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- DESTDIR="${pkgdir}" ninja -C build-shared install
- DESTDIR="${pkgdir}" ninja -C build-static install
-
- install -Dm644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-
- cd "${pkgdir}"/usr/lib
- for lib in *.so; do
- ln -sf "${lib}" "${lib}.0"
- done
-
- # Delete the stuff that's been vendored in. It's not ideal but that's we'll
deal with for now.
- mv "${pkgdir}"/usr/bin/spirv-remap .
- rm -r
"${pkgdir}"/usr/{bin/spirv*,include/spirv-tools,lib/cmake/SPIRV-Tools*,lib/libSPIRV-*,lib/pkgconfig}
- mv spirv-remap "${pkgdir}"/usr/bin/spirv-remap
-}
-
-# vim: ts=2 sw=2 et:
Copied: glslang/repos/staging-x86_64/PKGBUILD (from rev 465154,
glslang/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-01-02 17:02:19 UTC (rev 465155)
@@ -0,0 +1,65 @@
+# Maintainer: Sven-Hendrik Haase <[email protected]>
+
+# Careful when upgrading this package! It usually breaks ABI without bumping
+# soname. Also, be very mindful of the version of spirv-tools that this links
+# to. Upstream actually expects the uae of the particular commits of
+# spirv-tools and spirv-headers that are provided in known_good.json. However,
+# if we went that route, we'd have to vendor the resulting spirv-tools libs
+# from this glslang build and they would be incompatible with system libs,
+# resulting in us having to ship both. Instead, I recommend just waiting until
+# upstream releases a compatible version of spirv-tools, then updating the
+# spriv-tools system package and only then building glslang against that.
+pkgname=glslang
+pkgver=11.13.0
+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' 'python')
+makedepends=('cmake' 'ninja' 'git' 'spirv-tools' 'spirv-headers')
+options=('staticlibs')
+# Get the commits from known_good.json for every release
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz)
+sha256sums=('592c98aeb03b3e81597ddaf83633c4e63068d14b18a766fd11033bad73127162')
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ # we need fat LTO objects to not break consumers during linking
+ CXXFLAGS+=" -ffat-lto-objects"
+ cmake \
+ -Bbuild-shared \
+ -GNinja \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=None \
+ -DBUILD_SHARED_LIBS=ON
+ ninja -Cbuild-shared
+ cmake \
+ -Bbuild-static \
+ -GNinja \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=None \
+ -DBUILD_SHARED_LIBS=OFF
+ ninja -Cbuild-static
+}
+
+check() {
+ cd ${pkgname}-${pkgver}
+ ninja -Cbuild-shared test
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ DESTDIR="${pkgdir}" ninja -C build-shared install
+ DESTDIR="${pkgdir}" ninja -C build-static install
+
+ install -Dm644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+ cd "${pkgdir}"/usr/lib
+ for lib in *.so; do
+ ln -sf "${lib}" "${lib}.0"
+ done
+}
+
+# vim: ts=2 sw=2 et:
Copied: glslang/repos/staging-x86_64/glslang-11.13.0-cmake_include_dirs.patch
(from rev 465154, glslang/trunk/glslang-11.13.0-cmake_include_dirs.patch)
===================================================================
--- glslang-11.13.0-cmake_include_dirs.patch (rev 0)
+++ glslang-11.13.0-cmake_include_dirs.patch 2023-01-02 17:02:19 UTC (rev
465155)
@@ -0,0 +1,24 @@
+diff -ruN a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
+--- a/SPIRV/CMakeLists.txt 2022-12-06 23:34:33.000000000 +0100
++++ b/SPIRV/CMakeLists.txt 2022-12-16 12:15:03.231070779 +0100
+@@ -100,7 +100,7 @@
+ target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt)
+ target_include_directories(SPIRV PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
+- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
++ )
+ else()
+ target_link_libraries(SPIRV PRIVATE MachineIndependent)
+ endif()
+diff -ruN a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
+--- a/StandAlone/CMakeLists.txt 2022-12-06 23:34:33.000000000 +0100
++++ b/StandAlone/CMakeLists.txt 2022-12-16 12:15:20.527812776 +0100
+@@ -83,7 +83,7 @@
+ target_link_libraries(glslangValidator ${LIBRARIES})
+ target_include_directories(glslangValidator PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
+- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
++)
+
+ if(ENABLE_OPT)
+ target_include_directories(glslangValidator
