targets/vdpau: Don't link unused libraries

libvdpau, libselinux and libexpat are not used.

Signed-off-by: Kusanagi Kouichi <slash@ac.auone-net.jp>

diff --git a/configure.ac b/configure.ac
index d839476827ca53e777bc162827ef69fff11b55fa..e1d4806938f38bb79802c50244baf388150d0d36 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1323,7 +1323,8 @@ 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 fec69cc523f99507b7542c61509b593be887c0cf..1acc99ef51baad9f83feee65a23e6443cdd7240c 100644 (file)
--- 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 6e9f1174c9d70c294d5078c103ab51994bc7cdc2..509b954a68527157af520518f6e5bb66a6d3062a 100644 (file)
--- 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)
 
 libvdpau_r600_la_LINK = $(CXXLINK) $(libvdpau_r600_la_LDFLAGS)

diff --git a/src/gallium/targets/radeonsi/vdpau/Makefile.am b/src/gallium/targets/radeonsi/vdpau/Makefile.am
index 0292b2bc60c0e704659716f101386fa6f6c5c630..54d65b3d783310738ba80c92074a82f8dea1bbfc 100644 (file)
--- 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 fbaad037f85fcc67ede22441df30a60aacd5819c..3cdf1031044ad5c1a1797fbf7c1c96014b4a0278 100644 (file)
--- 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