[SCM] libass/master: Re-enable yasm on x32

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Tue Dec 8 11:25:52 UTC 2015


The following commit has been merged in the master branch:
commit 92a5c15e7d5feae3087b3f04346469af0ae18c9d
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Dec 8 12:20:36 2015 +0100

    Re-enable yasm on x32

diff --git a/debian/control b/debian/control
index 1e943b8..e281528 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
  libfreetype6-dev,
  libfribidi-dev,
  libharfbuzz-dev,
- yasm [amd64 kfreebsd-amd64]
+ yasm [any-amd64]
 Standards-Version: 3.9.6
 Section: libs
 Homepage: https://github.com/libass/libass
diff --git a/debian/rules b/debian/rules
index 2a50dfa..0b785b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,4 @@ export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
 	dh $@ --parallel --with autoreconf
 
 override_dh_auto_configure:
-ifeq (,$(filter-out x32,$(shell dpkg-architecture -qDEB_HOST_ARCH)))
-	dh_auto_configure -- --disable-asm
-else
 	dh_auto_configure
-endif

-- 
LibASS packaging



More information about the pkg-multimedia-commits mailing list