From 1d5b898a83a1de4be4f3685268583671aa6df765 Mon Sep 17 00:00:00 2001 From: William King Date: Wed, 24 Feb 2016 16:13:29 -0800 Subject: [PATCH] FS-8867 Adding changes to the debian package building --- debian/bootstrap.sh | 6 +++--- debian/util.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh index f9c599acdf..5ee809f693 100755 --- a/debian/bootstrap.sh +++ b/debian/bootstrap.sh @@ -336,7 +336,7 @@ Build-Depends: libedit-dev (>= 2.11), libsqlite3-dev, wget, pkg-config, - libyuv-dev, libvpx-dev (>= 1.4.0) | libvpx2-dev, + libyuv-dev, yasm, # core codecs libogg-dev, libspeex-dev, libspeexdsp-dev, # configure options @@ -370,7 +370,7 @@ Conflicts: $(list_freeswitch_all_replaces) Depends: \${shlibs:Depends}, \${perl:Depends}, \${misc:Depends}, freeswitch-music-default (>= 1.0.8), freeswitch-sounds-en-us-callie (>= 1.0.25) | freeswitch-sounds, - libyuv, libvpx (>= 1.4.0) | libvpx2, + libyuv, yasm, $(debian_wrap "${mod_depends}") Recommends: $(debian_wrap "${mod_recommends}") @@ -395,7 +395,7 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch Package: libfreeswitch1 Architecture: any Depends: \${shlibs:Depends}, \${misc:Depends}, - libyuv, libvpx (>= 1.4.0) | libvpx2 + libyuv, yasm Recommends: Suggests: libfreeswitch1-dbg Description: Cross-Platform Scalable Multi-Protocol Soft Switch diff --git a/debian/util.sh b/debian/util.sh index 1f713462b9..3c481a3aa3 100755 --- a/debian/util.sh +++ b/debian/util.sh @@ -445,7 +445,7 @@ build_all () { [ -n "$distros" ] || distros="$(default_distros)" ! $depinst || aptitude install -y \ rsync git less cowbuilder ccache \ - devscripts equivs build-essential + devscripts equivs build-essential yasm [ -n "$orig" ] || orig="$(create_orig $orig_opts HEAD | tail -n1)" if [ -n "$modlist" ]; then local modtmp="$(mktemp /tmp/modules-XXXXXXXXXX.conf)"