TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'isolated-ffmpeg' into smart-album

Browse Source
This commit is contained in:
Prateek Sunal
2025-07-21 00:23:36 +05:30
parent 4d9b6ecbc6 8afc4bb0cb
commit 418d20b336
11 changed files with 37 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/mobile-internal-release-rust.yml vendored
View File

@@ -4,7 +4,7 @@ on:
workflow_dispatch: # Allow manually running the action
env:
FLUTTER_VERSION: "3.32.5"
FLUTTER_VERSION: "3.29.3"
RUST_VERSION: "1.85.1"
permissions:

2
.github/workflows/mobile-internal-release.yml vendored
View File

@@ -4,7 +4,7 @@ on:
workflow_dispatch: # Allow manually running the action
env:
FLUTTER_VERSION: "3.32.5"
FLUTTER_VERSION: "3.29.3"
permissions:
contents: write

2
.github/workflows/mobile-lint.yml vendored
View File

@@ -8,7 +8,7 @@ on:
- ".github/workflows/mobile-lint.yml"
env:
FLUTTER_VERSION: "3.32.5"
FLUTTER_VERSION: "3.29.3"
permissions:
contents: read

2
.github/workflows/mobile-release.yml vendored
View File

@@ -9,7 +9,7 @@ on:
- "photos-v*"
env:
FLUTTER_VERSION: "3.32.5"
FLUTTER_VERSION: "3.29.3"
permissions:
contents: write

3
mobile/apps/photos/.fvmrc Normal file
View File

@@ -0,0 +1,3 @@
{
"flutter": "3.29.3"
}

3
mobile/apps/photos/.gitignore vendored
View File

@@ -43,3 +43,6 @@ fastlane/report.xml
# Android related
android/app/build/
# FVM Version Cache
.fvm/

10
mobile/apps/photos/ios/Podfile.lock
View File

@@ -240,7 +240,7 @@ PODS:
- Flutter
- wakelock_plus (0.0.1):
- Flutter
- workmanager_apple (0.0.1):
- workmanager (0.0.1):
- Flutter
DEPENDENCIES:
@@ -300,7 +300,7 @@ DEPENDENCIES:
- video_thumbnail (from `.symlinks/plugins/video_thumbnail/ios`)
- volume_controller (from `.symlinks/plugins/volume_controller/ios`)
- wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
- workmanager_apple (from `.symlinks/plugins/workmanager_apple/ios`)
- workmanager (from `.symlinks/plugins/workmanager/ios`)
SPEC REPOS:
https://github.com/ente-io/ffmpeg-kit-custom-repo-ios:
@@ -438,8 +438,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/volume_controller/ios"
wakelock_plus:
:path: ".symlinks/plugins/wakelock_plus/ios"
workmanager_apple:
:path: ".symlinks/plugins/workmanager_apple/ios"
workmanager:
:path: ".symlinks/plugins/workmanager/ios"
SPEC CHECKSUMS:
app_links: 76b66b60cc809390ca1ad69bfd66b998d2387ac7
@@ -517,7 +517,7 @@ SPEC CHECKSUMS:
video_thumbnail: b637e0ad5f588ca9945f6e2c927f73a69a661140
volume_controller: 3657a1f65bedb98fa41ff7dc5793537919f31b12
wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
workmanager_apple: f540d652595dfe5c8b8200c4c85ba622d6fb5c5b
workmanager: b89e4e4445d8b57ee2fdbf1c3925696ebe5b8990
PODFILE CHECKSUM: cce2cd3351d3488dca65b151118552b680e23635

4
mobile/apps/photos/ios/Runner.xcodeproj/project.pbxproj
View File

@@ -579,7 +579,7 @@
"${BUILT_PRODUCTS_DIR}/video_thumbnail/video_thumbnail.framework",
"${BUILT_PRODUCTS_DIR}/volume_controller/volume_controller.framework",
"${BUILT_PRODUCTS_DIR}/wakelock_plus/wakelock_plus.framework",
"${BUILT_PRODUCTS_DIR}/workmanager_apple/workmanager_apple.framework",
"${BUILT_PRODUCTS_DIR}/workmanager/workmanager.framework",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ffmpeg_kit_custom/ffmpegkit.framework/ffmpegkit",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ffmpeg_kit_custom/libavcodec.framework/libavcodec",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ffmpeg_kit_custom/libavdevice.framework/libavdevice",
@@ -674,7 +674,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_thumbnail.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/volume_controller.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock_plus.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/workmanager_apple.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/workmanager.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ffmpegkit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libavcodec.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libavdevice.framework",

2
mobile/apps/photos/ios/Runner/AppDelegate.swift
View File

@@ -2,7 +2,7 @@ import AVFoundation
import Flutter
import UIKit
import app_links
import workmanager_apple
import workmanager
@main
@objc class AppDelegate: FlutterAppDelegate {

60
mobile/apps/photos/pubspec.lock
View File

@@ -125,10 +125,10 @@ packages:
dependency: "direct main"
description:
name: async
sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
url: "https://pub.dev"
source: hosted
version: "2.13.0"
version: "2.12.0"
battery_info:
dependency: "direct main"
description:
@@ -271,10 +271,10 @@ packages:
dependency: transitive
description:
name: checked_yaml
sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f"
sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
url: "https://pub.dev"
source: hosted
version: "2.0.4"
version: "2.0.3"
chewie:
dependency: "direct main"
description:
@@ -630,10 +630,10 @@ packages:
dependency: transitive
description:
name: fake_async
sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
url: "https://pub.dev"
source: hosted
version: "1.3.3"
version: "1.3.2"
fast_base58:
dependency: "direct main"
description:
@@ -1428,10 +1428,10 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
url: "https://pub.dev"
source: hosted
version: "10.0.9"
version: "10.0.8"
leak_tracker_flutter_testing:
dependency: transitive
description:
@@ -2534,10 +2534,10 @@ packages:
dependency: "direct main"
description:
name: synchronized
sha256: c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0
sha256: "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6"
url: "https://pub.dev"
source: hosted
version: "3.4.0"
version: "3.3.1"
system_info_plus:
dependency: "direct main"
description:
@@ -2840,10 +2840,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
url: "https://pub.dev"
source: hosted
version: "15.0.0"
version: "14.3.1"
volume_controller:
dependency: transitive
description:
@@ -2904,10 +2904,10 @@ packages:
dependency: transitive
description:
name: webdriver
sha256: "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade"
sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8"
url: "https://pub.dev"
source: hosted
version: "3.1.0"
version: "3.0.4"
webkit_inspection_protocol:
dependency: transitive
description:
@@ -2968,34 +2968,10 @@ packages:
dependency: "direct main"
description:
name: workmanager
sha256: dffcbbfd99af17271ca52d8a3767ba8a1000b357f2774db8ed5d58879cb9783a
sha256: "746a50c535af15b6dc225abbd9b52ab272bcd292c535a104c54b5bc02609c38a"
url: "https://pub.dev"
source: hosted
version: "0.8.0"
workmanager_android:
dependency: transitive
description:
name: workmanager_android
sha256: a6447816c41aa0ad8f6fa29b62d09a528891cf0737296397e1caae2523ced7dc
url: "https://pub.dev"
source: hosted
version: "0.8.0"
workmanager_apple:
dependency: transitive
description:
name: workmanager_apple
sha256: "9c99003682a8423bdc122ff4bae891e24574d1e676ea302d2ef0493266228461"
url: "https://pub.dev"
source: hosted
version: "0.8.0"
workmanager_platform_interface:
dependency: transitive
description:
name: workmanager_platform_interface
sha256: b1f0a868f1117511a23b0eb4220f08134152433b51a83eed479b1d68bbe23789
url: "https://pub.dev"
source: hosted
version: "0.8.0"
version: "0.7.0"
xdg_directories:
dependency: transitive
description:
@@ -3029,5 +3005,5 @@ packages:
source: hosted
version: "3.1.3"
sdks:
dart: ">=3.8.0 <4.0.0"
flutter: ">=3.32.0"
dart: ">=3.7.2 <4.0.0"
flutter: ">=3.29.0"

2
mobile/apps/photos/pubspec.yaml
View File

@@ -212,7 +212,7 @@ dependencies:
wakelock_plus: ^1.1.1
wechat_assets_picker: ^9.5.1
widgets_to_image: ^1.0.0
workmanager: ^0.8.0
workmanager: ^0.7.0
xml: ^6.3.0
dependency_overrides: