diff --git a/dev-util/glslang/glslang-14.0.0.recipe b/dev-util/glslang/glslang-14.3.0.recipe similarity index 74% rename from dev-util/glslang/glslang-14.0.0.recipe rename to dev-util/glslang/glslang-14.3.0.recipe index 2496d83a0..91a58116a 100644 --- a/dev-util/glslang/glslang-14.0.0.recipe +++ b/dev-util/glslang/glslang-14.3.0.recipe @@ -30,27 +30,30 @@ glslangValidator is command-line tool for accessing the functionality above. Status: Complete. Tasks waiting to be done are documented as GitHub issues." HOMEPAGE="https://github.com/KhronosGroup/glslang" -COPYRIGHT="2014-2020 The Khronos Group Inc" +COPYRIGHT="2014-2024 The Khronos Group Inc" LICENSE="Apache v2 BSD (2-clause) BSD (3-clause) MIT" REVISION="1" SOURCE_URI="https://github.com/KhronosGroup/glslang/archive/refs/tags/$portVersion.tar.gz" -CHECKSUM_SHA256="80bbb916a23e94ea9cbfb1acb5d1a44a7e0c9613bcf5b5947c03f2273bdc92b0" +CHECKSUM_SHA256="be6339048e20280938d9cb399fcdd06e04f8654d43e170e8cce5a56c9a754284" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" +libVersion="$portVersion" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" glslang$secondaryArchSuffix = $portVersion cmd:glslang$secondaryArchSuffix = $portVersion cmd:glslangValidator$secondaryArchSuffix = $portVersion cmd:spirv_remap$secondaryArchSuffix = $portVersion - lib:libglslang_default_resource_limits$secondaryArchSuffix = $portVersion - lib:libglslang$secondaryArchSuffix = $portVersion - lib:libSPIRV$secondaryArchSuffix = $portVersion - lib:libSPVRemapper$secondaryArchSuffix = $portVersion + lib:libglslang_default_resource_limits$secondaryArchSuffix = $libVersionCompat + lib:libglslang$secondaryArchSuffix = $libVersionCompat + lib:libSPIRV$secondaryArchSuffix = $libVersionCompat + lib:libSPVRemapper$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -58,10 +61,10 @@ REQUIRES=" PROVIDES_devel=" glslang${secondaryArchSuffix}_devel = $portVersion - devel:libglslang_default_resource_limits$secondaryArchSuffix = $portVersion - devel:libglslang$secondaryArchSuffix = $portVersion - devel:libSPIRV$secondaryArchSuffix = $portVersion - devel:libSPVRemapper$secondaryArchSuffix = $portVersion + devel:libglslang_default_resource_limits$secondaryArchSuffix = $libVersionCompat + devel:libglslang$secondaryArchSuffix = $libVersionCompat + devel:libSPIRV$secondaryArchSuffix = $libVersionCompat + devel:libSPVRemapper$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" glslang$secondaryArchSuffix == $portVersion base @@ -77,19 +80,25 @@ BUILD_PREREQUIRES=" cmd:python3 " +TEST_REQUIRES=" + cmd:diff + " + BUILD() { - cmake -Bbuild -S. $cmakeDirArgs \ - -DCMAKE_BUILD_TYPE=Release \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ + $cmakeDirArgs \ -DBUILD_SHARED_LIBS=ON \ -DENABLE_OPT=OFF \ -DGLSLANG_TESTS=ON - make -Cbuild $jobArgs + + make -C build $jobArgs } INSTALL() { - make -Cbuild install + # 0% tests passed, 1 tests failed out of 1 (4 crashes) + make -C build install prepareInstalledDevelLibs \ libglslang-default-resource-limits \ @@ -104,5 +113,5 @@ INSTALL() TEST() { - make -Cbuild test + ctest --test-dir build --output-on-failure }