[SCM] libav/master: Restrict Build-Depends to "yasm [any-amd64 any-i386]" and explicitely disable it if not found.

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

The following commit has been merged in the master branch:
commit 1ac5a4d33c3b047d5d3e082fec160a28db67bc83
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Thu Jun 21 14:55:36 2012 +0200

    Restrict Build-Depends to "yasm [any-amd64 any-i386]" and explicitely disable it if not found.

diff --git a/debian/README.source b/debian/README.source
index 5d0b658..29b5ee0 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -19,8 +19,7 @@ Using the nomenclature of the EmdebianSprint2011 [0,1] one would write e.g.:
 
  Build-Depends-Bootstrap1:
   debhelper (>= 8.1.3~),
-  texi2html,
-  yasm
+  texi2html
 
 [0] http://wiki.debian.org/DebianBootstrap/EmdebianSprint2011
 [1] http://lists.debian.org/debian-devel-announce/2011/03/msg00000.html
diff --git a/debian/confflags b/debian/confflags
index d420d92..66b1830 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -95,6 +95,7 @@ confflags += --enable-runtime-cpudetect
 confflags += --extra-version='$(DEB_VERSION)'
 confflags += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 confflags += --prefix=/usr
+confflags += $(shell test -x /usr/bin/yasm || echo --disable-yasm )
 
 ifeq      ($(DEB_HOST_ARCH),armel)
 # this is required on Ubuntu lucid as it defaults to thumb2 and Libav has
diff --git a/debian/control b/debian/control
index 7d358bc..7e24a9c 100644
--- a/debian/control
+++ b/debian/control
@@ -58,7 +58,7 @@ Build-Depends:
  libxvidcore-dev,
  libxvmc-dev,
  texi2html,
- yasm,
+ yasm [any-amd64 any-i386],
  zlib1g-dev
 
 Package: libav-tools

-- 
Libav/FFmpeg packaging