update to ffmpeg 6.0.0 (#697)

This commit is contained in:
jake
2023-04-13 15:10:23 +01:00
committed by GitHub
parent cbcfe5adba
commit 39e92cc7e7
4 changed files with 11 additions and 4 deletions

View File

@@ -184,10 +184,17 @@ elif [[ $OSTYPE == "darwin"* ]]; then
echo "Installing Homebrew dependencies..."
BREW_DEPS="ffmpeg"
BREW_LIBP2P_DEPS="protobuf"
brew install -q $BREW_DEPS $BREW_LIBP2P_DEPS
brew install -q $BREW_LIBP2P_DEPS
if ! brew tap homebrew-ffmpeg/ffmpeg; then
log_err "We were unable to add the homebrew-ffmpeg tap. Please ensure that you have ran `brew uninstall ffmpeg` and try again."
fi
if ! brew install homebrew-ffmpeg/ffmpeg/ffmpeg; then
log_err "We were unable to install the homebrew-ffmpeg/ffmpeg package. Please ensure that you have ran `brew uninstall ffmpeg` and try again."
fi
else
log_err "Your OS ($OSTYPE) is not supported by this script. We would welcome a PR or some help adding your OS to this script. https://github.com/spacedriveapp/spacedrive/issues"
exit 1

BIN
Cargo.lock generated
View File

Binary file not shown.

View File

@@ -72,7 +72,7 @@ http-range = "0.1.5"
mini-moka = "0.10.0"
serde_with = "2.2.0"
dashmap = { version = "5.4.0", features = ["serde"] }
ffmpeg-next = { version = "5.1.1", optional = true, features = [] }
ffmpeg-next = { version = "6.0.0", optional = true, features = [] }
notify = { version = "5.0.0", default-features = false, features = [
"macos_fsevent",
], optional = true }

View File

@@ -12,7 +12,7 @@ resolver = "2"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
ffmpeg-sys-next = "5.1.1"
ffmpeg-sys-next = "6.0.0"
thiserror = "1.0.37"
webp = "0.2.2"