mirror of
https://github.com/spacedriveapp/spacedrive.git
synced 2026-05-14 18:24:27 -04:00
[ENG-1184, ENG-1286, ENG-1330] Rework native dependencies (+ deb fixes) (#1685)
* Almost working * Downgrade libplacebo - FFMpeg 6.0 uses some now removed deprecated functions * Use -Oz for zimg * Fix CI script to run the new ffmpeg build script * Fix heif step name + Ignore docker cache while building in CI * Fix Opencl build on linux * Fix adding incorrect -target argument to linker - Update zig for windows target * Disable opengl for ffmpeg, it only uses it as an outdev, not for processing - Disable opengl and directx for libplacebo, ffmpeg only supports vulkan when using it - Add WIN32_LEAN_AND_MEAN to global cflags to optimize windows api usage - Fix 99-heif.sh incorrect bsdtar flag * Remove WIN32_LEAN_AND_MEAN from global CFLAGS as that was breaking OpenCL build - Fix Dockerfile step for cleaning up the out dir - Improve licensing handling * x86_64 windows and linux builds are working * Fix aarch64 build for windows and linux * Fix symbol visibility in linux builds - Fix soxr failing to download due to sourcefourge - Only patch zimg on windows targets - Tell cmake to hide libheif symbols * Fix Linux .so rpath - Add lzo dependency - Publish source for the built libs - Add warning for missing nasm in tauri.mjs - Remove ffmpeg install from setup.sh - Add download logic for our linux ffmpeg bundle in preprep.mjs * Remove jobs, docker doesn't support this * Fix typing * Change ffmpeg references to native deps - Rename FFMpeg.framework to Spacedrive.framework - Centralize the macOS native deps build with the windows and linux one - Change the preprep script to only download our native deps - Remove old macOS ffmpeg build scripts * Compress native deps before creating github artifact - The zip implementation for github artifact does not mantain symlinks and permissions - Remove conditional protoc, it is now always included * Don't strip dylibs, it was breaking them - Only download macOS Framework for darwin targets - Fix preprep script - Improve README.md for native-deps - Fix not finding native-deps src * Attempt to fix macOS dylib * Fix macOS dylibs - Replace lld.ld64 with apple's own linker - Add stages for building apple's compiler tools to use instead of LLVM ones * Ensure sourced file exists * All targets should build now - Fix environment sourcing in build.sh - Some minor improvements to cc.sh - Fix incorrect flag in zlib.sh - Improve how -f[...] flags are passed to compiler and linker - Add more stack hardening flags * We now can support macOS 11.0 on arm64 * Improve macOS Framework generation - Remove installed unused deps - Improve cleanup and organization logic in Dockerfile last step - Move libav* .dll.a to .lib to fix missing files in windows target - Remove apple tools from /srv folder after installation to prevent their files from being copied by other stage steps - Create all the necessary symlinks for the macOS targets while building - Remove symlink logic for macOS target from preprep.mjs * Remove native-deps from spacedrive repo - It now resides in https://github.com/spacedriveapp/native-deps - Modify preprep script to dowload native-deps from new location - Remove Github API code from scripts (not needed anymore) - Add flock.mjs to allow running tauri.mjs cleanup as soon as cargo finishes building in linux * Handle flock not present in system - Allow macOS to try using flock * Fix preprep on macOS * Add script that patch deb to fix errors and warnings raised by lintian * Fix ctrl+c/ctrl+v typo * Remove gstreamer1.0-gtk3 from deb dependencies * eval is evil * Handle tauri build release with an explicit target in fix-deb.sh * Preserve environment variables when re-executing fix-deb with sudo * Only execute fix-deb.sh when building a deb bundle * Improvements fix-deb.sh * Improve setup.sh (Add experiemental alpine support)
This commit is contained in:
committed by
GitHub
parent
c2dd3661f9
commit
48afea5a4b
@@ -52,10 +52,12 @@ export async function tauriUpdaterKey(nativeDeps) {
|
||||
/**
|
||||
* @param {string} root
|
||||
* @param {string} nativeDeps
|
||||
* @param {string[]} targets
|
||||
* @param {string[]} bundles
|
||||
* @param {string[]} args
|
||||
* @returns {Promise<string[]>}
|
||||
*/
|
||||
export async function patchTauri(root, nativeDeps, args) {
|
||||
export async function patchTauri(root, nativeDeps, targets, bundles, args) {
|
||||
if (args.findIndex(e => e === '-c' || e === '--config') !== -1) {
|
||||
throw new Error('Custom tauri build config is not supported.')
|
||||
}
|
||||
@@ -66,7 +68,7 @@ export async function patchTauri(root, nativeDeps, args) {
|
||||
const osType = os.type()
|
||||
const resources =
|
||||
osType === 'Linux'
|
||||
? await copyLinuxLibs(root, nativeDeps)
|
||||
? await copyLinuxLibs(root, nativeDeps, args[0] === 'dev')
|
||||
: osType === 'Windows_NT'
|
||||
? await copyWindowsDLLs(root, nativeDeps)
|
||||
: { files: [], toClean: [] }
|
||||
@@ -86,6 +88,12 @@ export async function patchTauri(root, nativeDeps, args) {
|
||||
.readFile(path.join(tauriRoot, 'tauri.conf.json'), 'utf-8')
|
||||
.then(JSON.parse)
|
||||
|
||||
if (bundles.length === 0) {
|
||||
const defaultBundles = tauriConfig.tauri?.bundle?.targets
|
||||
if (Array.isArray(defaultBundles)) bundles.push(...defaultBundles)
|
||||
if (bundles.length === 0) bundles.push('all')
|
||||
}
|
||||
|
||||
if (args[0] === 'build') {
|
||||
if (tauriConfig?.tauri?.updater?.active) {
|
||||
const pubKey = await tauriUpdaterKey(nativeDeps)
|
||||
@@ -94,19 +102,10 @@ export async function patchTauri(root, nativeDeps, args) {
|
||||
}
|
||||
|
||||
if (osType === 'Darwin') {
|
||||
// ARM64 support was added in macOS 11, but we need at least 11.2 due to our ffmpeg build
|
||||
const macOSArm64MinimumVersion = '11.2'
|
||||
const macOSArm64MinimumVersion = '11.0'
|
||||
|
||||
let macOSMinimumVersion = tauriConfig?.tauri?.bundle?.macOS?.minimumSystemVersion
|
||||
|
||||
const targets = args
|
||||
.filter((_, index, args) => {
|
||||
if (index === 0) return false
|
||||
const previous = args[index - 1]
|
||||
return previous === '-t' || previous === '--target'
|
||||
})
|
||||
.flatMap(target => target.split(','))
|
||||
|
||||
if (
|
||||
(targets.includes('aarch64-apple-darwin') ||
|
||||
(targets.length === 0 && process.arch === 'arm64')) &&
|
||||
|
||||
Reference in New Issue
Block a user