[SCM] ffmpeg/master: don't enable vaapi support on s390 and the hurd

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d097e5e16d8b8b465900bc248da23468b52ea29c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 9 07:03:19 2011 +0100

    don't enable vaapi support on s390 and the hurd

diff --git a/debian/confflags b/debian/confflags
index cd1424e..029a075 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -102,7 +102,6 @@ confflags += --enable-libschroedinger
 confflags += --enable-libspeex
 confflags += --enable-libtheora
 confflags += --enable-libvorbis
-confflags += --enable-vaapi
 confflags += --enable-pthreads
 confflags += --enable-zlib
 confflags += --enable-libvpx
@@ -121,6 +120,9 @@ endif
 
 confflags += $(extra_common_confflags)
 
+# vaapi is not available on s390 and on the hurd
+confflags += $(call cond_enable,/usr/include/va/va.h,vaapi)
+
 # this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
 gpl_confflags += $(call cond_enable,/usr/include/dirac/libdirac_decoder/dirac_parser.h,libdirac)
 gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
diff --git a/debian/control b/debian/control
index cb43621..e045151 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Build-Depends: debhelper (>= 7),
  libsdl1.2-dev,
  libspeex-dev,
  libtheora-dev (>> 0.0.0.alpha4),
- libva-dev,
+ libva-dev [!hurd-i386 !s390],
  libvdpau-dev,
  libvorbis-dev,
  libvpx-dev,

-- 
FFmpeg packaging