From 39e92cc7e714008fc9fa955082cc3a4224ef7a06 Mon Sep 17 00:00:00 2001
From: jake <77554505+brxken128@users.noreply.github.com>
Date: Thu, 13 Apr 2023 15:10:23 +0100
Subject: [PATCH] update to ffmpeg 6.0.0 (#697)

---
 .github/scripts/setup-system.sh |  11 +++++++++--
 Cargo.lock                      | Bin 229414 -> 229421 bytes
 core/Cargo.toml                 |   2 +-
 crates/ffmpeg/Cargo.toml        |   2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/scripts/setup-system.sh b/.github/scripts/setup-system.sh
index 6dff259bc..f2d548962 100755
--- a/.github/scripts/setup-system.sh
+++ b/.github/scripts/setup-system.sh
@@ -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
diff --git a/Cargo.lock b/Cargo.lock
index 1ef92eacb514e593a530f570eebf7ea52d299598..924122f6e8438f42a6dd149211e3090e4e398f2b 100644
GIT binary patch
delta 365
zcmWmAKTAVF3;=Lm?IPHY?I_}2?tktUpWs*!Y&+_Z++Can7q@O*g(tk(MQ{+sCkPIH
z0u}rQ4nkLV7f-T;5RzYVvmD+nhYy=jx#s9#R!5_Z&Q55loJa(aQx1U1yQm;rA(Jx>
z6(Ct48_<GbP&NgRB$=8jjhe61LGuc$cG0i4yJJ7S>bXgKz2BSF9$DyU$~@(~R!AC=
zqKS!ENr9}BCJ!ZaPRSw=3S$WMe;c4{cIt6+Io)bb-VclS^I~2{c2=-)GDeoVWI3}5
z#mAfzlx0zSAn7%6Gzf`v_6`NOD7BQTIh&8V#mCckd;8m)?Fq&hvPvj5*-WNLUCc!l
z6f2D?ls^PR%-|)JQ&75?0>)AW8(Q&FjobUK8f>UZ;hpccKaW*^weG6tb=Rxk{s7AB
BbN&DT

delta 359
zcmWNNy-Ec!5JuV6#==|4)mH3fGRY(}AX-=of<KkmB%4XAHr5KF4-jF&N<r)dWd%!L
zKn35y%0_$xm(zUJ;p04>O&-oBPjjIqsm}{L8<;XiiH=ygI18>L?3~q<perd80<sjg
zK_a1AlxR7Y97R%LP4)a>+QU&hsc+%3-p?!!nYXSR>f=qbw-Fg67*+KlDZuD39kW2n
z>KV}&m6X9b6C9N6bI#DI8fzT;WU<~YPy6GOX1?mj_UQb(X!q9wL$Y2$5Xo5|6pJZn
zj2ICNmO56n#hOSX>;vayV~`R8LErqgOT*#k%XeMD-E|}C9ii9pj~Yhn3<XpIm6*Yb
trx?jVm&G{@V<R^XF36-pq24Yp_OC-TKWkQv)UVT(tDm8H{TbTL_kW!_Y|a1x

diff --git a/core/Cargo.toml b/core/Cargo.toml
index 3a10782f7..069810bd6 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -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 }
diff --git a/crates/ffmpeg/Cargo.toml b/crates/ffmpeg/Cargo.toml
index 376e1b094..24134f26d 100644
--- a/crates/ffmpeg/Cargo.toml
+++ b/crates/ffmpeg/Cargo.toml
@@ -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"