Date: Sun, 20 Dec 2015 20:15:23 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404073 - in branches/2015Q4/www/chromium: . files Message-ID: <201512202015.tBKKFNnS059151@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Sun Dec 20 20:15:23 2015 New Revision: 404073 URL: https://svnweb.freebsd.org/changeset/ports/404073 Log: MFH: r404050 www/chromium: update to 47.0.2526.106 Submitted by: Christoph Moench-Tegeder via GitHub Security: http://vuxml.freebsd.org/freebsd/bb7d4791-a5bf-11e5-a0e5-00262d5ed8ee.html Approved by: ports-secteam (feld) Added: branches/2015Q4/www/chromium/files/patch-chrome__browser__ssl__bad_blocking_page.cc - copied unchanged from r404050, head/www/chromium/files/patch-chrome__browser__ssl__bad_blocking_page.cc branches/2015Q4/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h - copied unchanged from r404050, head/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h branches/2015Q4/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc - copied unchanged from r404050, head/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc branches/2015Q4/www/chromium/files/patch-media__audio__audio_manager.cc - copied unchanged from r404050, head/www/chromium/files/patch-media__audio__audio_manager.cc branches/2015Q4/www/chromium/files/patch-media__audio__audio_manager.h - copied unchanged from r404050, head/www/chromium/files/patch-media__audio__audio_manager.h branches/2015Q4/www/chromium/files/patch-third_party__ffmpeg__chromium__scripts__generate_gyp.py - copied unchanged from r404050, head/www/chromium/files/patch-third_party__ffmpeg__chromium__scripts__generate_gyp.py branches/2015Q4/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gni - copied unchanged from r404050, head/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gni Deleted: branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.h Modified: branches/2015Q4/www/chromium/Makefile branches/2015Q4/www/chromium/distinfo branches/2015Q4/www/chromium/files/extra-patch-clang branches/2015Q4/www/chromium/files/patch-base__process__memory_unittest.cc branches/2015Q4/www/chromium/files/patch-base__process__process_info_linux.cc branches/2015Q4/www/chromium/files/patch-base__process__process_posix.cc branches/2015Q4/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser.gypi branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi branches/2015Q4/www/chromium/files/patch-chrome__common__chrome_paths.h branches/2015Q4/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp branches/2015Q4/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc branches/2015Q4/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc branches/2015Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc branches/2015Q4/www/chromium/files/patch-device__usb__usb_service_impl.cc branches/2015Q4/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc branches/2015Q4/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.cc branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.h branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc branches/2015Q4/www/chromium/files/patch-media__filters__vp9_parser.h branches/2015Q4/www/chromium/files/patch-media__media.gyp branches/2015Q4/www/chromium/files/patch-net__net.gypi branches/2015Q4/www/chromium/files/patch-net__proxy__proxy_service.cc branches/2015Q4/www/chromium/files/patch-skia__skia_chrome.gypi branches/2015Q4/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gypi branches/2015Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__JS_Value.cpp branches/2015Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp branches/2015Q4/www/chromium/files/patch-third_party__sfntly__sfntly.gyp branches/2015Q4/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc branches/2015Q4/www/chromium/files/patch-ui__events__keycodes__dom__keycode_converter.cc branches/2015Q4/www/chromium/files/patch-ui__gl__gl_surface_glx.cc branches/2015Q4/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc branches/2015Q4/www/chromium/files/patch-ui__resources__ui_resources.grd branches/2015Q4/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc branches/2015Q4/www/chromium/files/patch-ui__views__controls__button__label_button.cc Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/www/chromium/Makefile ============================================================================== --- branches/2015Q4/www/chromium/Makefile Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/Makefile Sun Dec 20 20:15:23 2015 (r404073) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 47.0.2526.80 +PORTVERSION= 47.0.2526.106 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on @@ -23,7 +23,6 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${ ${LOCALBASE}/share/usbids/usb.ids:${PORTSDIR}/misc/usbids \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2 \ ${PYTHON_PKGNAMEPREFIX}ply>0:${PORTSDIR}/devel/py-ply \ - ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:${PORTSDIR}/www/py-beautifulsoup \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:${PORTSDIR}/www/py-html5lib LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ @@ -244,9 +243,6 @@ post-patch: ${WRKSRC}/base/base.gyp pre-configure: -.if ! ${PORT_OPTIONS:MTEST} - ${ECHO_CMD} > ${WRKSRC}/chrome/test/data/webui/i18n_process_css_test.html -.endif # phajdan-jr: list of things *not* to remove, so maybe the script # should be called "keep_bundled_libraries.py" cd ${WRKSRC} && ${PYTHON_CMD} \ @@ -275,6 +271,13 @@ pre-configure: 'third_party/brotli' \ 'third_party/boringssl' \ 'third_party/cacheinvalidation' \ + 'third_party/catapult' \ + 'third_party/catapult/third_party/beautifulsoup' \ + 'third_party/catapult/tracing' \ + 'third_party/catapult/tracing/third_party' \ + 'third_party/catapult/tracing/third_party/tvcm' \ + 'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \ + 'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \ 'third_party/cld' \ 'third_party/cros_system_api' \ 'third_party/dom_distiller_js' \ @@ -299,11 +302,9 @@ pre-configure: 'third_party/libsrtp' \ 'third_party/libvpx_new' \ 'third_party/libvpx_new/source/libvpx/third_party/x86inc' \ + 'third_party/libwebm' \ 'third_party/libxml/chromium' \ 'third_party/libXNVCtrl' \ - 'third_party/libwebm' \ - 'third_party/libwebm/source' \ - 'third_party/libwebm/source/common' \ 'third_party/libyuv' \ 'third_party/lss' \ 'third_party/lzma_sdk' \ @@ -332,13 +333,6 @@ pre-configure: 'third_party/sqlite' \ 'third_party/tcmalloc' \ 'third_party/tlslite' \ - 'third_party/catapult' \ - 'third_party/catapult/tracing' \ - 'third_party/catapult/tracing/third_party' \ - 'third_party/catapult/tracing/third_party/tvcm/third_party' \ - 'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \ - 'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \ - 'third_party/catapult/tracing/third_party/tvcm/tvcm' \ 'third_party/usrsctp' \ 'third_party/web-animations-js' \ 'third_party/webdriver' \ @@ -356,6 +350,10 @@ pre-configure: ${GYP_DEFINES:C/^/-D/} || ${FALSE} # allow removal of third_party/adobe ${ECHO_CMD} > ${WRKSRC}/flapper_version.h + # missing file: file is in -testdata only, but configure stage + # will fail if it's not there. do not break TESTS build while + # allowing regular build without pulling in -testdata. + ${TOUCH} ${WRKSRC}/chrome/test/data/webui/i18n_process_css_test.html do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ Modified: branches/2015Q4/www/chromium/distinfo ============================================================================== --- branches/2015Q4/www/chromium/distinfo Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/distinfo Sun Dec 20 20:15:23 2015 (r404073) @@ -1,4 +1,4 @@ -SHA256 (chromium-47.0.2526.80.tar.xz) = b107148323a3b641eae29bfeda298183c0d1c110ef96a04a13f329015d614d05 -SIZE (chromium-47.0.2526.80.tar.xz) = 1210266772 -SHA256 (chromium-47.0.2526.80-testdata.tar.xz) = 155165253d232cc2fd5f072d45aec98efca7ca38e29661890b3debc9ad310bfd -SIZE (chromium-47.0.2526.80-testdata.tar.xz) = 117394704 +SHA256 (chromium-47.0.2526.106.tar.xz) = 64535073330a3d37aad228d10a15cdcbb5b389e59d079d1a3b22d023b99a58e6 +SIZE (chromium-47.0.2526.106.tar.xz) = 1433438428 +SHA256 (chromium-47.0.2526.106-testdata.tar.xz) = 327fe48a9611f55005654c49ce79349b1caed283fba2df6283ebdc486ce348b8 +SIZE (chromium-47.0.2526.106-testdata.tar.xz) = 117395412 Modified: branches/2015Q4/www/chromium/files/extra-patch-clang ============================================================================== --- branches/2015Q4/www/chromium/files/extra-patch-clang Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/extra-patch-clang Sun Dec 20 20:15:23 2015 (r404073) @@ -224,7 +224,7 @@ --- third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc.orig 2015-09-03 09:31:11.815462000 -0400 +++ third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc 2015-09-03 09:31:50.974163000 -0400 -@@ -844,7 +844,7 @@ +@@ -1028,7 +1028,7 @@ const AudioEncoder* AudioCodingImpl::GetSenderInfo() const { FATAL() << "Not implemented yet."; @@ -233,7 +233,7 @@ } const CodecInst* AudioCodingImpl::GetSenderCodecInst() { -@@ -864,7 +864,7 @@ +@@ -1048,7 +1048,7 @@ const ReceiverInfo* AudioCodingImpl::GetReceiverInfo() const { FATAL() << "Not implemented yet."; Modified: branches/2015Q4/www/chromium/files/patch-base__process__memory_unittest.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-base__process__memory_unittest.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-base__process__memory_unittest.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- base/process/memory_unittest.cc.orig 2015-10-14 03:01:18.000000000 -0400 -+++ base/process/memory_unittest.cc 2015-10-23 11:11:40.281381000 -0400 +--- base/process/memory_unittest.cc.orig 2015-12-04 20:12:12.356919000 +0100 ++++ base/process/memory_unittest.cc 2015-12-04 20:14:11.966272000 +0100 @@ -137,11 +137,11 @@ #endif // defined(OS_MACOSX) @@ -19,5 +19,5 @@ } #endif // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) -#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !(defined(OS_WIN) && -+#endif // !defined(OS_ANDROID) && !defined(OS_BSD) && !defined(OS_WIN) ++#endif // !defined(OS_ANDROID) && !defined(OS_BSD) && !(defined(OS_WIN) && // !defined(ALLOCATOR_SHIM)) && !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) Modified: branches/2015Q4/www/chromium/files/patch-base__process__process_info_linux.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-base__process__process_info_linux.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-base__process__process_info_linux.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- base/process/process_info_linux.cc.orig 2015-10-06 22:42:06.000000000 -0400 -+++ base/process/process_info_linux.cc 2015-10-14 08:06:38.761855000 -0400 +--- base/process/process_info_linux.cc.orig 2015-10-14 16:18:44.939415000 +0200 ++++ base/process/process_info_linux.cc 2015-10-14 16:22:36.086176000 +0200 @@ -10,10 +10,28 @@ #include "base/process/process_handle.h" #include "base/time/time.h" Modified: branches/2015Q4/www/chromium/files/patch-base__process__process_posix.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-base__process__process_posix.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-base__process__process_posix.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- base/process/process_posix.cc.orig 2015-10-14 03:01:18.000000000 -0400 -+++ base/process/process_posix.cc 2015-10-23 11:23:26.411838000 -0400 +--- base/process/process_posix.cc.orig 2015-12-04 20:16:14.101666000 +0100 ++++ base/process/process_posix.cc 2015-12-04 20:32:34.362201000 +0100 @@ -17,8 +17,18 @@ #include <sys/event.h> #endif @@ -28,7 +28,16 @@ // Using kqueue on Mac so that we can wait on non-child processes. // We can't use kqueues on child processes because we need to reap // our own children using wait. -@@ -180,7 +190,7 @@ +@@ -172,7 +182,7 @@ + + return true; + } +-#endif // OS_MACOSX ++#endif // OS_MACOSX || OS_BSD + + bool WaitForExitWithTimeoutImpl(base::ProcessHandle handle, + int* exit_code, +@@ -180,13 +190,13 @@ base::ProcessHandle parent_pid = base::GetParentProcessId(handle); base::ProcessHandle our_pid = base::GetCurrentProcessHandle(); if (parent_pid != our_pid) { @@ -37,34 +46,51 @@ // On Mac we can wait on non child processes. return WaitForSingleNonChildProcess(handle, timeout); #else -@@ -258,7 +268,11 @@ - #if !defined(OS_LINUX) + // Currently on Linux we can't handle non child processes. + NOTIMPLEMENTED(); +-#endif // OS_MACOSX ++#endif // OS_MACOSX || OS_BSD + } + + int status; +@@ -255,12 +265,16 @@ + return Process(handle); + } + +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_FREEBSD) // static bool Process::CanBackgroundProcesses() { -+#if defined(OS_BSD) -+ return true; -+#else return false; -+#endif } - #endif // !defined(OS_LINUX) - -@@ -358,17 +372,21 @@ +-#endif // !defined(OS_LINUX) ++#elif defined(OS_FREEBSD) ++bool Process::CanBackgroundProcesses() { ++ return true; ++} ++#endif // !defined(OS_LINUX) && !defined(OS_FREEBSD) - #if !defined(OS_LINUX) + bool Process::IsValid() const { + return process_ != kNullProcessHandle; +@@ -360,15 +374,32 @@ bool Process::IsProcessBackgrounded() const { -- // See SetProcessBackgrounded(). + // See SetProcessBackgrounded(). DCHECK(IsValid()); -- return false; -+ return GetPriority() == kBackgroundPriority; ++#if defined(OS_FREEBSD) ++ return true; ++#else + return false; ++#endif } bool Process::SetProcessBackgrounded(bool value) { -- // Not implemented for POSIX systems other than Linux. With POSIX, if we were -- // to lower the process priority we wouldn't be able to raise it back to its -- // initial priority. -- NOTIMPLEMENTED(); -- return false; ++#if !defined(OS_FREEBSD) + // Not implemented for POSIX systems other than Linux. With POSIX, if we were + // to lower the process priority we wouldn't be able to raise it back to its + // initial priority. + NOTIMPLEMENTED(); + return false; ++#else + DCHECK(IsValid()); + + if (!CanBackgroundProcesses()) @@ -75,6 +101,7 @@ + + DPCHECK(result == 0); + return result == 0; ++#endif // !defined(OS_FREEBSD) } #endif // !defined(OS_LINUX) Modified: branches/2015Q4/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,11 +1,24 @@ ---- chrome/browser/net/cookie_store_util.cc.orig 2015-07-21 21:42:54.358730000 -0400 -+++ chrome/browser/net/cookie_store_util.cc 2015-07-21 21:43:07.938330000 -0400 -@@ -85,7 +85,7 @@ - new ChromeCookieMonsterDelegate(profile)); - } +--- chrome/browser/net/cookie_store_util.cc.orig 2015-10-14 19:42:28.950909000 +0200 ++++ chrome/browser/net/cookie_store_util.cc 2015-10-14 19:43:32.447326000 +0200 +@@ -15,7 +15,7 @@ + + namespace chrome_browser_net { -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) namespace { // Use the operating system's mechanisms to encrypt cookies before writing +@@ -67,10 +67,10 @@ + net::CookieCryptoDelegate* GetCookieCryptoDelegate() { + return g_cookie_crypto_delegate.Pointer(); + } +-#else // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#else // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + net::CookieCryptoDelegate* GetCookieCryptoDelegate() { + return NULL; + } +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + + } // namespace chrome_browser_net Copied: branches/2015Q4/www/chromium/files/patch-chrome__browser__ssl__bad_blocking_page.cc (from r404050, head/www/chromium/files/patch-chrome__browser__ssl__bad_blocking_page.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-chrome__browser__ssl__bad_blocking_page.cc Sun Dec 20 20:15:23 2015 (r404073, copy of r404050, head/www/chromium/files/patch-chrome__browser__ssl__bad_blocking_page.cc) @@ -0,0 +1,11 @@ +--- ./chrome/browser/ssl/bad_clock_blocking_page.cc.orig 2015-12-04 22:09:59.759216000 +0100 ++++ ./chrome/browser/ssl/bad_clock_blocking_page.cc 2015-12-04 22:10:08.964486000 +0100 +@@ -93,7 +93,7 @@ + // iOS does not have a way to launch the date and time settings. + NOTREACHED(); + +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + struct ClockCommand { + const char* pathname; + const char* argument; Modified: branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2015-10-13 15:04:32.000000000 -0400 -+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2015-10-14 08:16:21.359565000 -0400 +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2015-10-14 16:37:51.456856000 +0200 ++++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2015-10-14 16:38:21.306588000 +0200 @@ -273,7 +273,7 @@ #if !defined(OS_ANDROID) || url.host() == chrome::kChromeUITermsHost Modified: branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser.gypi ============================================================================== --- branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser.gypi Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser.gypi Sun Dec 20 20:15:23 2015 (r404073) @@ -1,6 +1,6 @@ ---- chrome/chrome_browser.gypi.orig 2015-10-21 18:00:37.000000000 -0400 -+++ chrome/chrome_browser.gypi 2015-10-23 12:31:48.047090000 -0400 -@@ -3365,6 +3365,13 @@ +--- chrome/chrome_browser.gypi.orig 2015-12-04 22:23:49.106516000 +0100 ++++ chrome/chrome_browser.gypi 2015-12-04 22:27:43.886261000 +0100 +@@ -3369,6 +3369,13 @@ 'browser/download/download_dir_policy_handler.h', ], }], @@ -14,7 +14,7 @@ ['OS=="mac"', { 'dependencies': [ 'app_shim', -@@ -3518,7 +3525,7 @@ +@@ -3522,7 +3529,7 @@ '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol', ], }], @@ -23,16 +23,16 @@ 'dependencies': [ '../build/linux/system.gyp:libspeechd', ], -@@ -3572,7 +3579,7 @@ +@@ -3576,7 +3583,7 @@ ['use_x11==1', { 'sources': [ '<@(chrome_browser_x11_sources)' ], }], - ['os_posix == 1 and OS != "mac" and OS != "ios"', { -+ ['os_posix == 1 and OS != "mac" and OS != "ios" and os_bsd != 1', { ++ ['os_posix == 1 and os_bsd != 1 and OS != "mac" and OS != "ios"', { 'sources': [ 'app/chrome_crash_reporter_client.cc', 'app/chrome_crash_reporter_client.h', -@@ -3813,7 +3820,7 @@ +@@ -3817,7 +3824,7 @@ }], ], }], Modified: branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi ============================================================================== --- branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- chrome/chrome_browser_ui.gypi.orig 2015-10-13 15:04:32.000000000 -0400 -+++ chrome/chrome_browser_ui.gypi 2015-10-14 08:19:30.748417000 -0400 +--- chrome/chrome_browser_ui.gypi.orig 2015-10-14 16:42:08.849931000 +0200 ++++ chrome/chrome_browser_ui.gypi 2015-10-14 16:45:35.205417000 +0200 @@ -2921,7 +2921,7 @@ }], ], Modified: branches/2015Q4/www/chromium/files/patch-chrome__common__chrome_paths.h ============================================================================== --- branches/2015Q4/www/chromium/files/patch-chrome__common__chrome_paths.h Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-chrome__common__chrome_paths.h Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,14 @@ ---- chrome/common/chrome_paths.h.orig 2015-10-14 03:01:20.000000000 -0400 -+++ chrome/common/chrome_paths.h 2015-10-23 12:35:13.801677000 -0400 +--- chrome/common/chrome_paths.h.orig 2015-12-04 22:29:29.523602000 +0100 ++++ chrome/common/chrome_paths.h 2015-12-04 22:31:37.428818000 +0100 +@@ -50,7 +50,7 @@ + DIR_USER_APPLICATIONS, // ~/Applications + DIR_USER_LIBRARY, // ~/Library + #endif +-#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \ ++#if defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD)) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions + // on Chrome Mac and Chromium Linux. @@ -117,7 +117,7 @@ DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized // supervised user whitelists are @@ -9,3 +18,16 @@ DIR_NATIVE_MESSAGING, // System directory where native messaging host // manifest files are stored. DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts +@@ -136,10 +136,10 @@ + DIR_GEN_TEST_DATA, // Directory where generated test data resides. + DIR_TEST_DATA, // Directory where unit test data resides. + DIR_TEST_TOOLS, // Directory where unit test tools reside. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + FILE_COMPONENT_FLASH_HINT, // A file in a known location that points to + // the component updated flash plugin. +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + PATH_END + }; Copied: branches/2015Q4/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h (from r404050, head/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h Sun Dec 20 20:15:23 2015 (r404073, copy of r404050, head/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h) @@ -0,0 +1,14 @@ +--- chrome/common/component_flash_hint_file_linux.h.orig 2015-10-15 10:25:32.927627000 +0200 ++++ chrome/common/component_flash_hint_file_linux.h 2015-10-15 10:25:53.911624000 +0200 +@@ -7,9 +7,9 @@ + + #include "build/build_config.h" + +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_FREEBSD) + #error "This file only applies to the Linux component update of Flash." +-#endif // !defined(OS_LINUX) ++#endif // !defined(OS_LINUX) && !defined(OS_FREEBSD) + + #include <string> + Modified: branches/2015Q4/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp ============================================================================== --- branches/2015Q4/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- chrome/common/variations/fieldtrial_testing_config.gyp.orig 2015-10-15 09:32:40.670879000 -0400 -+++ chrome/common/variations/fieldtrial_testing_config.gyp 2015-10-15 09:27:09.909117000 -0400 +--- chrome/common/variations/fieldtrial_testing_config.gyp.orig 2015-12-16 21:13:34.948159764 +0100 ++++ chrome/common/variations/fieldtrial_testing_config.gyp 2015-12-16 21:14:00.477158698 +0100 @@ -19,7 +19,7 @@ 'conditions': [ ['OS!="android"', {'sources/': [['exclude', '_android\\.json$']]}], Modified: branches/2015Q4/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- components/metrics/drive_metrics_provider_linux.cc.orig 2015-10-14 08:11:50.411251000 -0400 -+++ components/metrics/drive_metrics_provider_linux.cc 2015-10-14 08:12:35.355093000 -0400 +--- components/metrics/drive_metrics_provider_linux.cc.orig 2015-10-14 16:34:04.903957000 +0200 ++++ components/metrics/drive_metrics_provider_linux.cc 2015-10-14 16:34:35.113096000 +0200 @@ -4,7 +4,13 @@ #include "components/metrics/drive_metrics_provider.h" Copied: branches/2015Q4/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc (from r404050, head/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc Sun Dec 20 20:15:23 2015 (r404073, copy of r404050, head/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc) @@ -0,0 +1,10 @@ +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2015-10-14 23:20:02.027419000 +0200 ++++ content/browser/renderer_host/render_process_host_impl.cc 2015-10-14 23:20:29.597226000 +0200 +@@ -38,6 +38,7 @@ + #include "base/tracked_objects.h" + #include "cc/base/switches.h" + #include "components/tracing/tracing_switches.h" ++#include "content/common/bluetooth/bluetooth_scan_filter.h" + #include "content/browser/appcache/appcache_dispatcher_host.h" + #include "content/browser/appcache/chrome_appcache_service.h" + #include "content/browser/background_sync/background_sync_service_impl.h" Modified: branches/2015Q4/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2015-11-04 18:00:50.000000000 -0500 -+++ content/renderer/renderer_blink_platform_impl.cc 2015-11-06 16:14:45.473476000 -0500 +--- content/renderer/renderer_blink_platform_impl.cc.orig 2015-11-24 21:00:55.000000000 +0100 ++++ content/renderer/renderer_blink_platform_impl.cc 2015-12-06 14:27:00.785767410 +0100 @@ -104,7 +104,7 @@ #if defined(OS_POSIX) Modified: branches/2015Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- device/serial/serial_io_handler_posix.cc.orig 2015-10-06 22:42:12.000000000 -0400 -+++ device/serial/serial_io_handler_posix.cc 2015-10-14 10:57:52.264932000 -0400 +--- device/serial/serial_io_handler_posix.cc.orig 2015-10-14 16:49:00.395597000 +0200 ++++ device/serial/serial_io_handler_posix.cc 2015-10-14 17:18:20.515698000 +0200 @@ -59,7 +59,7 @@ BITRATE_TO_SPEED_CASE(9600) BITRATE_TO_SPEED_CASE(19200) Modified: branches/2015Q4/www/chromium/files/patch-device__usb__usb_service_impl.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-device__usb__usb_service_impl.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-device__usb__usb_service_impl.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,11 +1,11 @@ ---- device/usb/usb_service_impl.cc.orig 2015-10-21 18:00:38.000000000 -0400 -+++ device/usb/usb_service_impl.cc 2015-10-23 12:39:46.908676000 -0400 +--- device/usb/usb_service_impl.cc.orig 2015-12-04 22:33:43.708484000 +0100 ++++ device/usb/usb_service_impl.cc 2015-12-04 22:39:47.903086000 +0100 @@ -20,7 +20,11 @@ #include "device/usb/usb_device_handle.h" #include "device/usb/usb_error.h" #include "device/usb/webusb_descriptors.h" +#if defined(OS_FREEBSD) -+#include "libusb.h" ++#include <libusb.h> +#else #include "third_party/libusb/src/libusb/libusb.h" +#endif @@ -20,11 +20,16 @@ rv = libusb_hotplug_register_callback( context_->context(), static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | -@@ -559,12 +564,15 @@ - device_observer_.Add(device_monitor); +@@ -553,6 +558,8 @@ } - #endif // OS_WIN -+#endif // OS_FREEBSD + + RefreshDevices(); ++#endif // !defined(OS_FREEBSD) ++ + #if defined(OS_WIN) + DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces(); + if (device_monitor) { +@@ -562,9 +569,11 @@ } UsbServiceImpl::~UsbServiceImpl() { @@ -32,11 +37,11 @@ if (hotplug_enabled_) { libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_); } -+#endif // OS_FREEBSD ++#endif // !defined(OS_FREEBSD) for (const auto& map_entry : devices_) { map_entry.second->OnDisconnect(); } -@@ -802,6 +810,7 @@ +@@ -802,6 +811,7 @@ device->OnDisconnect(); } @@ -44,11 +49,11 @@ // static int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, PlatformUsbDevice device, -@@ -839,6 +848,7 @@ +@@ -839,6 +849,7 @@ return 0; } -+#endif // !OS_FREEBSD ++#endif // !defined(OS_FREEBSD) void UsbServiceImpl::OnPlatformDeviceAdded(PlatformUsbDevice platform_device) { DCHECK(CalledOnValidThread()); Copied: branches/2015Q4/www/chromium/files/patch-media__audio__audio_manager.cc (from r404050, head/www/chromium/files/patch-media__audio__audio_manager.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-media__audio__audio_manager.cc Sun Dec 20 20:15:23 2015 (r404073, copy of r404050, head/www/chromium/files/patch-media__audio__audio_manager.cc) @@ -0,0 +1,29 @@ +--- media/audio/audio_manager.cc.orig 2015-12-05 21:00:28.652308000 +0100 ++++ media/audio/audio_manager.cc 2015-12-05 21:00:59.340983000 +0100 +@@ -157,7 +157,7 @@ + } + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + void set_app_name(const std::string& app_name) { + app_name_ = app_name; + } +@@ -184,7 +184,7 @@ + scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_for_testing_; + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + std::string app_name_; + #endif + +@@ -267,7 +267,7 @@ + #endif + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + // static + void AudioManager::SetGlobalAppName(const std::string& app_name) { + g_helper.Pointer()->set_app_name(app_name); Copied: branches/2015Q4/www/chromium/files/patch-media__audio__audio_manager.h (from r404050, head/www/chromium/files/patch-media__audio__audio_manager.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-media__audio__audio_manager.h Sun Dec 20 20:15:23 2015 (r404073, copy of r404050, head/www/chromium/files/patch-media__audio__audio_manager.h) @@ -0,0 +1,11 @@ +--- media/audio/audio_manager.h.orig 2015-12-05 22:20:38.929937000 +0100 ++++ media/audio/audio_manager.h 2015-12-05 22:21:06.651164000 +0100 +@@ -61,7 +61,7 @@ + // called previously to start the hang monitor. Does nothing on OSX. + static void EnableHangMonitor(); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + // Sets the name of the audio source as seen by external apps. Only actually + // used with PulseAudio as of this writing. + static void SetGlobalAppName(const std::string& app_name); Modified: branches/2015Q4/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- media/capture/video/fake_video_capture_device_factory.cc.orig 2015-10-14 11:08:16.489018000 -0400 -+++ media/capture/video/fake_video_capture_device_factory.cc 2015-10-14 11:09:19.850751000 -0400 +--- media/capture/video/fake_video_capture_device_factory.cc.orig 2015-10-14 17:33:35.934406000 +0200 ++++ media/capture/video/fake_video_capture_device_factory.cc 2015-10-14 17:34:01.687650000 +0200 @@ -51,7 +51,7 @@ for (int n = 0; n < number_of_devices_; ++n) { VideoCaptureDevice::Name name(base::StringPrintf("fake_device_%d", n), Modified: branches/2015Q4/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- media/capture/video/file_video_capture_device_factory.cc.orig 2015-10-14 11:10:41.842256000 -0400 -+++ media/capture/video/file_video_capture_device_factory.cc 2015-10-14 11:11:13.400581000 -0400 +--- media/capture/video/file_video_capture_device_factory.cc.orig 2015-10-14 17:42:06.832425000 +0200 ++++ media/capture/video/file_video_capture_device_factory.cc 2015-10-14 17:42:45.561757000 +0200 @@ -49,7 +49,7 @@ device_names->push_back(VideoCaptureDevice::Name( command_line_file_path.value(), kFileVideoCaptureDeviceName, Modified: branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,57 +1,62 @@ ---- media/capture/video/linux/video_capture_device_linux.cc.orig 2015-10-21 18:00:38.000000000 -0400 -+++ media/capture/video/linux/video_capture_device_linux.cc 2015-10-23 12:49:31.985359000 -0400 -@@ -43,6 +43,7 @@ +--- media/capture/video/linux/video_capture_device_linux.cc.orig 2015-11-24 21:00:55.000000000 +0100 ++++ media/capture/video/linux/video_capture_device_linux.cc 2015-12-05 22:01:43.229465000 +0100 +@@ -41,6 +41,7 @@ + return true; + } ++#if !defined(OS_FREEBSD) // Translates Video4Linux pixel formats to Chromium pixel formats. // static -+#if !defined(OS_FREEBSD) VideoPixelFormat - VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat(uint32 v4l2_fourcc) { - return V4L2CaptureDelegate::V4l2FourCcToChromiumPixelFormat(v4l2_fourcc); @@ -54,6 +55,7 @@ bool favour_mjpeg) { return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg); } -+#endif // !defined(OS_FREEBSD) ++#endif // !defined(OS_FREEBSD) const std::string VideoCaptureDevice::Name::GetModel() const { // |unique_id| is of the form "/dev/video2". |file_name| is "video2". -@@ -91,6 +93,7 @@ +@@ -88,6 +90,7 @@ + v4l2_thread_.Stop(); + } + ++#if !defined(OS_FREEBSD) void VideoCaptureDeviceLinux::AllocateAndStart( const VideoCaptureParams& params, scoped_ptr<VideoCaptureDevice::Client> client) { -+#if !defined(OS_FREEBSD) - DCHECK(!capture_impl_); - if (v4l2_thread_.IsRunning()) - return; // Wrong state. -@@ -110,9 +113,11 @@ - params.requested_format.frame_size.width(), +@@ -111,7 +114,13 @@ params.requested_format.frame_size.height(), params.requested_format.frame_rate, base::Passed(&client))); -+#endif } ++#else // !defined(OS_FREEBSD) ++void VideoCaptureDeviceLinux::AllocateAndStart( ++ const VideoCaptureParams& params, ++ scoped_ptr<VideoCaptureDevice::Client> client) {} ++#endif // !defined(OS_FREEBSD) - void VideoCaptureDeviceLinux::StopAndDeAllocate() { +#if !defined(OS_FREEBSD) + void VideoCaptureDeviceLinux::StopAndDeAllocate() { if (!v4l2_thread_.IsRunning()) return; // Wrong state. - v4l2_thread_.message_loop()->PostTask( -@@ -121,8 +126,10 @@ - v4l2_thread_.Stop(); +@@ -122,7 +131,11 @@ capture_impl_ = NULL; -+#endif } ++#else // !defined(OS_FREEBSD) ++void VideoCaptureDeviceLinux::StopAndDeAllocate() {} ++#endif // !defined(OS_FREEBSD) +#if !defined(OS_FREEBSD) void VideoCaptureDeviceLinux::SetRotation(int rotation) { if (v4l2_thread_.IsRunning()) { v4l2_thread_.message_loop()->PostTask( -@@ -130,6 +137,7 @@ +@@ -130,6 +143,9 @@ base::Bind(&V4L2CaptureDelegate::SetRotation, capture_impl_, rotation)); } } -+#endif // !defined(OS_FREEBSD) ++#else // !defined(OS_FREEBSD) ++void VideoCaptureDeviceLinux::SetRotation(int rotation) {} ++#endif // !defined(OS_FREEBSD) // static int VideoCaptureDeviceLinux::TranslatePowerLineFrequencyToV4L2(int frequency) { Modified: branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- media/capture/video/video_capture_device.cc.orig 2015-10-21 18:00:38.000000000 -0400 -+++ media/capture/video/video_capture_device.cc 2015-10-23 12:51:56.086998000 -0400 +--- media/capture/video/video_capture_device.cc.orig 2015-12-04 22:51:59.984494000 +0100 ++++ media/capture/video/video_capture_device.cc 2015-12-04 22:53:28.114262000 +0100 @@ -11,6 +11,10 @@ namespace media { Modified: branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.h ============================================================================== --- branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.h Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.h Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- media/capture/video/video_capture_device.h.orig 2015-10-14 11:35:25.088073000 -0400 -+++ media/capture/video/video_capture_device.h 2015-10-14 11:37:56.457208000 -0400 +--- media/capture/video/video_capture_device.h.orig 2015-10-14 18:04:30.325845000 +0200 ++++ media/capture/video/video_capture_device.h 2015-10-14 18:06:41.271627000 +0200 @@ -43,7 +43,7 @@ Name(); Name(const std::string& name, const std::string& id); Modified: branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- media/capture/video/video_capture_device_factory.cc.orig 2015-10-14 11:42:17.044891000 -0400 -+++ media/capture/video/video_capture_device_factory.cc 2015-10-14 11:43:44.770286000 -0400 +--- media/capture/video/video_capture_device_factory.cc.orig 2015-10-14 18:11:45.655658000 +0200 ++++ media/capture/video/video_capture_device_factory.cc 2015-10-14 18:13:09.785092000 +0200 @@ -14,6 +14,10 @@ // static scoped_ptr<VideoCaptureDeviceFactory> VideoCaptureDeviceFactory::CreateFactory( @@ -15,7 +15,7 @@ return scoped_ptr<VideoCaptureDeviceFactory>( CreateVideoCaptureDeviceFactory(ui_task_runner)); } -+#endif ++#endif } VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() { Modified: branches/2015Q4/www/chromium/files/patch-media__filters__vp9_parser.h ============================================================================== --- branches/2015Q4/www/chromium/files/patch-media__filters__vp9_parser.h Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-media__filters__vp9_parser.h Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- media/filters/vp9_parser.h.orig 2015-11-13 12:04:18.000000000 +0100 -+++ media/filters/vp9_parser.h 2015-12-06 01:55:30.382338000 +0100 +--- media/filters/vp9_parser.h.orig 2015-12-16 23:46:15.092527599 +0100 ++++ media/filters/vp9_parser.h 2015-12-16 23:46:43.476526238 +0100 @@ -14,6 +14,7 @@ #include <stddef.h> Modified: branches/2015Q4/www/chromium/files/patch-media__media.gyp ============================================================================== --- branches/2015Q4/www/chromium/files/patch-media__media.gyp Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-media__media.gyp Sun Dec 20 20:15:23 2015 (r404073) @@ -1,6 +1,6 @@ ---- media/media.gyp.orig 2015-10-21 18:00:38.000000000 -0400 -+++ media/media.gyp 2015-10-23 12:57:14.545450000 -0400 -@@ -780,13 +780,19 @@ +--- media/media.gyp.orig 2015-12-04 22:55:01.017572000 +0100 ++++ media/media.gyp 2015-12-04 22:58:02.692056000 +0100 +@@ -782,13 +782,19 @@ ['exclude', '_alsa\\.(h|cc)$'], ], }], @@ -22,7 +22,7 @@ 'conditions': [ ['use_x11==1', { 'dependencies': [ -@@ -1122,7 +1128,7 @@ +@@ -1124,7 +1130,7 @@ 'base/simd/filter_yuv_sse2.cc', ], }], Modified: branches/2015Q4/www/chromium/files/patch-net__net.gypi ============================================================================== --- branches/2015Q4/www/chromium/files/patch-net__net.gypi Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-net__net.gypi Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- net/net.gypi.orig 2015-10-21 18:00:38.000000000 -0400 -+++ net/net.gypi 2015-10-23 12:58:44.791781000 -0400 +--- net/net.gypi.orig 2015-12-04 22:59:49.506305000 +0100 ++++ net/net.gypi 2015-12-04 23:00:47.269128000 +0100 @@ -392,8 +392,8 @@ 'android/network_library.h', 'android/traffic_stats.cc', @@ -16,7 +16,7 @@ 'android/traffic_stats_unittest.cc', 'base/address_list_unittest.cc', - 'base/address_tracker_linux_unittest.cc', -+ #'base/address_tracker_linux_unittest.cc', ++# 'base/address_tracker_linux_unittest.cc', 'base/backoff_entry_serializer_unittest.cc', 'base/backoff_entry_unittest.cc', 'base/chunked_upload_data_stream_unittest.cc', Modified: branches/2015Q4/www/chromium/files/patch-net__proxy__proxy_service.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-net__proxy__proxy_service.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-net__proxy__proxy_service.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- net/proxy/proxy_service.cc.orig 2015-10-21 18:00:38.000000000 -0400 -+++ net/proxy/proxy_service.cc 2015-10-23 13:27:56.693933000 -0400 +--- net/proxy/proxy_service.cc.orig 2015-12-04 23:02:25.675097000 +0100 ++++ net/proxy/proxy_service.cc 2015-12-04 23:04:16.821354000 +0100 @@ -43,7 +43,7 @@ #elif defined(OS_MACOSX) #include "net/proxy/proxy_config_service_mac.h" Modified: branches/2015Q4/www/chromium/files/patch-skia__skia_chrome.gypi ============================================================================== --- branches/2015Q4/www/chromium/files/patch-skia__skia_chrome.gypi Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-skia__skia_chrome.gypi Sun Dec 20 20:15:23 2015 (r404073) @@ -1,14 +1,14 @@ ---- skia/skia_chrome.gypi.orig 2015-10-13 15:04:33.000000000 -0400 -+++ skia/skia_chrome.gypi 2015-10-14 11:46:34.142959000 -0400 -@@ -55,6 +55,11 @@ - 'ext/skia_utils_win.cc', - ], - 'conditions': [ +--- skia/skia_chrome.gypi.orig 2015-10-14 18:24:42.938769000 +0200 ++++ skia/skia_chrome.gypi 2015-10-14 18:22:24.515306000 +0200 +@@ -60,6 +60,11 @@ + 'ext/platform_canvas.cc', + ], + }], + [ 'use_cairo == 1', { + 'dependencies': [ + '../build/linux/system.gyp:pangocairo', + ], + }], - [ 'OS == "ios"', { + [ 'OS == "android" and ' + 'enable_basic_printing==0 and enable_print_preview==0', { 'sources!': [ - 'ext/platform_canvas.cc', Copied: branches/2015Q4/www/chromium/files/patch-third_party__ffmpeg__chromium__scripts__generate_gyp.py (from r404050, head/www/chromium/files/patch-third_party__ffmpeg__chromium__scripts__generate_gyp.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-third_party__ffmpeg__chromium__scripts__generate_gyp.py Sun Dec 20 20:15:23 2015 (r404073, copy of r404050, head/www/chromium/files/patch-third_party__ffmpeg__chromium__scripts__generate_gyp.py) @@ -0,0 +1,20 @@ +--- third_party/ffmpeg/chromium/scripts/generate_gyp.py.orig 2015-12-06 15:33:39.820492707 +0100 ++++ third_party/ffmpeg/chromium/scripts/generate_gyp.py 2015-12-06 18:01:30.369881976 +0100 +@@ -43,6 +43,8 @@ + COPYRIGHT = """# Copyright %d The Chromium Authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. ++# ++# modified: cmt@burggraben.net + + # NOTE: this file is autogenerated by ffmpeg/chromium/scripts/generate_gyp.py + +@@ -372,6 +374,8 @@ + + if condition.PLATFORM == '*': + platform_condition = None ++ elif condition.PLATFORM == 'linux': ++ platform_condition = '(OS == "%s" or os_bsd == 1)' % condition.PLATFORM + else: + platform_condition = 'OS == "%s"' % condition.PLATFORM + Copied: branches/2015Q4/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gni (from r404050, head/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gni) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gni Sun Dec 20 20:15:23 2015 (r404073, copy of r404050, head/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gni) @@ -0,0 +1,301 @@ +--- third_party/ffmpeg/ffmpeg_generated.gni.orig 2015-12-06 19:48:34.878438301 +0100 ++++ third_party/ffmpeg/ffmpeg_generated.gni 2015-12-06 19:52:33.782420758 +0100 +@@ -12,7 +12,7 @@ + ffmpeg_gas_sources = [] + ffmpeg_yasm_sources = [] + +-if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is _linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ff mpeg_branding == "Chrome") || (is_linux && c! urrent_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { ++if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ar m_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS"! ) || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ff mpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { + ffmpeg_c_sources += [ + "libavcodec/allcodecs.c", + "libavcodec/autorename_libavcodec_utils.c", +@@ -138,7 +138,7 @@ + ] + } + +-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") | | (is_win && current_cpu == "x64" && ffmpeg_! branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { ++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == " arm64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpe g_branding == "ChromeOS") || ((is_linux || o! s_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { + ffmpeg_c_sources += [ + "libavcodec/h264pred.c", + "libavcodec/hpeldsp.c", +@@ -153,13 +153,13 @@ + ] + } + +-if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && c urrent_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { ++if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == ! "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { + ffmpeg_c_sources += [ + "libavformat/rawdec.c", + ] + } + +-if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x 64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { ++if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding = = "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { + ffmpeg_c_sources += [ + "libavcodec/aac_ac3_parser.c", + "libavcodec/aac_parser.c", +@@ -195,7 +195,7 @@ + ] + } + +-if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { ++if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { + ffmpeg_c_sources += [ + "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c", + "libavcodec/x86/constants.c", +@@ -213,7 +213,7 @@ + ] + } + +-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_b randing == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { ++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome ") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { + ffmpeg_c_sources += [ + "libavcodec/cabac.c", + "libavcodec/h264.c", +@@ -242,7 +242,7 @@ + ] + } + +-if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) { ++if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) { + ffmpeg_c_sources += [ + "libavcodec/arm/fft_fixed_init_arm.c", + "libavcodec/arm/fft_init_arm.c", +@@ -258,7 +258,7 @@ + ] + } + +-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS")) { ++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg _branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS")) { + ffmpeg_c_sources += [ + "libavcodec/flac.c", + "libavcodec/flac_parser.c", +@@ -269,7 +269,7 @@ + ] + } + +-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) { ++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) { + ffmpeg_c_sources += [ + "libavcodec/arm/h264pred_init_arm.c", + "libavcodec/arm/hpeldsp_init_arm.c", +@@ -289,7 +289,7 @@ + ] + } + +-if ((is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { ++if (((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && curre nt_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { + ffmpeg_c_sources += [ + "libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c", + "libavcodec/x86/h264_intrapred_init.c", +@@ -309,7 +309,7 @@ + ] + } + +-if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { ++if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { + ffmpeg_c_sources += [ + "libavcodec/x86/aacpsdsp_init.c", + "libavcodec/x86/dct_init.c", +@@ -324,7 +324,7 @@ + ] + } + +-if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS")) { ++if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS")) { + ffmpeg_c_sources += [ + "libavutil/arm/float_dsp_init_neon.c", + ] +@@ -339,7 +339,7 @@ + ] + } + +-if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) { ++if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) { + ffmpeg_c_sources += [ + "libavcodec/arm/aacpsdsp_init_arm.c", + "libavcodec/arm/mpegaudiodsp_init_arm.c", +@@ -350,7 +350,7 @@ + ] + } + +-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { ++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { + ffmpeg_c_sources += [ + "libavcodec/acelp_filters.c", + "libavcodec/acelp_pitch_delay.c", +@@ -405,13 +405,13 @@ + ] + } + +-if ((is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS")) { ++if ((is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS")) { + ffmpeg_c_sources += [ + "libavutil/mips/float_dsp_mips.c", + ] + } + +-if ((is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS")) { ++if (((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS")) { + ffmpeg_c_sources += [ + "libavcodec/mips/h264pred_init_mips.c", + "libavcodec/mips/hpeldsp_init_mips.c", +@@ -419,7 +419,7 @@ + ] + } + +-if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS")) { ++if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS")) { + ffmpeg_c_sources += [ + "libavcodec/aarch64/fft_init_aarch64.c", + "libavcodec/aarch64/vorbisdsp_init.c", +@@ -434,7 +434,7 @@ + ] + } + +-if ((is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS")) { ++if (((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS")) { + ffmpeg_c_sources += [ + "libavcodec/aarch64/h264pred_init.c", + "libavcodec/aarch64/hpeldsp_init_aarch64.c", +@@ -447,7 +447,7 @@ + ] + } + +-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) { ++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) { + ffmpeg_c_sources += [ + "libavcodec/arm/flacdsp_init_arm.c", + ] +@@ -456,7 +456,7 @@ + ] + } + *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512202015.tBKKFNnS059151>