From ea772cb16b92706abe813e3b4b859467ed800af2 Mon Sep 17 00:00:00 2001 From: relan Date: Tue, 30 Aug 2022 16:22:41 +0300 Subject: [PATCH] Update VLC to 3.5.1 --- metadata/org.videolan.vlc.yml | 164 +++++++++++++++++++++++++++++++++- srclibs/VLCjni.yml | 2 + 2 files changed, 162 insertions(+), 4 deletions(-) create mode 100644 srclibs/VLCjni.yml diff --git a/metadata/org.videolan.vlc.yml b/metadata/org.videolan.vlc.yml index 92d63af9d3..c478704324 100644 --- a/metadata/org.videolan.vlc.yml +++ b/metadata/org.videolan.vlc.yml @@ -4668,11 +4668,159 @@ Builds: - gradle assembleRelease ndk: r21e + - versionName: 3.5.1 + versionCode: 13050104 + commit: 3.5.1 + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless g++ ragel libltdl-dev + output: application/app/build/outputs/apk/release/VLC-Android-$$VERSION$$-armeabi-v7a.apk + srclibs: + - VLC@cdcf450c8ef00c682af82a66e889022bfdb91d39 + - VLCjni@c509a1c955e64c889e784a784d581d84a43b7b1c + - VLCmedialibrary@981f88679d71409ee3c1be23ef190ce17cf3f70f + prebuild: + - 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=/s/0.55.1/0.56.2/' extras/tools/packages.mak + - sed -i -e 's/172b4de8c7474d709f172431b89bf2b2b1c2c38bc842039cccf6be075a45bd3509a1dab8512bc5b2ee025d65d8050d2f717dd15c1f9be17fca3b2e7da0d3e889 meson-0.55.1.tar.gz/3b6cc5cae31d756b251ecde3483d3710bceff50cfd03ef6cf6f939d9e599998e61fcb03a2ee09d6a6f9bfa2198f43e7f20447359de3bff1055febcf03e82e514 meson-0.56.2.tar.gz/' + extras/tools/SHA512SUMS + - cd ../medialibrary/medialibrary/libvlcpp + - git apply ../../../buildsystem/patches/libvlcpp/*.patch + build: + - 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" + - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 + - gradle wrapper --gradle-version 7.5.1 --gradle-distribution-sha256-sum f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4 + - RESET=0 ./buildsystem/compile.sh -a "$FD_TARGET_ARCH" -ml -b --release + - gradle assembleRelease + ndk: r21e + + - versionName: 3.5.1 + versionCode: 13050105 + commit: 3.5.1 + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless g++ ragel libltdl-dev + output: application/app/build/outputs/apk/release/VLC-Android-$$VERSION$$-x86.apk + srclibs: + - VLC@cdcf450c8ef00c682af82a66e889022bfdb91d39 + - VLCjni@c509a1c955e64c889e784a784d581d84a43b7b1c + - VLCmedialibrary@981f88679d71409ee3c1be23ef190ce17cf3f70f + prebuild: + - 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=/s/0.55.1/0.56.2/' extras/tools/packages.mak + - sed -i -e 's/172b4de8c7474d709f172431b89bf2b2b1c2c38bc842039cccf6be075a45bd3509a1dab8512bc5b2ee025d65d8050d2f717dd15c1f9be17fca3b2e7da0d3e889 meson-0.55.1.tar.gz/3b6cc5cae31d756b251ecde3483d3710bceff50cfd03ef6cf6f939d9e599998e61fcb03a2ee09d6a6f9bfa2198f43e7f20447359de3bff1055febcf03e82e514 meson-0.56.2.tar.gz/' + extras/tools/SHA512SUMS + - cd ../medialibrary/medialibrary/libvlcpp + - git apply ../../../buildsystem/patches/libvlcpp/*.patch + build: + - 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" + - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 + - gradle wrapper --gradle-version 7.5.1 --gradle-distribution-sha256-sum f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4 + - RESET=0 ./buildsystem/compile.sh -a "$FD_TARGET_ARCH" -ml -b --release + - gradle assembleRelease + ndk: r21e + + - versionName: 3.5.1 + versionCode: 13050107 + commit: 3.5.1 + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless g++ ragel libltdl-dev + output: application/app/build/outputs/apk/release/VLC-Android-$$VERSION$$-arm64-v8a.apk + srclibs: + - VLC@cdcf450c8ef00c682af82a66e889022bfdb91d39 + - VLCjni@c509a1c955e64c889e784a784d581d84a43b7b1c + - VLCmedialibrary@981f88679d71409ee3c1be23ef190ce17cf3f70f + prebuild: + - 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=/s/0.55.1/0.56.2/' extras/tools/packages.mak + - sed -i -e 's/172b4de8c7474d709f172431b89bf2b2b1c2c38bc842039cccf6be075a45bd3509a1dab8512bc5b2ee025d65d8050d2f717dd15c1f9be17fca3b2e7da0d3e889 meson-0.55.1.tar.gz/3b6cc5cae31d756b251ecde3483d3710bceff50cfd03ef6cf6f939d9e599998e61fcb03a2ee09d6a6f9bfa2198f43e7f20447359de3bff1055febcf03e82e514 meson-0.56.2.tar.gz/' + extras/tools/SHA512SUMS + - cd ../medialibrary/medialibrary/libvlcpp + - git apply ../../../buildsystem/patches/libvlcpp/*.patch + build: + - 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" + - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 + - gradle wrapper --gradle-version 7.5.1 --gradle-distribution-sha256-sum f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4 + - RESET=0 ./buildsystem/compile.sh -a "$FD_TARGET_ARCH" -ml -b --release + - gradle assembleRelease + ndk: r21e + + - versionName: 3.5.1 + versionCode: 13050108 + commit: 3.5.1 + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless g++ ragel libltdl-dev + output: application/app/build/outputs/apk/release/VLC-Android-$$VERSION$$-x86_64.apk + srclibs: + - VLC@cdcf450c8ef00c682af82a66e889022bfdb91d39 + - VLCjni@c509a1c955e64c889e784a784d581d84a43b7b1c + - VLCmedialibrary@981f88679d71409ee3c1be23ef190ce17cf3f70f + prebuild: + - 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=/s/0.55.1/0.56.2/' extras/tools/packages.mak + - sed -i -e 's/172b4de8c7474d709f172431b89bf2b2b1c2c38bc842039cccf6be075a45bd3509a1dab8512bc5b2ee025d65d8050d2f717dd15c1f9be17fca3b2e7da0d3e889 meson-0.55.1.tar.gz/3b6cc5cae31d756b251ecde3483d3710bceff50cfd03ef6cf6f939d9e599998e61fcb03a2ee09d6a6f9bfa2198f43e7f20447359de3bff1055febcf03e82e514 meson-0.56.2.tar.gz/' + extras/tools/SHA512SUMS + - cd ../medialibrary/medialibrary/libvlcpp + - git apply ../../../buildsystem/patches/libvlcpp/*.patch + build: + - 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" + - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 + - gradle wrapper --gradle-version 7.5.1 --gradle-distribution-sha256-sum f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4 + - RESET=0 ./buildsystem/compile.sh -a "$FD_TARGET_ARCH" -ml -b --release + - gradle assembleRelease + ndk: r21e + MaintainerNotes: |- Instructions and dependencies: https://wiki.videolan.org/AndroidCompile - The VLC srclib commit can be found out from TESTED_HASH value in compile.sh, - but sometimes it's different in official builds: + The VLCjni srclib commit can be found out from LIBVLCJNI_TESTED_HASH value + in compile.sh, but sometimes it's different in official builds: * https://code.videolan.org/videolan/vlc-android/-/blob//buildsystem/compile.sh @@ -4681,11 +4829,19 @@ MaintainerNotes: |- * https://code.videolan.org/videolan/vlc-android/-/blob//buildsystem/compile-medialibrary.sh + The VLC srclib commit can be found out from VLC_TESTED_HASH in get-vlc.sh: + + * https://code.videolan.org/videolan/libvlcjni/-/blob//buildsystem/get-vlc.sh + For recommended versions of the build tools, see: * 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). + Actual versioncodes are: * Build:2.0.6,12000624 armv7 @@ -4707,5 +4863,5 @@ MaintainerNotes: |- ArchivePolicy: 12 versions AutoUpdateMode: None UpdateCheckMode: Static -CurrentVersion: 3.4.4 -CurrentVersionCode: 13040408 +CurrentVersion: 3.5.1 +CurrentVersionCode: 13050108 diff --git a/srclibs/VLCjni.yml b/srclibs/VLCjni.yml new file mode 100644 index 0000000000..a2b73d8cb5 --- /dev/null +++ b/srclibs/VLCjni.yml @@ -0,0 +1,2 @@ +RepoType: git +Repo: https://code.videolan.org/videolan/libvlcjni.git