[SCM] libass/master: Do not depend on yasm on x32 to disable asm

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 49ce3a10dc98c86c030d05147b2c28b9b683b9d7
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Jul 27 17:56:50 2015 +0200

    Do not depend on yasm on x32 to disable asm

diff --git a/debian/control b/debian/control
index 12309da..c5f6ebf 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Build-Depends:
  libfreetype6-dev,
  libfribidi-dev,
  libharfbuzz-dev,
- yasm [any-amd64]
+ yasm [amd64 kfreebsd-amd64]
+Build-Conflicts: yasm [x32]
 Standards-Version: 3.9.6
 Section: libs
 Homepage: https://github.com/libass/libass

-- 
LibASS packaging