aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2020-03-13 22:50:15 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2021-01-29 08:50:24 +0100
commit4faa0e02175a0583d5c3c887df71577be1f8a47d (patch)
treea3c1d4fc6b124088af62dcac26db0e0eb7a40ae7
parent1e3485cad80e0373949a449afe19f4a3101becfc (diff)
downloadbuildroot-4faa0e02175a0583d5c3c887df71577be1f8a47d.tar.gz
buildroot-4faa0e02175a0583d5c3c887df71577be1f8a47d.tar.bz2
package/linphone: bump to version 4.3.1
- Update site to get latest release - License is GPL-3.0+ since version 4.3.0 and https://gitlab.linphone.org/BC/public/liblinphone/commit/2bc924c184e2f00f1be3f82a736bccaeacce106e - Switch to cmake-infrastructure - Remove most of the existing dependencies (alsa, speex, libupnp, ...) as they are now only managed in mediatreamer - Add external dependencies: belr, belle-sip, libxml2, mediastreamer, sqlite - This bump is needed as current linphone does not build with latest libeXosip2 Fixes: - http://autobuild.buildroot.org/results/ed8bdcbfb7d453ed7d436bada35417ee305e6ac9 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> (cherry picked from commit 50842fc0169d22b6656224b3a40222b32b63bb9c) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/linphone/Config.in26
-rw-r--r--package/linphone/linphone.hash4
-rw-r--r--package/linphone/linphone.mk76
3 files changed, 51 insertions, 55 deletions
diff --git a/package/linphone/Config.in b/package/linphone/Config.in
index 06eb059cfd..c7683b829e 100644
--- a/package/linphone/Config.in
+++ b/package/linphone/Config.in
@@ -1,11 +1,17 @@
config BR2_PACKAGE_LINPHONE
bool "linphone"
- depends on BR2_INSTALL_LIBSTDCPP # mediastreamer (bundled)
- depends on BR2_TOOLCHAIN_HAS_THREADS # ortp (bundled)
- depends on BR2_USE_MMU # libeXosip2
- select BR2_PACKAGE_LIBEXOSIP2
- select BR2_PACKAGE_SPEEX
- select BR2_PACKAGE_SPEEXDSP
+ depends on BR2_USE_MMU
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_STATIC_LIBS # belle-sip, mediastreamer
+ depends on BR2_TOOLCHAIN_HAS_THREADS # belr, belle-sip, mediastreamer
+ # belr, belle-sip, mediastreamer
+ depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735
+ depends on BR2_USE_WCHAR # belle-sip
+ select BR2_PACKAGE_BELLE_SIP
+ select BR2_PACKAGE_BELR
+ select BR2_PACKAGE_LIBXML2
+ select BR2_PACKAGE_MEDIASTREAMER
+ select BR2_PACKAGE_SQLITE
help
Linphone is an internet phone or Voice Over IP phone (VoIP).
@@ -24,6 +30,10 @@ config BR2_PACKAGE_LINPHONE
http://www.linphone.org/
-comment "linphone needs a toolchain w/ threads, C++"
+comment "linphone needs a toolchain w/ threads, C++, dynamic library, wchar"
depends on BR2_USE_MMU
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \
+ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
+
+comment "linphone needs a toolchain not affected by GCC bug 64735"
+ depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
diff --git a/package/linphone/linphone.hash b/package/linphone/linphone.hash
index e5b9015ae5..9aa03078d2 100644
--- a/package/linphone/linphone.hash
+++ b/package/linphone/linphone.hash
@@ -1,4 +1,4 @@
# Locally calculated after checking pgp signature
-sha256 05ba81223e9378c3bce8d33080213b9925af49bd9623cd9004eb3dd22ca9d2a0 linphone-3.6.1.tar.gz
+sha256 bfb195845ae23311667d5631c470310a63818fe46029cea2f1b77a5ed84e6e21 linphone-4.3.1.tar.gz
# Locally computed
-sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
+sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt
diff --git a/package/linphone/linphone.mk b/package/linphone/linphone.mk
index 4129c2a9e3..9fd69670e5 100644
--- a/package/linphone/linphone.mk
+++ b/package/linphone/linphone.mk
@@ -4,52 +4,38 @@
#
################################################################################
-LINPHONE_VERSION_MAJOR = 3.6
-LINPHONE_VERSION = $(LINPHONE_VERSION_MAJOR).1
-LINPHONE_SITE = http://download-mirror.savannah.gnu.org/releases/linphone/$(LINPHONE_VERSION_MAJOR).x/sources
+LINPHONE_VERSION = 4.3.1
+LINPHONE_SITE = \
+ https://gitlab.linphone.org/BC/public/liblinphone/-/archive/$(LINPHONE_VERSION)
LINPHONE_CONF_OPTS = \
- --disable-strict --disable-video
-# configure is out of sync causing deplibs linking issues
-LINPHONE_AUTORECONF = YES
+ -DENABLE_ADVANCED_IM=OFF \
+ -DENABLE_CXX_WRAPPER=OFF \
+ -DENABLE_DB_STORAGE=OFF \
+ -DENABLE_LIME=OFF \
+ -DENABLE_LIME_X3DH=OFF \
+ -DENABLE_STRICT=OFF \
+ -DENABLE_TOOLS=OFF \
+ -DENABLE_TUTORIALS=OFF \
+ -DENABLE_UNIT_TESTS=OFF \
+ -DENABLE_VCARD=OFF \
+ -DENABLE_VIDEO=OFF
LINPHONE_INSTALL_STAGING = YES
-LINPHONE_DEPENDENCIES = host-pkgconf libeXosip2 speex
-LINPHONE_LICENSE = GPL-2.0+
-LINPHONE_LICENSE_FILES = COPYING
-
-ifeq ($(BR2_arc),y)
-# toolchain __arc__ define conflicts with libosip2 source
-LINPHONE_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -U__arc__"
-endif
-
-ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_XORG7),yy)
-LINPHONE_CONF_OPTS += --enable-gtk_ui
-LINPHONE_DEPENDENCIES += libgtk2
-else
-LINPHONE_CONF_OPTS += --disable-gtk_ui
-endif
-
-# needed for bundled mediastreamer2
-LINPHONE_DEPENDENCIES += host-intltool host-gettext
-
-ifeq ($(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yy)
-LINPHONE_CONF_OPTS += --enable-alsa
-LINPHONE_DEPENDENCIES += alsa-lib
-else
-LINPHONE_CONF_OPTS += --disable-alsa
-endif
-
-ifeq ($(BR2_PACKAGE_LIBV4L),y)
-LINPHONE_CONF_OPTS += --enable-libv4l1 --enable-libv4l2
-LINPHONE_DEPENDENCIES += libv4l
-else
-LINPHONE_CONF_OPTS += --disable-libv4l1 --disable-libv4l2
-endif
-
-ifeq ($(BR2_PACKAGE_LIBUPNP),y)
-LINPHONE_DEPENDENCIES += libupnp
-LINPHONE_CONF_OPTS += --enable-upnp
-else
-LINPHONE_CONF_OPTS += --disable-upnp
+LINPHONE_DEPENDENCIES = \
+ belle-sip \
+ belr \
+ libxml2 \
+ mediastreamer \
+ sqlite \
+ $(if $(BR2_PACKAGE_ZLIB),zlib)
+LINPHONE_LICENSE = GPL-3.0+
+LINPHONE_LICENSE_FILES = LICENSE.txt
+
+ifeq ($(BR2_STATIC_LIBS),y)
+LINPHONE_CONF_OPTS += -DENABLE_STATIC=ON -DENABLE_SHARED=OFF
+else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
+LINPHONE_CONF_OPTS += -DENABLE_STATIC=ON -DENABLE_SHARED=ON
+else ifeq ($(BR2_SHARED_LIBS),y)
+LINPHONE_CONF_OPTS += -DENABLE_STATIC=OFF -DENABLE_SHARED=ON
endif
-$(eval $(autotools-package))
+$(eval $(cmake-package))