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

[Reinhard Tartler]

On Mon, Oct 1, 2012 at 10:42 AM,  <fabian-guest at users.alioth.debian.org> wrote:
> The following commit has been merged in the experimental branch:
> commit 41ee05441fd64068f99b72865c457420e738eb76
> 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 )

this part looks OK to me

>  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 438eacf..c5d7916 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -57,7 +57,7 @@ Build-Depends:
>   libxvidcore-dev,
>   libxvmc-dev,
>   texi2html,
> - yasm,
> + yasm [any-amd64 any-i386],

This part makes me wonder. We do have a number of futher archs that do
have a supposely working yasm by now:

yasm | 1.1.0-1         | sid               | source, amd64, armel,
armhf, i386, ia64, kfreebsd-amd64, kfreebsd-i386, mips, mipsel,
powerpc, s390, s390x, sparc

Why do you want to disable yasm on archs such as ia64, the armish
ports, mipsen, s390ish, powerpc and sparc?


-- 
regards,
    Reinhard