mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 14:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'public/master' into dev_linphone_qt

Browse source
This commit is contained in:
Ronan Abhamon 2017-01-16 15:39:44 +01:00
commit 58c1a1f5ff
9 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitmodules vendored
View file

@ -89,3 +89,9 @@
[submodule "submodules/bcunit"]
path = submodules/bcunit
url = git://git.linphone.org/bcunit.git
[submodule "submodules/belle-msrp"]
path = submodules/belle-msrp
url = git://git.linphone.org/belle-msrp.git
[submodule "submodules/externals/libjpeg-turbo"]
path = submodules/externals/libjpeg-turbo
url = git://git.linphone.org/libjpeg-turbo.git

1
prepare.py
View file

@ -132,7 +132,6 @@ class DesktopPreparator(prepare.Preparator):
self.additional_args += ["-DENABLE_MPEG4=YES"]
self.additional_args += ["-DENABLE_OPENH264=YES"]
self.additional_args += ["-DENABLE_VPX=YES"]
self.additional_args += ["-DENABLE_X264=NO"]
def check_environment(self):
ret = prepare.Preparator.check_environment(self)

2
submodules/bctoolbox

@ -1 +1 @@
Subproject commit d0c166650a4a39aaae1d5bc17b5ae64639982930
Subproject commit 7254fe94e7155f0164fca177f8bf54ab82b76e84

2
submodules/belcard

@ -1 +1 @@
Subproject commit eaeab2d665423e1fdbf2f59c2ae8da6c3c89c8fa
Subproject commit f5a8603f8e379486d3a4bfa4d74861b0a2d880dd

1
submodules/belle-msrp Submodule

@ -0,0 +1 @@
Subproject commit 7a62a5a2ba79544984df772573744bafa7c8d6e7

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit ac49ba799fd9231f1cd7014fe9c061107a832534
Subproject commit b8bc7f2a5a899e8acfa59c7b49ebabcbab7d0efd

2
submodules/cmake-builder

@ -1 +1 @@
Subproject commit a0680560f471c2c1dd488f271a501e7e1617ec89
Subproject commit c767e7c434f8ab21bae86de1e828b3ed492af138

1
submodules/externals/libjpeg-turbo vendored Submodule

@ -0,0 +1 @@
Subproject commit 0e99446a237bef6704d45f74d504ae8aafa45f9a

2
submodules/linphone

@ -1 +1 @@
Subproject commit 6c4053d101a99ac574346ca7c5e35e2491d727dd
Subproject commit 09627fe9562b9e0420e7d27e06bb4619d3ad7f4e