From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
In-Reply-To: <20210107111404.357-6-p.zabel@pengutronix.de>
MIME-Version: 1.0
Message-Id: <E1l0JQz-008qEF-C6@dude03.red.stw.pengutronix.de>
From: Michael Olbrich <mol@pengutronix.de>
Date: Fri, 15 Jan 2021 08:22:13 +0100
Subject: Re: [ptxdist] [APPLIED] shaderc: version bump 2020.3 -> 2020.4
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ptxdist-bounces@pengutronix.de
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>

Thanks, applied as cff9d40de7ebca345a6d4cd8281739108f1eb417.

Michael

[sent from post-receive hook]

On Fri, 15 Jan 2021 08:22:13 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> spvc was removed upstream.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20210107111404.357-6-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/host-shaderc.make b/rules/host-shaderc.make
> index 0ee834d1bab3..50b6a6503634 100644
> --- a/rules/host-shaderc.make
> +++ b/rules/host-shaderc.make
> @@ -55,11 +55,8 @@ HOST_SHADERC_CONF_OPT	:= \
>  	$(HOST_CMAKE_OPT) \
>  	-DCMAKE_BUILD_TYPE=Release \
>  	-DCMAKE_INSTALL_LIBDIR=/usr/lib \
> -	-DSHADERC_ENABLE_SPVC=OFF \
>  	-DSHADERC_SKIP_INSTALL=OFF \
>  	-DSHADERC_SKIP_TESTS=ON \
> -	-DSHADERC_SPVC_ENABLE_DIRECT_LOGGING=OFF \
> -	-DSHADERC_SPVC_DISABLE_CONTEXT_LOGGING=OFF \
>  	-DSHADERC_ENABLE_WERROR_COMPILE=ON
>  
>  # vim: syntax=make
> diff --git a/rules/shaderc.in b/rules/shaderc.in
> index ccb3bc538032..bd6c65c09678 100644
> --- a/rules/shaderc.in
> +++ b/rules/shaderc.in
> @@ -16,26 +16,10 @@ config SHADERC_GLSLC
>  	help
>  	  Install glslc tool.
>  
> -config SHADERC_SPVC
> -	bool
> -	# requires SPIRV-Cross
> -	depends on BROKEN
> -	prompt "install spvc"
> -	help
> -	  Install spvc tool.
> -
>  config SHADERC_LIBSHADERC
>  	bool
>  	prompt "install libshaderc"
>  	help
>  	  Install libshaderc shared library.
>  
> -config SHADERC_LIBSHADERC_SPVC
> -	bool
> -	# requires SPIRV-Cross
> -	depends on BROKEN
> -	prompt "install libshaderc_spvc"
> -	help
> -	  Install libshaderc_spvc shared library.
> -
>  endif
> diff --git a/rules/shaderc.make b/rules/shaderc.make
> index 3328574570de..902a60a2a71d 100644
> --- a/rules/shaderc.make
> +++ b/rules/shaderc.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SHADERC) += shaderc
>  #
>  # Paths and names
>  #
> -SHADERC_VERSION			:= v2020.3
> -SHADERC_MD5			:= 7415b7c5376dd36c610b9cc53c7dbe1b
> +SHADERC_VERSION			:= v2020.4
> +SHADERC_MD5			:= 5c587cb6bd3b7e8745ca2e0dd46bb284
>  SHADERC				:= shaderc-$(SHADERC_VERSION)
>  SHADERC_SUFFIX			:= tar.gz
>  SHADERC_URL			:= \
> @@ -73,15 +73,10 @@ SHADERC_CONF_OPT	:= \
>  	$(CROSS_CMAKE_USR) \
>  	-DCMAKE_BUILD_TYPE=Release \
>  	-DCMAKE_INSTALL_LIBDIR=/usr/lib \
> -	-DSHADERC_ENABLE_SPVC=$(call ptx/onoff, PTXCONF_SHADERC_SPVC) \
>  	-DSHADERC_SKIP_INSTALL=OFF \
>  	-DSHADERC_SKIP_TESTS=ON \
> -	-DSHADERC_SPVC_ENABLE_DIRECT_LOGGING=OFF \
> -	-DSHADERC_SPVC_DISABLE_CONTEXT_LOGGING=OFF \
>  	-DSHADERC_ENABLE_WERROR_COMPILE=ON
>  
> -#	-DSHADERC_ENABLE_SHARED_CRT=OFF
> -
>  # ----------------------------------------------------------------------------
>  # Target-Install
>  # ----------------------------------------------------------------------------
> @@ -98,16 +93,10 @@ $(STATEDIR)/shaderc.targetinstall:
>  ifdef PTXCONF_SHADERC_GLSLC
>  	@$(call install_copy, shaderc, 0, 0, 0755, -, /usr/bin/glslc)
>  endif
> -ifdef PTXCONF_SHADERC_SPVC
> -	@$(call install_copy, shaderc, 0, 0, 0755, -, /usr/bin/spvc)
> -endif
>  
>  ifdef PTXCONF_SHADERC_LIBSHADERC
>  	@$(call install_lib, shaderc, 0, 0, 0644, libshaderc_shared)
>  endif
> -ifdef PTXCONF_SHADERC_LIBSHADERC_SPVC
> -	@$(call install_lib, shaderc, 0, 0, 0644, libshaderc_spvc)
> -endif
>  
>  	@$(call install_finish, shaderc)
>  

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de