From df07f1136142023f6bd3ab96ac069e1585ff6167 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 11 Jul 2017 09:39:25 +0200 Subject: [PATCH] Remove old submodules/oRTP if found + updated linphone --- prepare.py | 2 ++ submodules/linphone | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/prepare.py b/prepare.py index e2a2cf37a..e60d272a3 100755 --- a/prepare.py +++ b/prepare.py @@ -154,6 +154,8 @@ class DesktopPreparator(prepare.Preparator): ret |= not self.check_python_module_is_present('six') if "python" in self.args.target or "python-raspberry" in self.args.target: ret |= not self.check_python_module_is_present('wheel') + if os.path.isdir('submodules/oRTP'): + os.rmdir('submodules/oRTP') return ret def show_missing_dependencies(self): diff --git a/submodules/linphone b/submodules/linphone index 17e4a1ff6..82c68c8e1 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 17e4a1ff6c1e6798af2b488a89303b0ee2104130 +Subproject commit 82c68c8e1710816fa339352a3beba1482a7940b2