Merge branch 'master' into 'master'
Update Linphone build file I removed dependency to GCM (google cloud messaging). I reenabled various codecs because I do not see any reason to disable them a priori. Can you confirm? See merge request !380
This commit is contained in:
commit
8421f448df
|
@ -2,14 +2,14 @@ AntiFeatures:NonFreeDep
|
||||||
Categories:Phone & SMS
|
Categories:Phone & SMS
|
||||||
License:GPLv3
|
License:GPLv3
|
||||||
Web Site:http://www.linphone.org
|
Web Site:http://www.linphone.org
|
||||||
Source Code:http://www.linphone.org/eng/download/git.html
|
Source Code:http://www.linphone.org/technical-corner/linphone/downloads
|
||||||
Issue Tracker:
|
Issue Tracker:
|
||||||
|
|
||||||
Auto Name:Linphone
|
Auto Name:Linphone
|
||||||
Summary:SIP (VOIP) phone
|
Summary:SIP (VOIP) phone
|
||||||
Description:
|
Description:
|
||||||
* Audio: speex; iLBC; G711; GSM; G722. No Silk and AMR-WB depends on device in this build
|
* Audio: speex; Opus; iLBC; G711; GSM; G722; Silk; PCMA; PCMU; AMR-WB; AAC-ELD
|
||||||
* Video with VP8, mpeg4, x264 (ARMv7 only). No h264 in this build
|
* Video with VP8, mpeg4, x264; H263
|
||||||
* Audio multicall and conferencing
|
* Audio multicall and conferencing
|
||||||
* SRTP/ZRTP media encryption
|
* SRTP/ZRTP media encryption
|
||||||
* Echo cancellation
|
* Echo cancellation
|
||||||
|
@ -17,10 +17,7 @@ Description:
|
||||||
* Call history
|
* Call history
|
||||||
* Multiple accounts support
|
* Multiple accounts support
|
||||||
* Native x86
|
* Native x86
|
||||||
|
* Text messaging
|
||||||
Anti-Feature: Non-Free dependency. Linphone uses Google Cloud Messaging, which
|
|
||||||
is a free software library but only works if the user has a Google account on
|
|
||||||
their phone.
|
|
||||||
.
|
.
|
||||||
|
|
||||||
Repo Type:git
|
Repo Type:git
|
||||||
|
@ -39,6 +36,7 @@ Build:2.0.3-fdroid,2003
|
||||||
|
|
||||||
# note the custom_rules ; didn't use a tag because of zrtp security fix
|
# note the custom_rules ; didn't use a tag because of zrtp security fix
|
||||||
Build:2.1.2-fdroid,2120
|
Build:2.1.2-fdroid,2120
|
||||||
|
disable=do not build anymore due to change in x264 history
|
||||||
commit=846a2a3a58
|
commit=846a2a3a58
|
||||||
submodules=yes
|
submodules=yes
|
||||||
patch=makefile.patch
|
patch=makefile.patch
|
||||||
|
@ -73,8 +71,35 @@ Build:2.2.1.1,2211
|
||||||
build=make generate-libs BUILD_SILK=0 BUILD_AMRNB=light BUILD_GPLV3_ZRTP=1 BUILD_G729=0 BUILD_TUNNEL=0
|
build=make generate-libs BUILD_SILK=0 BUILD_AMRNB=light BUILD_GPLV3_ZRTP=1 BUILD_G729=0 BUILD_TUNNEL=0
|
||||||
buildjni=no
|
buildjni=no
|
||||||
|
|
||||||
|
Build:2.3.2-fdroid,2302
|
||||||
|
commit=2fc5048
|
||||||
|
submodules=yes
|
||||||
|
prebuild= find submodules/externals/antlr3/runtime/ -mindepth 1 -maxdepth 1 -not -name "C" -exec rm -r {} \; && \
|
||||||
|
rm -rf gradle liblinphone_tester tests && \
|
||||||
|
rm -rf submodules/externals/antlr3/antlr-3.4-complete.jar && \
|
||||||
|
rm -rf submodules/externals/antlr3/antlr-ant && \
|
||||||
|
rm -rf submodules/externals/libupnp/ixml/doc && \
|
||||||
|
rm -rf submodules/externals/libupnp/upnp/doc && \
|
||||||
|
rm -rf submodules/externals/libxml2/result && \
|
||||||
|
rm -rf submodules/externals/libxml2/test && \
|
||||||
|
rm -rf submodules/externals/libxml2/win32 && \
|
||||||
|
rm -rf submodules/externals/openh264/res && \
|
||||||
|
rm -rf submodules/externals/polarssl/programs && \
|
||||||
|
rm -rf submodules/externals/polarssl/tests && \
|
||||||
|
rm -rf submodules/externals/webrtc/modules/video_capture/main/source/android/java/org/webrtc/videoengine/* && \
|
||||||
|
rm -rf submodules/externals/webrtc/voice_engine/test && \
|
||||||
|
rm -rf submodules/linphone/pixmaps && \
|
||||||
|
rm -rf submodules/linphone/share && \
|
||||||
|
rm -rf submodules/linphone/tester && \
|
||||||
|
rm -rf submodules/mssilk/ios_bin && \
|
||||||
|
rm libs/gcm.jar src/org/linphone/gcm/GCMService.java src/org/linphone/gcm/GCMReceiver.java && \
|
||||||
|
sed -i -e 's/<application/<application android:debuggable="false"/' AndroidManifest.xml && \
|
||||||
|
sed -i -e 's/android:versionCode/android:versionName="2.3.2-fdroid" android:versionCode/' AndroidManifest.xml
|
||||||
|
target=android-19
|
||||||
|
build=make generate-libs BUILD_GPLV3_ZRTP=1
|
||||||
|
buildjni=no
|
||||||
|
|
||||||
Auto Update Mode:None
|
Auto Update Mode:None
|
||||||
Update Check Mode:Tags
|
Update Check Mode:Tags
|
||||||
Current Version:Unknown
|
Current Version:2.3.2-fdroid
|
||||||
Current Version Code:2302
|
Current Version Code:2302
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue