Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 May 2020 02:37:15 +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: r536039 - head/graphics/shaderc
Message-ID:  <202005210237.04L2bF83086500@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu May 21 02:37:15 2020
New Revision: 536039
URL: https://svnweb.freebsd.org/changeset/ports/536039

Log:
  graphics/shaderc: use upstream repo in case the fork is deleted
  
  As of 2020.0 the workaround is still required without LLD such as on
  DragonFly or FreeBSD < 12:
  
  FAILED: glslc/glslc
  : && /usr/bin/c++  -O2 -pipe -fstack-protector-strong -isystem /usr/local/include -fno-strict-aliasing  -isystem /usr/local/include -Wimplicit-fallthrough -O2 -pipe -fstack-protector-strong -isystem /usr/local/include -fno-strict-aliasing  -isystem /usr/local/include  -fstack-protector-strong -L/usr/local/lib glslc/CMakeFiles/glslc_exe.dir/src/main.cc.o  -o glslc/glslc  glslc/libglslc.a  libshaderc_util/libshaderc_util.a  libshaderc/libshaderc.a  libshaderc_util/libshaderc_util.a  -lSPIRV-Tools-opt  -lSPIRV-Tools  -lHLSL  -lglslang  -lOSDependent  -lOGLCompiler  -lglslang  -lOSDependent  -lOGLCompiler  -lSPIRV  -pthread && :
  /usr/local/lib/libglslang.a(ShaderLang.cpp.o): In function `(anonymous namespace)::CreateBuiltInParseables(TInfoSink&, glslang::EShSource)':
  ShaderLang.cpp:(.text+0x7502): undefined reference to `glslang::TBuiltInParseablesHlsl::TBuiltInParseablesHlsl()'
  c++: error: linker command failed with exit code 1 (use -v to see invocation)

Modified:
  head/graphics/shaderc/Makefile   (contents, props changed)

Modified: head/graphics/shaderc/Makefile
==============================================================================
--- head/graphics/shaderc/Makefile	Thu May 21 01:32:50 2020	(r536038)
+++ head/graphics/shaderc/Makefile	Thu May 21 02:37:15 2020	(r536039)
@@ -5,8 +5,8 @@ DISTVERSIONPREFIX=v
 DISTVERSION=	2020.0
 CATEGORIES=	graphics devel
 
-PATCH_SITES=	https://github.com/haasn/${GH_PROJECT}/commit/
-PATCHFILES=	21c8be385b3f.patch:-p1
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	21c8be385b3f.patch:-p1 # https://github.com/google/shaderc/pull/463
 
 MAINTAINER=	greg@unrelenting.technology
 COMMENT=	GLSL/HLSL to SPIR-V shader compiler



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