From fa7c5d17b0a7a787a40a9799037c40d3633a593a Mon Sep 17 00:00:00 2001 From: Allan Amstadt Date: Thu, 18 Apr 2019 13:39:00 +0200 Subject: [PATCH] Updated Readme & added missing deps --- README.md | 28 +++++++++++++--------------- build_ffmpeg.py | 20 ++++++++++++++++++++ 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 3753d5e..f79bd04 100644 --- a/README.md +++ b/README.md @@ -1,34 +1,32 @@ # FFmpeg prebuilt for NW.js -#### Linux -[![Build Status](https://travis-ci.org/iteufel/nwjs-ffmpeg-prebuilt.svg?branch=master)](https://travis-ci.org/iteufel/nwjs-ffmpeg-prebuilt) -#### macOS -... -#### Windows -[![Build status](https://ci.appveyor.com/api/projects/status/nfnn60p44w62swic/branch/master?svg=true)](https://ci.appveyor.com/project/iteufel/nwjs-ffmpeg-prebuilt/branch/master) + +FFMpeg prebuilt binaries with proprietary codecs and build instructions for window, linux and macos. -FFMpeg prebuilt binaries with proprietary codecs and build instructions for window, linux and osx. +### Downloads (v0.37.4) +- Linux: [32bit](https://github.com/iteufel/nwjs-ffmpeg-prebuilt/releases/download/0.37.4/0.37.4-linux-ia32.zip) / [64bit](https://github.com/iteufel/nwjs-ffmpeg-prebuilt/releases/download/0.37.4/0.37.4-linux-x64.zip) +- Windows: [32bit](https://github.com/iteufel/nwjs-ffmpeg-prebuilt/releases/download/0.37.4/0.37.4-win-ia32.zip) / [64bit](https://github.com/iteufel/nwjs-ffmpeg-prebuilt/releases/download/0.37.4/0.37.4-win-x64.zip) +- Mac: [64bit](https://github.com/iteufel/nwjs-ffmpeg-prebuilt/releases/download/0.37.4/0.37.4-osx-x64.zip) -##### Usage: +### Build + +#### Usage: + +build_ffmpeg.py [-h] [-c] [-nw NW_VERSION] [-ta TARGET_ARCH] +##### Arguments explanied: -build_ffmpeg.py [-h] [-c] [-nw NW_VERSION] [-ta TARGET_ARCH] [-pc] -###### Arguments explanied: - *-h, --help* : Show the help message and exit - *-c, --clean* : Clean the workspace, removes downloaded source code - *-nw NW_VERSION, --nw_version NW_VERSION* : Build ffmpeg for the specified Nw.js version (latest from http://nwjs.io/versions.json if not specified) or branch - *-ta TARGET_ARCH, --target_arch TARGET_ARCH* : Target architecture, ia32, x64 -- *-pc, --proprietary_codecs* : Build ffmpeg with proprietary codecs applied from the specific platform [patch](https://github.com/iteufel/nwjs-ffmpeg-prebuilt/tree/master/patch) -###### Specific guides: +#### Specific guides: - [Windows guide](guides/build_windows.md) - [Linux guide](guides/build_linux.md) - [Mac guide](guides/build_mac.md) - -Downloads [prebuilt binaries](https://github.com/iteufel/nwjs-ffmpeg-prebuilt/releases). - You can get the FFmpeg source code from [here](https://chromium.googlesource.com/chromium/third_party/ffmpeg). >### License and Patent Fee diff --git a/build_ffmpeg.py b/build_ffmpeg.py index e05d8b5..577ec2d 100644 --- a/build_ffmpeg.py +++ b/build_ffmpeg.py @@ -384,6 +384,13 @@ def get_min_hooks(): 'condition': 'checkout_ios or checkout_mac', 'action': ['python', 'src/build/mac_toolchain.py'], }, + { + # Update the Windows toolchain if necessary. Must run before 'clang' below. + 'name': 'win_toolchain', + 'pattern': '.', + 'condition': 'checkout_win', + 'action': ['python', 'src/build/vs_toolchain.py', 'update', '--force'], + }, { 'action': [ 'python', @@ -465,6 +472,19 @@ def get_min_hooks(): '--bucket', 'chromium-clang-format', '-s', 'src/buildtools/mac/clang-format.sha1', ], + }, + # Pull rc binaries using checked-in hashes. + { + 'name': 'rc_win', + 'pattern': '.', + 'condition': 'checkout_win and host_os == "win"', + 'action': [ 'python', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '--bucket', 'chromium-browser-clang/rc', + '-s', 'src/build/toolchain/win/rc/win/rc.exe.sha1', + ], }, { 'name': 'rc_mac',