mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 19:38:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove FFMPEG from dependencies as it is no mmore needed.

Browse source 
Fix LDAP authtentication method to use default.
This commit is contained in:
Julien Wadel 2023-02-06 17:04:13 +01:00
parent 7f25efc482
commit f2ec5fda4e
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Crash when editing contacts from chat.
- Contacts synchronization on creation.
- Contact menu in secure chats.
- Remove FFMPEG from dependencies as it is no mmore needed.
## 5.0.9 - 2023-01-31

8
CMakeLists.txt
View file

@ -101,7 +101,7 @@ option(ENABLE_BUILD_APP_PLUGINS "Enable the build of plugins" YES)
option(ENABLE_BUILD_EXAMPLES "Enable the build of examples" NO)
option(ENABLE_BUILD_VERBOSE "Enable the build generation to be more verbose" NO)
option(ENABLE_DAEMON "Enable the linphone daemon interface." NO)
option(ENABLE_FFMPEG "Build mediastreamer2 with ffmpeg video support." ON)
option(ENABLE_FFMPEG "Build mediastreamer2 with ffmpeg video support." NO)# No more needed
option(ENABLE_QT_KEYCHAIN "Build QtKeychain to manage VFS from System key stores." ON)
option(ENABLE_QRCODE "Enable QRCode support" NO)#Experimental
option(ENABLE_SANITIZER "Enable sanitizer." NO)
@ -149,7 +149,11 @@ list(APPEND APP_OPTIONS "-DENABLE_BUILD_VERBOSE=${ENABLE_BUILD_VERBOSE}")
list(APPEND APP_OPTIONS "-DENABLE_CONSOLE_UI=${ENABLE_CONSOLE_UI}")
list(APPEND APP_OPTIONS "-DENABLE_DAEMON=${ENABLE_DAEMON}")
list(APPEND APP_OPTIONS "-DENABLE_FFMPEG=${ENABLE_FFMPEG}")
list(APPEND APP_OPTIONS "-DENABLE_FLEXIAPI=${ENABLE_QRCODE}")
if(ENABLE_UNIT_TESTS)
list(APPEND APP_OPTIONS "-DENABLE_FLEXIAPI=ON")
else()
list(APPEND APP_OPTIONS "-DENABLE_FLEXIAPI=${ENABLE_QRCODE}")
endif()
list(APPEND APP_OPTIONS "-DENABLE_LDAP=${ENABLE_LDAP}")
list(APPEND APP_OPTIONS "-DENABLE_NON_FREE_CODECS=${ENABLE_NON_FREE_CODECS}")
list(APPEND APP_OPTIONS "-DENABLE_OPENH264=${ENABLE_OPENH264}")

2
README.md
View file

@ -236,7 +236,7 @@ Also, more configurations are available in the docker-files folder of linphone-s
| ENABLE_VIDEO | Enable Video support. | YES |
| ENABLE_OPENH264 | Enable the use of OpenH264 codec | YES |
| ENABLE_NON_FREE_CODECS | Enable the use of non free codecs | YES |
| ENABLE_FFMPEG | Build mediastreamer2 with ffmpeg video support. | ON |
| ENABLE_FFMPEG | Build mediastreamer2 with ffmpeg video support. | NO |
| ENABLE_CONSOLE_UI | Turn on or off compilation of console interface. | NO |
-->

2
linphone-app/src/components/ldap/LdapModel.cpp
View file

@ -114,8 +114,6 @@ void LdapModel::set(){
mLdapParams->setSipDomain(mSipDomain.toStdString());
mLdapParams->setDebugLevel( (linphone::LdapDebugLevel) mDebug);
mLdapParams->setServerCertificatesVerificationMode((linphone::LdapCertVerificationMode)mVerifyServerCertificates);
static int gCount = 0;
mLdapParams->setAuthMethod((++gCount % 2) == 0 ? linphone::LdapAuthMethod::Anonymous : linphone::LdapAuthMethod::Simple);
}
void LdapModel::unset(){