Merge branch 'feature/vlc-3.2.6' into 'master'
VLC: Update to 3.2.6 See merge request fdroid/fdroiddata!6237
This commit is contained in:
Licaon_Kter
commit
6d08efe630
|
|
@ -3144,6 +3144,154 @@ Builds:
|
|||
- ./compile.sh -a arm64-v8a -ml --release
|
||||
ndk: r18b
|
||||
|
||||
- versionName: 3.2.6
|
||||
versionCode: 13020604
|
||||
commit: 3.2.6
|
||||
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@46d459f
|
||||
- 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.6
|
||||
versionCode: 13020605
|
||||
commit: 3.2.6
|
||||
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@46d459f
|
||||
- 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.6
|
||||
versionCode: 13020607
|
||||
commit: 3.2.6
|
||||
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@46d459f
|
||||
- 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.6
|
||||
versionCode: 13020608
|
||||
commit: 3.2.6
|
||||
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@46d459f
|
||||
- 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
|
||||
|
||||
|
|
@ -3166,8 +3314,18 @@ MaintainerNotes: |-
|
|||
* Build:2.0.6,12000627 armv8
|
||||
* Build:2.0.6,12000628 x86_64
|
||||
|
||||
Variables FD_TARGET_TUPLE, FD_TARGET_ARCH and abi in output apk name needs
|
||||
to be changed per build.
|
||||
|
||||
* arm64-v7a: aarch64-linux-android
|
||||
* armeabi-v7a: arm-linux-androideabi
|
||||
* x86: x86-linux-android
|
||||
* x86_64: x86_64-linux-android
|
||||
|
||||
Mips no longer supported since 3.2.6.
|
||||
|
||||
ArchivePolicy: 9 versions
|
||||
AutoUpdateMode: None
|
||||
UpdateCheckMode: Static
|
||||
CurrentVersion: 3.1.7
|
||||
CurrentVersionCode: 13010707
|
||||
CurrentVersion: 3.2.6
|
||||
CurrentVersionCode: 13020608
|
||||
|
|
|
|||
Loading…
Reference in New Issue