From 4502ce28f2ed769b3c71c59a658153709e6fdfaa Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Mon, 6 May 2019 21:24:07 +0200 Subject: [PATCH] remove linux32 bit support because static builds seem to be missing now --- package.json | 3 +-- scripts/ffmpeg-dl/dl.sh | 2 -- scripts/ffmpeg-dl/extract.sh | 5 ----- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/package.json b/package.json index 1f0aba53..8f0c063c 100644 --- a/package.json +++ b/package.json @@ -14,11 +14,10 @@ "package:darwin_x64": "PLATFORM=darwin ARCH=x64 ICON=app.icns npm run package-single", "package:win32_ia32": "PLATFORM=win32 ARCH=ia32 ICON=app.ico npm run package-single", "package:win32_x64": "PLATFORM=win32 ARCH=x64 ICON=app.ico npm run package-single", - "package:linux_ia32": "PLATFORM=linux ARCH=ia32 ICON=app.ico npm run package-single", "package:linux_x64": "PLATFORM=linux ARCH=x64 ICON=app.ico npm run package-single", "zip": "(cd package && rm -f LosslessCut-*.zip && for f in LosslessCut-*; do zip -r --symlinks \"$f\".zip \"$f\"; done)", "icon-gen": "icon-gen -i src/icon.svg -o ./icon-dist -r", - "package": "npm run package:darwin_x64 && npm run package:win32_ia32 && npm run package:win32_x64 && npm run package:linux_ia32 && npm run package:linux_x64 && npm run zip", + "package": "npm run package:darwin_x64 && npm run package:win32_ia32 && npm run package:win32_x64 && npm run package:linux_x64 && npm run zip", "release": "gh-release -a package/LosslessCut-darwin-x64.zip,package/LosslessCut-win32-ia32.zip,package/LosslessCut-win32-x64.zip,package/LosslessCut-linux-ia32.zip,package/LosslessCut-linux-x64.zip", "gifify": "gifify -p 405:299 -r 5@3 Untitled.mov-00.00.00.971-00.00.19.780.mp4", "lint": "eslint --ext .jsx --ext .js .", diff --git a/scripts/ffmpeg-dl/dl.sh b/scripts/ffmpeg-dl/dl.sh index eaca1195..c3b8661f 100755 --- a/scripts/ffmpeg-dl/dl.sh +++ b/scripts/ffmpeg-dl/dl.sh @@ -1,7 +1,6 @@ #!/usr/bin/env bash ffmpeg_version=4.1 -ffmpeg_linux_ia32=https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-32bit-static.tar.xz ffmpeg_linux_x64=https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz ffmpeg_darwin_x64=http://evermeet.cx/ffmpeg/ffmpeg-"${ffmpeg_version}".7z ffmpeg_win32_ia32=https://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-"${ffmpeg_version}"-win32-static.zip @@ -17,7 +16,6 @@ fi mkdir -p "$OUT_DIR" && (cd "$OUT_DIR" && -wget -O ffmpeg_linux_ia32.tar.xz "${ffmpeg_linux_ia32}" && wget -O ffmpeg_linux_x64.tar.xz "${ffmpeg_linux_x64}" && wget -O ffmpeg_darwin_x64.7z "${ffmpeg_darwin_x64}" && wget -O ffmpeg_win32_ia32.zip "${ffmpeg_win32_ia32}" && diff --git a/scripts/ffmpeg-dl/extract.sh b/scripts/ffmpeg-dl/extract.sh index c461b5f7..834c768c 100755 --- a/scripts/ffmpeg-dl/extract.sh +++ b/scripts/ffmpeg-dl/extract.sh @@ -4,8 +4,6 @@ ffmpeg_version=4.1 ( mkdir -p ffmpeg-tmp/extracted && cd ffmpeg-tmp/extracted && - (mkdir -p linux_ia32 && cd linux_ia32 && - 7z x ../../archives/ffmpeg_linux_ia32.tar.xz && tar xvfp ffmpeg_linux_ia32.tar) && (mkdir -p linux_x64 && cd linux_x64 && 7z x ../../archives/ffmpeg_linux_x64.tar.xz && tar xvfp ffmpeg_linux_x64.tar) && (mkdir -p win32_ia32 && cd win32_ia32 && @@ -17,14 +15,11 @@ ffmpeg_version=4.1 7z x ../../archives/ffprobe_darwin_x64.7z) ) && cd ffmpeg-tmp && -mkdir -p binaries/linux_ia32 && mkdir -p binaries/linux_x64 && mkdir -p binaries/win32_ia32 && mkdir -p binaries/win32_x64 && mkdir -p binaries/darwin_x64 && ls -R extracted && -mv extracted/linux_ia32/ffmpeg-"${ffmpeg_version}"-32bit-static/ffmpeg binaries/linux_ia32 && -mv extracted/linux_ia32/ffmpeg-"${ffmpeg_version}"-32bit-static/ffprobe binaries/linux_ia32 && mv extracted/linux_x64/ffmpeg-"${ffmpeg_version}"-64bit-static/ffmpeg binaries/linux_x64 && mv extracted/linux_x64/ffmpeg-"${ffmpeg_version}"-64bit-static/ffprobe binaries/linux_x64 && mv extracted/win32_ia32/ffmpeg-"${ffmpeg_version}"-win32-static/bin/ffmpeg.exe binaries/win32_ia32 &&