From owner-svn-ports-all@freebsd.org Thu May 21 02:37:16 2020 Return-Path: Delivered-To: svn-ports-all@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 9C0D92FDBD3; Thu, 21 May 2020 02:37:16 +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 49SDKm04r0z4CLv; Thu, 21 May 2020 02:37:16 +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 F22552640A; Thu, 21 May 2020 02:37:15 +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 04L2bFhg086501; Thu, 21 May 2020 02:37:15 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04L2bF83086500; Thu, 21 May 2020 02:37:15 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202005210237.04L2bF83086500@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 21 May 2020 02:37:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536039 - head/graphics/shaderc X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/graphics/shaderc X-SVN-Commit-Revision: 536039 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 May 2020 02:37:16 -0000 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