[Mesa-dev] [PATCH] targets/vdpau: Don't link unused libraries

[Emil Velikov]

On 17/02/14 08:29, Kusanagi Kouichi wrote:
> libvdpau, libselinux and libexpat are not used.
> 
Nice catch, I'm a bit unsure about libexpat but considering that you've
tested the resulting libraries the patch is

Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>

I'll push this and any other pending patches of yours later on today.

-Emil
> Signed-off-by: Kusanagi Kouichi <slash at ac.auone-net.jp>
> ---
>  configure.ac                                   | 2 +-
>  src/gallium/Automake.inc                       | 6 +++++-
>  src/gallium/targets/r600/vdpau/Makefile.am     | 1 -
>  src/gallium/targets/radeonsi/vdpau/Makefile.am | 1 -
>  src/gallium/targets/vdpau-nouveau/Makefile.am  | 1 -
>  5 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 00a0eaa..17a51af 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1320,7 +1320,7 @@ fi
>  AM_CONDITIONAL(HAVE_ST_XVMC, test "x$enable_xvmc" = xyes)
>  
>  if test "x$enable_vdpau" = xyes; then
> -    PKG_CHECK_MODULES([VDPAU], [vdpau >= 0.4.1 x11-xcb xcb-dri2 >= 1.8])
> +    PKG_CHECK_MODULES([VDPAU], [vdpau >= 0.4.1 x11-xcb xcb-dri2 >= 1.8], [VDPAU_LIBS="`$PKG_CONFIG --libs x11-xcb xcb-dri2`"])
>      GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS vdpau"
>  fi
>  AM_CONDITIONAL(HAVE_ST_VDPAU, test "x$enable_vdpau" = xyes)
> diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
> index fec69cc..1acc99e 100644
> --- a/src/gallium/Automake.inc
> +++ b/src/gallium/Automake.inc
> @@ -78,7 +78,11 @@ GALLIUM_VDPAU_LIB_DEPS = \
>  	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
>  	$(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \
>  	$(VDPAU_LIBS) \
> -	$(LIBDRM_LIBS)
> +	$(LIBDRM_LIBS) \
> +	-lm \
> +	$(CLOCK_LIB) \
> +	$(PTHREAD_LIBS) \
> +	$(DLOPEN_LIBS)
>  
>  GALLIUM_XVMC_LIB_DEPS = \
>  	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
> diff --git a/src/gallium/targets/r600/vdpau/Makefile.am b/src/gallium/targets/r600/vdpau/Makefile.am
> index 7f43fbb..c5103bd 100644
> --- a/src/gallium/targets/r600/vdpau/Makefile.am
> +++ b/src/gallium/targets/r600/vdpau/Makefile.am
> @@ -41,7 +41,6 @@ libvdpau_r600_la_LIBADD = \
>  	$(top_builddir)/src/gallium/drivers/r600/libr600.la \
>  	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
>  	$(GALLIUM_VDPAU_LIB_DEPS) \
> -	$(GALLIUM_DRI_LIB_DEPS) \
>  	$(RADEON_LIBS)
>  
>  if HAVE_MESA_LLVM
> diff --git a/src/gallium/targets/radeonsi/vdpau/Makefile.am b/src/gallium/targets/radeonsi/vdpau/Makefile.am
> index 0292b2b..54d65b3 100644
> --- a/src/gallium/targets/radeonsi/vdpau/Makefile.am
> +++ b/src/gallium/targets/radeonsi/vdpau/Makefile.am
> @@ -42,7 +42,6 @@ libvdpau_radeonsi_la_LIBADD = \
>  	$(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
>  	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
>  	$(GALLIUM_VDPAU_LIB_DEPS) \
> -	$(GALLIUM_DRI_LIB_DEPS) \
>  	$(RADEON_LIBS)
>  
>  if HAVE_MESA_LLVM
> diff --git a/src/gallium/targets/vdpau-nouveau/Makefile.am b/src/gallium/targets/vdpau-nouveau/Makefile.am
> index fbaad03..3cdf103 100644
> --- a/src/gallium/targets/vdpau-nouveau/Makefile.am
> +++ b/src/gallium/targets/vdpau-nouveau/Makefile.am
> @@ -42,7 +42,6 @@ libvdpau_nouveau_la_LIBADD = \
>  	$(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
>  	$(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \
>  	$(GALLIUM_VDPAU_LIB_DEPS) \
> -	$(GALLIUM_DRI_LIB_DEPS) \
>  	$(NOUVEAU_LIBS)
>  
>  if HAVE_MESA_LLVM
>