Update VLC to 3.4.0

2021-09-27 22:06:33 +03:00 · 2021-09-27 22:06:33 +03:00 · 133efcefd5
commit 133efcefd5
parent 63575bbdde
2 changed files with 132 additions and 4 deletions
--- a/metadata/org.videolan.vlc.yml
+++ b/metadata/org.videolan.vlc.yml
@ -4156,6 +4156,134 @@ Builds:
      - ./gradlew assembleRelease
    ndk: r21d

+  - versionName: 3.4.0
+    versionCode: 13040004
+    commit: 3.4.0
+    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@9e48d340d4177fefc0bf2edefe462d7baf88e586
+      - VLCmedialibrary@0bc75bd1becf49982e70269d56fb40fc78187d91
+    prebuild:
+      - cp -a $$VLC$$ vlc
+      - 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 ../libvlc/patches/vlc3/*.patch
+      - 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.0.2 --gradle-distribution-sha256-sum 0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c
+      - RESET=0 ./buildsystem/compile.sh -a "$FD_TARGET_ARCH" -ml -b --release
+      - gradle assembleRelease
+    ndk: r21e
+
+  - versionName: 3.4.0
+    versionCode: 13040005
+    commit: 3.4.0
+    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@9e48d340d4177fefc0bf2edefe462d7baf88e586
+      - VLCmedialibrary@0bc75bd1becf49982e70269d56fb40fc78187d91
+    prebuild:
+      - cp -a $$VLC$$ vlc
+      - 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 ../libvlc/patches/vlc3/*.patch
+      - 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.0.2 --gradle-distribution-sha256-sum 0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c
+      - RESET=0 ./buildsystem/compile.sh -a "$FD_TARGET_ARCH" -ml -b --release
+      - gradle assembleRelease
+    ndk: r21e
+
+  - versionName: 3.4.0
+    versionCode: 13040007
+    commit: 3.4.0
+    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@9e48d340d4177fefc0bf2edefe462d7baf88e586
+      - VLCmedialibrary@0bc75bd1becf49982e70269d56fb40fc78187d91
+    prebuild:
+      - cp -a $$VLC$$ vlc
+      - 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 ../libvlc/patches/vlc3/*.patch
+      - 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.0.2 --gradle-distribution-sha256-sum 0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c
+      - RESET=0 ./buildsystem/compile.sh -a "$FD_TARGET_ARCH" -ml -b --release
+      - gradle assembleRelease
+    ndk: r21e
+
+  - versionName: 3.4.0
+    versionCode: 13040008
+    commit: 3.4.0
+    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@9e48d340d4177fefc0bf2edefe462d7baf88e586
+      - VLCmedialibrary@0bc75bd1becf49982e70269d56fb40fc78187d91
+    prebuild:
+      - cp -a $$VLC$$ vlc
+      - 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 ../libvlc/patches/vlc3/*.patch
+      - 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.0.2 --gradle-distribution-sha256-sum 0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c
+      - 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

@ -4171,7 +4299,7 @@ MaintainerNotes: |-

    For recommended versions of the build tools, see:

-    * https://git.videolan.org/?p=vlc.git;a=blob;f=extras/tools/bootstrap#l128
+    * 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

    Actual versioncodes are:
@ -4195,5 +4323,5 @@ MaintainerNotes: |-
 ArchivePolicy: 12 versions
 AutoUpdateMode: None
 UpdateCheckMode: Static
-CurrentVersion: 3.3.4
-CurrentVersionCode: 13030408
+CurrentVersion: 3.4.0
+CurrentVersionCode: 13040008
--- a/srclibs/VLC.yml
+++ b/srclibs/VLC.yml
@ -1,3 +1,3 @@
 RepoType: git
-Repo: git://git.videolan.org/vlc.git
+Repo: https://code.videolan.org/videolan/vlc.git