diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-09-09 06:16:35 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-09-09 06:16:35 +0000 |
| commit | f4aef6b62c614ecd1d50069031eae67318ac5ff9 (patch) | |
| tree | 781de0366f06f8728245988a38a42d4e172d024d /www/firefox/files/patch-bug826985 | |
| parent | www/ruybgem-puma: update to 2.9.1 (diff) | |
Mozilla upgrades:
- Update nspr to 4.10.7
- Update ca_root_nss to 3.17 (mark as NO_ARCH while here)
- Update firefox to 32.0
- Update thunderbird to 31.1.0
- Add net-im/linux-instantbird
- Update firefox-est to 31.1.0
- Update libxul to 24.8.0
- Update seamonkey to 2.29
Submitted by: Jan Beich for gecko@
Notes
Notes:
svn path=/head/; revision=367712
Diffstat (limited to 'www/firefox/files/patch-bug826985')
| -rw-r--r-- | www/firefox/files/patch-bug826985 | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/www/firefox/files/patch-bug826985 b/www/firefox/files/patch-bug826985 index b8eee831f66d..4e20ff41d658 100644 --- a/www/firefox/files/patch-bug826985 +++ b/www/firefox/files/patch-bug826985 @@ -132,23 +132,26 @@ index d46b5aa..e452223 100644 'targets': [ { 'target_name': 'video_capture_module', -@@ -49,6 +52,16 @@ - }, { # include_internal_video_capture == 1 - 'conditions': [ - ['include_v4l2_video_capture==1', { +@@ -46,6 +49,19 @@ + 'linux/video_capture_linux.cc', + 'linux/video_capture_linux.h', + ], + 'conditions': [ + ['use_libv4l2==1', { + 'defines': [ + 'HAVE_LIBV4L2', + ], ++ 'cflags_mozilla': [ ++ '$(MOZ_LIBV4L2_CFLAGS)', ++ ], + 'libraries': [ + '-lv4l2', + ], + }], + ], - 'include_dirs': [ - 'linux', - ], + }], # linux + ['OS=="mac"', { + 'sources': [ diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in index 9c16ffa..1db3794 100644 --- toolkit/library/libxul.mk |