Skip to content

Commit

Permalink
fix: tauri conf + prebuild
Browse files Browse the repository at this point in the history
  • Loading branch information
louis030195 committed Nov 19, 2024
1 parent 9bd8c17 commit f7764cf
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 14 deletions.
17 changes: 8 additions & 9 deletions screenpipe-app-tauri/scripts/pre_build.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ const config = {
],
},
macos: {
ffmpegName: 'ffmpeg-7.1',
ffmpegUrl: 'https://evermeet.cx/ffmpeg/ffmpeg-7.1.7z',
ffmpegName: 'ffmpeg-7.0-macOS-default',
ffmpegUrl: 'https://master.dl.sourceforge.net/project/avbuild/macOS/ffmpeg-7.0-macOS-default.tar.xz?viasf=1',
},
}

Expand Down Expand Up @@ -442,11 +442,10 @@ if (platform == 'macos') {

// Setup FFMPEG
if (!(await fs.exists(config.ffmpegRealname))) {
await $`wget --no-config -nc ${config.macos.ffmpegUrl} -O ${config.macos.ffmpegName}.7z`
await $`mkdir -p ${config.macos.ffmpegName}`
await $`7z x ${config.macos.ffmpegName}.7z -o${config.macos.ffmpegName}`
await $`mv ${config.macos.ffmpegName}/ffmpeg ${config.ffmpegRealname}`
await $`rm -rf ${config.macos.ffmpegName} ${config.macos.ffmpegName}.7z`
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');
}
Expand All @@ -470,10 +469,10 @@ if (platform == 'macos') {

for (const arch of architectures) {
console.log(`Compiling Swift UI monitor for ${arch}...`);

const binaryName = `ui_monitor-${arch === 'arm64' ? 'aarch64' : 'x86_64'}-apple-darwin`;
const outputPath = path.join(cwd, binaryName);

// Compile directly to the final destination
await $`swiftc -O -whole-module-optimization -enforce-exclusivity=unchecked -num-threads 8 -target ${arch}-apple-macos11.0 -o ${outputPath} ${swiftSrc} -framework Cocoa -framework ApplicationServices -framework Foundation`;

Expand Down
2 changes: 1 addition & 1 deletion screenpipe-app-tauri/src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion screenpipe-app-tauri/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "screenpipe-app"
version = "0.11.0"
version = "0.11.1"
description = ""
authors = ["you"]
license = ""
Expand Down
2 changes: 1 addition & 1 deletion screenpipe-app-tauri/src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"title": "timeline",
"url": "/timeline",
"width": 1200,
"height": 600,
"height": 1000,
"minWidth": 1000,
"minHeight": 600,
"visible": false,
Expand Down
3 changes: 1 addition & 2 deletions screenpipe-app-tauri/src-tauri/tauri.macos.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
"screenpipe",
"bun",
"ollama",
"ui_monitor-aarch64-apple-darwin",
"ui_monitor-x86_64-apple-darwin"
"ui_monitor"
]
}
}
Binary file not shown.
Binary file not shown.
Binary file modified screenpipe-vision/bin/ui_monitor-aarch64-apple-darwin
Binary file not shown.

0 comments on commit f7764cf

Please sign in to comment.