[SCM] libva/master: Update library dependencies to fix FTBFS properly.

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f9ef0f2818e8f14ff66de5ec08c0445869a15b34
Author: Artur Rona <ari-tczew at ubuntu.com>
Date:   Sun Feb 13 14:32:45 2011 +0100

    Update library dependencies to fix FTBFS properly.

diff --git a/debian/patches/remove-unneeded-dep2.patch b/debian/patches/remove-unneeded-dep2.patch
index 91761db..d4e17db 100644
--- a/debian/patches/remove-unneeded-dep2.patch
+++ b/debian/patches/remove-unneeded-dep2.patch
@@ -1,10 +1,9 @@
-Fix library dependencies
+From: Artur Rona <ari-tczew at ubuntu.com>
+Description: Fix FTBFS with ld --no-add-needed. 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.
+Bug-Debian: http://bugs.debian.org/609554
+Author: Matthias Klose <doko at ubuntu.com>
+Last-Update: 2011-02-13
 
-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
 @@ -43,9 +43,9 @@
@@ -64,7 +63,18 @@ on ubuntu natty
 -TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) -lpthread
 +TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) \
 +  $(top_builddir)/va/$(libvacorelib) \
-+  $(X11_LIBS)
++  $(X11_LIBS) -lpthread
  
  putsurface_LDADD = $(TEST_LIBS)
  putsurface_SOURCES = putsurface.c
+--- a/test/vainfo/Makefile.am
++++ b/test/vainfo/Makefile.am
+@@ -25,7 +25,7 @@ bin_PROGRAMS = vainfo
+ 
+ AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11
+ 
+-vainfo_LDADD = $(top_builddir)/va/$(libvacorelib) $(top_builddir)/va/$(libvabackendlib)
++vainfo_LDADD = $(top_builddir)/va/$(libvacorelib) $(top_builddir)/va/$(libvabackendlib) $(X11_LIBS)
+ vainfo_DEPENDENCIES =  $(top_builddir)/va/$(libvacorelib) $(top_builddir)/va/$(libvabackendlib)
+ vainfo_SOURCES = vainfo.c
+ 

-- 
libva packaging