diff options
Diffstat (limited to 'www/chromium/files/patch-third_party__libvpx__libvpx.gyp')
| -rw-r--r-- | www/chromium/files/patch-third_party__libvpx__libvpx.gyp | 45 |
1 files changed, 3 insertions, 42 deletions
diff --git a/www/chromium/files/patch-third_party__libvpx__libvpx.gyp b/www/chromium/files/patch-third_party__libvpx__libvpx.gyp index 2ea73b11547e..f98fffd89d02 100644 --- a/www/chromium/files/patch-third_party__libvpx__libvpx.gyp +++ b/www/chromium/files/patch-third_party__libvpx__libvpx.gyp @@ -1,15 +1,6 @@ ---- third_party/libvpx/libvpx.gyp.orig 2011-10-09 00:08:25.368469771 +0300 -+++ third_party/libvpx/libvpx.gyp 2011-10-10 21:41:31.622025374 +0300 -@@ -77,7 +77,7 @@ - 'source/libvpx/vpx_scale/generic/yv12extend.c', - ], - 'conditions': [ -- ['OS=="mac" or OS=="linux"', { -+ ['OS=="mac" or OS=="linux" or OS=="freebsd"', { - 'asm_obj_extension': 'o', - }], - ['OS=="win"', { -@@ -86,7 +86,7 @@ +--- third_party/libvpx/libvpx.gyp.orig 2012-01-29 21:54:54.000000000 +0200 ++++ third_party/libvpx/libvpx.gyp 2012-01-29 21:55:14.000000000 +0200 +@@ -13,7 +13,7 @@ ], }, 'conditions': [ @@ -18,33 +9,3 @@ 'targets': [ { # This libvpx target contains both encoder and decoder. -@@ -98,7 +98,7 @@ - '<(SHARED_INTERMEDIATE_DIR)/third_party/libvpx', - 'yasm_path': '<(PRODUCT_DIR)/yasm', - 'conditions': [ -- [ 'OS=="linux" and target_arch=="ia32"', { -+ [ '(OS=="linux" or OS=="freebsd") and target_arch=="ia32"', { - 'yasm_flags': [ - '-felf32', - '-m', 'x86', -@@ -106,7 +106,7 @@ - '-I', 'source/libvpx', - ], - }], -- [ 'OS=="linux" and target_arch=="x64"', { -+ [ '(OS=="linux" or OS=="freebsd") and target_arch=="x64"', { - 'yasm_flags': [ - '-felf64', - '-m', 'amd64', -@@ -482,6 +482,11 @@ - 'libvpx_path': 'lib/linux/arm', - }, - }], -+ ['OS=="freebsd"', { -+ 'variables': { -+ 'libvpx_path': '/usr/local/lib', -+ }, -+ }], - ['OS=="win"', { - 'variables': { - 'libvpx_path': 'lib/win/ia32', |