Re: [ptxdist] [PATCH 1/2] mesa-demos: remove option to build OpenVG demos

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Thu, Jan 28, 2016 at 01:13:43PM +0100, Lucas Stach wrote:
> Current MESA versions have dropped the VG state tracker, so
> there is no way to provide OpenVG acceleration anymore.
> Disable the respective demos unconditionally.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

Thanks, both applied.

Michael

> ---
>  rules/mesa-demos.in   | 20 --------------------
>  rules/mesa-demos.make |  4 +---
>  2 files changed, 1 insertion(+), 23 deletions(-)
> 
> diff --git a/rules/mesa-demos.in b/rules/mesa-demos.in
> index 5ea2f87ce099..192bbd01d0e9 100644
> --- a/rules/mesa-demos.in
> +++ b/rules/mesa-demos.in
> @@ -8,7 +8,6 @@ menuconfig MESA_DEMOS
>  	select MESALIB_EGL		if MESA_DEMOS_EGL
>  	select MESALIB_GLES1		if MESA_DEMOS_GLES1
>  	select MESALIB_GLES2		if MESA_DEMOS_GLES2
> -	select MESALIB_OPENVG		if MESA_DEMOS_VG
>  	select MESALIB_EGL_WAYLAND	if MESA_DEMOS_WAYLAND
>  	select XORG_LIB_X11		if MESA_DEMOS_X11
>  	select XORG_LIB_XEXT		if MESA_DEMOS_X11
> @@ -177,23 +176,4 @@ config MESA_DEMOS_ES2GEARS_WAYLAND
>  
>  endif
>  
> -menuconfig MESA_DEMOS_VG
> -	bool
> -	select MESA_DEMOS_GLES1
> -	select MESA_DEMOS_EGL
> -	select MESA_DEMOS_X11
> -	prompt "OpenVG demos"
> -
> -if MESA_DEMOS_VG
> -
> -config MESA_DEMOS_VGIMAGE2TEX
> -	bool
> -	prompt "vgimage2tex"
> -
> -config MESA_DEMOS_TEX2VGIMAGE
> -	bool
> -	prompt "tex2vgimage"
> -
> -endif
> -
>  endif
> diff --git a/rules/mesa-demos.make b/rules/mesa-demos.make
> index a83d54e258e0..90ef9f9ac988 100644
> --- a/rules/mesa-demos.make
> +++ b/rules/mesa-demos.make
> @@ -44,7 +44,7 @@ MESA_DEMOS_CONF_OPT	:= \
>  	--$(call ptx/endis, PTXCONF_MESA_DEMOS_EGL)-egl \
>  	--$(call ptx/endis, PTXCONF_MESA_DEMOS_GLES1)-gles1 \
>  	--$(call ptx/endis, PTXCONF_MESA_DEMOS_GLES2)-gles2 \
> -	--$(call ptx/endis, PTXCONF_MESA_DEMOS_VG)-vg \
> +	--disable-vg \
>  	--disable-osmesa \
>  	--disable-libdrm \
>  	--$(call ptx/endis, PTXCONF_MESA_DEMOS_X11)-x11 \
> @@ -90,8 +90,6 @@ MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_ES2GEARS_SCREEN)	+= es2gears_screen
>  MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_ES2GEARS_WAYLAND)	+= es2gears_wayland
>  MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_ES2GEARS_X11)	+= es2gears_x11
>  MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_ES2TRI)		+= es2tri
> -MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_TEX2VGIMAGE)	+= tex2vgimage
> -MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_VGIMAGE2TEX)	+= vgimage2tex
>  
>  $(STATEDIR)/mesa-demos.targetinstall:
>  	@$(call targetinfo)
> -- 
> 2.7.0.rc3
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de