Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 Dec 2020 00:31:43 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r559203 - in head/graphics/shaderc: . files
Message-ID:  <202012250031.0BP0VhsZ040784@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
+   $<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint>      # Tint libraries, optional
+   shaderc_util shaderc                                  # internal Shaderc libraries
+   ${CMAKE_THREAD_LIBS_INIT})



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012250031.0BP0VhsZ040784>