upgrade to ffmpeg6

and use shared ffmpeg for win and linux
closes #1143
pull/1556/head
Mikael Finstad 3 years ago
parent 99b6f5479a
commit 2674f66c7d
No known key found for this signature in database
GPG Key ID: 25AB36E3E81CBC26

@ -11,10 +11,10 @@
"start:frontend": "cross-env vite --port 3001", "start:frontend": "cross-env vite --port 3001",
"start:electron": "wait-on tcp:3001 && electron .", "start:electron": "wait-on tcp:3001 && electron .",
"icon-gen": "mkdirp icon-build build-resources/appx && node script/icon-gen.mjs", "icon-gen": "mkdirp icon-build build-resources/appx && node script/icon-gen.mjs",
"download-ffmpeg-darwin-x64": "mkdirp ffmpeg/darwin-x64 && cd ffmpeg/darwin-x64 && wget https://github.com/mifi/ffmpeg-build-script/releases/download/5.1.2/ffmpeg -O ffmpeg && wget https://github.com/mifi/ffmpeg-build-script/releases/download/5.1.2/ffprobe -O ffprobe && chmod +x ffmpeg && chmod +x ffprobe", "download-ffmpeg-darwin-x64": "mkdirp ffmpeg/darwin-x64 && cd ffmpeg/darwin-x64 && wget https://github.com/mifi/ffmpeg-build-script/releases/download/6.0/ffmpeg -O ffmpeg && wget https://github.com/mifi/ffmpeg-build-script/releases/download/6.0/ffprobe -O ffprobe && chmod +x ffmpeg && chmod +x ffprobe",
"download-ffmpeg-darwin-arm64": "mkdirp ffmpeg/darwin-arm64 && cd ffmpeg/darwin-arm64 && wget https://github.com/mifi/ffmpeg-builds/releases/download/5.1.2/ffmpeg-darwin-arm64-v5.1.2 -O ffmpeg && wget https://github.com/mifi/ffmpeg-builds/releases/download/5.1.2/ffprobe-darwin-arm64-v5.1.2 -O ffprobe && chmod +x ffmpeg && chmod +x ffprobe", "download-ffmpeg-darwin-arm64": "mkdirp ffmpeg/darwin-arm64 && cd ffmpeg/darwin-arm64 && wget https://github.com/mifi/ffmpeg-builds/releases/download/6.0/ffmpeg-darwin-arm64-v6.0 -O ffmpeg && wget https://github.com/mifi/ffmpeg-builds/releases/download/6.0/ffprobe-darwin-arm64-v6.0 -O ffprobe && chmod +x ffmpeg && chmod +x ffprobe",
"download-ffmpeg-linux-x64": "mkdirp ffmpeg/linux-x64 && cd ffmpeg/linux-x64 && wget https://github.com/mifi/ffmpeg-builds/releases/download/5.1.2/linux-x64-v5.1.1.tar.xz -O ffmpeg-ffprobe.xz && tar -xv --strip-components=1 -f ffmpeg-ffprobe.xz ffmpeg-5.1.1-amd64-static/ffmpeg ffmpeg-5.1.1-amd64-static/ffprobe", "download-ffmpeg-linux-x64": "mkdirp ffmpeg/linux-x64 && cd ffmpeg/linux-x64 && wget https://github.com/mifi/ffmpeg-builds/releases/download/6.0/ffmpeg-n6.0-12-ga6dc92968a-linux64-gpl-shared-6.0.tar.xz -O ffmpeg-ffprobe.xz && tar -xv -f ffmpeg-ffprobe.xz && mv ffmpeg-n6.0-12-ga6dc92968a-linux64-gpl-shared-6.0 extracted && mkdirp lib && mv extracted/bin/{ffmpeg,ffprobe} extracted/lib/lib*.so* lib",
"download-ffmpeg-win32-x64": "mkdirp ffmpeg/win32-x64 && cd ffmpeg/win32-x64 && npx download-cli https://github.com/mifi/ffmpeg-builds/releases/download/5.1.2/win32-x64-v5.1.2.7z --out . --filename ffmpeg-ffprobe.7z && 7z x ffmpeg-ffprobe.7z && npx shx mv ffmpeg-5.1.2-essentials_build/bin/ffmpeg.exe ./ && npx shx mv ffmpeg-5.1.2-essentials_build/bin/ffprobe.exe ./", "download-ffmpeg-win32-x64": "mkdirp ffmpeg/win32-x64 && cd ffmpeg/win32-x64 && npx download-cli https://github.com/mifi/ffmpeg-builds/releases/download/6.0/ffmpeg-n6.0-12-ga6dc92968a-win64-gpl-shared-6.0.zip --out . --filename ffmpeg-ffprobe.zip && 7z x ffmpeg-ffprobe.zip && mkdirp lib && cd ffmpeg-n6.0-12-ga6dc92968a-win64-gpl-shared-6.0/bin && npx shx mv ffmpeg.exe ffprobe.exe *.dll ../../lib",
"build": "yarn icon-gen && vite build --outDir vite-dist", "build": "yarn icon-gen && vite build --outDir vite-dist",
"test": "vitest", "test": "vitest",
"lint": "eslint --ext .jsx --ext .js . --ext .mjs", "lint": "eslint --ext .jsx --ext .js . --ext .mjs",
@ -160,12 +160,8 @@
], ],
"extraResources": [ "extraResources": [
{ {
"from": "ffmpeg/darwin-${arch}/ffmpeg", "from": "ffmpeg/darwin-${arch}",
"to": "ffmpeg" "to": "."
},
{
"from": "ffmpeg/darwin-${arch}/ffprobe",
"to": "ffprobe"
} }
], ],
"icon": "icon-build/app.icns", "icon": "icon-build/app.icns",
@ -283,12 +279,8 @@
], ],
"extraResources": [ "extraResources": [
{ {
"from": "ffmpeg/win32-${arch}/ffmpeg.exe", "from": "ffmpeg/win32-${arch}/lib",
"to": "ffmpeg.exe" "to": "."
},
{
"from": "ffmpeg/win32-${arch}/ffprobe.exe",
"to": "ffprobe.exe"
} }
], ],
"icon": "icon-build/app.ico", "icon": "icon-build/app.ico",
@ -399,12 +391,8 @@
"executableName": "losslesscut", "executableName": "losslesscut",
"extraResources": [ "extraResources": [
{ {
"from": "ffmpeg/linux-${arch}/ffmpeg", "from": "ffmpeg/linux-${arch}/lib",
"to": "ffmpeg" "to": "."
},
{
"from": "ffmpeg/linux-${arch}/ffprobe",
"to": "ffprobe"
} }
], ],
"category": "AudioVideo", "category": "AudioVideo",

Loading…
Cancel
Save