From owner-svn-ports-head@freebsd.org Fri Dec 25 00:31:46 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8F0DF4D7ADC; Fri, 25 Dec 2020 00:31:46 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D27DK4Mv8z3nhN; Fri, 25 Dec 2020 00:31:45 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 403C919BB2; Fri, 25 Dec 2020 00:31:44 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BP0Vige040787; Fri, 25 Dec 2020 00:31:44 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BP0VhsZ040784; Fri, 25 Dec 2020 00:31:43 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202012250031.0BP0VhsZ040784@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 25 Dec 2020 00:31:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r559203 - in head/graphics/shaderc: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/graphics/shaderc: . files X-SVN-Commit-Revision: 559203 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Dec 2020 00:31:46 -0000 Author: jbeich Date: Fri Dec 25 00:31:43 2020 New Revision: 559203 URL: https://svnweb.freebsd.org/changeset/ports/559203 Log: graphics/shaderc: update to 2020.4 Changes: https://github.com/google/shaderc/compare/v2020.0...v2020.4 Added: head/graphics/shaderc/files/ head/graphics/shaderc/files/patch-system-glslang (contents, props changed) Modified: head/graphics/shaderc/Makefile (contents, props changed) head/graphics/shaderc/distinfo (contents, props changed) Modified: head/graphics/shaderc/Makefile ============================================================================== --- head/graphics/shaderc/Makefile Fri Dec 25 00:31:35 2020 (r559202) +++ head/graphics/shaderc/Makefile Fri Dec 25 00:31:43 2020 (r559203) @@ -2,12 +2,9 @@ PORTNAME= shaderc DISTVERSIONPREFIX=v -DISTVERSION= 2020.0 +DISTVERSION= 2020.4 CATEGORIES= graphics devel -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 21c8be385b3f.patch:-p1 # https://github.com/google/shaderc/pull/463 - MAINTAINER= jbeich@FreeBSD.org COMMENT= GLSL/HLSL to SPIR-V shader compiler @@ -25,6 +22,7 @@ GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.3:headers/thi CMAKE_ON+= SHADERC_SKIP_TESTS CMAKE_ARGS+= -DSPIRV-Headers_SOURCE_DIR=${WRKSRC}/third_party/spirv-headers +CMAKE_ARGS+= -Dglslang_SOURCE_DIR=${LOCALBASE}/include/glslang # https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/shaderc Modified: head/graphics/shaderc/distinfo ============================================================================== --- head/graphics/shaderc/distinfo Fri Dec 25 00:31:35 2020 (r559202) +++ head/graphics/shaderc/distinfo Fri Dec 25 00:31:43 2020 (r559203) @@ -1,7 +1,5 @@ -TIMESTAMP = 1589483588 -SHA256 (google-shaderc-v2020.0_GH0.tar.gz) = e02e2a9d4c3960bc629ca8cdcf83d295bec9c80ed08a8c5062e4e294022605ec -SIZE (google-shaderc-v2020.0_GH0.tar.gz) = 274371 +TIMESTAMP = 1607549421 +SHA256 (google-shaderc-v2020.4_GH0.tar.gz) = 19e4c812bfbdbabbfb658062628c377339d14894080b5c169216a1d86483bdcc +SIZE (google-shaderc-v2020.4_GH0.tar.gz) = 220148 SHA256 (KhronosGroup-SPIRV-Headers-1.5.3_GH0.tar.gz) = eece8a9e147d37997d425d5d2eeb2e757ad25adc30d6651467094f3b18609b5a SIZE (KhronosGroup-SPIRV-Headers-1.5.3_GH0.tar.gz) = 386853 -SHA256 (21c8be385b3f.patch) = 986a972d8b8fbfa750e92b750673108c4ae77af47acdc4dbb684358e2600a4ea -SIZE (21c8be385b3f.patch) = 1744 Added: head/graphics/shaderc/files/patch-system-glslang ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/shaderc/files/patch-system-glslang Fri Dec 25 00:31:43 2020 (r559203) @@ -0,0 +1,18 @@ +ld: error: undefined symbol: glslang::InitializeProcess() +>>> referenced by compiler.cc +>>> compiler.cc.o:(shaderc_util::GlslangInitializer::GlslangInitializer()) in archive libshaderc_util/libshaderc_util.a +ld: error: undefined symbol: ConstructCompiler(EShLanguage, int) +>>> referenced by ShaderLang.cpp +>>> ShaderLang.cpp.o:(ShConstructCompiler) in archive /usr/local/lib/libMachineIndependent.a + +--- glslc/CMakeLists.txt.orig 2020-12-24 21:26:10 UTC ++++ glslc/CMakeLists.txt +@@ -43,7 +43,7 @@ if (SHADERC_ENABLE_WGSL_OUTPUT) + endif(SHADERC_ENABLE_WGSL_OUTPUT) + + target_link_libraries(glslc PRIVATE +- glslang OSDependent OGLCompiler HLSL glslang SPIRV # Glslang libraries ++ glslang MachineIndependent GenericCodeGen # Glslang libraries + $<$:libtint> # Tint libraries, optional + shaderc_util shaderc # internal Shaderc libraries + ${CMAKE_THREAD_LIBS_INIT})