From ca07aa0a5b095f3ddb836e514e025ecd93541710 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Tue, 22 Jun 2021 15:02:08 +0800
Subject: [PATCH] atalk: 2.6.1

---
 metadata/org.atalk.android.yml | 54 +++++++++++++---------------------
 1 file changed, 21 insertions(+), 33 deletions(-)

diff --git a/metadata/org.atalk.android.yml b/metadata/org.atalk.android.yml
index 6fcfaab096..df5863c6c8 100644
--- a/metadata/org.atalk.android.yml
+++ b/metadata/org.atalk.android.yml
@@ -1395,58 +1395,46 @@ Builds:
       - mv jni/static_library_built/openssl/output/android/ jni/openssl/
     ndk: r15c
 
-  - versionName: 2.4.7
-    versionCode: 1147
-    disable: fails to build see upstream issue 170
-    commit: 2.4.7
-    subdir: aTalk/
+  - versionName: 2.6.1
+    versionCode: 206010
+    commit: 2.6.1
+    subdir: aTalk
     gradle:
       - fdroid
-    srclibs:
-      - fmj@r122
-      - jitsi-zrtp4j@7cbd8101108191089aad871002567c2a0eb2b512
     rm:
       - aTalk/lib/src_reference/
       - aTalk/jni/ffmpeg/android/
       - aTalk/jni/openssl/android/
       - aTalk/jni/vpx/android/
-    prebuild: sed -i -e "/clean.dependsOn 'ndkClean'/d" build.gradle
+    prebuild:
+      - $$SDK$$/tools/bin/sdkmanager 'ndk;18.1.5063045' > /dev/null
+      - sed -i -e 's|dl.bintray.com/google/exoplayer/|jitpack.io|' build.gradle
+      - sed -i -e '/export ANDROID_NDK_HOME/d' jni/static_library_built/openssl/_settings.sh
     scanignore:
       - aTalk/build.gradle
     scandelete:
-      - aTalk/jni/static_library_built/libvpx/sources/*.gz
-      - aTalk/third_party/m2/org/igniterealtime/smack/*/*/*.jar
+      - aTalk/jni/static_library_built
+      - aTalk/third_party/m2
     build:
-      - pushd $$fmj$$
-      - ant
-      - popd
-      - pushd $$jitsi-zrtp4j$$
-      - ant jar
-      - popd
-      - mkdir -p lib/bundles
-      - mv $$fmj$$/build/jars/fmj.jar lib/bundles/fmj-1.0-SNAPSHOT.jar
-      - mv $$jitsi-zrtp4j$$/dist/zrtp4j-light.jar lib/bundles/zrtp4j-light-4.1.0-jitsi-1-SNAPSHOT.jar
-      - pushd jni/static_library_built/ffmpeg-x264/
-      - ./init_update_libs.sh
-      - ./ffmpeg-atalk_build.sh
-      - popd
-      - mv jni/static_library_built/ffmpeg-x264/android/ jni/ffmpeg/
-      - pushd jni/static_library_built/libvpx/
-      - ./init_libvpx.sh
-      - ./build-libvpx4android.sh
-      - popd
-      - mv jni/static_library_built/libvpx/output/android/ jni/vpx/
       - pushd jni/static_library_built/openssl/
       - ./init_libopenssl.sh
       - ./build-openssl4android.sh
       - popd
-      - mv jni/static_library_built/openssl/output/android/ jni/openssl/
-    ndk: r15c
+      - export ANDROID_NDK=/opt/android-sdk/ndk/18.1.5063045
+      - pushd jni/static_library_built/ffmpeg-x264/
+      - ./init_update_libs.sh
+      - ./build-ffmpeg4android.sh
+      - popd
+      - pushd jni/static_library_built/libvpx/
+      - ./init_libvpx.sh
+      - ./build-libvpx4android.sh
+      - popd
+    ndk: r20
 
 MaintainerNotes: scanignore is used to allow the local "third_party/m2" Gradle repository
     (which is populated by libraries we build).
 
-AutoUpdateMode: None
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: 2.6.1
 CurrentVersionCode: 206010