diff --git a/metadata/org.linphone.yml b/metadata/org.linphone.yml index 42971badd4..52651b4537 100644 --- a/metadata/org.linphone.yml +++ b/metadata/org.linphone.yml @@ -3630,11 +3630,12 @@ Builds: - versionName: 5.2.1 versionCode: 520011 - disable: needs more deps wip commit: 1d153ae5bb5918d76b47ed26563fdbbe2a083714 sudo: - apt-get update - - apt-get install -y cmake doxygen pkgconf python3-pystache yasm + - apt-get install -y build-essential doxygen meson nasm pkgconf python3-pystache + yasm + - apt-get install -y -t bullseye-backports cmake - apt-get install -y openjdk-17-jdk-headless - update-java-alternatives -a gradle: @@ -3672,27 +3673,25 @@ Builds: - settings.gradle build: - pushd $$linphone-sdk$$ - - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 - - mkdir build-sdk - - cd build-sdk - - cmake .. -DENABLE_GPL_THIRD_PARTIES=YES -DLINPHONESDK_PLATFORM=Android -DLINPHONESDK_ANDROID_ARCHS="armv7" - -DCMAKE_BUILD_TYPE=Release -DENABLE_G729=ON - - cmake --build . --parallel $(nproc) + - cmake --preset=android-sdk -B build-android -DLINPHONESDK_ANDROID_ARCHS=armv7 + -DENABLE_GPL_THIRD_PARTIES=ON -DENABLE_G729=ON + - cmake --build build-android --parallel $(nproc) - popd - mkdir app/libs - - cp $$linphone-sdk$$/build-sdk/linphone-sdk/bin/outputs/aar/linphone-sdk-android-release.aar + - cp $$linphone-sdk$$/build-android/linphone-sdk/bin/outputs/aar/linphone-sdk-android-release.aar app/libs/ - ndk: r21e + ndk: 25.1.8937393 antifeatures: - UpstreamNonFree - versionName: 5.2.1 versionCode: 520012 - disable: needs more deps wip commit: 1d153ae5bb5918d76b47ed26563fdbbe2a083714 sudo: - apt-get update - - apt-get install -y cmake doxygen pkgconf python3-pystache yasm + - apt-get install -y build-essential doxygen meson nasm pkgconf python3-pystache + yasm + - apt-get install -y -t bullseye-backports cmake - apt-get install -y openjdk-17-jdk-headless - update-java-alternatives -a gradle: @@ -3730,27 +3729,25 @@ Builds: - settings.gradle build: - pushd $$linphone-sdk$$ - - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 - - mkdir build-sdk - - cd build-sdk - - cmake .. -DENABLE_GPL_THIRD_PARTIES=YES -DLINPHONESDK_PLATFORM=Android -DLINPHONESDK_ANDROID_ARCHS="x86" - -DCMAKE_BUILD_TYPE=Release -DENABLE_G729=ON - - cmake --build . --parallel $(nproc) + - cmake --preset=android-sdk -B build-android -DLINPHONESDK_ANDROID_ARCHS=x86 + -DENABLE_GPL_THIRD_PARTIES=ON -DENABLE_G729=ON + - cmake --build build-android --parallel $(nproc) - popd - mkdir app/libs - - cp $$linphone-sdk$$/build-sdk/linphone-sdk/bin/outputs/aar/linphone-sdk-android-release.aar + - cp $$linphone-sdk$$/build-android/linphone-sdk/bin/outputs/aar/linphone-sdk-android-release.aar app/libs/ - ndk: r21e + ndk: 25.1.8937393 antifeatures: - UpstreamNonFree - versionName: 5.2.1 versionCode: 520013 - disable: needs more deps wip commit: 1d153ae5bb5918d76b47ed26563fdbbe2a083714 sudo: - apt-get update - - apt-get install -y cmake doxygen pkgconf python3-pystache yasm + - apt-get install -y build-essential doxygen meson nasm pkgconf python3-pystache + yasm + - apt-get install -y -t bullseye-backports cmake - apt-get install -y openjdk-17-jdk-headless - update-java-alternatives -a gradle: @@ -3788,17 +3785,14 @@ Builds: - settings.gradle build: - pushd $$linphone-sdk$$ - - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 - - mkdir build-sdk - - cd build-sdk - - cmake .. -DENABLE_GPL_THIRD_PARTIES=YES -DLINPHONESDK_PLATFORM=Android -DLINPHONESDK_ANDROID_ARCHS="arm64" - -DCMAKE_BUILD_TYPE=Release -DENABLE_G729=ON - - cmake --build . --parallel $(nproc) + - cmake --preset=android-sdk -B build-android -DLINPHONESDK_ANDROID_ARCHS=arm64 + -DENABLE_GPL_THIRD_PARTIES=ON -DENABLE_G729=ON + - cmake --build build-android --parallel $(nproc) - popd - mkdir app/libs - - cp $$linphone-sdk$$/build-sdk/linphone-sdk/bin/outputs/aar/linphone-sdk-android-release.aar + - cp $$linphone-sdk$$/build-android/linphone-sdk/bin/outputs/aar/linphone-sdk-android-release.aar app/libs/ - ndk: r21e + ndk: 25.1.8937393 antifeatures: - UpstreamNonFree @@ -3806,7 +3800,7 @@ MaintainerNotes: |- We pull linphone-sdk at one random tag (since master is not allowed) and then checkout the latest tag available. We patch linphone-sdk to remove GMS and Firebase, thus UpstreamNonFree. -AutoUpdateMode: None +AutoUpdateMode: Version UpdateCheckMode: Tags .*[0-9]$ VercodeOperation: - '%c * 10 + 1'