From 1f27db4903d3c5934524c872af52b57306dfef52 Mon Sep 17 00:00:00 2001 From: licaon-kter Date: Sat, 5 Oct 2024 01:11:46 +0300 Subject: [PATCH] vlc - update versioncodes --- metadata/org.videolan.vlc.yml | 107 +++++++++++++++++----------------- 1 file changed, 52 insertions(+), 55 deletions(-) diff --git a/metadata/org.videolan.vlc.yml b/metadata/org.videolan.vlc.yml index a22f51262a..e3274b2d43 100644 --- a/metadata/org.videolan.vlc.yml +++ b/metadata/org.videolan.vlc.yml @@ -4971,7 +4971,7 @@ Builds: ndk: r21e - versionName: 3.5.5 - versionCode: 13050504 + versionCode: 13050505 commit: 3.5.5 subdir: application/app sudo: @@ -5016,52 +5016,7 @@ Builds: ndk: r21e - versionName: 3.5.5 - versionCode: 13050505 - commit: 3.5.5 - subdir: application/app - sudo: - - apt-get update - - apt-get install -y ant automake autopoint bison bzip2 cmake flex g++ gettext - help2man libltdl-dev libtool-bin make meson nasm ninja-build pkg-config ragel - wget - gradle: - - yes - srclibs: - - VLC@4d46246f4aec36a0f749da870af04606a7b3e4e5 - - VLCjni@6691a43c73df3abe3e30bda139c6a7b4d1adda87 - - VLCmedialibrary@981f88679d71409ee3c1be23ef190ce17cf3f70f - prebuild: - - mkdir -p ./gradle/wrapper - - echo 'distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip' - > ./gradle/wrapper/gradle-wrapper.properties - - cp -r gradle ../.. - - sed -i -e 's/include .*/include "x86"/' build.gradle - - sed -i -e '/println/d' ../vlc-android/build.gradle - - cd ../.. - - cp -a $$VLC$$ vlc - - cp -a $$VLCjni$$ libvlcjni - - cp -a $$VLCmedialibrary$$ medialibrary/medialibrary - - sed -i -e '/signingConfig/d' application/app/build.gradle - - sed -i -E -e '/(debug|release|signedRelease)(Api|Implementation)/d; s/devApi/api/; - s/devImplementation/implementation/' application/vlc-android/build.gradle - application/resources/build.gradle medialibrary/build.gradle - - cd vlc - - cp share/vlc.appdata.xml.in.in share/vlc.appdata.xml - - git apply ../libvlcjni/libvlc/patches/vlc3/*.patch - - sed -i -e '/MESON_VERSION/,\/^#/d' extras/tools/tools.mak - - sed -i -e '/check meson/d' extras/tools/bootstrap - - find -name *.mak -type f -exec sed -i -e 's/tar xv/tar x/' {} + - - cd ../medialibrary/medialibrary/libvlcpp - - git apply ../../../buildsystem/patches/libvlcpp/*.patch - build: - - cd ../.. - - ln -s $(which gradle) ./gradlew - - export GRADLE_VLC_SRC_DIRS="$PWD/vlc/build-android-arm-linux-androideabi/ndk/libs" - - RESET=0 ./buildsystem/compile.sh -a x86 -ml -b --release - ndk: r21e - - - versionName: 3.5.5 - versionCode: 13050507 + versionCode: 13050506 commit: 3.5.5 subdir: application/app sudo: @@ -5105,6 +5060,51 @@ Builds: - RESET=0 ./buildsystem/compile.sh -a arm64-v8a -ml -b --release ndk: r21e + - versionName: 3.5.5 + versionCode: 13050507 + commit: 3.5.5 + subdir: application/app + sudo: + - apt-get update + - apt-get install -y ant automake autopoint bison bzip2 cmake flex g++ gettext + help2man libltdl-dev libtool-bin make meson nasm ninja-build pkg-config ragel + wget + gradle: + - yes + srclibs: + - VLC@4d46246f4aec36a0f749da870af04606a7b3e4e5 + - VLCjni@6691a43c73df3abe3e30bda139c6a7b4d1adda87 + - VLCmedialibrary@981f88679d71409ee3c1be23ef190ce17cf3f70f + prebuild: + - mkdir -p ./gradle/wrapper + - echo 'distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip' + > ./gradle/wrapper/gradle-wrapper.properties + - cp -r gradle ../.. + - sed -i -e 's/include .*/include "x86"/' build.gradle + - sed -i -e '/println/d' ../vlc-android/build.gradle + - cd ../.. + - cp -a $$VLC$$ vlc + - cp -a $$VLCjni$$ libvlcjni + - cp -a $$VLCmedialibrary$$ medialibrary/medialibrary + - sed -i -e '/signingConfig/d' application/app/build.gradle + - sed -i -E -e '/(debug|release|signedRelease)(Api|Implementation)/d; s/devApi/api/; + s/devImplementation/implementation/' application/vlc-android/build.gradle + application/resources/build.gradle medialibrary/build.gradle + - cd vlc + - cp share/vlc.appdata.xml.in.in share/vlc.appdata.xml + - git apply ../libvlcjni/libvlc/patches/vlc3/*.patch + - sed -i -e '/MESON_VERSION/,\/^#/d' extras/tools/tools.mak + - sed -i -e '/check meson/d' extras/tools/bootstrap + - find -name *.mak -type f -exec sed -i -e 's/tar xv/tar x/' {} + + - cd ../medialibrary/medialibrary/libvlcpp + - git apply ../../../buildsystem/patches/libvlcpp/*.patch + build: + - cd ../.. + - ln -s $(which gradle) ./gradlew + - export GRADLE_VLC_SRC_DIRS="$PWD/vlc/build-android-arm-linux-androideabi/ndk/libs" + - RESET=0 ./buildsystem/compile.sh -a x86 -ml -b --release + ndk: r21e + - versionName: 3.5.5 versionCode: 13050508 commit: 3.5.5 @@ -5175,13 +5175,12 @@ MaintainerNotes: |- Note that compilation of VLC 3.5.5 fails with Meson 0.55.1, so we patch build scripts to use Bookworms apt installed one. - Actual versioncodes are: + Actual versioncodes since 3.5.5 are: - * Build:2.0.6,12000624 armv7 - * Build:2.0.6,12000625 x86 - * Build:2.0.6,12000626 mips - * Build:2.0.6,12000627 armv8 - * Build:2.0.6,12000628 x86_64 + * Build:3.5.5,13050505 armv7 + * Build:3.5.5,13050506 armv8 + * Build:3.5.5,13050507 armv8 + * Build:3.5.5,13050508 x86_64 Variables FD_TARGET_TUPLE, FD_TARGET_ARCH and abi in output apk name needs to be changed per build. @@ -5191,8 +5190,6 @@ MaintainerNotes: |- * x86: x86-linux-android * x86_64: x86_64-linux-android - Mips no longer supported since 3.2.6. - ArchivePolicy: 12 AutoUpdateMode: None UpdateCheckMode: Tags ^[\d.]+$