From adc3d5334950d8e2d4dfbfa299f84ac64bd75542 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 3 Dec 2014 20:27:12 +0100 Subject: [PATCH 1/2] Upgrade Linphone metadata and use up-to-date git revision --- metadata/org.linphone.txt | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/metadata/org.linphone.txt b/metadata/org.linphone.txt index 34cb89c2e4..d2916de78f 100644 --- a/metadata/org.linphone.txt +++ b/metadata/org.linphone.txt @@ -2,14 +2,14 @@ AntiFeatures:NonFreeDep Categories:Phone & SMS License:GPLv3 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: Auto Name:Linphone Summary:SIP (VOIP) phone Description: -* Audio: speex; iLBC; G711; GSM; G722. No Silk and AMR-WB depends on device in this build -* Video with VP8, mpeg4, x264 (ARMv7 only). No h264 in this build +* Audio: speex; Opus; iLBC; G711; GSM; G722; Silk; PCMA; PCMU; AMR-WB; AAC-ELD +* Video with VP8, mpeg4, x264; H263 * Audio multicall and conferencing * SRTP/ZRTP media encryption * Echo cancellation @@ -17,10 +17,7 @@ Description: * Call history * Multiple accounts support * Native x86 - -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. +* Text messaging . 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 Build:2.1.2-fdroid,2120 + disable=do not build anymore due to change in x264 history commit=846a2a3a58 submodules=yes patch=makefile.patch @@ -73,8 +71,18 @@ 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 buildjni=no +Build:2.3.2-fdroid,2302 + commit=ceb74e2 + submodules=yes + prebuild=rm -rf submodules/mssilk/ios_bin tests submodules/externals/webrtc/modules/video_capture/main/source/android/java/org/webrtc/videoengine/* && \ + rm libs/gcm.jar src/org/linphone/gcm/GCMService.java src/org/linphone/gcm/GCMReceiver.java && \ + sed -i -e 's/ Date: Mon, 15 Dec 2014 19:49:34 +0100 Subject: [PATCH 2/2] Remove binaries embedded within Linphone repository --- metadata/org.linphone.txt | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/metadata/org.linphone.txt b/metadata/org.linphone.txt index d2916de78f..afb89a0d32 100644 --- a/metadata/org.linphone.txt +++ b/metadata/org.linphone.txt @@ -72,9 +72,26 @@ Build:2.2.1.1,2211 buildjni=no Build:2.3.2-fdroid,2302 - commit=ceb74e2 + commit=2fc5048 submodules=yes - prebuild=rm -rf submodules/mssilk/ios_bin tests submodules/externals/webrtc/modules/video_capture/main/source/android/java/org/webrtc/videoengine/* && \ + 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/