From b9b170835e614d3aee6fd895a42e98eae23f9079 Mon Sep 17 00:00:00 2001 From: Licaon_Kter Date: Fri, 4 Oct 2024 14:05:04 +0000 Subject: [PATCH] vlc - update --- metadata/org.videolan.vlc.yml | 185 +++++++++++++++++++++++++++++++++- 1 file changed, 182 insertions(+), 3 deletions(-) diff --git a/metadata/org.videolan.vlc.yml b/metadata/org.videolan.vlc.yml index f308c2c845..abb2e73328 100644 --- a/metadata/org.videolan.vlc.yml +++ b/metadata/org.videolan.vlc.yml @@ -4970,6 +4970,186 @@ Builds: - RESET=0 ./buildsystem/compile.sh -a x86_64 -ml -b --release ndk: r21e + - versionName: 3.5.5 + versionCode: 13050504 + 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 "armeabi-v7a"/' 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 armeabi-v7a -ml -b --release + 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 + 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 "arm64-v8a"/' 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 arm64-v8a -ml -b --release + ndk: r21e + + - versionName: 3.5.5 + versionCode: 13050508 + 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_64"/' 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_64 -ml -b --release + ndk: r21e + MaintainerNotes: |- Instructions and dependencies: https://wiki.videolan.org/AndroidCompile @@ -4992,9 +5172,8 @@ MaintainerNotes: |- * https://git.videolan.org/?p=vlc.git;a=blob;f=extras/tools/bootstrap#l130 * https://code.videolan.org/videolan/docker-images/raw/master/vlc-debian-android/Dockerfile - Note that compilation of VLC 3.5.1 fails with Meson 0.55.1, so we patch - build scripts to use 0.56.2 (the upstream actually uses 0.56.1 from - buster-backports, see their Dockerfile). + 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: