From 4f48a8931e283b6da3c5ab33f0ef31a2f7ab9ca7 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Fri, 6 Jan 2012 18:16:45 +0100
Subject: [PATCH] libva: update to libva-1.0.15

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/multimedia/libva/build   | 12 ++----------
 packages/multimedia/libva/install |  9 ---------
 packages/multimedia/libva/meta    | 10 +++++++++-
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/packages/multimedia/libva/build b/packages/multimedia/libva/build
index 804a1f6cb0..ed1a117b25 100755
--- a/packages/multimedia/libva/build
+++ b/packages/multimedia/libva/build
@@ -22,15 +22,6 @@
 
 . config/options $1
 
-LIBVA_CONFIG="--disable-dummy-driver --disable-i965-driver"
-
-get_graphicdrivers
-for drv in $GRAPHIC_DRIVERS; do
-  if [ "$drv" = i965 ]; then
-    LIBVA_CONFIG=`echo $LIBVA_CONFIG | sed -e 's/disable-i965-driver/enable-i965-driver/'`
-  fi
-done
-
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
@@ -39,7 +30,8 @@ cd $PKG_BUILD
             --disable-static \
             --disable-silent-rules \
             --enable-glx \
-            $LIBVA_CONFIG \
+            --disable-dummy-driver \
+            --disable-dummy-backend \
             --with-drivers-path="/usr/lib/va" \
 
 make
diff --git a/packages/multimedia/libva/install b/packages/multimedia/libva/install
index 13e931b002..fc28bea95c 100755
--- a/packages/multimedia/libva/install
+++ b/packages/multimedia/libva/install
@@ -22,19 +22,10 @@
 
 . config/options $1
 
-get_graphicdrivers
-
 mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/va/.libs/libva*.so* $INSTALL/usr/lib
   rm -rf $INSTALL/usr/lib/libva-*.so*T
 
-for drv in $GRAPHIC_DRIVERS; do
-  if [ "$drv" = i965 ]; then
-    mkdir -p $INSTALL/usr/lib/va
-      cp -P $PKG_BUILD/i965_drv_video/.libs/*.so $INSTALL/usr/lib/va
-  fi
-done
-
 if [ "$DEVTOOLS" = yes ]; then
   mkdir -p $INSTALL/usr/bin
     cp $PKG_BUILD/test/vainfo/.libs/vainfo $INSTALL/usr/bin
diff --git a/packages/multimedia/libva/meta b/packages/multimedia/libva/meta
index f3ee74b113..a650ab335a 100644
--- a/packages/multimedia/libva/meta
+++ b/packages/multimedia/libva/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libva"
-PKG_VERSION="1.0.14"
+PKG_VERSION="1.0.15"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="GPL"
@@ -34,3 +34,11 @@ PKG_LONGDESC="The main motivation for VAAPI (Video Acceleration API) is to enabl
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="yes"
+
+get_graphicdrivers
+
+for drv in $GRAPHIC_DRIVERS; do
+  if [ "$drv" = i965 ]; then
+    PKG_DEPENDS="$PKG_DEPENDS libva-drivers-intel"
+  fi
+done