diff --git a/common/shlibs b/common/shlibs index d4419f1c393..56f4c7d4eef 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3579,9 +3579,9 @@ libbelr.so.1 belr-0.1.3_1 libbelcard.so.1 belcard-1.0.2_1 libsoci_core.so.4.0 soci-4.0.3_1 libshaderc_shared.so.1 shaderc-2018.0_1 -libglslang.so.11 glslang-11.11.0_1 -libHLSL.so glslang-11.11.0_1 -libSPIRV.so glslang-11.11.0_1 +libglslang.so.15 glslang-15.0.0_1 +libglslang-default-resource-limits.so.15 glslang-15.0.0_1 +libSPIRV.so glslang-15.0.0_1 libSPIRV-Tools-shared.so SPIRV-Tools-2022.3_1 libmaxminddb.so.0 libmaxminddb-1.3.2_1 libmysqlpp.so.3 mysql++-3.2.5_1 diff --git a/srcpkgs/glslang/template b/srcpkgs/glslang/template index f374b3ae7c9..573c127d05c 100644 --- a/srcpkgs/glslang/template +++ b/srcpkgs/glslang/template @@ -1,17 +1,56 @@ # Template file for 'glslang' # Libraries are unversioned, beware of ABI breakage (rebuild shaderc on updates) pkgname=glslang -version=11.11.0 +version=15.0.0 revision=1 build_style=cmake -configure_args="-DBUILD_SHARED_LIBS=ON" -hostmakedepends="python3 bison" +hostmakedepends="python3 bison gtest-devel" +makedepends="SPIRV-Tools-devel" short_desc="Khronos reference front-end for GLSL, ESSL, and sample SPIR-V generator" maintainer="Orphaned " license="BSD-3-Clause" homepage="https://github.com/KhronosGroup/glslang" distfiles="https://github.com/KhronosGroup/glslang/archive/${version}.tar.gz" -checksum=26c216c3062512c018cbdd752224b8dad703b7e5bb90bf338ba2dbb5d4f11438 +checksum=c31c8c2e89af907507c0631273989526ee7d5cdf7df95ececd628fd7b811e064 + +if [ "$CROSS_BUILD" ]; then + export cmake_crossopts="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" +fi + +do_configure() { + cmake -B build-shared -G Ninja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_EXTERNAL=OFF \ + -DBUILD_SHARED_LIBS=ON \ + -DALLOW_EXTERNAL_SPIRV_TOOLS=YES \ + $cmake_crossopts + + + cmake -B build-static -G Ninja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_EXTERNAL=OFF \ + -DBUILD_SHARED_LIBS=OFF \ + -DALLOW_EXTERNAL_SPIRV_TOOLS=YES \ + $cmake_crossopts +} + +do_build() { + ninja -C build-shared + ninja -C build-static +} + +do_install() { + DESTDIR=$DESTDIR ninja install -C build-static + DESTDIR=$DESTDIR ninja install -C build-shared +} + +pre_check() { + cmake_builddir="build-static" +} post_install() { sed -n '2,32p' < glslang/GenericCodeGen/CodeGen.cpp > LICENSE @@ -24,7 +63,7 @@ glslang-devel_package() { pkg_install() { vmove usr/include vmove "usr/lib/*.a" - vmove usr/lib/libglslang.so + vmove "usr/lib/*.so" vmove usr/lib/cmake } }