network/linphone: Updated for version 3.12.0.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

5 files changed, 40 insertions, 25 deletions

diff --git a/network/linphone/README b/network/linphone/README
index 1b1bc8442cf3..04cd544df2c4 100644
--- a/network/linphone/README
+++ b/network/linphone/README
@@ -16,3 +16,5 @@ the script.
 
 Truespeech is disabled by default, but can be enabled.
 To enable support for Truespeech just pass TRUESPEECH=yes to the script.
+
+For h264 codec support, install either msx264 or openh264 SlackBuild.
diff --git a/network/linphone/doinst.sh b/network/linphone/doinst.sh
index 5fb28930db0b..65c7e2eeb9aa 100644
--- a/network/linphone/doinst.sh
+++ b/network/linphone/doinst.sh
@@ -1,3 +1,9 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/network/linphone/linphone.SlackBuild b/network/linphone/linphone.SlackBuild
index de65b8bf6d3d..07eab0096ecd 100644
--- a/network/linphone/linphone.SlackBuild
+++ b/network/linphone/linphone.SlackBuild
@@ -25,23 +25,25 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=linphone
-VERSION=${VERSION:-3.9.1}
+VERSION=${VERSION:-3.12.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 MOD1NAME=ortp
-MOD1VERSION=0.25.0
+MOD1VERSION=1.0.2
+MOD1SRCDIRNAME=${MOD1NAME}-${MOD1VERSION}-0
 MOD1DIRNAME=oRTP
 
 MOD2NAME=mediastreamer
-MOD2VERSION=2.12.1
+MOD2VERSION=2.16.1
+MOD2SRCDIRNAME=${MOD2NAME}-${MOD2VERSION}
 MOD2DIRNAME=mediastreamer2
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
-      *) ARCH=$( uname -m ) ;;
+       *) ARCH=$( uname -m ) ;;
   esac
 fi
 
@@ -50,8 +52,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -65,7 +67,7 @@ else
 fi
 
 DOCS="ABOUT-NLS AUTHORS BUGS COPYING ChangeLog \
-  INSTALL NEWS README TODO $CWD/$PRGNAM.SlackBuild"
+  NEWS README.md TODO $CWD/$PRGNAM.SlackBuild"
 
 # enable support for video by default, requires ffmpeg
 if [ "${VIDEO:-yes}" = "yes" ]; then
@@ -97,9 +99,14 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 tar xvf $CWD/$MOD1NAME-$MOD1VERSION.tar.gz
-mv $MOD1NAME-$MOD1VERSION $MOD1DIRNAME
+mv $MOD1SRCDIRNAME $MOD1DIRNAME
 tar xvf $CWD/$MOD2NAME-$MOD2VERSION.tar.gz
-mv $MOD2NAME-$MOD2VERSION $MOD2DIRNAME
+mv $MOD2SRCDIRNAME $MOD2DIRNAME
+
+# Some patching for silly build issues
+sed -i 's|ms_message("Mediastreamer2 factory " MEDIASTREAMER_VERSION " (git: " MS2_GIT_VERSION ") initialized.");|ms_message("Mediastreamer2 factory " MEDIASTREAMER_VERSION "  initialized.");|' $MOD2DIRNAME/src/base/msfactory.c
+touch coreapi/gitversion.h
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -107,9 +114,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-export LIBZRTPCPP_LIBS="$(pkg-config --libs libzrtpcpp) "
-export LIBZRTPCPP_CFLAGS="$(pkg-config --cflags libzrtpcpp) "
-
+./autogen.sh
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -123,6 +128,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-tutorials \
   --enable-ipv6 \
   --enable-alsa \
+  --enable-pulseaudio \
   --enable-ldap \
   --enable-zrtp \
   --with-included-gettext \
@@ -144,6 +150,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS  $PKG/usr/doc/$PRGNAM-$VERSION
 chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
 chmod 0644 $PKG/usr/doc/$PRGNAM-$VERSION/*
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/linphone/linphone.info b/network/linphone/linphone.info
index 77b64a99d99f..6fabd351e69f 100644
--- a/network/linphone/linphone.info
+++ b/network/linphone/linphone.info
@@ -1,14 +1,14 @@
 PRGNAM="linphone"
-VERSION="3.9.1"
-HOMEPAGE="http://www.linphone.org/"
-DOWNLOAD="http://download-mirror.savannah.gnu.org/releases/linphone/3.9.x/sources/linphone-3.9.1.tar.gz \
-	  http://download-mirror.savannah.gnu.org/releases/linphone/ortp/sources/ortp-0.25.0.tar.gz \
-	  http://download-mirror.savannah.gnu.org/releases/linphone/mediastreamer/mediastreamer-2.12.1.tar.gz"
-MD5SUM="c1c3a63b7ee963360e0e89cf5e5ff406 \
-	f44b4ab2a8de32c19abfa584c4426f76 \
-	1ca115e94a718638fbecf8352c169861"
+VERSION="3.12.0"
+HOMEPAGE="https://www.linphone.org/"
+DOWNLOAD="https://www.linphone.org/releases/sources/linphone/linphone-3.12.0.tar.gz \
+          https://www.linphone.org/releases/sources/ortp/ortp-1.0.2.tar.gz \
+          https://www.linphone.org/releases/sources/mediastreamer/mediastreamer-2.16.1.tar.gz"
+MD5SUM="8292dbaa0a5d0a448dcbbee125e947e4 \
+        82629e99befa578341e0bdc225924135 \
+        15b8b129a922180855d04d58cdd08d43"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="speex ffmpeg belle-sip linphone-srtp bzrtp libupnp"
+REQUIRES="bctoolbox belle-sip bzrtp ffmpeg libsrtp libupnp mbedtls speex"
 MAINTAINER="Euan Thoms"
 EMAIL="euan at potensol dot com"
diff --git a/network/linphone/slack-desc b/network/linphone/slack-desc
index e087e2508199..71a34e142e8d 100644
--- a/network/linphone/slack-desc
+++ b/network/linphone/slack-desc
@@ -11,9 +11,9 @@ linphone:
 linphone: Linphone is an audio and video Internet phone with GTK+ and
 linphone: console interfaces. It uses the SIP protocol, and is compatible
 linphone: with most SIP clients and gateways. It uses various audio and
-linphone: video codecs such as Speex, GSM, G711, ilbc, Theora, H263-1998,
-linphone: MPEG4, and snow.
+linphone: video codecs such as Opus, Speex, GSM, G711, ilbc, Theora, H263-1998,
+linphone: MPEG4, VP8, H264 and snow.
 linphone:
-linphone: Homepage: http://www.linphone.org
+linphone: Homepage: https://www.linphone.org
 linphone:
 linphone: