diff --git a/flatpak/flatpak-manifest.yaml b/flatpak/flatpak-manifest.yaml index 3c1d73c3..d11efc25 100644 --- a/flatpak/flatpak-manifest.yaml +++ b/flatpak/flatpak-manifest.yaml @@ -27,215 +27,6 @@ cleanup: - /share/gtk-docmodules modules: - - name: libmpv - buildsystem: meson - cleanup: - - /bin - - /share/applications - - /share/bash-completion - - /share/icons - - /share/zsh - - /share/metainfo - config-opts: - - -Dalsa=enabled - - -Dbuild-date=false - - -Dcdda=disabled - - -Dcplayer=true - - -Dcplugins=enabled - - -Dcuda-hwaccel=enabled - - -Dcuda-interop=enabled - - -Ddmabuf-wayland=enabled - - -Ddrm=enabled - - -Ddvbin=enabled - - -Ddvdnav=disabled - - -Degl-drm=enabled - - -Degl-wayland=enabled - - -Degl-x11=enabled - - -Degl=enabled - - -Dgbm=enabled - - -Dgl-x11=enabled - - -Dgl=enabled - - -Diconv=enabled - - -Djack=enabled - - -Djavascript=disabled - - -Djpeg=enabled - - -Dlcms2=enabled - - -Dlibarchive=enabled - - -Dlibavdevice=enabled - - -Dlibbluray=disabled - - -Dlibmpv=true - - -Dlua=enabled - - -Dmanpage-build=disabled - - -Dopenal=enabled - - -Dpipewire=enabled - - -Dplain-gl=enabled - - -Dpulse=enabled - - -Drubberband=disabled - - -Dsdl2-audio=enabled - - -Dsdl2-gamepad=enabled - - -Dsdl2-video=enabled - - -Dsdl2=enabled - - -Duchardet=disabled - - -Dvaapi-drm=enabled - - -Dvaapi-wayland=enabled - - -Dvaapi-x11=enabled - - -Dvaapi=enabled - - -Dvapoursynth=disabled - - -Dvdpau-gl-x11=enabled - - -Dvdpau=enabled - - -Dvector=enabled - - -Dvulkan=enabled - - -Dwayland=enabled - - -Dwerror=false - - -Dx11=enabled - - -Dxv=enabled - - -Dzimg=disabled - - -Dzlib=enabled - sources: - - type: git - url: https://github.com/mpv-player/mpv.git - tag: v0.40.0 - commit: e48ac7ce08462f5e33af6ef9deeac6fa87eef01e - x-checker-data: - type: git - tag-pattern: ^v([\d.]+)$ - - modules: - # Hard dependency of mpv - - name: libplacebo - buildsystem: meson - config-opts: - - -Dvulkan=enabled - - -Dshaderc=enabled - - -Dd3d11=disabled - - -Ddemos=false - sources: - - type: git - url: https://code.videolan.org/videolan/libplacebo.git - tag: v7.351.0 - commit: 3188549fba13bbdf3a5a98de2a38c2e71f04e21e - x-checker-data: - type: git - tag-pattern: ^v([\d.]+)$ - - type: patch - path: libplacebo-python-3.14.patch - modules: - # runtime shaderc is broken for mpv build. - - 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 - - /include - - /lib/cmake - - /lib/pkgconfig - sources: - - type: git - url: https://github.com/google/shaderc.git - tag: v2025.4 - commit: 73743588fe9c39f2f1c780a087d94afac691a189 - x-checker-data: - type: git - tag-pattern: ^v(\d{4}\.\d{1,2})$ - - type: git - url: https://github.com/KhronosGroup/SPIRV-Headers.git - tag: vulkan-sdk-1.4.328.1 - commit: 01e0577914a75a2569c846778c2f93aa8e6feddd - dest: third_party/spirv-headers - x-checker-data: - type: git - tag-pattern: ^vulkan-sdk-([\d.]+)$ - - type: git - url: https://github.com/KhronosGroup/SPIRV-Tools.git - tag: vulkan-sdk-1.4.328.1 - commit: 7f2d9ee926f98fc77a3ed1e1e0f113b8c9c49458 - dest: third_party/spirv-tools - x-checker-data: - type: git - tag-pattern: ^vulkan-sdk-([\d.]+)$ - - type: git - url: https://github.com/KhronosGroup/glslang.git - tag: vulkan-sdk-1.4.328.1 - commit: a57276bf558f5cf94d3a9854ebdf5a2236849a5a - dest: third_party/glslang - x-checker-data: - type: git - tag-pattern: ^vulkan-sdk-([\d.]+)$ - - # Hard dependency of mpv - - name: libass - config-opts: - - --disable-static - sources: - - type: git - url: https://github.com/libass/libass.git - tag: 0.17.4 - commit: bbb3c7f1570a4a021e52683f3fbdf74fe492ae84 - x-checker-data: - type: git - tag-pattern: ^([\d.]+)$ - - # Lua to display mpv play info - - name: luajit - no-autogen: true - cleanup: - - /bin - - /include - - /lib/pkgconfig - - /share/man - sources: - - type: git - url: https://github.com/openresty/luajit2.git - tag: v2.1-20251030 - commit: 71fae383f6c4637d64b03a6d0ec76ae8c19d6821 - x-checker-data: - type: git - tag-pattern: ^v2.1-([\d\.\-]+)$ - - type: shell - commands: - - sed -i 's|/usr/local|/app|' ./Makefile - - # X11 - - name: libXpresent - buildsystem: autotools - sources: - - type: git - url: https://gitlab.freedesktop.org/xorg/lib/libxpresent.git - tag: libXpresent-1.0.2 - commit: 4d92149372461bf575e8a09b1064a2884c38c3aa - x-checker-data: - type: git - tag-pattern: ^libXpresent-([\d.]+)$ - - # Hardware acceleration - - name: libdisplay-info - buildsystem: meson - sources: - - type: git - url: https://gitlab.freedesktop.org/emersion/libdisplay-info.git - tag: 0.3.0 - commit: 47a5590e9c4eb35d67651b8c05a55f1a48259329 - x-checker-data: - type: git - tag-pattern: ^([\d.]+)$ - modules: - - name: hwdata - buildsystem: autotools - sources: - - type: git - url: https://github.com/vcrhonek/hwdata.git - tag: v0.400 - commit: f5ce55230206fd647bbcae42012094eb04640740 - x-checker-data: - type: git - tag-pattern: ^v([\d.]+)$ - - name: dart_simple_live buildsystem: simple build-options: diff --git a/flatpak/libplacebo-python-3.14.patch b/flatpak/libplacebo-python-3.14.patch deleted file mode 100644 index 687587a6..00000000 --- a/flatpak/libplacebo-python-3.14.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 12509c0f1ee8c22ae163017f0a5e7b8a9d983a17 Mon Sep 17 00:00:00 2001 -From: Nicolas Chauvet -Date: Tue, 29 Jul 2025 11:42:35 +0200 -Subject: [PATCH] vulkan/utils_gen: fix for python 3.14 - -Python 3.14+ has added more type checking. This patch fixes usage - -Fixes: https://github.com/haasn/libplacebo/issues/335 - -Signed-off-by: Nicolas Chauvet ---- - src/vulkan/utils_gen.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/vulkan/utils_gen.py b/src/vulkan/utils_gen.py -index 9a97d35f3..9b803d82b 100644 ---- a/src/vulkan/utils_gen.py -+++ b/src/vulkan/utils_gen.py -@@ -202,7 +202,8 @@ def find_registry_xml(datadir): - if not xmlfile or xmlfile == '': - xmlfile = find_registry_xml(datadir) - -- registry = VkXML(ET.parse(xmlfile)) -+ tree = ET.parse(xmlfile) -+ registry = VkXML(tree.getroot()) - with open(outfile, 'w') as f: - f.write(TEMPLATE.render( - vkresults = get_vkenum(registry, 'VkResult'), diff --git a/simple_live_app/pubspec.lock b/simple_live_app/pubspec.lock index b3f5df6e..8ed22fda 100644 --- a/simple_live_app/pubspec.lock +++ b/simple_live_app/pubspec.lock @@ -784,67 +784,75 @@ packages: media_kit: dependency: "direct main" description: - name: media_kit - sha256: "2a207ea7baf1a2ea2ff2016d512e572ca6fc02a937769effb5c27b4d682b4a53" - url: "https://pub.dev" - source: hosted - version: "1.2.3" + path: media_kit + ref: "480c1e182fdb300ba975b2160765965f79a9b955" + resolved-ref: "480c1e182fdb300ba975b2160765965f79a9b955" + url: "https://github.com/Predidit/media-kit.git" + source: git + version: "1.1.11" media_kit_libs_android_video: - dependency: transitive + dependency: "direct overridden" description: - name: media_kit_libs_android_video - sha256: "3f6274e5ab2de512c286a25c327288601ee445ed8ac319e0ef0b66148bd8f76c" - url: "https://pub.dev" - source: hosted - version: "1.3.8" + path: "libs/android/media_kit_libs_android_video" + ref: "480c1e182fdb300ba975b2160765965f79a9b955" + resolved-ref: "480c1e182fdb300ba975b2160765965f79a9b955" + url: "https://github.com/Predidit/media-kit.git" + source: git + version: "1.3.6" media_kit_libs_ios_video: - dependency: transitive + dependency: "direct overridden" description: - name: media_kit_libs_ios_video - sha256: b5382994eb37a4564c368386c154ad70ba0cc78dacdd3fb0cd9f30db6d837991 - url: "https://pub.dev" - source: hosted + path: "libs/ios/media_kit_libs_ios_video" + ref: "480c1e182fdb300ba975b2160765965f79a9b955" + resolved-ref: "480c1e182fdb300ba975b2160765965f79a9b955" + url: "https://github.com/Predidit/media-kit.git" + source: git version: "1.1.4" media_kit_libs_linux: - dependency: transitive + dependency: "direct overridden" description: - name: media_kit_libs_linux - sha256: "2b473399a49ec94452c4d4ae51cfc0f6585074398d74216092bf3d54aac37ecf" - url: "https://pub.dev" - source: hosted - version: "1.2.1" + path: "libs/linux/media_kit_libs_linux" + ref: "480c1e182fdb300ba975b2160765965f79a9b955" + resolved-ref: "480c1e182fdb300ba975b2160765965f79a9b955" + url: "https://github.com/Predidit/media-kit.git" + source: git + version: "1.1.3" media_kit_libs_macos_video: - dependency: transitive + dependency: "direct overridden" description: - name: media_kit_libs_macos_video - sha256: f26aa1452b665df288e360393758f84b911f70ffb3878032e1aabba23aa1032d - url: "https://pub.dev" - source: hosted + path: "libs/macos/media_kit_libs_macos_video" + ref: "480c1e182fdb300ba975b2160765965f79a9b955" + resolved-ref: "480c1e182fdb300ba975b2160765965f79a9b955" + url: "https://github.com/Predidit/media-kit.git" + source: git version: "1.1.4" media_kit_libs_video: dependency: "direct main" description: - name: media_kit_libs_video - sha256: "2b235b5dac79c6020e01eef5022c6cc85fedc0df1738aadc6ea489daa12a92a9" - url: "https://pub.dev" - source: hosted - version: "1.0.7" + path: "libs/universal/media_kit_libs_video" + ref: "480c1e182fdb300ba975b2160765965f79a9b955" + resolved-ref: "480c1e182fdb300ba975b2160765965f79a9b955" + url: "https://github.com/Predidit/media-kit.git" + source: git + version: "1.0.5" media_kit_libs_windows_video: - dependency: transitive + dependency: "direct overridden" description: - name: media_kit_libs_windows_video - sha256: dff76da2778729ab650229e6b4ec6ec111eb5151431002cbd7ea304ff1f112ab - url: "https://pub.dev" - source: hosted - version: "1.0.11" + path: "libs/windows/media_kit_libs_windows_video" + ref: "480c1e182fdb300ba975b2160765965f79a9b955" + resolved-ref: "480c1e182fdb300ba975b2160765965f79a9b955" + url: "https://github.com/Predidit/media-kit.git" + source: git + version: "1.0.10" media_kit_video: dependency: "direct main" description: - name: media_kit_video - sha256: afaa509e7b7e0bf247557a3a740cde903a52c34ace9810f94500e127bd7b043d - url: "https://pub.dev" - source: hosted - version: "2.0.1" + path: media_kit_video + ref: "480c1e182fdb300ba975b2160765965f79a9b955" + resolved-ref: "480c1e182fdb300ba975b2160765965f79a9b955" + url: "https://github.com/Predidit/media-kit.git" + source: git + version: "1.2.5" message_pack_dart: dependency: transitive description: @@ -913,10 +921,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d + sha256: "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968" url: "https://pub.dev" source: hosted - version: "9.0.0" + version: "8.3.1" package_info_plus_platform_interface: dependency: transitive description: @@ -1524,10 +1532,10 @@ packages: dependency: "direct main" description: name: wakelock_plus - sha256: "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228" + sha256: "61713aa82b7f85c21c9f4cd0a148abd75f38a74ec645fcb1e446f882c82fd09b" url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.3.3" wakelock_plus_platform_interface: dependency: transitive description: diff --git a/simple_live_app/pubspec.yaml b/simple_live_app/pubspec.yaml index 3b117592..71126473 100644 --- a/simple_live_app/pubspec.yaml +++ b/simple_live_app/pubspec.yaml @@ -7,6 +7,11 @@ environment: flutter: 3.38.4 dependencies: + flutter: + sdk: flutter + flutter_localizations: + sdk: flutter + simple_live_core: path: ../simple_live_core # 图标 @@ -40,7 +45,7 @@ dependencies: canvas_danmaku: ^0.2.7 # 弹幕库 # 系统交互 - package_info_plus: ^9.0.0 # 包信息 + package_info_plus: ^8.3.1 # 包信息 device_info_plus: ^12.2.0 # 设备信息 url_launcher: ^6.3.1 # 打开链接 share_plus: ^12.0.1 # 分享 @@ -53,7 +58,7 @@ dependencies: flutter_image_gallery_saver: ^0.0.2 # 图片保存到相册 screen_brightness: ^2.1.7 # 亮度控制 auto_orientation_v2: ^2.3.6 # 屏幕方向 - wakelock_plus: ^1.4.0 # 屏幕常亮 + wakelock_plus: ^1.3.3 # 屏幕常亮 file_picker: ^10.1.2 # 文件选择 window_manager: ^0.5.0 # 窗口管理 floating: ^6.0.0 # PIP 画中画 @@ -74,16 +79,49 @@ dependencies: signalr_netcore: ^1.3.9 # SignalR # 视频播放 - media_kit: ^1.2.3 # Primary package. - media_kit_video: ^2.0.1 # For video rendering. - media_kit_libs_video: ^1.0.7 # Native video dependencies. volume_controller: any + media_kit: + git: + url: https://github.com/Predidit/media-kit.git + ref: 480c1e182fdb300ba975b2160765965f79a9b955 + path: ./media_kit + media_kit_video: + git: + url: https://github.com/Predidit/media-kit.git + ref: 480c1e182fdb300ba975b2160765965f79a9b955 + path: ./media_kit_video + media_kit_libs_video: + git: + url: https://github.com/Predidit/media-kit.git + ref: 480c1e182fdb300ba975b2160765965f79a9b955 + path: ./libs/universal/media_kit_libs_video - flutter: - sdk: flutter - flutter_localizations: - sdk: flutter - +dependency_overrides: + media_kit_libs_linux: + git: + url: https://github.com/Predidit/media-kit.git + ref: 480c1e182fdb300ba975b2160765965f79a9b955 + path: ./libs/linux/media_kit_libs_linux + media_kit_libs_ios_video: + git: + url: https://github.com/Predidit/media-kit.git + ref: 480c1e182fdb300ba975b2160765965f79a9b955 + path: ./libs/ios/media_kit_libs_ios_video + media_kit_libs_android_video: + git: + url: https://github.com/Predidit/media-kit.git + ref: 480c1e182fdb300ba975b2160765965f79a9b955 + path: ./libs/android/media_kit_libs_android_video + media_kit_libs_windows_video: + git: + url: https://github.com/Predidit/media-kit.git + ref: 480c1e182fdb300ba975b2160765965f79a9b955 + path: ./libs/windows/media_kit_libs_windows_video + media_kit_libs_macos_video: + git: + url: https://github.com/Predidit/media-kit.git + ref: 480c1e182fdb300ba975b2160765965f79a9b955 + path: ./libs/macos/media_kit_libs_macos_video dev_dependencies: flutter_lints: ^6.0.0