| Index: third_party/ffmpeg/ffmpeg.gyp
|
| ===================================================================
|
| --- third_party/ffmpeg/ffmpeg.gyp (revision 38032)
|
| +++ third_party/ffmpeg/ffmpeg.gyp (working copy)
|
| @@ -7,7 +7,9 @@
|
| {
|
| 'target_defaults': {
|
| 'conditions': [
|
| - ['OS!="linux" and OS!="freebsd"', {'sources/': [['exclude', '/linux/']]}],
|
| + ['OS!="linux" and OS!="freebsd" and OS!="openbsd"', {
|
| + 'sources/': [['exclude', '/linux/']]
|
| + }],
|
| ['OS!="mac"', {'sources/': [['exclude', '/mac/']]}],
|
| ['OS!="win"', {'sources/': [['exclude', '/win/']]}],
|
| ],
|
| @@ -47,7 +49,7 @@
|
| #
|
| # TODO(ajwong): Per the comment above, reduce this conditional's size and
|
| # determine if in-tree build in Windows is tractable.
|
| - ['(OS!="linux" and OS!="freebsd" and OS!="mac") or use_system_ffmpeg!=0', {
|
| + ['(OS!="linux" and OS!="freebsd" and OS!="openbsd" and OS!="mac") or use_system_ffmpeg!=0', {
|
| 'variables': {
|
| 'target_for_binaries': 'ffmpeg_binaries',
|
| 'ffmpeg_include_root': 'include',
|
| @@ -274,7 +276,7 @@
|
| 'source/patched-ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c',
|
| ],
|
| }], # target_arch=="arm" and ffmpeg_branding=="ChromeOS"
|
| - ['OS=="linux" or OS=="freebsd"', {
|
| + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
|
| 'defines': [
|
| '_ISOC99_SOURCE',
|
| '_LARGEFILE_SOURCE',
|
| @@ -310,7 +312,7 @@
|
| }],
|
| ],
|
| },
|
| - }], # OS=="linux" or OS=="freebsd"
|
| + }], # OS=="linux" or OS=="freebsd" or OS=="openbsd"
|
| ['OS=="mac"', {
|
| 'libraries': [
|
| # TODO(ajwong): Move into link_settings when this is fixed:
|
| @@ -394,7 +396,7 @@
|
| 'rules': [
|
| {
|
| 'conditions': [
|
| - ['OS=="linux" or OS=="freebsd"', {
|
| + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
|
| 'variables': {
|
| 'obj_format': 'elf',
|
| },
|
| @@ -512,7 +514,7 @@
|
| 'ffmpegsumo',
|
| ],
|
| 'conditions': [
|
| - ['OS=="linux" or OS=="freebsd"', {
|
| + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
|
| 'copies': [
|
| {
|
| # On Make and Scons builds, the library does not end up in
|
| @@ -717,7 +719,7 @@
|
| ],
|
| },
|
| 'dependencies': ['../../build/win/system.gyp:cygwin'],
|
| - }], ['OS=="linux" or OS=="freebsd"', {
|
| + }], ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
|
| 'variables': {
|
| # TODO(ajwong): Clean this up after we've finished
|
| # migrating to in-tree build.
|
|
|