Index: devel/glslang/Makefile =================================================================== --- devel/glslang/Makefile +++ devel/glslang/Makefile @@ -1,9 +1,7 @@ # $FreeBSD$ PORTNAME= glslang -DISTVERSION= 6.2.2596-248 -PORTREVISION= 1 -DISTVERSIONSUFFIX= -ge0bc65b +DISTVERSION= 7.10.2984 CATEGORIES= devel graphics MAINTAINER= greg@unrelenting.technology @@ -12,7 +10,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKDIR}/LICENSE -USES= cmake compiler:c++11-lib +BUILD_DEPENDS= ${LOCALBASE}/lib/libSPIRV-Tools-opt.a:devel/spirv-tools + +USES= cmake compiler:c++11-lib localbase USE_GITHUB= yes GH_ACCOUNT= KhronosGroup @@ -21,4 +21,9 @@ ${SED} '/^$$/,$$d' ${WRKSRC}/${PORTNAME}/Include/Types.h \ >${WRKDIR}/LICENSE +post-patch: + ${REINPLACE_CMD} \ + "s|SPIRV glslang SPIRV-Tools-opt|SPIRV glslang ${LOCALBASE}/lib/libSPIRV-Tools.a ${LOCALBASE}/lib/libSPIRV-Tools-opt.a|" \ + ${WRKSRC}/SPIRV/CMakeLists.txt + .include Index: devel/glslang/distinfo =================================================================== --- devel/glslang/distinfo +++ devel/glslang/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1533666570 -SHA256 (KhronosGroup-glslang-6.2.2596-248-ge0bc65b_GH0.tar.gz) = 497a18bfe7e102cda61377ca4fd7dbd84478a89b80e4d53420cf94c9a380f2f0 -SIZE (KhronosGroup-glslang-6.2.2596-248-ge0bc65b_GH0.tar.gz) = 2353165 +TIMESTAMP = 1546371497 +SHA256 (KhronosGroup-glslang-7.10.2984_GH0.tar.gz) = d0afe88034577ecf06a825db1a5e8222d949a38d3b19c5ce002b90b66c403f67 +SIZE (KhronosGroup-glslang-7.10.2984_GH0.tar.gz) = 2439082 Index: devel/glslang/files/patch-CMakeLists.txt =================================================================== --- /dev/null +++ devel/glslang/files/patch-CMakeLists.txt @@ -0,0 +1,13 @@ +--- CMakeLists.txt.orig 2019-01-01 19:45:04 UTC ++++ CMakeLists.txt +@@ -121,10 +121,6 @@ endfunction(glslang_set_link_args) + # We depend on these for later projects, so they should come first. + add_subdirectory(External) + +-if(NOT TARGET SPIRV-Tools-opt) +- set(ENABLE_OPT OFF) +-endif() +- + if(ENABLE_OPT) + message(STATUS "optimizer enabled") + add_definitions(-DENABLE_OPT=1) Index: devel/glslang/pkg-plist =================================================================== --- devel/glslang/pkg-plist +++ devel/glslang/pkg-plist @@ -9,6 +9,7 @@ include/SPIRV/Logger.h include/SPIRV/SPVRemapper.h include/SPIRV/SpvBuilder.h +include/SPIRV/SpvTools.h include/SPIRV/bitutils.h include/SPIRV/disassemble.h include/SPIRV/doc.h