From 5d9fc76dad9e093f98bcafc55d4388dd1c8073cc Mon Sep 17 00:00:00 2001
From: Alexandre Lision <alexandre.lision@gmail.com>
Date: Tue, 21 Oct 2014 14:36:27 -0400
Subject: [PATCH] build: bump tested hash
Fix issue introduced by 17442b78a39fa24407e363a8c4b0025d3eed2c60
---
compile.sh | 2 +-
configure.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/compile.sh b/compile.sh
index 4cd844e07..219d67576 100755
--- a/compile.sh
+++ b/compile.sh
@@ -112,7 +112,7 @@ ANDROID_PATH="`pwd`"
if [ ! -z "$FETCH" ]
then
# 1/ libsflphone
- TESTED_HASH=d3453ea4cd06c59503dd81d95f99ebf4be4ea14e
+ TESTED_HASH=e1d64e3447dbb936dc8e664f80c1f8e3adb3b189
if [ ! -d "sflphone" ]; then
echo "sflphone daemon source not found, cloning"
git clone https://gerrit-sflphone.savoirfairelinux.com/sflphone
diff --git a/configure.sh b/configure.sh
index 41884f2de..ecaf200ae 100755
--- a/configure.sh
+++ b/configure.sh
@@ -39,7 +39,7 @@ ANDROID_BIN=`echo $ANDROID_NDK/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/\`unam
CROSS_COMPILE=${ANDROID_BIN}/${TARGET_TUPLE}-
# FIXME: this a temporary kludge to fix linking on Debian/Ubuntu, these are
# libaries we don't use directly and so shouldn't be adding them here
-SFLPHONE_BROKEN_LIBS=" -L$SFLPHONE_SOURCEDIR/contrib/$TARGET_TUPLE/lib -lgcrypt -lFLAC -lvorbisenc -lgpg-error -lvorbis -logg"
+SFLPHONE_BROKEN_LIBS=" -L$SFLPHONE_SOURCEDIR/contrib/$TARGET_TUPLE/lib -lgcrypt -lFLAC -lvorbisenc -lgpg-error -lvorbis -logg -lspeex -lspeexdsp"
CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS ${SFLPHONE_EXTRA_CFLAGS}" \
@@ -54,5 +54,5 @@ RANLIB="${CROSS_COMPILE}ranlib" \
AR="${CROSS_COMPILE}ar" \
PKG_CONFIG_LIBDIR=$SFLPHONE_SOURCEDIR/contrib/$TARGET_TUPLE/lib/pkgconfig \
sh $SFLPHONE_SOURCEDIR/configure --host=$TARGET_TUPLE $EXTRA_PARAMS \
- --disable-video --with-opensl --without-zrtp --without-dbus --without-alsa --without-pulse --without-tls \
+ --disable-video --with-opensl --without-zrtp --without-dbus --without-alsa --without-pulse --without-tls --without-dht \
$*
--
GitLab