[SCM] libva/master: update library dependencies for test programs, fixes FTBFS

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 29ba9b71048827c9c51217b637936fd8750dcd54
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 8 12:07:17 2011 +0100

    update library dependencies for test programs, fixes FTBFS

diff --git a/debian/patches/remove-unneeded-dep2.patch b/debian/patches/remove-unneeded-dep2.patch
index 383b027..9cf766a 100644
--- a/debian/patches/remove-unneeded-dep2.patch
+++ b/debian/patches/remove-unneeded-dep2.patch
@@ -1,5 +1,9 @@
-Patch to remove unnecessary dependency on libva for libva-x11. libva-x11 uses
-none of libva's symbols.
+Fix library dependencies
+
+remove unnecessary dependency on libva for libva-x11. libva-x11 uses
+none of libva's symbols. But it uses -lX11, which fixes FTBFS
+on ubuntu natty
+
 ==========================================================================
 --- a/va/Makefile.am
 +++ b/va/Makefile.am
@@ -23,7 +27,7 @@ none of libva's symbols.
  
 -TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
 +TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) \
-+  $(top_builddir)/va/$(libvacorelib)
++  $(top_builddir)/va/$(libvacorelib) -lX11
  
  test_01_LDADD = $(TEST_LIBS)
  test_01_SOURCES = test_01.c
@@ -35,7 +39,7 @@ none of libva's symbols.
  
 -TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
 +TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) \
-+  $(top_builddir)/va/$(libvacorelib)
++  $(top_builddir)/va/$(libvacorelib) -lX11
  
  mpeg2vldemo_LDADD = $(TEST_LIBS)
  mpeg2vldemo_SOURCES = mpeg2vldemo.c
@@ -47,7 +51,7 @@ none of libva's symbols.
  
 -TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
 +TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) \
-+  $(top_builddir)/va/$(libvacorelib)
++  $(top_builddir)/va/$(libvacorelib) -lX11
  
  h264encode_LDADD = $(TEST_LIBS)
  h264encode_SOURCES = h264encode.c
@@ -60,7 +64,7 @@ none of libva's symbols.
 -TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) -lpthread
 +TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) \
 +  $(top_builddir)/va/$(libvacorelib) \
-+  -lpthread
++  -lX11 -lpthread
  
  putsurface_LDADD = $(TEST_LIBS)
  putsurface_SOURCES = putsurface.c

-- 
libva packaging