Merge branch 'vlc334' into 'master'

VLC 3.3.4

Closes #2296

See merge request fdroid/fdroiddata!8363
This commit is contained in:
Licaon_Kter 2021-02-12 16:28:26 +00:00
commit 653952bb2f

View file

@ -4016,6 +4016,146 @@ Builds:
- ./gradlew assembleRelease
ndk: r21d
- versionName: 3.3.4
versionCode: 13030404
commit: 3.3.4
timeout: 10800
subdir: application/app
sudo:
- apt-get update || apt-get update
- apt-get install -y g++ ragel libltdl-dev
output: build/outputs/apk/release/VLC-Android-$$VERSION$$-armeabi-v7a.apk
srclibs:
- VLC-3.0@ef615ff0cb6390656e84f7218c561e21bc4c39d8
- VLCmedialibrary@214c7fc12e698df82b5494507771fe23939064b9
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)(Api|Implementation)/d; s/devApi/api/;
s/devImplementation/implementation/' ../vlc-android/build.gradle ../resources/build.gradle
../../medialibrary/build.gradle
- cd ../../vlc
- cp share/vlc.appdata.xml.in.in share/vlc.appdata.xml
- git apply ../libvlc/patches/vlc3/*.patch
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
- ./buildsystem/compile.sh -a "$FD_TARGET_ARCH" -ml -b --release
- ./gradlew assembleRelease
ndk: r21d
- versionName: 3.3.4
versionCode: 13030405
commit: 3.3.4
timeout: 10800
subdir: application/app
sudo:
- apt-get update || apt-get update
- apt-get install -y g++ ragel libltdl-dev
output: build/outputs/apk/release/VLC-Android-$$VERSION$$-x86.apk
srclibs:
- VLC-3.0@ef615ff0cb6390656e84f7218c561e21bc4c39d8
- VLCmedialibrary@214c7fc12e698df82b5494507771fe23939064b9
prebuild:
- cp -a $$VLC-3.0$$ ../../vlc
- cp -a $$VLCmedialibrary$$ ../../medialibrary/medialibrary
- sed -i -e '/maven {/,/}/d' ../../build.gradle
- sed -i -e '/signingConfig/d' ../app/build.gradle
- sed -i -E -e '/(debug|release|signedRelease)(Api|Implementation)/d; s/devApi/api/;
s/devImplementation/implementation/' ../vlc-android/build.gradle ../resources/build.gradle
../../medialibrary/build.gradle
- cd ../../vlc
- cp share/vlc.appdata.xml.in.in share/vlc.appdata.xml
- git apply ../libvlc/patches/vlc3/*.patch
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
- ./buildsystem/compile.sh -a "$FD_TARGET_ARCH" -ml -b --release
- ./gradlew assembleRelease
ndk: r21d
- versionName: 3.3.4
versionCode: 13030407
commit: 3.3.4
timeout: 10800
subdir: application/app
sudo:
- apt-get update || apt-get update
- apt-get install -y g++ ragel libltdl-dev
output: build/outputs/apk/release/VLC-Android-$$VERSION$$-arm64-v8a.apk
srclibs:
- VLC-3.0@ef615ff0cb6390656e84f7218c561e21bc4c39d8
- VLCmedialibrary@214c7fc12e698df82b5494507771fe23939064b9
prebuild:
- cp -a $$VLC-3.0$$ ../../vlc
- cp -a $$VLCmedialibrary$$ ../../medialibrary/medialibrary
- sed -i -e '/maven {/,/}/d' ../../build.gradle
- sed -i -e '/signingConfig/d' ../app/build.gradle
- sed -i -E -e '/(debug|release|signedRelease)(Api|Implementation)/d; s/devApi/api/;
s/devImplementation/implementation/' ../vlc-android/build.gradle ../resources/build.gradle
../../medialibrary/build.gradle
- cd ../../vlc
- cp share/vlc.appdata.xml.in.in share/vlc.appdata.xml
- git apply ../libvlc/patches/vlc3/*.patch
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
- ./buildsystem/compile.sh -a "$FD_TARGET_ARCH" -ml -b --release
- ./gradlew assembleRelease
ndk: r21d
- versionName: 3.3.4
versionCode: 13030408
commit: 3.3.4
timeout: 10800
subdir: application/app
sudo:
- apt-get update || apt-get update
- apt-get install -y g++ ragel libltdl-dev
output: build/outputs/apk/release/VLC-Android-$$VERSION$$-x86_64.apk
srclibs:
- VLC-3.0@ef615ff0cb6390656e84f7218c561e21bc4c39d8
- VLCmedialibrary@214c7fc12e698df82b5494507771fe23939064b9
prebuild:
- cp -a $$VLC-3.0$$ ../../vlc
- cp -a $$VLCmedialibrary$$ ../../medialibrary/medialibrary
- sed -i -e '/maven {/,/}/d' ../../build.gradle
- sed -i -e '/signingConfig/d' ../app/build.gradle
- sed -i -E -e '/(debug|release|signedRelease)(Api|Implementation)/d; s/devApi/api/;
s/devImplementation/implementation/' ../vlc-android/build.gradle ../resources/build.gradle
../../medialibrary/build.gradle
- cd ../../vlc
- cp share/vlc.appdata.xml.in.in share/vlc.appdata.xml
- git apply ../libvlc/patches/vlc3/*.patch
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
- ./buildsystem/compile.sh -a "$FD_TARGET_ARCH" -ml -b --release
- ./gradlew assembleRelease
ndk: r21d
MaintainerNotes: |-
Instructions and dependencies: https://wiki.videolan.org/AndroidCompile
@ -4055,5 +4195,5 @@ MaintainerNotes: |-
ArchivePolicy: 12 versions
AutoUpdateMode: None
UpdateCheckMode: Static
CurrentVersion: 3.3.3
CurrentVersionCode: 13030308
CurrentVersion: 3.3.4
CurrentVersionCode: 13030408