From a996d3f9265bd761e4e1150838ee077567bee9ba Mon Sep 17 00:00:00 2001 From: relan Date: Mon, 4 May 2020 11:42:04 +0300 Subject: [PATCH] Update VLC to 3.2.12 Also set ArchivePolicy to 12 versions now that we have 4 APKs per upstream release. --- metadata/org.videolan.vlc.yml | 154 +++++++++++++++++++++++++++++++++- 1 file changed, 151 insertions(+), 3 deletions(-) diff --git a/metadata/org.videolan.vlc.yml b/metadata/org.videolan.vlc.yml index 9433f08342..b3570915c4 100644 --- a/metadata/org.videolan.vlc.yml +++ b/metadata/org.videolan.vlc.yml @@ -3588,6 +3588,154 @@ Builds: - ./gradlew assembleRelease ndk: r18b + - versionName: 3.2.12 + versionCode: 13021204 + commit: 3.2.12 + timeout: 10800 + subdir: vlc-android + sudo: + - apt update || apt update + - apt install -y g++ ragel libltdl-dev + output: build/outputs/apk/release/VLC-Android-$$VERSION$$-armeabi-v7a.apk + srclibs: + - VLC-3.0@5a9a71d + - VLCmedialibrary@099bd5f2 + rm: + - java-libs/appcompat/libs + - java-libs/cardview/libs + prebuild: + - cp -a $$VLC-3.0$$ ../vlc + - cp -a $$VLCmedialibrary$$ ../medialibrary/medialibrary + - sed -i -e '/maven {/,/}/d' ../build.gradle + - sed -i -e '/signingConfig/d' build.gradle + - sed -i -E -e '/(debug|release|signedRelease)Implementation/d; s/devImplementation/implementation/' + build.gradle ../medialibrary/build.gradle + - cd ../vlc + - git apply ../libvlc/patches/vlc3/*.patch + - sed -i '/.libdsm:\ libdsm$/a \\tcd $< \&\& touch "config.rpath"' contrib/src/libdsm/rules.mak + build: + - cd .. + - export FD_TARGET_TUPLE="arm-linux-androideabi" + - export FD_TARGET_ARCH="armeabi-v7a" + - export GRADLE_VLC_SRC_DIRS="$(pwd)/vlc/build-android-${FD_TARGET_TUPLE}/ndk/libs" + - mkdir -p gradle/wrapper + - echo 'gradle "$@"' > gradlew + - chmod a+x gradlew + - ./compile.sh -a $FD_TARGET_ARCH -ml -b --release + - ./gradlew assembleRelease + ndk: r18b + + - versionName: 3.2.12 + versionCode: 13021205 + commit: 3.2.12 + timeout: 10800 + subdir: vlc-android + sudo: + - apt update || apt update + - apt install -y g++ ragel libltdl-dev + output: build/outputs/apk/release/VLC-Android-$$VERSION$$-x86.apk + srclibs: + - VLC-3.0@5a9a71d + - VLCmedialibrary@099bd5f2 + rm: + - java-libs/appcompat/libs + - java-libs/cardview/libs + prebuild: + - cp -a $$VLC-3.0$$ ../vlc + - cp -a $$VLCmedialibrary$$ ../medialibrary/medialibrary + - sed -i -e '/maven {/,/}/d' ../build.gradle + - sed -i -e '/signingConfig/d' build.gradle + - sed -i -E -e '/(debug|release|signedRelease)Implementation/d; s/devImplementation/implementation/' + build.gradle ../medialibrary/build.gradle + - cd ../vlc + - git apply ../libvlc/patches/vlc3/*.patch + - sed -i '/.libdsm:\ libdsm$/a \\tcd $< \&\& touch "config.rpath"' contrib/src/libdsm/rules.mak + build: + - cd .. + - export FD_TARGET_TUPLE="i686-linux-android" + - export FD_TARGET_ARCH="x86" + - export GRADLE_VLC_SRC_DIRS="$(pwd)/vlc/build-android-${FD_TARGET_TUPLE}/ndk/libs" + - mkdir -p gradle/wrapper + - echo 'gradle "$@"' > gradlew + - chmod a+x gradlew + - ./compile.sh -a $FD_TARGET_ARCH -ml -b --release + - ./gradlew assembleRelease + ndk: r18b + + - versionName: 3.2.12 + versionCode: 13021207 + commit: 3.2.12 + timeout: 10800 + subdir: vlc-android + sudo: + - apt update || apt update + - apt install -y g++ ragel libltdl-dev + output: build/outputs/apk/release/VLC-Android-$$VERSION$$-arm64-v8a.apk + srclibs: + - VLC-3.0@5a9a71d + - VLCmedialibrary@099bd5f2 + rm: + - java-libs/appcompat/libs + - java-libs/cardview/libs + prebuild: + - cp -a $$VLC-3.0$$ ../vlc + - cp -a $$VLCmedialibrary$$ ../medialibrary/medialibrary + - sed -i -e '/maven {/,/}/d' ../build.gradle + - sed -i -e '/signingConfig/d' build.gradle + - sed -i -E -e '/(debug|release|signedRelease)Implementation/d; s/devImplementation/implementation/' + build.gradle ../medialibrary/build.gradle + - cd ../vlc + - git apply ../libvlc/patches/vlc3/*.patch + - sed -i '/.libdsm:\ libdsm$/a \\tcd $< \&\& touch "config.rpath"' contrib/src/libdsm/rules.mak + build: + - cd .. + - export FD_TARGET_TUPLE="aarch64-linux-android" + - export FD_TARGET_ARCH="arm64-v8a" + - export GRADLE_VLC_SRC_DIRS="$(pwd)/vlc/build-android-${FD_TARGET_TUPLE}/ndk/libs" + - mkdir -p gradle/wrapper + - echo 'gradle "$@"' > gradlew + - chmod a+x gradlew + - ./compile.sh -a $FD_TARGET_ARCH -ml -b --release + - ./gradlew assembleRelease + ndk: r18b + + - versionName: 3.2.12 + versionCode: 13021208 + commit: 3.2.12 + timeout: 10800 + subdir: vlc-android + sudo: + - apt update || apt update + - apt install -y g++ ragel libltdl-dev + output: build/outputs/apk/release/VLC-Android-$$VERSION$$-x86_64.apk + srclibs: + - VLC-3.0@5a9a71d + - VLCmedialibrary@099bd5f2 + rm: + - java-libs/appcompat/libs + - java-libs/cardview/libs + prebuild: + - cp -a $$VLC-3.0$$ ../vlc + - cp -a $$VLCmedialibrary$$ ../medialibrary/medialibrary + - sed -i -e '/maven {/,/}/d' ../build.gradle + - sed -i -e '/signingConfig/d' build.gradle + - sed -i -E -e '/(debug|release|signedRelease)Implementation/d; s/devImplementation/implementation/' + build.gradle ../medialibrary/build.gradle + - cd ../vlc + - git apply ../libvlc/patches/vlc3/*.patch + - sed -i '/.libdsm:\ libdsm$/a \\tcd $< \&\& touch "config.rpath"' contrib/src/libdsm/rules.mak + build: + - cd .. + - export FD_TARGET_TUPLE="x86_64-linux-android" + - export FD_TARGET_ARCH="x86_64" + - export GRADLE_VLC_SRC_DIRS="$(pwd)/vlc/build-android-${FD_TARGET_TUPLE}/ndk/libs" + - mkdir -p gradle/wrapper + - echo 'gradle "$@"' > gradlew + - chmod a+x gradlew + - ./compile.sh -a $FD_TARGET_ARCH -ml -b --release + - ./gradlew assembleRelease + ndk: r18b + MaintainerNotes: |- Instructions and dependencies: https://wiki.videolan.org/AndroidCompile @@ -3620,8 +3768,8 @@ MaintainerNotes: |- Mips no longer supported since 3.2.6. -ArchivePolicy: 9 versions +ArchivePolicy: 12 versions AutoUpdateMode: None UpdateCheckMode: Static -CurrentVersion: 3.2.11 -CurrentVersionCode: 13021108 +CurrentVersion: 3.2.12 +CurrentVersionCode: 13021208