Date: Fri, 29 Apr 2011 02:05:30 +0300 From: George Liaskos <geo.liaskos@gmail.com> To: Rene Ladan <rene@freebsd.org> Cc: freebsd-chromium@freebsd.org Subject: Re: Chromium 11 patches Message-ID: <BANLkTinkmvE-EuN_Zc-wSQx9WbVGXthFDw@mail.gmail.com> In-Reply-To: <4DB9083E.2060103@freebsd.org> References: <BANLkTimgdyx_0=9r53bos2ncWS8t0DUDcA@mail.gmail.com> <BANLkTikwtGKWQt9oEjr3QiaVkMAMx1q9cw@mail.gmail.com> <4DB72016.2090806@freebsd.org> <BANLkTik3rXta_n98BHjoQJ_YX-LGM9NFzw@mail.gmail.com> <4DB8838F.1030203@gmail.com> <BANLkTimn_08VWwKx-roKQEkRrnLg4Cgh6Q@mail.gmail.com> <4DB9083E.2060103@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
The attached patch fixes the remaining issues.
Regards
[-- Attachment #2 --]
--- third_party/ffmpeg/ffmpeg.gyp.orig 2011-04-26 11:02:53.000000000 +0300
+++ third_party/ffmpeg/ffmpeg.gyp 2011-04-29 01:18:16.629475671 +0300
@@ -50,7 +50,7 @@
}, {
'ffmpeg_config%': '<(target_arch)',
}],
- ['OS=="mac" or OS=="win"', {
+ ['OS=="mac" or OS=="win" or OS=="freebsd"', {
'os_config%': '<(OS)',
}, { # all other Unix OS's use the linux config
'os_config%': 'linux',
@@ -205,8 +205,19 @@
],
}], # ffmpeg_branding
['target_arch=="ia32" or target_arch=="x64"', {
- 'dependencies': [
- '../yasm/yasm.gyp:yasm#host',
+ 'conditions': [
+ ['use_system_yasm==0', {
+ 'dependencies': [
+ '../yasm/yasm.gyp:yasm#host',
+ ],
+ 'variables': {
+ 'yasm_path': '<(PRODUCT_DIR)/yasm',
+ },
+ }, {
+ 'variables': {
+ 'yasm_path': '<!(which yasm)',
+ },
+ }],
],
'sources': [
'patched-ffmpeg-mt/libavcodec/libvpxdec.c',
@@ -365,7 +376,6 @@
],
},
'variables': {
- 'yasm_path': '<(PRODUCT_DIR)/yasm',
'obj_format': 'elf',
'conditions': [
[ 'target_arch=="ia32"', {
@@ -720,6 +730,12 @@
},
}],
+ ['OS=="freebsd" and use_system_vpx==1', {
+ 'include_dirs': [
+ '/usr/local/include',
+ ],
+ }],
+
['use_system_vpx==0', {
'include_dirs': [
# TODO(fischman): when both mac & linux are building from
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?BANLkTinkmvE-EuN_Zc-wSQx9WbVGXthFDw>