From 039d1b4bf538c7292c7e6fd48d4d52d4bc7890b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Wed, 1 Mar 2017 10:08:17 +0100 Subject: [PATCH 1/6] Update all submodules --- mediastreamer2 | 2 +- oRTP | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mediastreamer2 b/mediastreamer2 index 73fcad7ca..fdc01612c 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 73fcad7ca4e5b5fd16a836bde98571889ae58d60 +Subproject commit fdc01612c6a928a8cc5563e3eec830fbb76dd04b diff --git a/oRTP b/oRTP index b722bcf8a..ac0921adf 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit b722bcf8a3e6a821dda124b255a0d86303f73225 +Subproject commit ac0921adf06f8c557dff3810aa147a30bd761344 From 2b10a470dbd0cb4a2978f15cd2974124039aeb7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Wed, 1 Mar 2017 11:54:32 +0100 Subject: [PATCH 2/6] Add CPack targets for source package generation --- CMakeLists.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index bd701b78c..1f35a76a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -366,3 +366,18 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/LinphoneConfigVersion.cmake" DESTINATION ${CONFIG_PACKAGE_LOCATION} ) + + +# CPack settings +set(CPACK_PACKAGE_NAME "linphone") +set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) +set(CPACK_SOURCE_GENERATOR "TGZ") +set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") +set(CPACK_SOURCE_IGNORE_FILES + "^${CMAKE_BINARY_DIR}" + "/\\\\..+" + "^${CMAKE_SOURCE_DIR}/mediastreamer2" + "^${CMAKE_SOURCE_DIR}/oRTP" +) + +include(CPack) From 6b110ae40bbbf17801712b4d5221479867a46d7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Thu, 2 Mar 2017 09:10:40 +0100 Subject: [PATCH 3/6] Update ms2 --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index fdc01612c..72579b868 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit fdc01612c6a928a8cc5563e3eec830fbb76dd04b +Subproject commit 72579b8686ab85c409263aa0f3d8cd2572d6e2a3 From 8f0c130c0e56a18e2f7c80f2c18197dfc388d689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Thu, 2 Mar 2017 09:10:58 +0100 Subject: [PATCH 4/6] Fix autotools stripts in order they works on tarball generated by CPack * Automatically switch --external-ortp and --external--mediastreamer to "enabled" when neither mediastreamer nor oRTP subdirectories can be found. * Create an empty liblinphone_gitversion.h when there is no .git repository. --- configure.ac | 4 ++-- coreapi/Makefile.am | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index d7740b1d8..410a1fc31 100644 --- a/configure.ac +++ b/configure.ac @@ -819,7 +819,7 @@ AC_ARG_ENABLE(external-ortp, no) external_ortp=false ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-external-ortp) ;; esac], - [external_ortp=false] + [external_ortp=$(if test -d oRTP; then printf false; else printf true; fi)] ) if test "$external_ortp" = 'true'; then @@ -847,7 +847,7 @@ AC_SUBST([ORTP_DIR]) AC_ARG_ENABLE([external-mediastreamer], [AS_HELP_STRING([--enable-external-mediastreamer],[Use external mediastreamer library])],, - [enable_external_mediastreamer=no] + [enable_external_mediastreamer=$(if test -d mediastreamer2; then printf no; else printf yes; fi)] ) AS_CASE($enable_external_mediastreamer, diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am index 887dd63c8..1ea19e35c 100644 --- a/coreapi/Makefile.am +++ b/coreapi/Makefile.am @@ -202,6 +202,8 @@ make_gitversion_h: cp -f $(builddir)/$(GITVERSION_FILE_TMP) $(builddir)/$(GITVERSION_FILE) ; \ fi ; \ rm -f $(builddir)/$(GITVERSION_FILE_TMP) ; \ + else \ + touch $(GITVERSION_FILE) ; \ fi $(GITVERSION_FILE): make_gitversion_h From f2f86daf1d46d09b1b8da7771c8ce65a3a735408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Thu, 2 Mar 2017 14:52:59 +0100 Subject: [PATCH 5/6] Update ms2 --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index 72579b868..af5f4bd9c 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 72579b8686ab85c409263aa0f3d8cd2572d6e2a3 +Subproject commit af5f4bd9ca4d02a27c7bc230e3306b3618260f82 From e28e14d4bd4a5f1ed118048b8740dae3461108c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Thu, 2 Mar 2017 14:55:12 +0100 Subject: [PATCH 6/6] v3.11.1 --- CMakeLists.txt | 2 +- NEWS | 3 +++ configure.ac | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f35a76a2..271cde7b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ ############################################################################ cmake_minimum_required(VERSION 3.0) -project(linphone VERSION 3.11.0 LANGUAGES C CXX) +project(linphone VERSION 3.11.1 LANGUAGES C CXX) set(LINPHONE_MAJOR_VERSION ${PROJECT_VERSION_MAJOR}) diff --git a/NEWS b/NEWS index 6d66c3692..2ec197b39 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +linphone-3.11.1 -- March 2nd, 2017 + * Bugfix in Autotools scripts + linphone-3.11.0 -- February 24th, 2017 * Security vulnerability fix concering TLS. The common name of certificats delivered by SIP proxies were not compared with their hostname. diff --git a/configure.ac b/configure.ac index 410a1fc31..b80fe16eb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([linphone],[3.11.0],[linphone-developers@nongnu.org]) +AC_INIT([linphone],[3.11.1],[linphone-developers@nongnu.org]) AC_CANONICAL_SYSTEM AC_CONFIG_SRCDIR([coreapi/linphonecore.c])