Daurnimator pushed to branch main at Arch Linux / Packaging / Packages / glslang
Commits:
1c7800fa by Alexandre Bouvier at 2024-01-25T20:24:46+01:00
cmake: prefer shared targets
- - - - -
980fe156 by Daurnimator at 2024-02-13T23:26:49+11:00
upgpkg: 14.0.0-1
- - - - -
2 changed files:
- .SRCINFO
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,10 +1,10 @@
pkgbase = glslang
pkgdesc = OpenGL and OpenGL ES shader front end and validator
- pkgver = 13.1.1
- pkgrel = 3
+ pkgver = 14.0.0
+ pkgrel = 1
url = https://github.com/KhronosGroup/glslang
arch = x86_64
- license = BSD
+ license = BSD-3-Clause
makedepends = cmake
makedepends = ninja
makedepends = spirv-headers
@@ -12,9 +12,7 @@ pkgbase = glslang
depends = gcc-libs
depends = spirv-tools
options = staticlibs
- source =
glslang-13.1.1.tar.gz::https://github.com/KhronosGroup/glslang/archive/13.1.1.tar.gz
- source =
glslang-3420.patch::https://github.com/KhronosGroup/glslang/pull/3420.patch
- sha256sums =
1c4d0a5a38c8aaf89a2d7e6093be734320599f5a6775b2726beeb05b0c054e66
- sha256sums =
8930d3829bae4e0cd911bf63728d4d49d736d261af1e2cef912b769e6fa8373f
+ source =
glslang-14.0.0.tar.gz::https://github.com/KhronosGroup/glslang/archive/14.0.0.tar.gz
+ sha256sums =
80bbb916a23e94ea9cbfb1acb5d1a44a7e0c9613bcf5b5947c03f2273bdc92b0
pkgname = glslang
=====================================
PKGBUILD
=====================================
@@ -11,24 +11,17 @@
# 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=13.1.1
-pkgrel=3
+pkgver=14.0.0
+pkgrel=1
pkgdesc='OpenGL and OpenGL ES shader front end and validator'
arch=('x86_64')
url='https://github.com/KhronosGroup/glslang'
-license=('BSD')
+license=('BSD-3-Clause')
depends=('gcc-libs' 'spirv-tools')
makedepends=('cmake' 'ninja' 'spirv-headers' 'python')
options=('staticlibs')
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz
-
${pkgname}-3420.patch::https://github.com/KhronosGroup/glslang/pull/3420.patch)
-sha256sums=('1c4d0a5a38c8aaf89a2d7e6093be734320599f5a6775b2726beeb05b0c054e66'
- '8930d3829bae4e0cd911bf63728d4d49d736d261af1e2cef912b769e6fa8373f')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -Np1 -i "${srcdir}"/${pkgname}-3420.patch
-}
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz)
+sha256sums=('80bbb916a23e94ea9cbfb1acb5d1a44a7e0c9613bcf5b5947c03f2273bdc92b0')
build() {
cd ${pkgname}-${pkgver}
@@ -36,21 +29,22 @@ build() {
# we need fat LTO objects to not break consumers during linking
CXXFLAGS+=" -ffat-lto-objects"
cmake \
- -Bbuild-shared \
+ -Bbuild-static \
-GNinja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=None \
-DALLOW_EXTERNAL_SPIRV_TOOLS=ON \
- -DBUILD_SHARED_LIBS=ON
- ninja -Cbuild-shared
+ -DBUILD_SHARED_LIBS=OFF
+ cmake --build build-static
cmake \
- -Bbuild-static \
+ -Bbuild-shared \
-GNinja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=None \
-DALLOW_EXTERNAL_SPIRV_TOOLS=ON \
- -DBUILD_SHARED_LIBS=OFF
- ninja -Cbuild-static
+ -DBUILD_SHARED_LIBS=ON \
+ -DGLSLANG_TESTS=ON
+ cmake --build build-shared
}
check() {
@@ -60,8 +54,8 @@ check() {
package() {
cd ${pkgname}-${pkgver}
- DESTDIR="${pkgdir}" ninja -C build-shared install
- DESTDIR="${pkgdir}" ninja -C build-static install
+ DESTDIR="${pkgdir}" cmake --install build-static
+ DESTDIR="${pkgdir}" cmake --install build-shared
install -Dm644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/glslang/-/compare/b3f1b0df0b3d278f018e6ce5e4d9b4aeded3f578...980fe156d7c72224a99c427592b8a5de919880df
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/glslang/-/compare/b3f1b0df0b3d278f018e6ce5e4d9b4aeded3f578...980fe156d7c72224a99c427592b8a5de919880df
You're receiving this email because of your account on gitlab.archlinux.org.
