Linphone - per version antifeatures & remove disabled

metadata/org.linphone.yml

@@ -1,5 +1,3 @@
-AntiFeatures:
-  - NonFreeAdd
 Categories:
   - Phone & SMS
 License: GPL-2.0-or-later
@@ -31,66 +29,6 @@ RepoType: git
 Repo: git://git.linphone.org/linphone-android.git
 
 Builds:
-  - versionName: 2.0.3-fdroid
-    versionCode: 2003
-    disable: contains non-free codecs at 2.0.3-1
-    commit: 2.0.3-1
-    submodules: true
-    prebuild:
-      - rm -rf tests submodules/externals/webrtc/modules/video_capture/main/source/android/java/org/webrtc/videoengine/*
-      - echo "version.name=2.0.3-fdroid" > default.properties
-      - sed -i 's@\(NDK_PATH=\).*@\1$$NDK$$@' Makefile
-      - sed -i 's/markets\">true/markets\">=false/g' res/values/non_localizable_custom.xml
-    build: make BUILD_SILK=0 BUILD_X264=1 BUILD_GPLV3_ZRTP=1 BUILD_FOR_X86=1 prepare-sources
-
-  - versionName: 2.1.2-fdroid
-    versionCode: 2120
-    disable: do not build anymore due to change in x264 history
-    commit: 846a2a3a58
-    submodules: true
-    patch:
-      - makefile.patch
-    prebuild:
-      - sed -i '1 i NDK_PATH=$$NDK$$\nSDK_PATH=$$SDK$$/tools\nSDK_PLATFORM_TOOLS_PATH=$$SDK$$/platform-tools\n'
-        Makefile
-      - echo 'version.name=2.1.2-fdroid' > default.properties
-      - rm -rf tests submodules/externals/webrtc/modules/video_capture/main/source/android/java/org/webrtc/videoengine/*
-      - sed -i 's/markets">true/markets">=false/g' res/values/non_localizable_custom.xml
-    androidupdate:
-      - no
-    build: make
-
-  - versionName: 2.2.0.2-fdroid
-    versionCode: 2202
-    disable: wip - just needs new makefile patch at 1c3e19eb983
-    commit: 1c3e19eb983
-    submodules: true
-    patch:
-      - makefile.patch
-    prebuild:
-      - sed -i '1 i NDK_PATH=$$NDK$$\nSDK_PATH=$$SDK$$/tools\nSDK_PLATFORM_TOOLS_PATH=$$SDK$$/platform-tools\n'
-        Makefile
-      - echo 'version.name=2.2.0.2-fdroid' > default.properties
-      - rm -rf tests submodules/externals/webrtc/modules/video_capture/main/source/android/java/org/webrtc/videoengine/*
-      - sed -i 's/markets">true/markets">=false/g' res/values/non_localizable_custom.xml
-    androidupdate:
-      - no
-    build: make
-
-  - versionName: 2.2.1.1
-    versionCode: 2211
-    disable: "doesn't build because NDK r9b/r9c are broken - error: undefined reference\
-        \ to 'log2f'"
-    commit: 2.2.1.1
-    submodules: true
-    prebuild:
-      - rm -rf submodules/mssilk/ios_bin tests submodules/externals/webrtc/modules/video_capture/main/source/android/java/org/webrtc/videoengine/*
-      - sed -i -e 's/android:versionCode/android:versionName="2.2.1.1" android:versionCode/'
-        AndroidManifest.xml
-    target: android-17
-    build: make generate-libs BUILD_SILK=0 BUILD_AMRNB=light BUILD_GPLV3_ZRTP=1 BUILD_G729=0
-        BUILD_TUNNEL=0
-
   - versionName: 2.3.2-fdroid
     versionCode: 2302
     commit: 0f4de68
@@ -121,6 +59,8 @@ Builds:
         AndroidManifest.xml
     target: android-19
     build: make generate-libs BUILD_GPLV3_ZRTP=1
+    antifeatures:
+      - nonfreedep
 
   - versionName: 2.4.0-fdroid
     versionCode: 2400
@@ -154,6 +94,8 @@ Builds:
     scanignore:
       - submodules/mswebrtc/webrtc/modules/video_capture/main/source/android/java/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
     build: make generate-libs BUILD_GPLV3_ZRTP=1
+    antifeatures:
+      - nonfreedep
 
   - versionName: 2.4.1-fdroid
     versionCode: 2411
@@ -187,6 +129,8 @@ Builds:
     scanignore:
       - submodules/mswebrtc/webrtc/modules/video_capture/main/source/android/java/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
     build: make generate-libs BUILD_GPLV3_ZRTP=1
+    antifeatures:
+      - nonfreedep
 
   - versionName: 2.5.0-fdroid
     versionCode: 2500
@@ -220,6 +164,8 @@ Builds:
     scanignore:
       - submodules/mswebrtc/webrtc/modules/video_capture/main/source/android/java/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
     build: make generate-libs BUILD_GPLV3_ZRTP=1
+    antifeatures:
+      - nonfreedep
 
   - versionName: 2.5.1-fdroid
     versionCode: 2510
@@ -253,6 +199,8 @@ Builds:
     scanignore:
       - submodules/mswebrtc/webrtc/modules/video_capture/main/source/android/java/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
     build: make generate-libs BUILD_GPLV3_ZRTP=1
+    antifeatures:
+      - nonfreedep
 
   - versionName: 3.1.0-fdroid
     versionCode: 3100
@@ -290,46 +238,8 @@ Builds:
       - submodules/externals/openh264/autotest/performanceTest/ios/*
       - submodules/externals/mbedtls/tests/
     build: make generate-libs BUILD_GPLV3_ZRTP=1
-
-  - versionName: 3.2.4-fdroid
-    versionCode: 3241
-    disable: WIP, figure out how to antlr3/antlr-3.4-complete.jar
-    commit: 3.2.4
-    submodules: true
-    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 -rf submodules/externals/codec2/win32
-      - rm -rf submodules/externals/ffmpeg/tests
-      - 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:versionName=".*"/android:versionName="$$VERSION$$"/'
-        AndroidManifest.xml
-    target: android-22
-    scanignore:
-      - submodules/mswebrtc/webrtc/data/rtp_rtcp/*.bin
-    scandelete:
-      - submodules/mswebrtc/webrtc/data/voice_engine/stereo_rtp_files/rtpplay.exe
-      - submodules/externals/openh264/autotest/performanceTest/ios/*
-      - submodules/externals/mbedtls/tests/
-    build: ./prepare.py; make BUILD_GPLV3_ZRTP=1
+    antifeatures:
+      - nonfreedep
 
   - versionName: 3.3.0
     versionCode: 3303
@@ -357,6 +267,8 @@ Builds:
       - make copy-libs
       - make `pwd`/res/raw/rootca.pem
     ndk: r15c
+    antifeatures:
+      - nonfreedep
 
   - versionName: 3.3.1
     versionCode: 3311
@@ -386,6 +298,8 @@ Builds:
       - make copy-libs
       - make `pwd`/res/raw/rootca.pem
     ndk: r15c
+    antifeatures:
+      - nonfreedep
 
   - versionName: 3.3.2
     versionCode: 3320
@@ -415,6 +329,8 @@ Builds:
       - make copy-libs
       - make `pwd`/res/raw/rootca.pem
     ndk: r15c
+    antifeatures:
+      - nonfreedep
 
   - versionName: 4.0.1
     versionCode: 4002
@@ -448,6 +364,8 @@ Builds:
       - make -j`nproc` build
       - make copy-libs
     ndk: r16b
+    antifeatures:
+      - nonfreedep
 
   - versionName: '4.1'
     versionCode: 4124
@@ -485,6 +403,8 @@ Builds:
       - cp $$linphone-sdk$$/build-sdk/linphone-sdk/bin/outputs/aar/linphone-sdk-android-release.aar
         linphone-sdk-android/
     ndk: r16b
+    antifeatures:
+      - nonfreedep
 
   - versionName: 4.1.1
     versionCode: 4125
@@ -522,46 +442,8 @@ Builds:
       - cp $$linphone-sdk$$/build-sdk/linphone-sdk/bin/outputs/aar/linphone-sdk-android-release.aar
         linphone-sdk-android/
     ndk: r16b
-
-  - versionName: 4.2.0-beta
-    versionCode: 4200
-    disable: stable was released
-    commit: 4.2.0-beta
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y --no-install-recommends cmake -t stretch-backports
-      - apt-get install -y doxygen pkgconf python-pystache python-six yasm
-    gradle:
-      - yes
-    output: app/build/outputs/apk/release/linphone-android-release-*.apk
-    srclibs:
-      - linphone-sdk@4.3.0-beta
-    rm:
-      - app/src/main/java/org/linphone/firebase/Firebase*.java
-      - app/google-services.json
-      - sample
-    prebuild:
-      - sed -i -e '/google-services/d' build.gradle
-      - sed -i -e '/keystore/d' -e '/repositories/,+5d' -e 's/${project.version}/$$VERSION$$/g'
-        app/build.gradle
-      - sed -i -e 's|"kill_service_with_task_manager">true<|"kill_service_with_task_manager">false<|'
-        -e 's|"check_for_update_when_app_starts">true<|"check_for_update_when_app_starts">false<|'
-        app/src/main/res/values/non_localizable_custom.xml
-      - sed -i -e 's!https://www.linphone.org/releases!!' app/src/main/res/raw/linphonerc_default
-    scanignore:
-      - app/build.gradle
-    build:
-      - pushd $$linphone-sdk$$
-      - git submodule update --init --recursive
-      - mkdir build-sdk
-      - cd build-sdk
-      - cmake .. -DLINPHONESDK_PLATFORM=Android -DLINPHONESDK_ANDROID_ARCHS="arm64,
-        armv7, x86, x86_64" -DCMAKE_BUILD_TYPE=Release
-      - cmake --build . --parallel $(nproc)
-      - popd
-      - cp $$linphone-sdk$$/build-sdk/linphone-sdk/bin/outputs/aar/linphone-sdk-android-release.aar
-        linphone-sdk-android/
-    ndk: r16b
+    antifeatures:
+      - nonfreedep
 
   - versionName: 4.2.1
     versionCode: 4215
@@ -602,6 +484,8 @@ Builds:
       - cp $$linphone-sdk$$/build-sdk/linphone-sdk/bin/outputs/aar/linphone-sdk-android-release.aar
         linphone-sdk-android/
     ndk: r16b
+    antifeatures:
+      - nonfreedep
 
   - versionName: 4.2.3
     versionCode: 4230
@@ -642,6 +526,8 @@ Builds:
       - cp $$linphone-sdk$$/build-sdk/linphone-sdk/bin/outputs/aar/linphone-sdk-android-release.aar
         linphone-sdk-android/
     ndk: r16b
+    antifeatures:
+      - nonfreedep
 
   - versionName: 4.3.0
     versionCode: 4300

metadata/org.linphone/makefile.patch

@@ -1,48 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 2dbde39..fa7d6b8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,21 +1,18 @@
--NDK_PATH=$(shell dirname `which ndk-build`)
--SDK_PATH=$(shell dirname `which android`)
--SDK_PLATFORM_TOOLS_PATH=$(shell dirname `which adb`)
- NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo || echo "4" )
- TOPDIR=$(shell pwd)
- PATCH_FFMPEG=$(shell cd submodules/externals/ffmpeg && git status | grep neon)
- LINPHONE_VERSION=$(shell cd submodules/linphone && git describe --always)
- LINPHONE_ANDROID_DEBUG_VERSION=$(shell git describe --always)
--ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep android | tail -n1)
-+ANDROID_MOST_RECENT_TARGET=$(shell $(SDK_PATH)/android list target -c | grep android | tail -n1)
- 
- NDK_DEBUG=0
- BUILD_UPNP=1
- BUILD_REMOTE_PROVISIONING=1
- BUILD_X264=1
--BUILD_AMRNB=full # 0, light or full
-+BUILD_AMRNB=light # 0, light or full
- BUILD_AMRWB=0
--BUILD_GPLV3_ZRTP=0
--BUILD_SILK=1
-+BUILD_GPLV3_ZRTP=1
-+BUILD_SILK=0
- BUILD_G729=0
- BUILD_TUNNEL=0
- BUILD_WEBRTC_AECM=1
-@@ -24,7 +21,7 @@ USE_JAVAH=1
- 
- NDK_BUILD_OPTIONS=NDK_DEBUG=$(NDK_DEBUG) LINPHONE_VERSION=$(LINPHONE_VERSION) BUILD_UPNP=$(BUILD_UPNP) BUILD_REMOTE_PROVISIONING=$(BUILD_REMOTE_PROVISIONING) BUILD_X264=$(BUILD_X264) BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_TUNNEL=$(BUILD_TUNNEL) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_FOR_X86=$(BUILD_FOR_X86) USE_JAVAH=$(USE_JAVAH) -j$(NUMCPUS)
- 
--all: update-project prepare-sources generate-apk
-+all: update-project prepare-sources
- 
- install: install-apk run-linphone
- 
-@@ -98,7 +95,7 @@ prepare-mediastreamer2:
- 	if ! [ -e yuv2rgb.vs.h ]; then echo "yuv2rgb.vs.h creation error (do you have 'xxd' application installed ?)"; exit 1; fi && \
- 	if ! [ -e yuv2rgb.fs.h ]; then echo "yuv2rgb.fs.h creation error (do you have 'xxd' application installed ?)"; exit 1; fi
- 
--prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-srtp prepare-zrtp prepare-mediastreamer2
-+prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-srtp prepare-zrtp prepare-mediastreamer2
- 
- generate-libs:
- 	$(NDK_PATH)/ndk-build $(NDK_BUILD_OPTIONS)