fix macos

mediar-ai · Nov 11, 2024 · afc2e08 · afc2e08
1 parent 67eabf6
commit afc2e08
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 30 deletions.
diff --git a/screenpipe-app-tauri/scripts/pre_build.js b/screenpipe-app-tauri/scripts/pre_build.js
@@ -440,26 +440,26 @@ if (platform == 'macos') {
 	}
 
 
-	// Setup FFMPEG
-	if (!(await fs.exists(config.ffmpegRealname))) {
-		await $`wget --no-config -nc ${config.macos.ffmpegUrl} -O ${config.macos.ffmpegName}.tar.xz`
-		await $`tar xf ${config.macos.ffmpegName}.tar.xz`
-		await $`mv ${config.macos.ffmpegName} ${config.ffmpegRealname}`
-		await $`rm ${config.macos.ffmpegName}.tar.xz`
-	} else {
-		console.log('FFMPEG already exists');
-	}
-
-	// Move and rename ffmpeg and ffprobe binaries
-	const ffmpegSrc = path.join(cwd, config.ffmpegRealname, 'bin', 'ffmpeg');
-
-	// For x86_64
-	await fs.copyFile(ffmpegSrc, path.join(cwd, 'ffmpeg-x86_64-apple-darwin'));
-
-	// For arm64
-	await fs.copyFile(ffmpegSrc, path.join(cwd, 'ffmpeg-aarch64-apple-darwin'));
-
-	console.log('Moved and renamed ffmpeg binary for externalBin');
+	// // Setup FFMPEG
+	// if (!(await fs.exists(config.ffmpegRealname))) {
+	// 	await $`wget --no-config -nc ${config.macos.ffmpegUrl} -O ${config.macos.ffmpegName}.tar.xz`
+	// 	await $`tar xf ${config.macos.ffmpegName}.tar.xz`
+	// 	await $`mv ${config.macos.ffmpegName} ${config.ffmpegRealname}`
+	// 	await $`rm ${config.macos.ffmpegName}.tar.xz`
+	// } else {
+	// 	console.log('FFMPEG already exists');
+	// }
+
+	// // Move and rename ffmpeg and ffprobe binaries
+	// const ffmpegSrc = path.join(cwd, config.ffmpegRealname, 'bin', 'ffmpeg');
+
+	// // For x86_64
+	// await fs.copyFile(ffmpegSrc, path.join(cwd, 'ffmpeg-x86_64-apple-darwin'));
+
+	// // For arm64
+	// await fs.copyFile(ffmpegSrc, path.join(cwd, 'ffmpeg-aarch64-apple-darwin'));
+
+	// console.log('Moved and renamed ffmpeg binary for externalBin');
 
 }
 

diff --git a/screenpipe-app-tauri/src-tauri/Cargo.toml b/screenpipe-app-tauri/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "screenpipe-app"
-version = "0.10.6"
+version = "0.10.7"
 description = ""
 authors = ["you"]
 license = ""

diff --git a/screenpipe-app-tauri/src-tauri/tauri.macos.conf.json b/screenpipe-app-tauri/src-tauri/tauri.macos.conf.json
@@ -2,14 +2,6 @@
     "bundle": {
         "macOS": {
             "frameworks": [
-                "ffmpeg/lib/libavcodec.61.dylib",
-                "ffmpeg/lib/libavdevice.61.dylib",
-                "ffmpeg/lib/libavfilter.10.dylib",
-                "ffmpeg/lib/libavformat.61.dylib",
-                "ffmpeg/lib/libavutil.59.dylib",
-                "ffmpeg/lib/libffmpeg.7.dylib",
-                "ffmpeg/lib/libswresample.5.dylib",
-                "ffmpeg/lib/libswscale.8.dylib",
                 "../../screenpipe-vision/lib/libscreenpipe.dylib",
                 "../../screenpipe-vision/lib/libscreenpipe_x86_64.dylib",
                 "../../screenpipe-vision/lib/libscreenpipe_arm64.dylib"
@@ -24,7 +16,6 @@
         },
         "externalBin": [
             "screenpipe",
-            "ffmpeg",
             "bun",
             "ollama"
         ]