[SCM] VLC media player packaging branch, experimental, updated. debian/1.1.0-4-4-g6757055

[xtophe-guest at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 3949bb65d022ae61e0069a42029405f942833bf2
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Sun Jul 18 19:43:31 2010 +0200

    Activate VA-API
    
    Depends on FFmpeg's libs recent enough
    Closes: #587792

diff --git a/debian/control b/debian/control
index 5ea8644..2edd2f6 100644
--- a/debian/control
+++ b/debian/control
@@ -17,8 +17,8 @@ Build-Depends: debhelper (>= 7.2.3~),
                libass-dev (>= 0.9.5-2),
                libavahi-client-dev,
                libavc1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
-               libavcodec-dev (>= 0.cvs20060823),
-               libavformat-dev (>= 0.cvs20060823),
+               libavcodec-dev (>= 4:0.6),
+               libavformat-dev (>= 4:0.6),
                libcaca-dev (>= 0.99.beta4),
                libcddb2-dev,
                libcdio-dev,
@@ -52,7 +52,7 @@ Build-Depends: debhelper (>= 7.2.3~),
                libnotify-dev,
                libogg-dev,
                libpng12-dev,
-               libpostproc-dev (>= 0.cvs20060823),
+               libpostproc-dev (>= 4:0.6),
                libproxy-dev,
                libpulse-dev,
                libqt4-dev,
@@ -65,7 +65,7 @@ Build-Depends: debhelper (>= 7.2.3~),
                libsmbclient-dev,
                libspeex-dev,
                libsvga1-dev [amd64 i386],
-               libswscale-dev,
+               libswscale-dev (>= 4:0.6),
                libtag1-dev,
                libtar-dev,
                libtheora-dev,
@@ -73,6 +73,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,
                libvcdinfo-dev,
                libvorbis-dev,
                libx11-dev,
diff --git a/debian/rules b/debian/rules
index cfb701b..5c70a96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,6 +63,7 @@ confflags += \
 	--enable-libass \
 	--enable-libmpeg2 \
 	--enable-libproxy \
+	--enable-libva \
 	--enable-libxml2 \
 	--enable-lirc \
 	--enable-live555 \
@@ -101,7 +102,6 @@ confflags += \
 # dxva2 -> Windows only
 # gnomevfs -> poorly maintained
 # goom -> not in Debian
-# libva -> needs a vaapi enabled avcodec
 # osso_screensaver -> not targetting maemo
 # portaudio -> not needed
 # projectm -> broken
@@ -112,7 +112,6 @@ confflags += \
 	--disable-dxva2 \
 	--disable-gnomevfs \
 	--disable-goom \
-	--disable-libva \
 	--disable-osso_screensaver \
 	--disable-portaudio \
 	--disable-projectm \

-- 
VLC media player packaging