Alpha test

flathub · Apr 1, 2024 · 2d94443 · 2d94443
1 parent f39da9e
commit 2d94443
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 329 deletions.
diff --git a/ffmpeg_binutils241.patch b/ffmpeg_binutils241.patch
diff --git a/org.videolan.VLC.yaml b/org.videolan.VLC.yaml
@@ -1,6 +1,7 @@
 app-id: org.videolan.VLC
+branch: alpha
 runtime: org.kde.Platform
-runtime-version: 5.15-23.08
+runtime-version: '6.6'
 sdk: org.kde.Sdk
 command: vlc
 finish-args:
@@ -18,10 +19,9 @@ finish-args:
   - --talk-name=org.mpris.MediaPlayer2.Player
   - --own-name=org.mpris.MediaPlayer2.vlc
   - --device=all
-  - --filesystem=xdg-run/gvfs
 add-extensions:
   org.videolan.VLC.Plugin:
-    versions: 3-5.15-23.08;3-23.08
+    versions: 4-6.6;4-23.08
     directory: share/vlc/extra
     subdirectories: true
     merge-dirs: plugins
@@ -43,7 +43,7 @@ cleanup-commands:
   - mkdir -p /app/share/vlc/extra
   - ln -s /app/share/vlc/extra/plugins /app/lib/vlc/plugins/extra
   - rm -f /app/lib/vlc/plugins/plugins.dat
-  - /app/lib/vlc/vlc-cache-gen /app/lib/vlc/plugins
+  - /app/bin/vlc.bin --reset-plugins-cache --no-audio --no-video --intf dummy vlc://quit
 build-options:
   env:
     V: '1'
@@ -426,17 +426,15 @@ modules:
       - --enable-libopus
     sources:
       - type: archive
-        url: https://ffmpeg.org/releases/ffmpeg-4.4.4.tar.xz
-        sha256: e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309
+        url: https://ffmpeg.org/releases/ffmpeg-6.1.1.tar.xz
+        sha256: 8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968
         x-checker-data:
           type: anitya
           project-id: 5405
           versions:
-            '>=': '4'
-            <: '5'
+            '>=': '6'
+            '<': '7'
           url-template: https://ffmpeg.org/releases/ffmpeg-$version.tar.xz
-      - type: patch
-        path: ffmpeg_binutils241.patch
   - shared-modules/libsecret/libsecret.json
   - name: libaacs
     config-opts:
@@ -494,20 +492,6 @@ modules:
           type: anitya
           project-id: 10017
           url-template: https://github.com/libmtp/libmtp/releases/download/v$version/libmtp-$version.tar.gz
-  - name: chromaprint
-    buildsystem: cmake-ninja
-    config-opts:
-      - -DCMAKE_BUILD_TYPE=RelWithDebInfo
-      - -DBUILD_SHARED_LIBS=ON
-      - -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-    sources:
-      - type: archive
-        url: https://github.com/acoustid/chromaprint/releases/download/v1.5.1/chromaprint-1.5.1.tar.gz
-        sha256: a1aad8fa3b8b18b78d3755b3767faff9abb67242e01b478ec9a64e190f335e1c
-        x-checker-data:
-          type: anitya
-          project-id: 286
-          url-template: https://github.com/acoustid/chromaprint/releases/download/v$version/chromaprint-$version.tar.gz
   - name: fluidlite
     buildsystem: cmake-ninja
     config-opts:
@@ -531,18 +515,63 @@ modules:
   - name: libplacebo
     buildsystem: meson
     config-opts:
-      - -Dvulkan=false
+      - -Dvulkan=enabled
+      - -Dshaderc=enabled
     sources:
