9187a6460f
Submitted by: clutton <clutton@zoho.com> Reviewed by: cpm, rene Obtained from: https://github.com/paranormal/ MFH: 2016Q4 Security: https://vuxml.freebsd.org/freebsd/769ba449-79e1-11e6-bf75-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/653a8059-7c49-11e6-9242-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/9c135c7e-9fa4-11e6-a265-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/9118961b-9fa5-11e6-a265-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/ae9cb9b8-a203-11e6-a265-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/a3473f5a-a739-11e6-afaa-e8e0b747a45a.html Differential Revision: https://reviews.freebsd.org/D8517
18 lines
676 B
Text
18 lines
676 B
Text
--- third_party/ffmpeg/BUILD.gn.orig 2016-08-03 22:03:29.000000000 +0300
|
|
+++ third_party/ffmpeg/BUILD.gn 2016-10-10 14:53:20.790578000 +0300
|
|
@@ -6,8 +6,13 @@
|
|
import("ffmpeg_generated.gni")
|
|
|
|
# Path to platform configuration files.
|
|
-platform_config_root =
|
|
- "chromium/config/$ffmpeg_branding/$os_config/$ffmpeg_arch"
|
|
+if (!is_bsd) {
|
|
+ platform_config_root =
|
|
+ "chromium/config/$ffmpeg_branding/$os_config/$ffmpeg_arch"
|
|
+} else {
|
|
+ platform_config_root =
|
|
+ "chromium/config/$ffmpeg_branding/linux/$ffmpeg_arch"
|
|
+}
|
|
|
|
has_yasm_deps = ffmpeg_yasm_sources != [] && (current_cpu == "x86" || current_cpu == "x64") && os_config != "linux-noasm"
|
|
if (has_yasm_deps) {
|