[SCM] VLC media player packaging branch, experimental, updated. debian/1.1.1-1-9-g6140b58

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 6140b58ce320b490890c7972e43bb6a982b0a2ce
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 24 12:34:49 2010 +0200

    libva is (currently) Linux specific

diff --git a/debian/control b/debian/control
index 58558c8..aeaaf97 100644
--- a/debian/control
+++ b/debian/control
@@ -72,7 +72,7 @@ Build-Depends: debhelper (>= 7.2.3~),
                libudev-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libupnp3-dev,
                libv4l-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
-               libva-dev,
+               libva-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libvcdinfo-dev,
                libvorbis-dev,
                libx11-dev,
diff --git a/debian/rules b/debian/rules
index 6f70a7d..4e4ea5d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,7 +63,6 @@ confflags += \
 	--enable-libass \
 	--enable-libmpeg2 \
 	--enable-libproxy \
-	--enable-libva \
 	--enable-libxml2 \
 	--enable-lirc \
 	--enable-live555 \
@@ -129,6 +128,7 @@ confflags += \
 	--enable-atmo \
 	--enable-dc1394 \
 	--enable-dv \
+	--enable-libva \
 	--enable-pvr \
 	--enable-udev \
 	--enable-v4l \

-- 
VLC media player packaging