-      - type: archive
-        url: https://github.com/haasn/libplacebo/archive/refs/tags/v0.2.1.tar.gz
-        sha256: d5d920a1745e4209287d32e8b96a85127b61b843304813980e11104cd9f15e82
-        x-checker-data:
-          type: anitya
-          project-id: 20101
-          versions:
-            '>=': '0.2'
-            <: '0.3'
-          url-template: https://github.com/haasn/libplacebo/archive/refs/tags/v$version.tar.gz
+      - type: git
+        url: https://code.videolan.org/videolan/libplacebo.git
+        mirror-urls:
+          - https://github.com/haasn/libplacebo.git
+        tag: v5.264.1
+        commit: ed29e541a55acf28022738440b2a925386292551
+#        x-checker-data:
+#          type: git
+#          tag-pattern: ^v([\d.]+)$
+    modules:
+      - name: shaderc
+        buildsystem: cmake-ninja
+        builddir: true
+        config-opts:
+          - -DSHADERC_SKIP_COPYRIGHT_CHECK=ON
+          - -DSHADERC_SKIP_EXAMPLES=ON
+          - -DSHADERC_SKIP_TESTS=ON
+          - -DSPIRV_SKIP_EXECUTABLES=ON
+          - -DENABLE_GLSLANG_BINARIES=OFF
+        cleanup:
+          - /bin
+          - /lib/cmake
+        sources:
+          - type: git
+            url: https://github.com/google/shaderc.git
+            tag: v2023.4
+            commit: 45b735dfddefe26a99b77e5a74e30d860713ac64
+#            x-checker-data:
+#              type: git
+#              tag-pattern: ^v(\d{4}\.\d{1,2})$
+          - type: git
+            url: https://github.com/KhronosGroup/SPIRV-Tools.git
+            tag: v2023.2
+            commit: 44d72a9b36702f093dd20815561a56778b2d181e
+            dest: third_party/spirv-tools
+#            x-checker-data:
+#              type: git
+#              tag-pattern: ^v(\d{4}\.\d{1})$
+          - type: git
+            url: https://github.com/KhronosGroup/SPIRV-Headers.git
+            tag: sdk-1.3.246.1
+            commit: 1feaf4414eb2b353764d01d88f8aa4bcc67b60db
+            dest: third_party/spirv-headers
+#            x-checker-data:
+#              type: git
+#              tag-pattern: ^sdk-([\d.]+)$
+          - type: git
+            url: https://github.com/KhronosGroup/glslang.git
+            tag: 12.2.0
+            commit: d1517d64cfca91f573af1bf7341dc3a5113349c0
+            dest: third_party/glslang
+#            x-checker-data:
+#              type: git
+#              tag-pattern: ^(\d{1,2}\.\d{1,2}\.\d{1,4})$
   - name: libdsm
     buildsystem: meson
     sources:
@@ -632,6 +661,15 @@ modules:
           url-template: https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-cpp-3.$version.tar.gz
     cleanup:
       - /bin
+  - name: medialibrary
+    buildsystem: meson
+    config-opts:
+      - -Dlibvlc=disabled
+      - -Dlibtool_workaround=true
+    sources:
+      - type: archive
+        url: https://code.videolan.org/videolan/medialibrary/-/archive/0.13.0/medialibrary-0.13.0.tar.bz2
+        sha256: 0aa084caa3461e7d97b277c0707de7bfe51aabd7e57cad8c8572575cff0a01aa
   - name: vlc
     config-opts:
       - BUILDCC=/usr/bin/gcc -std=gnu99
@@ -650,22 +688,13 @@ modules:
       - tar xf chrpath-0.16.tar.gz && cd chrpath-0.16 && ./configure && make
       - ./chrpath-0.16/chrpath -d /app/lib/vlc/plugins/access/liblibbluray_plugin.so
     sources:
-      - type: archive
-        url: https://download.videolan.org/videolan/vlc/3.0.20/vlc-3.0.20.tar.xz
-        sha256: adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5
-        x-checker-data:
-          type: anitya
-          project-id: 6504
-          versions:
-            '>=': '3'
-            <: '4'
-          url-template: https://download.videolan.org/videolan/vlc/$version/vlc-$version.tar.xz
+      - type: git
+        url: https://code.videolan.org/videolan/vlc.git
+        commit: 9394e7eace4f7a343cf0a9de8ef63f2108b515ef
       - type: file
         path: org.videolan.VLC.appdata.xml
       - type: patch
         path: vlc-fix-appdata.patch
-      - type: patch
-        path: vlc-disc-shortcuts.patch
       - type: patch
         path: vlc-ignore-time-for-cache.patch
       - type: file

diff --git a/vlc-disc-shortcuts.patch b/vlc-disc-shortcuts.patch