diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2016-11-22 19:10:21 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2016-11-22 19:10:21 +0000 |
| commit | 9187a6460fc419eec4dc64a4569e306722a83427 (patch) | |
| tree | b3d680efe613bd39a30a50f60bcb0ce36a78eab2 /www/chromium | |
| parent | 856d6fcc598498ef2f8b9cac423158f32ccd5e6f (diff) | |
| download | ports-9187a6460fc419eec4dc64a4569e306722a83427.tar.gz ports-9187a6460fc419eec4dc64a4569e306722a83427.zip | |
www/chromium: update to 54.0.2840.100
Submitted by: clutton <clutton@zoho.com>
Reviewed by: cpm, rene
Obtained from: https://github.com/paranormal/
MFH: 2016Q4
Security: https://vuxml.freebsd.org/freebsd/769ba449-79e1-11e6-bf75-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/653a8059-7c49-11e6-9242-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/9c135c7e-9fa4-11e6-a265-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/9118961b-9fa5-11e6-a265-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/ae9cb9b8-a203-11e6-a265-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/a3473f5a-a739-11e6-afaa-e8e0b747a45a.html
Differential Revision: https://reviews.freebsd.org/D8517
Notes
Notes:
svn path=/head/; revision=426855
Diffstat (limited to 'www/chromium')
346 files changed, 5070 insertions, 4494 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 2e853ab9f7bd..91669b90e60d 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 52.0.2743.116 -PORTREVISION= 4 +PORTVERSION= 54.0.2840.100 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 @@ -14,9 +13,7 @@ COMMENT= Google web browser based on WebKit LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi -BROKEN_FreeBSD_9=does not patch - -CFLAGS+= -isystem${LOCALBASE}/include -I${PREFIX}/include/atk-1.0 +BROKEN_FreeBSD_9=does not configure BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:devel/gperf \ bash:shells/bash \ @@ -28,8 +25,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:devel/gperf \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib -LIB_DEPENDS= libasound.so:audio/alsa-lib \ - libcairo.so:graphics/cairo \ +LIB_DEPENDS= libcairo.so:graphics/cairo \ libcups.so:print/cups \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ @@ -39,7 +35,6 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \ libfreetype.so:print/freetype2 \ libgnome-keyring.so:security/libgnome-keyring \ libharfbuzz.so:print/harfbuzz \ - libevent.so:devel/libevent2 \ libexif.so:graphics/libexif \ libfontconfig.so:x11-fonts/fontconfig \ libgcrypt.so:security/libgcrypt \ @@ -56,101 +51,60 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \ libwebp.so:graphics/webp \ libxml2.so:textproc/libxml2 -RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \ - alsa-lib>=1.1.1_1:audio/alsa-lib \ - droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf \ +RUN_DEPENDS= droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf \ xdg-open:devel/xdg-utils ONLY_FOR_ARCHS= i386 amd64 -USES= bison cpe desktop-file-utils execinfo jpeg \ +USES= compiler bison cpe desktop-file-utils execinfo jpeg \ ninja perl5 pkgconfig python:2,build shebangfix tar:xz -# chromium requires a recent compiler (C++11 capable, but clang 3.4 is -# not able to build chromium. OTOH clang36 on FreeBSD 9.3 cannot build -# chromium as the libc++ includes are not up to the task. USES flags -# have to be set before bsd.ports.pre.mk and thereby cannot depend on -# bsd.ports.pre.mk's variables, so I'm using a hack here. -.if exists(/usr/lib/libc++.a) -USES+= compiler:c++14-lang -.else -USES+= compiler:c++11-lib -.endif CPE_VENDOR= google CPE_PRODUCT= chrome USE_PERL5= build USE_XORG= scrnsaverproto x11 xcomposite xcursor xext xdamage xfixes xi \ xproto xrandr xrender xscrnsaver xtst -USE_GNOME= atk glib20 gtk20 dconf libxslt +USE_GNOME= atk glib20 gtk20 dconf libxslt libxml2 MAKE_ARGS= -C out/${BUILDTYPE} SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome INSTALLS_ICONS= yes -#TODO bz@ : install libwidevinecdm.so (see -# third_party/widevine/cdm/widevine_cdm.gyp) -# See build/common.gypi for all the available variables. -GYP_DEFINES+= \ - clang_use_chrome_plugins=0 \ - linux_breakpad=0 \ - linux_use_heapchecker=0 \ - linux_strip_binary=1 \ - use_aura=1 \ - test_isolation_mode=noop \ - disable_nacl=1 \ - enable_extensions=1 \ - enable_one_click_signin=1 \ - enable_openmax=1 \ - enable_webrtc=1 \ - werror= \ - no_gc_sections=1 \ - OS=freebsd \ - os_ver=${OSVERSION} \ - prefix_dir=${LOCALBASE} \ - python_ver=${PYTHON_VER} \ - use_allocator=none \ - use_cups=1 \ - linux_link_gsettings=1 \ - linux_link_libpci=1 \ - linux_link_libspeechd=1 \ - libspeechd_h_prefix=speech-dispatcher/ \ - usb_ids_path=${LOCALBASE}/share/usbids/usb.ids \ - want_separate_host_toolset=0 \ - use_system_bzip2=1 \ - use_system_flac=1 \ - use_system_harfbuzz=1 \ - use_system_icu=1 \ - use_system_jsoncpp=1 \ - use_system_libevent=1 \ - use_system_libexif=1 \ - use_system_libjpeg=1 \ - use_system_libpng=1 \ - use_system_libusb=1 \ - use_system_libwebp=1 \ - use_system_libxml=1 \ - use_system_libxslt=1 \ - use_system_nspr=1 \ - use_system_protobuf=0 \ - use_system_re2=1 \ - use_system_snappy=1 \ - use_system_speex=1 \ - use_system_xdg_utils=1 \ - use_system_yasm=1 \ - v8_use_external_startup_data=0 -# allow removal of third_party/adobe -GYP_DEFINES+= flapper_version_h_file='${WRKSRC}/flapper_version.h' +# TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn) +# +# Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all the variables. +# Some parts don't have use_system_* flag, and can be turned on/off by using +# replace_gn_files.py script, some parts just turned on/off for target host +# OS "target_os == is_bsd", like libusb, libpci. +GN_ARGS+= \ + clang_use_chrome_plugins=false \ + enable_hevc_demuxing=true \ + enable_media_router=true \ + enable_nacl=false \ + enable_remoting=false \ + toolkit_views=true \ + use_allocator="none" \ + use_aura=true \ + use_experimental_allocator_shim=true \ + treat_warnings_as_errors=false \ + use_sysroot=false \ + use_system_libjpeg=true \ + use_system_sqlite=false # chrome has additional patches +# TODO: investigate building with these options: +# use_system_icu use_system_harfbuzz use_system_minigbm +GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild # FreeBSD Chromium Api Key # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . # Note: these are for FreeBSD use ONLY. For your own distribution, # please get your own set of keys. -GYP_DEFINES+= google_api_key=AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8 \ - google_default_client_id=996322985003.apps.googleusercontent.com \ - google_default_client_secret=IR1za9-1VK0zZ0f_O8MVFicn +GN_ARGS+= google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" \ + google_default_client_id="996322985003.apps.googleusercontent.com" \ + google_default_client_secret="IR1za9-1VK0zZ0f_O8MVFicn" SUB_FILES= chromium-browser.desktop chrome SUB_LIST+= COMMENT="${COMMENT}" -OPTIONS_DEFINE= CODECS GCONF PULSEAUDIO TEST KERBEROS DEBUG DRIVER +OPTIONS_DEFINE= ALSA CODECS GCONF PULSEAUDIO TEST KERBEROS DEBUG DRIVER CODECS_DESC= Compile and enable patented codecs like H.264 DRIVER_DESC= Install chromedriver @@ -158,44 +112,39 @@ OPTIONS_DEFAULT= CODECS GCONF KERBEROS OPTIONS_SUB= yes GCONF_USE= GNOME=gconf2 +ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib +ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \ + alsa-lib>=1.1.1_1:audio/alsa-lib PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio DRIVER_MAKE_ARGS=chromedriver TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} .include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MALSA} +GN_ARGS+= use_alsa=true +.else +GN_ARGS+= use_alsa=false +.endif + .if ${PORT_OPTIONS:MCODECS} -GYP_DEFINES+= ffmpeg_branding=Chrome -GYP_DEFINES+= proprietary_codecs=1 +GN_ARGS+= ffmpeg_branding="Chrome" +GN_ARGS+= proprietary_codecs=true .else -GYP_DEFINES+= ffmpeg_branding=Chromium -GYP_DEFINES+= proprietary_codecs=0 +GN_ARGS+= ffmpeg_branding="Chromium" +GN_ARGS+= proprietary_codecs=false .endif .if ${PORT_OPTIONS:MGCONF} -GYP_DEFINES+= use_gconf=1 +GN_ARGS+= use_gconf=true .else -GYP_DEFINES+= use_gconf=0 +GN_ARGS+= use_gconf=false .endif .if ${PORT_OPTIONS:MPULSEAUDIO} -GYP_DEFINES+= use_pulseaudio=1 +GN_ARGS+= use_pulseaudio=true .else -GYP_DEFINES+= use_pulseaudio=0 -.endif - -.if empty(MACHINE_CPU:Msse2) -GYP_DEFINES+= disable_sse2=1 -.endif - -.if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc) -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libusb-pc -.endif - -# pointed out by "Tomek" on freebsd-chromium@ -.if !exists(/usr/lib/libexecinfo.so) -CFLAGS+= -fno-omit-frame-pointer -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-fixup-ffmpeg +GN_ARGS+= use_pulseaudio=false .endif .if ${PORT_OPTIONS:MTEST} @@ -206,180 +155,80 @@ ALL_TARGET+= ${TEST_TARGETS} DEBUG_MAKE_ENV= V=1 .if ${PORT_OPTIONS:MDEBUG} BUILDTYPE= Debug +GN_ARGS+= is_debug=true +GN_BOOTSTRAP_FLAGS+= --debug +#GN_ARGS+= is_component_build = true .else BUILDTYPE= Release +.if ${ARCH} == amd64 +GN_ARGS+= use_lld=true # harder, better, faster, stronger +.endif +GN_ARGS+= is_debug=false +GN_ARGS+= symbol_level=0 +GN_ARGS+= remove_webcore_debug_symbols=true .endif -CONFIGURE_ENV+= CC="${CC}" \ - CXX="${CXX}" \ - GYP_GENERATORS=ninja \ - GYP_DEFINES="${GYP_DEFINES}" MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \ GPERF="${LOCALBASE}/bin/gperf" .include <bsd.port.pre.mk> .if ${CHOSEN_COMPILER_TYPE} == gcc -GYP_DEFINES+= gcc_version=${CXX:S/g++//} +GN_ARGS+= gcc_version=${CXX:S/g++//} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gcc -CFLAGS+= -fno-stack-protector # gcc 4.8 cannot find __stack_chk_fail_local .else -GYP_DEFINES+= clang=1 -CFLAGS+= -Wno-unknown-warning-option \ - -D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1 # work around base r261801 +BUILD_DEPENDS+= clang39:devel/llvm39 +CC= clang39 +CXX= clang++39 +# /usr/local/include unlike gcc isn't clang's default +MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ + CPLUS_INCLUDE_PATH=${LOCALBASE}/include +GN_ARGS+= is_clang=true EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang -CONFIGURE_ENV+= AR=/usr/bin/ar .endif -.if ! ${PORT_OPTIONS:MKERBEROS} -GYP_DEFINES+= use_kerberos=0 +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1002000 +BUILD_DEPENDS+= ${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++ +CXXFLAGS+= -stdlib=libc++ -isystem ${LOCALBASE}/include/c++/v1 .endif -# according to portlint the below is passed via bsd.port.mk, -# but 'make -V CONFIGURE_ENV' does not show it: -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ - CPPFLAGS="${CPPFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" +.if ${OSVERSION} < 1100000 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-10 +.endif + +.if ! ${PORT_OPTIONS:MKERBEROS} +GN_ARGS+= use_kerberos=true +.endif pre-everything:: @${ECHO_MSG} - @${ECHO_MSG} "To build Chromium, you should have around 2 GB of memory" + @${ECHO_MSG} "To build Chromium, you should have around 2GB of memory," .if ${PORT_OPTIONS:MDEBUG} - @${ECHO_MSG} "and lots of free diskspace (~ 8.5GB)." + @${ECHO_MSG} "lots of free diskspace (~ 40GB)" + @${ECHO_MSG} "and no less then 16GB of memory for linking." .else @${ECHO_MSG} "and a fair amount of free diskspace (~ 3.7GB)." .endif @${ECHO_MSG} @${ECHO_MSG} "Make sure you have Python build with the SEM option ON" @${ECHO_MSG} "(default in python27-2.7.8 since r361735)" - -post-patch: - @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \ - ${WRKSRC}/crypto/crypto.gyp \ - ${WRKSRC}/v8/src/v8.gyp \ - ${WRKSRC}/v8/gypfiles/toolchain.gypi - @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \ - ${WRKSRC}/chrome/common/chrome_paths.cc \ - ${WRKSRC}/base/base.gyp + @${ECHO_MSG} pre-configure: - # phajdan-jr: list of things *not* to remove, so maybe the script - # should be called "keep_bundled_libraries.py" + # We used to remove bundled libraries to be sure that chromium uses + # system libraries and not shippen ones. + # cd ${WRKSRC} && ${PYTHON_CMD} \ + #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${PYTHON_CMD} \ - ./build/linux/unbundle/remove_bundled_libraries.py \ - 'base/third_party/dmg_fp' \ - 'base/third_party/dynamic_annotations' \ - 'base/third_party/icu' \ - 'base/third_party/nspr' \ - 'base/third_party/superfasthash' \ - 'base/third_party/symbolize' \ - 'base/third_party/valgrind' \ - 'base/third_party/xdg_mime' \ - 'base/third_party/xdg_user_dirs' \ - 'breakpad/src/third_party/curl' \ - 'chrome/third_party/mock4js' \ - 'chrome/third_party/mozilla_security_manager' \ - 'courgette/third_party' \ - 'net/third_party/mozilla_security_manager' \ - 'net/third_party/nss' \ - 'third_party/WebKit' \ - 'third_party/analytics' \ - 'third_party/angle' \ - 'third_party/angle/src/third_party' \ - 'third_party/blanketjs' \ - 'third_party/brotli' \ - 'third_party/boringssl' \ - 'third_party/cacheinvalidation' \ - 'third_party/catapult' \ - 'third_party/catapult/third_party/beautifulsoup4' \ - 'third_party/catapult/third_party/py_vulcanize' \ - 'third_party/catapult/third_party/py_vulcanize/py_vulcanize' \ - 'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \ - 'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \ - 'third_party/catapult/tracing' \ - 'third_party/catapult/tracing/third_party' \ - 'third_party/cld' \ - 'third_party/cros_system_api' \ - 'third_party/dom_distiller_js' \ - 'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \ - 'third_party/ffmpeg' \ - 'third_party/gardiner_mod' \ - 'third_party/fips181' \ - 'third_party/flot' \ - 'third_party/google_input_tools' \ - 'third_party/google_input_tools/third_party/closure_library' \ - 'third_party/google_input_tools/third_party/closure_library/third_party/closure' \ - 'third_party/hunspell' \ - 'third_party/iccjpeg' \ - 'third_party/icu/icu.isolate' \ - 'third_party/jinja2' \ - 'third_party/jstemplate' \ - 'third_party/khronos' \ - 'third_party/leveldatabase' \ - 'third_party/libaddressinput' \ - 'third_party/libjingle' \ - 'third_party/libphonenumber' \ - 'third_party/libsrtp' \ - 'third_party/libvpx' \ - 'third_party/libvpx/source/libvpx/third_party/x86inc' \ - 'third_party/libwebm' \ - 'third_party/libxml/chromium' \ - 'third_party/libXNVCtrl' \ - 'third_party/libyuv' \ - 'third_party/lss' \ - 'third_party/lzma_sdk' \ - 'third_party/markupsafe' \ - 'third_party/mesa' \ - 'third_party/modp_b64' \ - 'third_party/mt19937ar' \ - 'third_party/openh264' \ - 'third_party/openmax_dl' \ - 'third_party/opus' \ - 'third_party/ots' \ - 'third_party/pdfium' \ - 'third_party/pdfium/third_party' \ - 'third_party/ply' \ - 'third_party/polymer' \ - 'third_party/protobuf' \ - 'third_party/protobuf/third_party' \ - 'third_party/protobuf/third_party/six' \ - 'third_party/pywebsocket' \ - 'third_party/qcms' \ - 'third_party/qunit' \ - 'third_party/sfntly' \ - 'third_party/sinonjs' \ - 'third_party/skia' \ - 'third_party/smhasher' \ - 'third_party/sqlite' \ - 'third_party/tcmalloc' \ - 'third_party/tlslite' \ - 'third_party/usrsctp' \ - 'third_party/web-animations-js' \ - 'third_party/webdriver' \ - 'third_party/webrtc' \ - 'third_party/widevine' \ - 'third_party/woff2' \ - 'third_party/x86inc' \ - 'third_party/yasm' \ - 'third_party/zlib' \ - 'url/third_party/mozilla' \ - 'v8/src/third_party/valgrind' \ - 'v8/src/third_party/fdlibm' \ - --do-remove || ${FALSE} - cd ${WRKSRC} && ${PYTHON_CMD} \ - ./build/linux/unbundle/replace_gyp_files.py \ - ${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 + ./build/linux/unbundle/replace_gn_files.py --system-libraries \ + flac harfbuzz-ng libwebp libxml libxslt snappy yasm || ${FALSE} do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ - ./build/gyp_chromium chrome/chrome.gyp --depth . + # GN generator bootstrapping and generating ninja files + cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} ${PYTHON_CMD} \ + ./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS} + cd ${WRKSRC} && ${SETENV} ./out/${BUILDTYPE}/gn \ + gen --args='${GN_ARGS}' out/${BUILDTYPE} test regression-test: build .for t in ${TEST_TARGETS} @@ -397,14 +246,17 @@ do-install: .endfor ${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \ ${STAGEDIR}${DATADIR} -.for p in chrome_100_percent content_resources keyboard_resources resources +.for p in chrome_100_percent chrome_200_percent keyboard_resources resources ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak \ ${STAGEDIR}${DATADIR} .endfor +.for d in icudtl.dat natives_blob.bin + ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} +.endfor ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \ ${STAGEDIR}${DATADIR} cd ${WRKSRC}/out/${BUILDTYPE} && \ - ${COPYTREE_SHARE} "locales pseudo_locales resources" ${STAGEDIR}${DATADIR} + ${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop \ ${STAGEDIR}${DESKTOPDIR} diff --git a/www/chromium/distinfo b/www/chromium/distinfo index ef5a70364f99..a0c98c59d6cd 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1470404034 -SHA256 (chromium-52.0.2743.116.tar.xz) = a194ae1edb041024b3d4b6ba438f32fefdb6f1ecb24a96c50248a486b237a101 -SIZE (chromium-52.0.2743.116.tar.xz) = 458156660 -SHA256 (chromium-52.0.2743.116-testdata.tar.xz) = d3d059e1215702d8665f02b47a10e14458f54f423c323a9fcc987e6e43767c0b -SIZE (chromium-52.0.2743.116-testdata.tar.xz) = 122423496 +TIMESTAMP = 1478859835 +SHA256 (chromium-54.0.2840.100.tar.xz) = e2e7f54a780c93ec2e933af09e1126837e6cf940b57213d39f36d58df10c89df +SIZE (chromium-54.0.2840.100.tar.xz) = 479762112 +SHA256 (chromium-54.0.2840.100-testdata.tar.xz) = 44319fea6de4dbb1f6d0bbeeec633b69b7064f53a54893df5b720935a6d27460 +SIZE (chromium-54.0.2840.100-testdata.tar.xz) = 123519620 diff --git a/www/chromium/files/extra-patch-10 b/www/chromium/files/extra-patch-10 new file mode 100644 index 000000000000..08d35b9ee895 --- /dev/null +++ b/www/chromium/files/extra-patch-10 @@ -0,0 +1,10 @@ +--- content/renderer/devtools/v8_sampling_profiler.cc.orig 2016-10-06 04:02:19.000000000 +0300 ++++ content/renderer/devtools/v8_sampling_profiler.cc 2016-10-30 03:00:33.775227000 +0300 +@@ -22,6 +22,7 @@ + + #if defined(OS_POSIX) + #include <signal.h> ++#include <ucontext.h> + #define USE_SIGNALS + #endif + diff --git a/www/chromium/files/extra-patch-clang b/www/chromium/files/extra-patch-clang index 034863ece00a..13eeca5e1b7d 100644 --- a/www/chromium/files/extra-patch-clang +++ b/www/chromium/files/extra-patch-clang @@ -1,13 +1,14 @@ ---- base/strings/safe_sprintf_unittest.cc 2015-04-15 00:18:48.000000000 +0200 -+++ base/strings/safe_sprintf_unittest.cc 2015-04-18 22:08:45.000000000 +0200 -@@ -729,12 +729,14 @@ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wconversion-null" - #endif +--- base/strings/safe_sprintf_unittest.cc.orig 2016-10-06 04:02:08.000000000 +0300 ++++ base/strings/safe_sprintf_unittest.cc 2016-10-25 21:42:28.951114000 +0300 +@@ -728,6 +728,7 @@ + } + + TEST(SafeSPrintfTest, EmitNULL) { +/* Avoid compiler error: http://pastebin.com/1edWUE84 - EXPECT_EQ(1, SafeSPrintf(buf, "%d", NULL)); - EXPECT_EQ("0", std::string(buf)); - EXPECT_EQ(3, SafeSPrintf(buf, "%p", NULL)); + char buf[40]; + #if defined(__GNUC__) + #pragma GCC diagnostic push +@@ -739,6 +740,7 @@ EXPECT_EQ("0x0", std::string(buf)); EXPECT_EQ(6, SafeSPrintf(buf, "%s", NULL)); EXPECT_EQ("<NULL>", std::string(buf)); @@ -41,7 +42,7 @@ +++ base/tracked_objects_unittest.cc 2015-09-03 09:20:53.370191000 -0400 @@ -58,9 +58,9 @@ Births* birth = ThreadData::TallyABirthIfActive(location); - + if (ThreadData::status() == ThreadData::DEACTIVATED) - EXPECT_EQ(reinterpret_cast<Births*>(NULL), birth); + EXPECT_EQ(static_cast<Births*>(NULL), birth); @@ -49,7 +50,7 @@ - EXPECT_NE(reinterpret_cast<Births*>(NULL), birth); + EXPECT_NE(static_cast<Births*>(NULL), birth); } - + // Helper function to verify the most common test expectations. --- components/sync_sessions/synced_session_tracker.cc.orig 2016-01-21 13:04:41.772845558 +0100 +++ components/sync_sessions/synced_session_tracker.cc 2016-01-21 13:05:17.652842509 +0100 @@ -70,34 +71,34 @@ .Times(2) - .WillRepeatedly(Return(reinterpret_cast<AudioOutputStream*>(NULL))); + .WillRepeatedly(Return(static_cast<AudioOutputStream*>(NULL))); - + EXPECT_CALL(callback_, OnError(_)) .Times(2); --- third_party/hunspell/src/hunspell/affentry.hxx.orig 2015-07-21 18:46:37.322427000 -0400 +++ third_party/hunspell/src/hunspell/affentry.hxx 2015-07-21 18:48:02.034251000 -0400 @@ -27,7 +27,7 @@ - struct hentry * checkword(const char * word, int len, char in_compound, + struct hentry * checkword(const char * word, int len, char in_compound, const FLAG needflag = FLAG_NULL); - + - struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = NULL); + struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = 0); - + char * check_morph(const char * word, int len, char in_compound, const FLAG needflag = FLAG_NULL); @@ -90,7 +90,7 @@ // const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, char in_compound=IN_CPD_NOT); const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, const FLAG badflag = 0); - + - struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = NULL); + struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = 0); - + char * check_twosfx_morph(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = FLAG_NULL); --- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-15 00:31:48.000000000 +0200 +++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-18 22:05:41.000000000 +0200 @@ -439,7 +439,7 @@ } - + CMapTable::CMapFormat0::Builder::Builder(const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL), + : CMap::Builder(static_cast<ReadableFontData*>(NULL), @@ -133,13 +134,13 @@ glyph_id_array_(glyph_id_array->begin(), glyph_id_array->end()) { @@ -966,7 +966,7 @@ } - + CMapTable::CMapFormat4::Builder::Builder(const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL), + : CMap::Builder(static_cast<ReadableFontData*>(NULL), CMapFormat::kFormat4, cmap_id) { } - + --- third_party/webrtc/base/taskrunner.cc 2015-04-15 00:32:17.000000000 +0200 +++ third_party/webrtc/base/taskrunner.cc 2015-04-18 22:10:53.000000000 +0200 @@ -102,7 +102,7 @@ @@ -148,6 +149,6 @@ tasks_.end(), - reinterpret_cast<Task *>(NULL)); + static_cast<Task *>(NULL)); - + tasks_.erase(it, tasks_.end()); - + diff --git a/www/chromium/files/extra-patch-fixup-ffmpeg b/www/chromium/files/extra-patch-fixup-ffmpeg deleted file mode 100644 index a9d61b97b76b..000000000000 --- a/www/chromium/files/extra-patch-fixup-ffmpeg +++ /dev/null @@ -1,18 +0,0 @@ ---- third_party/ffmpeg/ffmpeg.gyp.orig 2014-10-27 20:27:40.000000000 +0100 -+++ third_party/ffmpeg/ffmpeg.gyp 2014-11-06 22:53:10.000000000 +0100 -@@ -213,6 +213,15 @@ - 'cflags!': [ - '-fno-omit-frame-pointer', - ], -+ # "Tomek" from freebsd-chromium@ figured this out, rene is -+ # puzzled why this is needed. Fixes runtime on FreeBSD < 10 -+ 'cflags_c': [ -+ '-fomit-frame-pointer', -+ ], -+ 'cflags_cc': [ -+ '-fomit-frame-pointer', -+ ], -+ # back to upstream code - 'debug_extra_cflags!': [ - '-fno-omit-frame-pointer', - ], diff --git a/www/chromium/files/extra-patch-gcc b/www/chromium/files/extra-patch-gcc index 016b111aeca1..8921d4cd8065 100644 --- a/www/chromium/files/extra-patch-gcc +++ b/www/chromium/files/extra-patch-gcc @@ -3,27 +3,27 @@ @@ -5,6 +5,7 @@ #ifndef MEDIA_FILTERS_FILE_DATA_SOURCE_H_ #define MEDIA_FILTERS_FILE_DATA_SOURCE_H_ - + +#include <cstdio> #include <string> - + #include "base/files/file.h" --- content/public/common/child_process_sandbox_support_linux.h.orig 2013-10-11 19:30:28.000000000 +0200 +++ content/public/common/child_process_sandbox_support_linux.h 2013-10-16 15:29:00.000000000 +0200 @@ -7,6 +7,7 @@ - + #include <stdint.h> #include <string> +#include <sys/types.h> - + #include "content/common/content_export.h" - + --- third_party/ffmpeg/libavutil/cpu.c.orig 2013-11-16 01:26:14.000000000 +0100 +++ third_party/ffmpeg/libavutil/cpu.c 2013-11-19 00:24:53.000000000 +0100 @@ -24,6 +24,9 @@ #include "opt.h" #include "common.h" - + +/* TODO(rene) work around a compile error with GCC 4.6.4 on FreeBSD */ +#define __BSD_VISIBLE 1 + @@ -35,22 +35,22 @@ @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. - + +#include <stdio.h> + #include "content/browser/browser_shutdown_profile_dumper.h" - + #include "base/base_switches.h" --- testing/perf/perf_test.cc 2014-03-03 12:59:30.000000000 -0500 +++ testing/perf/perf_test.cc.orig 2014-02-20 15:28:27.000000000 -0500 @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. - + +#include <stdio.h> + #include "testing/perf/perf_test.h" - + -#include <stdio.h> - #include "base/logging.h" @@ -59,7 +59,7 @@ --- ui/gfx/codec/jpeg_codec.cc.orig 2014-10-02 19:19:03.000000000 +0200 +++ ui/gfx/codec/jpeg_codec.cc 2014-10-05 22:38:28.000000000 +0200 @@ -13,6 +13,7 @@ - + extern "C" { #if defined(USE_SYSTEM_LIBJPEG) +#include <stdio.h> @@ -70,77 +70,44 @@ +++ third_party/webrtc/common_audio/wav_file.h 2014-10-18 12:04:03.000000000 +0200 @@ -14,6 +14,7 @@ #ifdef __cplusplus - + #include <stdint.h> +#include <stdio.h> #include <cstddef> #include <string> - + --- v8/src/base/platform/platform.h.orig 2015-01-27 03:22:59.000000000 +0100 +++ v8/src/base/platform/platform.h 2015-01-28 18:37:43.268781292 +0100 @@ -22,6 +22,7 @@ #define V8_BASE_PLATFORM_PLATFORM_H_ - + #include <cstdarg> +#include <cstdio> #include <string> #include <vector> - + --- v8/src/compiler/graph-visualizer.cc.orig 2015-04-28 22:29:10.000000000 +0200 +++ v8/src/compiler/graph-visualizer.cc 2015-05-02 21:01:32.086593000 +0200 @@ -5,6 +5,7 @@ #include "src/compiler/graph-visualizer.h" - + #include <sstream> +#include <cstdio> #include <string> - + #include "src/code-stubs.h" -@@ -25,7 +26,7 @@ - namespace compiler { - - --FILE* OpenVisualizerLogFile(CompilationInfo* info, const char* phase, -+std::FILE* OpenVisualizerLogFile(CompilationInfo* info, const char* phase, - const char* suffix, const char* mode) { - EmbeddedVector<char, 256> filename; - SmartArrayPointer<char> function_name; --- third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c.orig 2015-07-24 22:27:11.000000000 +0200 +++ third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c 2015-07-26 17:38:40.937606000 +0200 -@@ -34,6 +34,7 @@ - #include <windows.h> - #endif - #if HAVE_SYSCTL +@@ -1,2 +1,3 @@ + // File automatically generated. See crbug.com/495833. +#define __BSD_VISIBLE 1 - #if HAVE_SYS_PARAM_H - #include <sys/param.h> - #endif ---- v8/src/compiler/graph-visualizer.h.orig 2015-07-24 22:28:03.000000000 +0200 -+++ v8/src/compiler/graph-visualizer.h 2015-07-26 18:37:45.488253000 +0200 -@@ -5,7 +5,7 @@ - #ifndef V8_COMPILER_GRAPH_VISUALIZER_H_ - #define V8_COMPILER_GRAPH_VISUALIZER_H_ - --#include <stdio.h> -+#include <cstdio> - #include <iosfwd> - - namespace v8 { -@@ -21,7 +21,7 @@ - class Schedule; - class SourcePositionTable; - --FILE* OpenVisualizerLogFile(CompilationInfo* info, const char* phase, -+std::FILE* OpenVisualizerLogFile(CompilationInfo* info, const char* phase, - const char* suffix, const char* mode); - - struct AsDOT { + #include "cpu.c" --- v8/src/log-utils.h.orig 2015-10-13 21:04:45.000000000 +0200 +++ v8/src/log-utils.h 2015-10-17 10:17:35.535561000 +0200 @@ -5,6 +5,9 @@ #ifndef V8_LOG_UTILS_H_ #define V8_LOG_UTILS_H_ - + +#include <cstdarg> +#include <cstdio> + @@ -151,7 +118,7 @@ +++ third_party/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc 2015-11-01 11:32:36.293750000 +0100 @@ -11,6 +11,7 @@ #include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h" - + #include <algorithm> +#include <cstdio> #include <sstream> @@ -162,15 +129,15 @@ @@ -42,7 +42,7 @@ else if (hue * 3.0 < 2.0) result = temp1 + (temp2 - temp1) * (2.0 / 3.0 - hue) * 6.0; - + - return static_cast<int>(std::round(result * 255)); + return static_cast<int>(round(result * 255)); } - + // Assumes sRGB. @@ -85,7 +85,7 @@ } - + uint8_t GetLuma(SkColor color) { - return static_cast<uint8_t>(std::round((0.299 * SkColorGetR(color)) + + return static_cast<uint8_t>(round((0.299 * SkColorGetR(color)) + @@ -188,12 +155,12 @@ + static_cast<int>(round(g)), + static_cast<int>(round(b))); } - + void BuildLumaHistogram(const SkBitmap& bitmap, int histogram[256]) { @@ -275,10 +275,10 @@ double b = (SkColorGetB(foreground) * f_weight + SkColorGetB(background) * b_weight) / 255.0; - + - return SkColorSetARGB(static_cast<int>(std::round(normalizer)), - static_cast<int>(std::round(r)), - static_cast<int>(std::round(g)), @@ -203,18 +170,18 @@ + static_cast<int>(round(g)), + static_cast<int>(round(b))); } - + bool IsDark(SkColor color) { --- media/filters/audio_clock.cc.orig 2016-04-07 11:55:00.678817033 +0200 +++ media/filters/audio_clock.cc 2016-04-07 11:55:28.152814716 +0200 @@ -121,7 +121,7 @@ } - + return base::TimeDelta::FromMicroseconds( - std::round(frames_until_timestamp * microseconds_per_frame_)); + round(frames_until_timestamp * microseconds_per_frame_)); } - + void AudioClock::ContiguousAudioDataBufferedForTesting( --- media/filters/audio_clock.h.orig 2016-04-08 14:22:02.833940146 +0200 +++ media/filters/audio_clock.h 2016-04-08 14:22:14.433876920 +0200 @@ -230,7 +197,7 @@ - std::round(back_timestamp_micros_)); + round(back_timestamp_micros_)); } - + // Returns the amount of wall time until |timestamp| will be played by the --- content/browser/web_contents/web_contents_impl.cc.orig 2016-04-08 15:44:21.989537858 +0200 +++ content/browser/web_contents/web_contents_impl.cc 2016-04-08 15:44:44.574535099 +0200 @@ -246,7 +213,7 @@ --- chrome/browser/ui/views/frame/browser_root_view.cc.orig 2016-04-08 17:23:19.749128496 +0200 +++ chrome/browser/ui/views/frame/browser_root_view.cc 2016-04-08 17:23:30.609126494 +0200 @@ -139,10 +139,10 @@ - + // Number of integer scroll events that have passed in each direction. int whole_scroll_amount_x = - std::lround(static_cast<double>(scroll_remainder_x_) / @@ -256,16 +223,16 @@ - std::lround(static_cast<double>(scroll_remainder_y_) / + lround(static_cast<double>(scroll_remainder_y_) / ui::MouseWheelEvent::kWheelDelta); - + // Adjust the remainder such that any whole scrolls we have taken action --- base/process/memory.h.orig 2016-06-06 21:05:12.000000000 +0200 +++ base/process/memory.h 2016-06-12 20:04:24.000000000 +0200 @@ -6,6 +6,7 @@ #define BASE_PROCESS_MEMORY_H_ - + #include <stddef.h> +#include <stdlib.h> - + #include "base/base_export.h" #include "base/process/process_handle.h" --- media/audio/audio_output_device.cc.orig 2016-06-06 21:05:19.000000000 +0200 @@ -278,61 +245,39 @@ + render_callback_->Render(output_bus_.get(), round(frames_delayed), frames_skipped); } - + --- media/audio/audio_output_stream_sink.cc.orig 2016-06-06 21:05:19.000000000 +0200 +++ media/audio/audio_output_stream_sink.cc 2016-06-12 20:35:05.000000000 +0200 @@ -85,7 +85,7 @@ if (!active_render_callback_) return 0; - + - uint32_t frames_delayed = std::round(static_cast<double>(total_bytes_delay) / + uint32_t frames_delayed = round(static_cast<double>(total_bytes_delay) / active_params_.GetBytesPerFrame()); - + return active_render_callback_->Render(dest, frames_delayed, frames_skipped); ---- media/base/audio_renderer_mixer_input.cc.orig 2016-06-06 21:05:19.000000000 +0200 -+++ media/base/audio_renderer_mixer_input.cc 2016-06-12 20:50:35.000000000 +0200 -@@ -164,7 +164,7 @@ - // TODO(chcunningham): Delete this conversion and change ProvideInput to more - // precisely describe delay as a count of frames delayed instead of TimeDelta. - // See http://crbug.com/587522. -- uint32_t frames_delayed = std::round(buffer_delay.InMicroseconds() / -+ uint32_t frames_delayed = round(buffer_delay.InMicroseconds() / - params_.GetMicrosecondsPerFrame()); - - int frames_filled = callback_->Render(audio_bus, frames_delayed, 0); ---- media/base/audio_renderer_mixer.cc.orig 2016-06-06 21:05:19.000000000 +0200 -+++ media/base/audio_renderer_mixer.cc 2016-06-12 20:52:34.000000000 +0200 -@@ -138,7 +138,7 @@ - // expect a count of frames delayed instead of TimeDelta (less precise). - // See http://crbug.com/587522. - base::TimeDelta audio_delay = base::TimeDelta::FromMicroseconds( -- std::round(frames_delayed * output_params_.GetMicrosecondsPerFrame())); -+ round(frames_delayed * output_params_.GetMicrosecondsPerFrame())); - - master_converter_.ConvertWithDelay(audio_delay, audio_bus); - return audio_bus->frames(); --- third_party/WebKit/Source/modules/battery/battery_status.h.orig 2016-06-06 21:05:36.000000000 +0200 +++ third_party/WebKit/Source/modules/battery/battery_status.h 2016-06-13 20:21:31.000000000 +0200 @@ -46,7 +46,7 @@ // of reducing the possibility of fingerprinting and triggers less level // change events on platforms where the granularity is high. - ASSERT(level >= 0 && level <= 1); + DCHECK(level >= 0 && level <= 1); - return std::round(level * 100) / 100.f; + return round(level * 100) / 100.f; } - + bool charging_; --- chrome/common/channel_info_posix.cc.orig 2016-06-06 21:05:14.000000000 +0200 +++ chrome/common/channel_info_posix.cc 2016-06-13 21:36:53.000000000 +0200 @@ -8,6 +8,8 @@ #include "build/build_config.h" #include "components/version_info/version_info.h" - + +#include <stdlib.h> + namespace chrome { - + namespace { --- chrome/browser/ui/views/tabs/tab_strip.cc.orig 2016-06-06 21:05:14.000000000 +0200 +++ chrome/browser/ui/views/tabs/tab_strip.cc 2016-06-13 22:03:03.000000000 +0200 @@ -360,3 +305,13 @@ CreateShadowDrawLooper(SkColorSetA(stroke_color, alpha))); canvas->DrawPath(fill, paint); +--- base/trace_event/heap_profiler_allocation_context_tracker.cc.orig 2016-08-03 22:02:10.000000000 +0300 ++++ base/trace_event/heap_profiler_allocation_context_tracker.cc 2016-08-21 04:17:53.717876000 +0300 +@@ -13,6 +13,7 @@ + #include "base/threading/thread_local_storage.h" + #include "base/trace_event/heap_profiler_allocation_context.h" + ++#include <stdio.h> + #if defined(OS_LINUX) || defined(OS_ANDROID) + #include <sys/prctl.h> + #endif diff --git a/www/chromium/files/extra-patch-libusb-pc b/www/chromium/files/extra-patch-libusb-pc deleted file mode 100644 index e4c89a3beb46..000000000000 --- a/www/chromium/files/extra-patch-libusb-pc +++ /dev/null @@ -1,20 +0,0 @@ ---- build/linux/unbundle/libusb.gyp.orig 2014-08-12 21:02:52.000000000 +0200 -+++ build/linux/unbundle/libusb.gyp 2014-08-17 16:21:03.000000000 +0200 -@@ -18,14 +18,14 @@ - ], - 'direct_dependent_settings': { - 'cflags': [ -- '<!@(pkg-config --cflags libusb-1.0)', -+ '', - ], - 'link_settings': { - 'ldflags': [ -- '<!@(pkg-config --libs-only-L --libs-only-other libusb-1.0)', -+ '', - ], - 'libraries': [ -- '<!@(pkg-config --libs-only-l libusb-1.0)', -+ '-lusb', - ], - }, - }, diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn new file mode 100644 index 000000000000..f8357134fe8f --- /dev/null +++ b/www/chromium/files/patch-BUILD.gn @@ -0,0 +1,164 @@ +--- BUILD.gn.orig 2016-10-06 04:02:07.000000000 +0300 ++++ BUILD.gn 2016-10-13 10:32:25.742762000 +0300 +@@ -201,7 +201,7 @@ + ] + } + +- if (!is_ios && !is_android && !is_chromecast) { ++ if (!is_ios && !is_android && !is_bsd && !is_chromecast) { + deps += [ + "//chrome", + "//chrome/test:browser_tests", +@@ -260,7 +260,7 @@ + ] + } + +- if (!is_ios) { ++ if (!is_ios && !is_bsd) { + # TODO(GYP): Figure out which of these should actually build on iOS, + # and whether there should be other targets that are iOS-only and missing. + deps += [ +@@ -300,7 +300,7 @@ + "//ui/touch_selection:ui_touch_selection_unittests", + "//url/ipc:url_ipc_unittests", + ] +- } else { ++ } else if (!is_bsd) { + deps += [ "//ios:all" ] + } + +@@ -457,7 +457,7 @@ + ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + # The following are definitely linux-only. + deps += [ + "//chrome:manpage", +@@ -484,9 +484,16 @@ + # TODO(dpranke): add the linux_dump_symbols flag? + deps += [ "//chrome:linux_symbols" ] + } ++ ++ if (is_bsd) { ++ deps -= [ ++ "//sandbox/linux:chrome_sandbox", ++ "//sandbox/linux:sandbox_linux_unittests", ++ ] ++ } + } + +- if (is_ios || is_win || (is_linux && !is_chromeos)) { ++ if (is_ios || is_win || is_bsd || (is_linux && !is_chromeos)) { + deps += [ + "//base:base_i18n_perftests", + "//base:base_perftests", +@@ -555,7 +562,7 @@ + if (enable_nacl) { + deps += [ "//components/nacl/loader:nacl_loader_unittests" ] + +- if (is_linux) { ++ if (is_linux || is_bsd) { + # TODO(dpranke): Figure out what platforms should actually have this. + deps += [ "//components/nacl/loader:nacl_helper" ] + +@@ -664,7 +671,7 @@ + deps += + [ "//chrome/installer/mini_installer:next_version_mini_installer" ] + } +- } else if (!is_android && !is_ios) { ++ } else if (!is_android && !is_ios && !is_bsd) { + deps += [ "//breakpad:symupload($host_toolchain)" ] + } + +@@ -713,7 +720,7 @@ + deps += [ "//chrome/tools/disable_outdated_build_detector" ] + } + +- if (is_win || is_linux) { ++ if (is_win || is_linux || is_bsd) { + deps += [ + "//mash:all", + "//media/mojo/services:media_mojo_shell_unittests", +@@ -726,7 +733,7 @@ + ] + } + +- if (is_linux && !is_chromeos && !is_chromecast) { ++ if ((is_linux || is_bsd) && !is_chromeos && !is_chromecast) { + # TODO(GYP): Figure out if any of these should be in gn_all + # and figure out how cross-platform they are + deps += [ +@@ -793,7 +800,7 @@ + ] + + if (target_cpu == "x86" || target_cpu == "x64") { +- if (!is_android) { ++ if (!is_android && !is_bsd) { + deps += [ "//chrome/test:load_library_perf_tests" ] + } + deps += [ +@@ -801,7 +808,7 @@ + "//third_party/libjpeg_turbo:simd_asm", + ] + } +- if (is_linux && current_toolchain == host_toolchain) { ++ if ((is_linux || is_bsd) && current_toolchain == host_toolchain) { + deps += [ "//v8:v8_shell" ] + } + } +@@ -811,7 +818,7 @@ + } + + if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) || +- (use_libfuzzer && is_mac)) { ++ (use_libfuzzer && is_mac) || is_bsd) { + deps += [ + "//testing/libfuzzer/fuzzers", + "//testing/libfuzzer/tests:libfuzzer_tests", +@@ -847,7 +854,7 @@ + + group("gn_mojo_targets") { + testonly = true +- if (is_linux && !is_chromeos) { ++ if ((is_linux || is_bsd) && !is_chromeos) { + # TODO(GYP): Figure out if any of these should be in gn_all + # and figure out how cross-platform they are + deps = [ +@@ -872,7 +879,7 @@ + } + } + +-if (!is_ios) { ++if (!is_ios || !is_bsd) { + # This group includes all of the targets needed to build and test Blink, + # including running the layout tests (see below). + group("blink_tests") { +@@ -906,7 +913,7 @@ + ] + } + +- if (!is_win && !is_android) { ++ if (!is_win && !is_android && !is_bsd) { + deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] + } + +@@ -935,7 +942,7 @@ + group("chromium_builder_perf") { + testonly = true + +- if (!is_ios && !is_android && !is_chromecast) { ++ if (!is_ios && !is_android && !is_chromecast && !is_bsd) { + deps = [ + "//cc:cc_perftests", + "//chrome/test:load_library_perf_tests", +@@ -965,7 +972,7 @@ + "//chrome/installer/mini_installer:mini_installer", + "//third_party/angle/src/tests:angle_perftests", + ] +- } else { ++ } else if (!is_bsd) { + deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] + } + } diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn new file mode 100644 index 000000000000..cf41e62d65b8 --- /dev/null +++ b/www/chromium/files/patch-base_BUILD.gn @@ -0,0 +1,83 @@ +--- base/BUILD.gn.orig 2016-10-06 04:02:08.000000000 +0300 ++++ base/BUILD.gn 2016-10-25 21:49:35.259700000 +0300 +@@ -1051,6 +1051,35 @@ + public_deps += [ "//base/allocator:unified_allocator_shim" ] + } + ++ if (is_bsd) { ++ sources -= [ ++ "files/file_util_linux.cc", ++ "files/file_path_watcher_linux.cc", ++ "process/process_linux.cc", ++ "process/process_iterator_linux.cc", ++ "process/process_metrics_linux.cc", ++ "process/process_handle_linux.cc", ++ "sys_info_linux.cc", ++ "trace_event/malloc_dump_provider.cc", ++ "trace_event/malloc_dump_provider.h", ++ "debug/proc_maps_linux.cc", ++ "debug/proc_maps_linux.h", ++ ] ++ sources += [ ++ "files/file_path_watcher_stub.cc", ++ "process/process_handle_freebsd.cc", ++ "process/process_iterator_freebsd.cc", ++ "process/process_metrics_freebsd.cc", ++ "sys_info_freebsd.cc", ++ ] ++ libs = [ ++ "execinfo", # logging.cc ++ "kvm" # process_metrics_freebsd ++ ] ++ } ++ ++ ++ + # Allow more direct string conversions on platforms with native utf8 + # strings + if (is_mac || is_ios || is_chromeos || is_chromecast) { +@@ -1322,7 +1351,7 @@ + } + + # Linux. +- if (is_linux) { ++ if (is_linux || is_bsd) { + if (is_asan || is_lsan || is_msan || is_tsan) { + # For llvm-sanitizer. + data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ] +@@ -1347,7 +1376,7 @@ + "//base/third_party/xdg_user_dirs", + ] + } else { +- # Non-Linux. ++ # Non-Linux/BSD. + sources -= [ + "nix/mime_util_xdg.cc", + "nix/mime_util_xdg.h", +@@ -1363,6 +1392,13 @@ + } + } + ++ if (is_bsd) { ++ sources -= [ ++ "threading/platform_thread_linux.cc", ++ ] ++ sources += [ "threading/platform_thread_freebsd.cc" ] ++ } ++ + # iOS + if (is_ios) { + set_sources_assignment_filter([]) +@@ -2117,6 +2153,12 @@ + set_sources_assignment_filter(sources_assignment_filter) + } + ++ if (is_bsd) { ++ sources -= [ ++ "debug/proc_maps_linux_unittest.cc", ++ ] ++ } ++ + if (is_win) { + deps += [ "//base:scoped_handle_test_dll" ] + if (current_cpu == "x64") { diff --git a/www/chromium/files/patch-base_allocator_BUILD.gn b/www/chromium/files/patch-base_allocator_BUILD.gn new file mode 100644 index 000000000000..db23a267392e --- /dev/null +++ b/www/chromium/files/patch-base_allocator_BUILD.gn @@ -0,0 +1,12 @@ +--- base/allocator/BUILD.gn.orig 2016-10-06 04:02:08.000000000 +0300 ++++ base/allocator/BUILD.gn 2016-10-13 04:07:29.886540000 +0300 +@@ -330,6 +330,9 @@ + ] + } else if (is_linux && use_allocator == "none") { + sources += [ "allocator_shim_default_dispatch_to_glibc.cc" ] ++ } else if (is_bsd && use_allocator == "none") { ++ # TODO move the code to allocator_shim_default_dispatch_to_libc.cc" ++ sources += [ "allocator_shim_default_dispatch_to_glibc.cc" ] + } else if (is_android && use_allocator == "none") { + sources += [ + "allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc", diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc new file mode 100644 index 000000000000..7ffd924176c0 --- /dev/null +++ b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc @@ -0,0 +1,70 @@ +--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2016-08-03 22:02:10.000000000 +0300 ++++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc 2016-09-21 22:14:12.220734000 +0300 +@@ -3,17 +3,28 @@ + // found in the LICENSE file. + + #include "base/allocator/allocator_shim.h" ++#include <stdio.h> ++#include <stdlib.h> ++#include <malloc_np.h> + + // This translation unit defines a default dispatch for the allocator shim which + // routes allocations to libc functions. +-// The code here is strongly inspired from tcmalloc's libc_override_glibc.h. ++// The code here is strongly inspired from tcmalloc's override_glibc.h. + + extern "C" { +-void* __libc_malloc(size_t size); +-void* __libc_calloc(size_t n, size_t size); +-void* __libc_realloc(void* address, size_t size); +-void* __libc_memalign(size_t alignment, size_t size); +-void __libc_free(void* ptr); ++void* __malloc(size_t size); ++void* __calloc(size_t n, size_t size); ++void* __realloc(void* address, size_t size); ++void* __memalign(size_t alignment, size_t size) { ++ void *ret; ++ if (__posix_memalign(&ret, alignment, size) != 0) { ++ return nullptr; ++ } else { ++ return ret; ++ } ++} ++int __posix_memalign(void **ptr, size_t alignment, size_t size); ++void __free(void* ptr); + } // extern "C" + + namespace { +@@ -21,23 +32,27 @@ + using base::allocator::AllocatorDispatch; + + void* GlibcMalloc(const AllocatorDispatch*, size_t size) { +- return __libc_malloc(size); ++ return __malloc(size); + } + + void* GlibcCalloc(const AllocatorDispatch*, size_t n, size_t size) { +- return __libc_calloc(n, size); ++ return __calloc(n, size); + } + + void* GlibcRealloc(const AllocatorDispatch*, void* address, size_t size) { +- return __libc_realloc(address, size); ++ return __realloc(address, size); + } + + void* GlibcMemalign(const AllocatorDispatch*, size_t alignment, size_t size) { +- return __libc_memalign(alignment, size); ++ return __memalign(alignment, size); + } + ++/* int GlibcPosixMemalign(const AllocatorDispatch*, void** ptr, size_t alignment, size_t size) { */ ++/* return __posix_memalign(ptr, alignment, size); */ ++/* } */ ++ + void GlibcFree(const AllocatorDispatch*, void* address) { +- __libc_free(address); ++ __free(address); + } + + } // namespace diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h b/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h new file mode 100644 index 000000000000..14edf7910aa8 --- /dev/null +++ b/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h @@ -0,0 +1,11 @@ +--- base/allocator/allocator_shim_override_libc_symbols.h.orig 2016-08-13 16:23:28.370905000 +0300 ++++ base/allocator/allocator_shim_override_libc_symbols.h 2016-08-13 16:23:33.784774000 +0300 +@@ -10,7 +10,7 @@ + #endif + #define BASE_ALLOCATOR_ALLOCATOR_SHIM_OVERRIDE_LIBC_SYMBOLS_H_ + +-#include <malloc.h> ++#include <stdlib.h> + + #include "base/allocator/allocator_shim_internals.h" + diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc new file mode 100644 index 000000000000..0a676221664f --- /dev/null +++ b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc @@ -0,0 +1,61 @@ +--- base/allocator/allocator_shim_unittest.cc.orig 2016-10-06 04:02:08.000000000 +0300 ++++ base/allocator/allocator_shim_unittest.cc 2016-10-25 21:48:23.218013000 +0300 +@@ -4,7 +4,6 @@ + + #include "base/allocator/allocator_shim.h" + +-#include <malloc.h> + #include <stdlib.h> + #include <string.h> + +@@ -193,11 +192,13 @@ + ASSERT_GE(zero_allocs_intercepted_by_size[2 * 23], 1u); + + #if !defined(OS_WIN) ++#if !defined(OS_BSD) + void* memalign_ptr = memalign(128, 53); + ASSERT_NE(nullptr, memalign_ptr); + ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(memalign_ptr) % 128); + ASSERT_GE(aligned_allocs_intercepted_by_alignment[128], 1u); + ASSERT_GE(aligned_allocs_intercepted_by_size[53], 1u); ++#endif + + void* posix_memalign_ptr = nullptr; + int res = posix_memalign(&posix_memalign_ptr, 256, 59); +@@ -214,12 +215,14 @@ + ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u); + ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u); + ++#if !defined(OS_BSD) + void* pvalloc_ptr = pvalloc(67); + ASSERT_NE(nullptr, pvalloc_ptr); + ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(pvalloc_ptr) % kPageSize); + ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u); + // pvalloc rounds the size up to the next page. + ASSERT_GE(aligned_allocs_intercepted_by_size[kPageSize], 1u); ++#endif + #endif // OS_WIN + + char* realloc_ptr = static_cast<char*>(realloc(nullptr, 71)); +@@ -240,8 +243,10 @@ + ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u); + + #if !defined(OS_WIN) ++#if !defined(OS_BSD) + free(memalign_ptr); + ASSERT_GE(frees_intercepted_by_addr[Hash(memalign_ptr)], 1u); ++#endif + + free(posix_memalign_ptr); + ASSERT_GE(frees_intercepted_by_addr[Hash(posix_memalign_ptr)], 1u); +@@ -249,8 +254,10 @@ + free(valloc_ptr); + ASSERT_GE(frees_intercepted_by_addr[Hash(valloc_ptr)], 1u); + ++#if !defined(OS_BSD) + free(pvalloc_ptr); + ASSERT_GE(frees_intercepted_by_addr[Hash(pvalloc_ptr)], 1u); ++#endif + #endif // OS_WIN + + free(realloc_ptr); diff --git a/www/chromium/files/patch-base_base.gyp b/www/chromium/files/patch-base_base.gyp deleted file mode 100644 index 7cf562ded0bd..000000000000 --- a/www/chromium/files/patch-base_base.gyp +++ /dev/null @@ -1,40 +0,0 @@ ---- ./base/base.gyp.orig 2016-07-22 00:06:49.000000000 -0400 -+++ ./base/base.gyp 2016-08-05 08:28:39.441243000 -0400 -@@ -114,7 +114,7 @@ - ], - 'link_settings': { - 'libraries': [ -- '-L/usr/local/lib -lexecinfo', -+ '-L/usr/local/lib -lexecinfo -lkvm', - ], - }, - }], -@@ -286,13 +286,13 @@ - ], - }], - ['icu_use_data_file_flag==1', { -- 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE'], -+ 'defines': ['ICU_UTIL_DATA_IMPL=0'], - }, { # else icu_use_data_file_flag !=1 - 'conditions': [ - ['OS=="win"', { -- 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_SHARED'], -+ 'defines': ['ICU_UTIL_DATA_IMPL=1'], - }, { -- 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC'], -+ 'defines': ['ICU_UTIL_DATA_IMPL=2'], - }], - ], - }], -@@ -773,6 +773,11 @@ - 'sync_socket_unittest.cc', - ], - }], -+ ['OS == "freebsd"', { -+ 'sources!': [ -+ 'debug/proc_maps_linux_unittest.cc', -+ ], -+ }], - ], # target_conditions - }, - { diff --git a/www/chromium/files/patch-base_base.gypi b/www/chromium/files/patch-base_base.gypi deleted file mode 100644 index d51b119ec915..000000000000 --- a/www/chromium/files/patch-base_base.gypi +++ /dev/null @@ -1,20 +0,0 @@ ---- base/base.gypi.orig 2016-05-11 19:02:11 UTC -+++ base/base.gypi -@@ -999,11 +999,16 @@ - 'process/memory_stubs.cc', - ], - 'sources/': [ -+ ['exclude', '^debug/proc_maps_linux\\.cc$'], - ['exclude', '^files/file_path_watcher_linux\\.cc$'], -- ['exclude', '^files/file_path_watcher_stub\\.cc$'], - ['exclude', '^files/file_util_linux\\.cc$'], -+ ['exclude', '^process/memory_linux\\.cc$'], - ['exclude', '^process/process_linux\\.cc$'], - ['exclude', '^sys_info_linux\\.cc$'], -+ ['exclude', '^process/process_iterator_linux\\.cc$'], -+ ['exclude', '^process/process_metrics_linux\\.cc$'], -+ ['exclude', '^files/file_path_watcher_fsevents\\.cc$'], -+ ['exclude', '^files/file_path_watcher_fsevents\\.h$'], - ], - }], - # Remove all unnecessary files for build_nexe.py to avoid exceeding diff --git a/www/chromium/files/patch-base_debug_proc__maps__linux.cc b/www/chromium/files/patch-base_debug_proc__maps__linux.cc new file mode 100644 index 000000000000..b10e9fa42133 --- /dev/null +++ b/www/chromium/files/patch-base_debug_proc__maps__linux.cc @@ -0,0 +1,11 @@ +--- base/debug/proc_maps_linux.cc.orig 2016-08-03 22:02:10.000000000 +0300 ++++ base/debug/proc_maps_linux.cc 2016-09-05 22:49:53.622055000 +0300 +@@ -12,7 +12,7 @@ + #include "base/strings/string_split.h" + #include "build/build_config.h" + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_ANDROID) + #include <inttypes.h> + #endif + diff --git a/www/chromium/files/patch-base_files_file__path__unittest.cc b/www/chromium/files/patch-base_files_file__path__unittest.cc new file mode 100644 index 000000000000..9792611df0d3 --- /dev/null +++ b/www/chromium/files/patch-base_files_file__path__unittest.cc @@ -0,0 +1,11 @@ +--- base/files/file_path_unittest.cc.orig 2016-10-06 04:02:08.000000000 +0300 ++++ base/files/file_path_unittest.cc 2016-10-25 21:44:53.079388000 +0300 +@@ -1133,7 +1133,7 @@ + "\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" }, + }; + +-#if !defined(SYSTEM_NATIVE_UTF8) && defined(OS_LINUX) ++#if !defined(SYSTEM_NATIVE_UTF8) && (defined(OS_LINUX) || defined(OS_BSD)) + ScopedLocale locale("en_US.UTF-8"); + #endif + diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h new file mode 100644 index 000000000000..b261921644d5 --- /dev/null +++ b/www/chromium/files/patch-base_files_file__util.h @@ -0,0 +1,11 @@ +--- base/files/file_util.h.orig 2016-08-03 22:02:10.000000000 +0300 ++++ base/files/file_util.h 2016-09-05 23:00:09.940024000 +0300 +@@ -391,7 +391,7 @@ + // the directory |path|, in the number of FilePath::CharType, or -1 on failure. + BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Broad categories of file systems as returned by statfs() on Linux. + enum FileSystemType { + FILE_SYSTEM_UNKNOWN, // statfs failed. diff --git a/www/chromium/files/patch-base_linux__util.cc b/www/chromium/files/patch-base_linux__util.cc new file mode 100644 index 000000000000..05401888b9e3 --- /dev/null +++ b/www/chromium/files/patch-base_linux__util.cc @@ -0,0 +1,18 @@ +--- base/linux_util.cc.orig 2016-08-13 05:03:14.838982000 +0300 ++++ base/linux_util.cc 2016-08-13 05:04:48.912092000 +0300 +@@ -86,12 +86,14 @@ + "CrOS"; + #elif defined(OS_ANDROID) + "Android"; ++#elif defined(OS_BSD) ++ "BSD"; + #else // if defined(OS_LINUX) + "Unknown"; + #endif + + std::string GetLinuxDistro() { +-#if defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) + return g_linux_distro; + #elif defined(OS_LINUX) + LinuxDistroHelper* distro_state_singleton = LinuxDistroHelper::GetInstance(); diff --git a/www/chromium/files/patch-base_native__library__posix.cc b/www/chromium/files/patch-base_native__library__posix.cc new file mode 100644 index 000000000000..c18b9cc68523 --- /dev/null +++ b/www/chromium/files/patch-base_native__library__posix.cc @@ -0,0 +1,11 @@ +--- base/native_library_posix.cc.orig 2016-10-06 04:02:08.000000000 +0300 ++++ base/native_library_posix.cc 2016-10-14 03:14:48.329757000 +0300 +@@ -35,7 +35,7 @@ + // versions. Crash here to warn developers that they're trying to rely on + // uncertain behavior. + CHECK(!options.prefer_own_symbols); +-#else ++#elif !defined(OS_BSD) + if (options.prefer_own_symbols) + flags |= RTLD_DEEPBIND; + #endif diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc b/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc index 4b8f548d8937..9998ff836a8e 100644 --- a/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc +++ b/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc @@ -1,10 +1,10 @@ ---- base/posix/unix_domain_socket_linux.cc.orig 2016-03-25 13:04:44 UTC -+++ base/posix/unix_domain_socket_linux.cc +--- base/posix/unix_domain_socket_linux.cc.orig 2016-08-03 22:02:10.000000000 +0300 ++++ base/posix/unix_domain_socket_linux.cc 2016-09-06 23:39:53.563078000 +0300 @@ -23,6 +23,15 @@ namespace base { -+#if defined(__FreeBSD__) ++#if defined(OS_BSD) +// Port over Linux ucred structure +struct ucred { + pid_t pid; // process ID of the sending process @@ -16,25 +16,26 @@ const size_t UnixDomainSocket::kMaxFileDescriptors = 16; #if !defined(OS_NACL_NONSFI) -@@ -41,7 +50,13 @@ static bool CreateSocketPair(ScopedFD* o +@@ -40,8 +49,14 @@ + // static bool UnixDomainSocket::EnableReceiveProcessId(int fd) { - const int enable = 1; -+#if defined(__FreeBSD__) ++#if defined(OS_BSD) + // XXX(rene) do this? : + // taken from dbus, Academic Free License 2.1 / GPL 2+ + return 0; // fake OK +#else + const int enable = 1; return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0; +#endif } #endif // !defined(OS_NACL_NONSFI) -@@ -147,7 +162,11 @@ ssize_t UnixDomainSocket::RecvMsgWithFla +@@ -147,7 +162,11 @@ // The PNaCl toolchain for Non-SFI binary build does not support // SCM_CREDENTIALS. if (cmsg->cmsg_level == SOL_SOCKET && -+#if defined(__FreeBSD__) ++#if defined(OS_BSD) + 1) { // XXX(rene) carpet getting full ... +#else cmsg->cmsg_type == SCM_CREDENTIALS) { diff --git a/www/chromium/files/patch-base_process_launch.cc b/www/chromium/files/patch-base_process_launch.cc index 08c4b147a429..7b4ea94dffaf 100644 --- a/www/chromium/files/patch-base_process_launch.cc +++ b/www/chromium/files/patch-base_process_launch.cc @@ -1,16 +1,11 @@ ---- base/process/launch.cc.orig 2016-04-08 16:02:06 UTC -+++ base/process/launch.cc -@@ -25,11 +25,11 @@ LaunchOptions::LaunchOptions() - fds_to_remap(NULL), - maximize_rlimits(NULL), - new_process_group(false) +--- base/process/launch.cc.orig 2016-10-06 04:02:08.000000000 +0300 ++++ base/process/launch.cc 2016-10-13 04:27:47.136877000 +0300 +@@ -15,7 +15,7 @@ + + LaunchOptions LaunchOptionsForTest() { + LaunchOptions options; -#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_FREEBSD) - , clone_flags(0) - , allow_new_privs(false) - , kill_on_parent_death(false) --#endif // OS_LINUX -+#endif // OS_LINUX || OS_FREEBSD - #if defined(OS_POSIX) - , pre_exec_delegate(NULL) - #endif // OS_POSIX ++#if defined(OS_LINUX) || defined(OS_BSD) + // To prevent accidental privilege sharing to an untrusted child, processes + // are started with PR_SET_NO_NEW_PRIVS. Do not set that here, since this + // new child will be used for testing only. diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h index 82eabb27b9e2..95594455c390 100644 --- a/www/chromium/files/patch-base_process_launch.h +++ b/www/chromium/files/patch-base_process_launch.h @@ -1,20 +1,20 @@ ---- base/process/launch.h.orig 2016-05-11 19:02:11 UTC -+++ base/process/launch.h -@@ -135,7 +135,7 @@ struct BASE_EXPORT LaunchOptions { +--- base/process/launch.h.orig 2016-10-06 04:02:08.000000000 +0300 ++++ base/process/launch.h 2016-10-13 04:27:24.908534000 +0300 +@@ -138,7 +138,7 @@ // will be the same as its pid. - bool new_process_group; + bool new_process_group = false; -#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_FREEBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) // If non-zero, start the process using clone(), using flags as provided. // Unlike in clone, clone_flags may not contain a custom termination signal // that is sent to the parent when the child dies. The termination signal will -@@ -148,7 +148,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -151,7 +151,7 @@ // Sets parent process death signal to SIGKILL. - bool kill_on_parent_death; + bool kill_on_parent_death = false; -#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_FREEBSD) ++#endif // defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_POSIX) - // If not empty, change to this directory before execing the new process. + // If non-null, a delegate to be run immediately prior to executing the new diff --git a/www/chromium/files/patch-base_process_launch__posix.cc b/www/chromium/files/patch-base_process_launch__posix.cc new file mode 100644 index 000000000000..dbd0ca9e9477 --- /dev/null +++ b/www/chromium/files/patch-base_process_launch__posix.cc @@ -0,0 +1,10 @@ +--- base/process/launch_posix.cc.orig 2016-10-06 04:02:08.000000000 +0300 ++++ base/process/launch_posix.cc 2016-10-16 15:45:00.730008000 +0300 +@@ -62,6 +62,7 @@ + #include <sys/event.h> + #else + extern char** environ; ++#pragma weak environ + #endif + + namespace base { diff --git a/www/chromium/files/patch-base_process_memory.cc b/www/chromium/files/patch-base_process_memory.cc deleted file mode 100644 index cbc41dd66ea7..000000000000 --- a/www/chromium/files/patch-base_process_memory.cc +++ /dev/null @@ -1,39 +0,0 @@ ---- base/process/memory.cc.orig 2016-03-25 13:04:44 UTC -+++ base/process/memory.cc -@@ -46,4 +46,36 @@ bool UncheckedCalloc(size_t num_items, s - - #endif - -+#if defined(OS_FREEBSD) -+ -+#if defined(USE_TCMALLOC) -+// Used by UncheckedMalloc. If tcmalloc is linked to the executable -+// this will be replaced by a strong symbol that actually implement -+// the semantics and don't call new handler in case the allocation fails. -+extern "C" { -+ -+__attribute__((weak, visibility("default"))) -+void* tc_malloc_skip_new_handler_weak(size_t size); -+ -+void* tc_malloc_skip_new_handler_weak(size_t size) { -+ return malloc(size); -+} -+ -+} -+#endif -+ -+bool UncheckedMalloc(size_t size, void** result) { -+#if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) || \ -+ (!defined(LIBC_GLIBC) && !defined(USE_TCMALLOC)) -+ *result = malloc(size); -+#elif defined(LIBC_GLIBC) && !defined(USE_TCMALLOC) -+ *result = __libc_malloc(size); -+#elif defined(USE_TCMALLOC) -+ *result = tc_malloc_skip_new_handler_weak(size); -+#endif -+ return *result != NULL; -+} -+ -+#endif // defined(OS_FREEBSD) -+ - } // namespace base diff --git a/www/chromium/files/patch-base_process_memory.h b/www/chromium/files/patch-base_process_memory.h new file mode 100644 index 000000000000..681a61d35dc3 --- /dev/null +++ b/www/chromium/files/patch-base_process_memory.h @@ -0,0 +1,11 @@ +--- base/process/memory.h.orig 2016-08-03 22:02:10.000000000 +0300 ++++ base/process/memory.h 2016-09-11 01:10:36.394804000 +0300 +@@ -32,7 +32,7 @@ + // Crash reporting classifies such crashes as OOM. + BASE_EXPORT void TerminateBecauseOutOfMemory(size_t size); + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_ANDROID) + BASE_EXPORT extern size_t g_oom_size; + + // The maximum allowed value for the OOM score. diff --git a/www/chromium/files/patch-base_process_memory__unittest.cc b/www/chromium/files/patch-base_process_memory__unittest.cc index 853c19d9d518..77df7a8722ac 100644 --- a/www/chromium/files/patch-base_process_memory__unittest.cc +++ b/www/chromium/files/patch-base_process_memory__unittest.cc @@ -1,23 +1,22 @@ ---- base/process/memory_unittest.cc.orig 2016-05-11 19:02:11 UTC -+++ base/process/memory_unittest.cc -@@ -140,11 +140,11 @@ TEST(ProcessMemoryTest, MacTerminateOnHe - #endif // defined(OS_MACOSX) +--- base/process/memory_unittest.cc.orig 2016-10-06 04:02:08.000000000 +0300 ++++ base/process/memory_unittest.cc 2016-10-13 04:32:50.457987000 +0300 +@@ -82,10 +82,10 @@ + ASSERT_TRUE(base::allocator::IsAllocatorInitialized()); + } - // Android doesn't implement set_new_handler, so we can't use the --// OutOfMemoryTest cases. OpenBSD does not support these tests either. -+// OutOfMemoryTest cases. OpenBSD and FreeBSD do not support these tests either. - // Don't test these on ASan/TSan/MSan configurations: only test the real - // allocator. +-// OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan ++// BSD does not support these tests. Don't test these on ASan/TSan/MSan + // configurations: only test the real allocator. // Windows only supports these tests with the allocator shim in place. --#if !defined(OS_ANDROID) && !defined(OS_OPENBSD) && \ -+#if !defined(OS_ANDROID) && !defined(OS_BSD) && \ - !(defined(OS_WIN) && !defined(ALLOCATOR_SHIM)) && \ +-#if !defined(OS_OPENBSD) && \ ++#if !defined(OS_BSD) && \ + BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && \ !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) -@@ -474,5 +474,5 @@ TEST_F(OutOfMemoryHandledTest, Unchecked +@@ -439,5 +439,5 @@ + EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_)); EXPECT_TRUE(value_ == NULL); } - #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) && - // !defined(ALLOCATOR_SHIM)) && !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) +-#endif // !defined(OS_OPENBSD) && BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && ++#endif // !defined(OS_BSD) && BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && + // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) diff --git a/www/chromium/files/patch-base_process_process__handle__freebsd.cc b/www/chromium/files/patch-base_process_process__handle__freebsd.cc new file mode 100644 index 000000000000..d52190819e9b --- /dev/null +++ b/www/chromium/files/patch-base_process_process__handle__freebsd.cc @@ -0,0 +1,11 @@ +--- base/process/process_handle_freebsd.cc.orig 2016-10-06 04:02:08.000000000 +0300 ++++ base/process/process_handle_freebsd.cc 2016-10-26 19:55:22.341492000 +0300 +@@ -16,7 +16,7 @@ + + ProcessId GetParentProcessId(ProcessHandle process) { + struct kinfo_proc info; +- size_t length; ++ size_t length = sizeof(struct kinfo_proc); + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process }; + + if (sysctl(mib, arraysize(mib), &info, &length, NULL, 0) < 0) diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index 52e67b3a3a9f..7abeb06e2a1c 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,6 +1,6 @@ ---- base/process/process_metrics.h.orig 2016-05-11 19:02:11 UTC -+++ base/process/process_metrics.h -@@ -21,6 +21,13 @@ +--- base/process/process_metrics.h.orig 2016-10-06 04:02:08.000000000 +0300 ++++ base/process/process_metrics.h 2016-10-13 12:58:13.818273000 +0300 +@@ -22,6 +22,12 @@ #include "base/values.h" #include "build/build_config.h" @@ -8,13 +8,12 @@ +#include <kvm.h> +#include <sys/param.h> +#include <sys/sysctl.h> -+#include <sys/user.h> +#endif + #if defined(OS_MACOSX) #include <mach/mach.h> #include "base/process/port_provider_mac.h" -@@ -314,13 +321,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(Sys +@@ -326,13 +332,17 @@ // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. BASE_EXPORT int ParseProcStatCPU(const std::string& input); diff --git a/www/chromium/files/patch-base_process_process__posix.cc b/www/chromium/files/patch-base_process_process__posix.cc index 7c53754f5afd..46938b5283e2 100644 --- a/www/chromium/files/patch-base_process_process__posix.cc +++ b/www/chromium/files/patch-base_process_process__posix.cc @@ -1,5 +1,5 @@ ---- base/process/process_posix.cc.orig 2016-03-25 13:04:44 UTC -+++ base/process/process_posix.cc +--- base/process/process_posix.cc.orig 2016-08-03 22:02:10.000000000 +0300 ++++ base/process/process_posix.cc 2016-09-11 02:18:36.481940000 +0300 @@ -20,8 +20,18 @@ #include <sys/event.h> #endif @@ -19,32 +19,15 @@ #if !defined(OS_NACL_NONSFI) bool WaitpidWithTimeout(base::ProcessHandle handle, -@@ -86,7 +96,7 @@ bool WaitpidWithTimeout(base::ProcessHan - return ret_pid > 0; - } - --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) - // 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. -@@ -175,7 +185,7 @@ static bool WaitForSingleNonChildProcess - - return true; - } --#endif // OS_MACOSX -+#endif // OS_MACOSX || OS_BSD - - bool WaitForExitWithTimeoutImpl(base::ProcessHandle handle, - int* exit_code, -@@ -183,13 +193,13 @@ bool WaitForExitWithTimeoutImpl(base::Pr +@@ -183,13 +193,13 @@ base::ProcessHandle parent_pid = base::GetParentProcessId(handle); base::ProcessHandle our_pid = base::GetCurrentProcessHandle(); if (parent_pid != our_pid) { -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_BSD) // On Mac we can wait on non child processes. - return WaitForSingleNonChildProcess(handle, timeout); +- return WaitForSingleNonChildProcess(handle, timeout); ++ /* return WaitForSingleNonChildProcess(handle, timeout); */ #else // Currently on Linux we can't handle non child processes. NOTIMPLEMENTED(); @@ -53,7 +36,7 @@ } int status; -@@ -256,12 +266,16 @@ Process Process::DeprecatedGetProcessFro +@@ -256,12 +266,16 @@ return Process(handle); } @@ -72,7 +55,7 @@ bool Process::IsValid() const { return process_ != kNullProcessHandle; -@@ -361,15 +375,32 @@ bool Process::WaitForExitWithTimeout(Tim +@@ -361,15 +375,32 @@ bool Process::IsProcessBackgrounded() const { // See SetProcessBackgrounded(). DCHECK(IsValid()); diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc new file mode 100644 index 000000000000..ef8e0deda89d --- /dev/null +++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc @@ -0,0 +1,11 @@ +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2016-10-06 04:02:08.000000000 +0300 ++++ base/profiler/stack_sampling_profiler_unittest.cc 2016-10-25 21:31:13.576230000 +0300 +@@ -30,7 +30,7 @@ + #include <intrin.h> + #include <malloc.h> + #include <windows.h> +-#else ++#elif !defined(OS_BSD) + #include <alloca.h> + #endif + diff --git a/www/chromium/files/patch-base_sys__info__freebsd.cc b/www/chromium/files/patch-base_sys__info__freebsd.cc index e4f9ce805dfe..19fbf5cc2892 100644 --- a/www/chromium/files/patch-base_sys__info__freebsd.cc +++ b/www/chromium/files/patch-base_sys__info__freebsd.cc @@ -1,5 +1,5 @@ ---- base/sys_info_freebsd.cc.orig 2016-03-25 13:04:44 UTC -+++ base/sys_info_freebsd.cc +--- base/sys_info_freebsd.cc.orig 2016-10-06 04:02:08.000000000 +0300 ++++ base/sys_info_freebsd.cc 2016-10-13 10:20:37.344204000 +0300 @@ -12,12 +12,34 @@ namespace base { @@ -39,11 +39,14 @@ NOTREACHED(); return 0; } -@@ -35,4 +57,25 @@ uint64_t SysInfo::MaxSharedMemorySize() - return static_cast<uint64_t>(limit); +@@ -25,14 +47,24 @@ } -+// static + // static +-uint64_t SysInfo::MaxSharedMemorySize() { +- size_t limit; +- size_t size = sizeof(limit); +- if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) { +std::string SysInfo::CPUModelName() { + int mib[] = { CTL_HW, HW_MODEL }; + char name[256]; @@ -58,10 +61,12 @@ + int ncpu; + size_t size = sizeof(ncpu); + if (sysctl(mib, arraysize(mib), &ncpu, &size, NULL, 0) == -1) { -+ NOTREACHED(); + NOTREACHED(); +- return 0; + return 1; -+ } + } +- return static_cast<uint64_t>(limit); + return ncpu; -+} -+ + } + } // namespace base diff --git a/www/chromium/files/patch-base_sys__info__posix.cc b/www/chromium/files/patch-base_sys__info__posix.cc index faf5ce3bd6bc..a746e82a0496 100644 --- a/www/chromium/files/patch-base_sys__info__posix.cc +++ b/www/chromium/files/patch-base_sys__info__posix.cc @@ -1,11 +1,20 @@ ---- base/sys_info_posix.cc.orig 2016-03-25 13:04:44 UTC -+++ base/sys_info_posix.cc -@@ -77,7 +77,7 @@ base::LazyInstance< +--- base/sys_info_posix.cc.orig 2016-08-03 22:02:10.000000000 +0300 ++++ base/sys_info_posix.cc 2016-09-24 01:27:31.548122000 +0300 +@@ -30,7 +30,7 @@ + + namespace { + +-#if !defined(OS_OPENBSD) ++#if !defined(OS_BSD) + int NumberOfProcessors() { + // sysconf returns the number of "logical" (not "physical") processors on both + // Mac and Linux. So we get the number of max available "logical" processors. +@@ -77,7 +77,7 @@ namespace base { -#if !defined(OS_OPENBSD) -+#if !defined(OS_OPENBSD) && !defined(OS_FREEBSD) ++#if !defined(OS_BSD) int SysInfo::NumberOfProcessors() { return g_lazy_number_of_processors.Get().value(); } diff --git a/www/chromium/files/patch-base_test_BUILD.gn b/www/chromium/files/patch-base_test_BUILD.gn new file mode 100644 index 000000000000..336fb2c063cb --- /dev/null +++ b/www/chromium/files/patch-base_test_BUILD.gn @@ -0,0 +1,11 @@ +--- base/test/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300 ++++ base/test/BUILD.gn 2016-09-02 23:56:39.647089000 +0300 +@@ -249,7 +249,7 @@ + ] + } + +-if (is_linux) { ++if (is_linux || is_bsd) { + shared_library("malloc_wrapper") { + testonly = true + sources = [ diff --git a/www/chromium/files/patch-base_test_test__file__util__posix.cc b/www/chromium/files/patch-base_test_test__file__util__posix.cc new file mode 100644 index 000000000000..7ce14dbdedea --- /dev/null +++ b/www/chromium/files/patch-base_test_test__file__util__posix.cc @@ -0,0 +1,11 @@ +--- base/test/test_file_util_posix.cc.orig 2016-10-06 04:02:08.000000000 +0300 ++++ base/test/test_file_util_posix.cc 2016-10-25 21:44:27.287523000 +0300 +@@ -79,7 +79,7 @@ + return DeleteFile(file, recurse); + } + +-#if !defined(OS_LINUX) && !defined(OS_MACOSX) ++#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_BSD) + bool EvictFileFromSystemCache(const FilePath& file) { + // There doesn't seem to be a POSIX way to cool the disk cache. + NOTIMPLEMENTED(); diff --git a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn new file mode 100644 index 000000000000..e7f4ac008894 --- /dev/null +++ b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn @@ -0,0 +1,12 @@ +--- base/third_party/libevent/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300 ++++ base/third_party/libevent/BUILD.gn 2016-10-12 18:30:43.933710000 +0300 +@@ -29,6 +29,9 @@ + } else if (is_linux) { + sources += [ "epoll.c" ] + include_dirs = [ "linux" ] ++ } else if (is_bsd) { ++ sources += [ "kqueue.c" ] ++ include_dirs = [ "freebsd" ] + } else if (is_android) { + sources += [ "epoll.c" ] + include_dirs = [ "android" ] diff --git a/www/chromium/files/patch-base_third__party_libevent_libevent.gyp b/www/chromium/files/patch-base_third__party_libevent_libevent.gyp deleted file mode 100644 index a83381edf64f..000000000000 --- a/www/chromium/files/patch-base_third__party_libevent_libevent.gyp +++ /dev/null @@ -1,83 +0,0 @@ ---- base/third_party/libevent/libevent.gyp.orig 2016-05-20 17:19:03 UTC -+++ base/third_party/libevent/libevent.gyp -@@ -1,4 +1,4 @@ --# Copyright (c) 2012 The Chromium Authors. All rights reserved. -+# Copyright 2013 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. - -@@ -6,59 +6,22 @@ - 'targets': [ - { - 'target_name': 'libevent', -- 'product_name': 'event', -- 'type': 'static_library', -+ 'type': 'none', - 'toolsets': ['host', 'target'], -- 'sources': [ -- 'buffer.c', -- 'evbuffer.c', -- 'evdns.c', -- 'event.c', -- 'event_tagging.c', -- 'evrpc.c', -- 'evutil.c', -- 'http.c', -- 'log.c', -- 'poll.c', -- 'select.c', -- 'signal.c', -- 'strlcpy.c', -- ], -- 'defines': [ -- 'HAVE_CONFIG_H', -- ], -- 'include_dirs': [ -- '../../..', -- ], -- 'conditions': [ -- # libevent has platform-specific implementation files. Since its -- # native build uses autoconf, platform-specific config.h files are -- # provided and live in platform-specific directories. -- [ 'OS == "linux" or (OS == "android" and _toolset == "host")', { -- 'sources': [ 'epoll.c' ], -- 'include_dirs': [ 'linux' ], -- 'link_settings': { -- 'libraries': [ -- # We need rt for clock_gettime(). -- # TODO(port) Maybe on FreeBSD as well? -- '-lrt', -- ], -- }, -- }], -- [ 'OS == "android" and _toolset == "target"', { -- # On android, clock_gettime() is in libc.so, so no need to link librt. -- 'sources': [ 'epoll.c' ], -- 'include_dirs': [ 'android' ], -- }], -- [ 'OS == "mac" or OS == "ios" or os_bsd==1', { -- 'sources': [ 'kqueue.c' ], -- 'include_dirs': [ 'mac' ] -- }], -- [ 'OS == "solaris"', { -- 'sources': [ 'devpoll.c', 'evport.c' ], -- 'include_dirs': [ 'solaris' ] -- }], -+ 'variables': { -+ 'headers_root_path': '.', -+ 'header_filenames': [ -+ 'event.h', -+ ], -+ }, -+ 'includes': [ -+ '../../../build/shim_headers.gypi', - ], -- }, -+ 'link_settings': { -+ 'libraries': [ -+ '-levent', -+ ], -+ }, -+ } - ], - } diff --git a/www/chromium/files/patch-base_threading_platform__thread__linux.cc b/www/chromium/files/patch-base_threading_platform__thread__linux.cc deleted file mode 100644 index e74ecca9e181..000000000000 --- a/www/chromium/files/patch-base_threading_platform__thread__linux.cc +++ /dev/null @@ -1,21 +0,0 @@ ---- base/threading/platform_thread_linux.cc.orig 2016-04-08 16:02:06 UTC -+++ base/threading/platform_thread_linux.cc -@@ -17,7 +17,9 @@ - - #if !defined(OS_NACL) - #include <pthread.h> -+#if !defined(OS_BSD) - #include <sys/prctl.h> -+#endif - #include <sys/types.h> - #include <unistd.h> - #endif -@@ -70,7 +72,7 @@ void PlatformThread::SetName(const std:: - ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name); - tracked_objects::ThreadData::InitializeThreadContext(name); - --#if !defined(OS_NACL) -+#if !defined(OS_NACL) && !defined(OS_BSD) - // On linux we can get the thread names to show up in the debugger by setting - // the process name for the LWP. We don't want to do this for the main - // thread because that would rename the process, causing tools like killall diff --git a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc new file mode 100644 index 000000000000..b673826edea7 --- /dev/null +++ b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -0,0 +1,11 @@ +--- base/trace_event/malloc_dump_provider.cc.orig 2016-07-20 22:03:18.000000000 +0300 ++++ base/trace_event/malloc_dump_provider.cc 2016-08-14 13:06:10.819247000 +0300 +@@ -20,7 +20,7 @@ + #if defined(OS_MACOSX) + #include <malloc/malloc.h> + #else +-#include <malloc.h> ++#include <stdlib.h> + #endif + + namespace base { diff --git a/www/chromium/files/patch-breakpad_BUILD.gn b/www/chromium/files/patch-breakpad_BUILD.gn new file mode 100644 index 000000000000..7de6b4d12b18 --- /dev/null +++ b/www/chromium/files/patch-breakpad_BUILD.gn @@ -0,0 +1,11 @@ +--- breakpad/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300 ++++ breakpad/BUILD.gn 2016-09-03 00:07:22.742094000 +0300 +@@ -420,7 +420,7 @@ + } + } + +-if (is_linux || is_android) { ++if (is_linux || is_bsd || is_android) { + if (current_toolchain == host_toolchain) { + executable("symupload") { + sources = [ diff --git a/www/chromium/files/patch-build_common.gypi b/www/chromium/files/patch-build_common.gypi deleted file mode 100644 index 309c5810d63e..000000000000 --- a/www/chromium/files/patch-build_common.gypi +++ /dev/null @@ -1,40 +0,0 @@ ---- build/common.gypi.orig 2016-07-22 00:06:49.000000000 -0400 -+++ build/common.gypi 2016-08-03 11:18:18.437811000 -0400 -@@ -726,6 +726,12 @@ - 'os_bsd%': 0, - }], - -+ ['OS=="freebsd" or OS=="openbsd"', { -+ 'icu_use_data_file_flag%': 0, -+ }, { -+ 'icu_use_data_file_flag%': 1, -+ }], -+ - # NSS usage. - ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris")', { - 'use_nss_certs%': 1, -@@ -1303,6 +1309,10 @@ - # able to turn it off for various reasons. - 'linux_disable_pie%': 0, - -+ # XXX(rene) More options, keep them? -+ 'os_ver%': 0, -+ 'use_system_libjpeg%': 0, -+ - # The release channel that this build targets. This is used to restrict - # channel-specific build options, like which installer packages to create. - # The default is 'all', which does no channel-specific filtering. -@@ -4709,6 +4719,13 @@ - 'ldflags': [ - '-Wl,--no-keep-memory', - ], -+ 'ldflags!': [ -+ '-ldl', -+ '-pie' -+ ], -+ 'libraries!': [ -+ '-ldl', -+ ], - }, - }], - # Android-specific options; note that most are set above with Linux. diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn new file mode 100644 index 000000000000..c0c10b68a6aa --- /dev/null +++ b/www/chromium/files/patch-build_config_BUILD.gn @@ -0,0 +1,20 @@ +--- build/config/BUILD.gn.orig 2016-10-06 04:02:08.000000000 +0300 ++++ build/config/BUILD.gn 2016-10-13 04:42:48.294016000 +0300 +@@ -297,7 +297,7 @@ + # builds, and we have to tell it to turn it off. + defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] + } +- } else if (is_linux && current_cpu == "x64" && enable_iterator_debugging) { ++ } else if ((is_linux || is_bsd) && current_cpu == "x64" && enable_iterator_debugging) { + # Enable libstdc++ debugging facilities to help catch problems early, see + # http://crbug.com/65151 . + # TODO(phajdan.jr): Should we enable this for all of POSIX? +@@ -411,7 +411,7 @@ + ] + } else if (is_ios) { + configs += [ "//build/config/ios:ios_dynamic_flags" ] +- } else if (is_linux || is_android) { ++ } else if (is_linux || is_android || is_bsd) { + configs += [ "//build/config/gcc:executable_ldconfig" ] + if (is_android) { + configs += [ "//build/config/android:executable_config" ] diff --git a/www/chromium/files/patch-build_config_BUILDCONFIG.gn b/www/chromium/files/patch-build_config_BUILDCONFIG.gn new file mode 100644 index 000000000000..be45e8000366 --- /dev/null +++ b/www/chromium/files/patch-build_config_BUILDCONFIG.gn @@ -0,0 +1,66 @@ +--- build/config/BUILDCONFIG.gn.orig 2016-10-06 04:02:08.000000000 +0300 ++++ build/config/BUILDCONFIG.gn 2016-10-13 04:48:31.029743000 +0300 +@@ -134,12 +134,13 @@ + is_debug = !is_official_build + + # Whether we're a traditional desktop unix. +- is_desktop_linux = current_os == "linux" ++ is_desktop_linux = current_os == "linux" || current_os == "bsd" + + # Set to true when compiling with the Clang compiler. Typically this is used + # to configure warnings. + is_clang = current_os == "mac" || current_os == "ios" || +- current_os == "linux" || current_os == "chromeos" ++ current_os == "linux" || current_os == "chromeos" || ++ current_os == "bsd" + + # Allows the path to a custom target toolchain to be injected as a single + # argument, and set as the default toolchain. +@@ -183,8 +184,8 @@ + # TODO(dpranke): Add some sort of assert here that verifies that + # no toolchain omitted host_toolchain from its toolchain_args(). + +- if (host_os == "linux") { +- if (target_os != "linux") { ++ if (host_os == "linux" || host_os == "bsd") { ++ if (target_os != "linux" || target_os != "bsd") { + # TODO(dpranke) - is_clang normally applies only to the target + # build, and there is no way to indicate that you want to override + # it for both the target build *and* the host build. Do we need to +@@ -220,7 +221,7 @@ + } else { + _default_toolchain = "//build/toolchain/android:$target_cpu" + } +-} else if (target_os == "chromeos" || target_os == "linux") { ++} else if (target_os == "chromeos" || target_os == "linux" || target_os == "bsd") { + # See comments in build/toolchain/cros/BUILD.gn about board compiles. + if (is_clang) { + _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" +@@ -340,8 +341,17 @@ + is_nacl = false + is_posix = true + is_win = false ++} else if (current_os == "bsd") { ++ is_android = false ++ is_chromeos = false ++ is_ios = false ++ is_linux = false ++ is_bsd = true ++ is_mac = false ++ is_nacl = false ++ is_posix = true ++ is_win = false + } +- + # ============================================================================= + # SOURCES FILTERS + # ============================================================================= +@@ -410,7 +420,7 @@ + if (!is_mac && !is_ios) { + sources_assignment_filter += [ "*.mm" ] + } +-if (!is_linux) { ++if (!is_linux && !is_bsd) { + sources_assignment_filter += [ + "*_linux.h", + "*_linux.cc", diff --git a/www/chromium/files/patch-build_config_allocator.gni b/www/chromium/files/patch-build_config_allocator.gni new file mode 100644 index 000000000000..65f52aa7c4fb --- /dev/null +++ b/www/chromium/files/patch-build_config_allocator.gni @@ -0,0 +1,11 @@ +--- build/config/allocator.gni.orig 2016-10-06 04:02:08.000000000 +0300 ++++ build/config/allocator.gni 2016-10-13 10:29:19.634367000 +0300 +@@ -44,7 +44,7 @@ + assert(!is_win || use_allocator == "none", "Tcmalloc doesn't work on Windows.") + + assert( +- !use_experimental_allocator_shim || is_linux || is_android || is_win, ++ !use_experimental_allocator_shim || is_linux || is_android || is_win || is_bsd, + "use_experimental_allocator_shim supported only on Linux, Android and Windows targets") + + if (is_win && use_experimental_allocator_shim) { diff --git a/www/chromium/files/patch-build_config_clang_BUILD.gn b/www/chromium/files/patch-build_config_clang_BUILD.gn new file mode 100644 index 000000000000..b84af78e2743 --- /dev/null +++ b/www/chromium/files/patch-build_config_clang_BUILD.gn @@ -0,0 +1,20 @@ +--- build/config/clang/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300 ++++ build/config/clang/BUILD.gn 2016-09-03 01:38:15.236274000 +0300 +@@ -21,7 +21,7 @@ + "//third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib", + root_build_dir), + ] +- } else if (is_linux || is_android) { ++ } else if (is_linux || is_bsd || is_android) { + cflags += [ + "-Xclang", + "-load", +@@ -51,7 +51,7 @@ + "check-implicit-copy-ctors", + ] + +- if ((is_linux || is_android) && !is_chromecast) { ++ if ((is_linux || is_bsd || is_android) && !is_chromecast) { + cflags += [ + "-Xclang", + "-plugin-arg-find-bad-constructs", diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn new file mode 100644 index 000000000000..f673f726f183 --- /dev/null +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -0,0 +1,100 @@ +--- build/config/compiler/BUILD.gn.orig 2016-10-06 04:02:08.000000000 +0300 ++++ build/config/compiler/BUILD.gn 2016-10-24 23:25:32.101459000 +0300 +@@ -141,7 +141,7 @@ + configs += [ "//build/config/win:compiler" ] + } else if (is_android) { + configs += [ "//build/config/android:compiler" ] +- } else if (is_linux) { ++ } else if (is_linux || is_bsd) { + configs += [ "//build/config/linux:compiler" ] + } else if (is_nacl) { + configs += [ "//build/config/nacl:compiler" ] +@@ -271,7 +271,7 @@ + + # Linux/Android common flags setup. + # --------------------------------- +- if (is_linux || is_android) { ++ if (is_linux || is_bsd || is_android) { + cflags += [ + "-fPIC", + "-pipe", # Use pipes for communicating between sub-processes. Faster. +@@ -376,14 +376,14 @@ + # clang-cl (used if is_win) doesn't expose this flag. + # Currently disabled for nacl since its toolchain lacks this flag (too old). + # TODO(zforman): Once nacl's toolchain is updated, remove check. +- if (is_clang && is_linux) { ++ if (is_clang && (is_linux || is_bsd)) { + absolute_path = rebase_path("//.") + cflags += [ "-fdebug-prefix-map=$absolute_path=." ] + } + + # C++11 compiler flags setup. + # --------------------------- +- if (is_linux || is_android || (is_nacl && is_clang)) { ++ if (is_linux || is_bsd || is_android || (is_nacl && is_clang)) { + # gnu++11 instead of c++11 is needed because some code uses typeof() (a + # GNU extension). + # TODO(thakis): Eventually switch this to c++11 instead, +@@ -441,7 +441,7 @@ + ldflags += [ "-flto" ] + + # Apply a lower LTO optimization level as the default is too slow. +- if (is_linux) { ++ if (is_linux || is_bsd) { + if (use_lld) { + ldflags += [ "-Wl,--lto-O1" ] + } else { +@@ -460,7 +460,7 @@ + # targeting ARM, without this flag, LTO produces a .text section that is + # larger than the maximum call displacement, preventing the linker from + # relocating calls (http://llvm.org/PR22999). +- if (is_linux) { ++ if (is_linux || is_bsd) { + ldflags += [ "-Wl,-plugin-opt,-function-sections" ] + } + +@@ -738,7 +738,7 @@ + # configs -= [ "//build/config/compiler:clang_stackrealign" ] + # See https://crbug.com/556393 for details of where it must be avoided. + config("clang_stackrealign") { +- if (is_clang && current_cpu == "x86" && is_linux) { ++ if (is_clang && current_cpu == "x86" && (is_linux || is_bsd)) { + cflags = [ + # Align the stack on 16-byte boundaries, http://crbug.com/418554. + "-mstack-alignment=16", +@@ -773,7 +773,7 @@ + # smaller. + if (is_win) { + configs += [ "//build/config/win:runtime_library" ] +- } else if (is_linux) { ++ } else if (is_linux || is_bsd) { + configs += [ "//build/config/linux:runtime_library" ] + } else if (is_ios) { + configs += [ "//build/config/ios:runtime_library" ] +@@ -1032,7 +1032,7 @@ + "-Wno-nonportable-include-path", + + # TODO(hans): https://crbug.com/637306 +- "-Wno-address-of-packed-member", ++ # "-Wno-address-of-packed-member", + ] + } + } +@@ -1064,7 +1064,7 @@ + ] + + if (!is_debug && !using_sanitizer && +- (!is_linux || !is_clang || is_official_build)) { ++ (!is_linux || !is_bsd || !is_clang || is_official_build)) { + # _FORTIFY_SOURCE isn't really supported by Clang now, see + # http://llvm.org/bugs/show_bug.cgi?id=16821. + # It seems to work fine with Ubuntu 12 headers though, so use it in +@@ -1124,7 +1124,7 @@ + ] + } + +- if (is_linux || is_android) { ++ if (is_linux || is_bsd || is_android) { + cflags_cc += [ + # Don't warn about hash_map in third-party code. + "-Wno-deprecated", diff --git a/www/chromium/files/patch-build_config_crypto.gni b/www/chromium/files/patch-build_config_crypto.gni new file mode 100644 index 000000000000..be98f4b52c03 --- /dev/null +++ b/www/chromium/files/patch-build_config_crypto.gni @@ -0,0 +1,8 @@ +--- build/config/crypto.gni.orig 2016-08-03 22:02:10.000000000 +0300 ++++ build/config/crypto.gni 2016-09-03 01:37:11.785915000 +0300 +@@ -20,4 +20,4 @@ + + # True if NSS is used for certificate handling. It is possible to use OpenSSL + # for the crypto library, but NSS for the platform certificate library. +-use_nss_certs = is_linux ++use_nss_certs = is_linux || is_bsd diff --git a/www/chromium/files/patch-build_config_features.gni b/www/chromium/files/patch-build_config_features.gni new file mode 100644 index 000000000000..c30729e8f39b --- /dev/null +++ b/www/chromium/files/patch-build_config_features.gni @@ -0,0 +1,37 @@ +--- build/config/features.gni.orig 2016-08-03 22:02:10.000000000 +0300 ++++ build/config/features.gni 2016-09-01 02:42:02.955488000 +0300 +@@ -22,7 +22,7 @@ + + declare_args() { + # Multicast DNS. +- enable_mdns = is_win || is_linux ++ enable_mdns = is_win || is_linux || is_bsd + + enable_extensions = !is_android && !is_ios + enable_plugins = (!is_android && !is_ios) || is_chromecast +@@ -100,13 +100,13 @@ + # libudev usage. This currently only affects the content layer. + use_udev = is_linux && !is_chromecast + +- use_dbus = is_linux && !is_chromecast ++ use_dbus = (is_linux || is_bsd) && !is_chromecast + + # Option controlling the use of GConf (the classic GNOME configuration + # system). +- use_gconf = is_linux && !is_chromeos && !is_chromecast ++ use_gconf = (is_linux || is_bsd) && !is_chromeos && !is_chromecast + +- use_gio = is_linux && !is_chromeos && !is_chromecast ++ use_gio = (is_linux || is_bsd) && !is_chromeos && !is_chromecast + + # Enable basic printing support and UI. + enable_basic_printing = !is_chromeos && !is_chromecast && !is_ios +@@ -126,7 +126,7 @@ + + # Enables the use of CDMs in pepper plugins. + enable_pepper_cdms = +- enable_plugins && (is_linux || is_mac || is_win) && !is_chromecast ++ enable_plugins && (is_linux || is_bsd || is_mac || is_win) && !is_chromecast + + # The seccomp-bpf sandbox is only supported on five architectures + # currently. diff --git a/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn b/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn new file mode 100644 index 000000000000..3c4a72ae71c6 --- /dev/null +++ b/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn @@ -0,0 +1,11 @@ +--- build/config/linux/gtk2/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300 ++++ build/config/linux/gtk2/BUILD.gn 2016-09-02 22:54:36.628597000 +0300 +@@ -4,7 +4,7 @@ + + import("//build/config/linux/pkg_config.gni") + +-assert(is_linux, "This file should only be referenced on Linux") ++assert(is_linux || is_bsd, "This file should only be referenced on Linux") + + # Depend on //build/config/linux/gtk2 to use GTKv2. + # diff --git a/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn b/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn new file mode 100644 index 000000000000..470385175afc --- /dev/null +++ b/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn @@ -0,0 +1,11 @@ +--- build/config/linux/gtk3/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300 ++++ build/config/linux/gtk3/BUILD.gn 2016-09-03 01:35:58.974361000 +0300 +@@ -4,7 +4,7 @@ + + import("//build/config/linux/pkg_config.gni") + +-assert(is_linux, "This file should only be referenced on Linux") ++assert(is_linux || is_bsd, "This file should only be referenced on Linux") + + # Depend on //build/config/linux/gtk3 to use GTKv3. + # diff --git a/www/chromium/files/patch-build_config_linux_pkg-config.py b/www/chromium/files/patch-build_config_linux_pkg-config.py new file mode 100644 index 000000000000..ea92a757a114 --- /dev/null +++ b/www/chromium/files/patch-build_config_linux_pkg-config.py @@ -0,0 +1,26 @@ +--- build/config/linux/pkg-config.py.orig 2016-08-03 22:02:10.000000000 +0300 ++++ build/config/linux/pkg-config.py 2016-09-04 01:43:37.226981000 +0300 +@@ -57,8 +57,12 @@ + print "You must specify an architecture via -a if using a sysroot." + sys.exit(1) + +- libdir = sysroot + '/usr/' + options.system_libdir + '/pkgconfig' +- libdir += ':' + sysroot + '/usr/share/pkgconfig' ++ if "linux" in sys.platform: ++ libdir = sysroot + '/libdata/' + options.system_libdir + '/pkgconfig' ++ libdir += ':' + sysroot + '/usr/share/pkgconfig' ++ elif "bsd" in sys.platform: ++ libdir = sysroot + '/libdata/pkgconfig' ++ libdir += ':' + '/usr/libdata/pkgconfig' + os.environ['PKG_CONFIG_LIBDIR'] = libdir + return libdir + +@@ -107,7 +111,7 @@ + # If this is run on non-Linux platforms, just return nothing and indicate + # success. This allows us to "kind of emulate" a Linux build from other + # platforms. +- if "linux" not in sys.platform: ++ if "bsd" not in sys.platform: + print "[[],[],[],[],[]]" + return 0 + diff --git a/www/chromium/files/patch-build_config_sanitizers_BUILD.gn b/www/chromium/files/patch-build_config_sanitizers_BUILD.gn new file mode 100644 index 000000000000..8982eef7d5c1 --- /dev/null +++ b/www/chromium/files/patch-build_config_sanitizers_BUILD.gn @@ -0,0 +1,20 @@ +--- build/config/sanitizers/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300 ++++ build/config/sanitizers/BUILD.gn 2016-09-03 00:19:39.656881000 +0300 +@@ -280,7 +280,7 @@ + + config("msan_flags") { + if (is_msan) { +- assert(is_linux, "msan only supported on linux x86_64") ++ assert(is_linux || is_bsd, "msan only supported on linux x86_64") + msan_blacklist_path = + rebase_path("//tools/msan/blacklist.txt", root_build_dir) + cflags = [ +@@ -293,7 +293,7 @@ + + config("tsan_flags") { + if (is_tsan) { +- assert(is_linux, "tsan only supported on linux x86_64") ++ assert(is_linux || is_bsd, "tsan only supported on linux x86_64") + tsan_blacklist_path = + rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir) + cflags = [ diff --git a/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni b/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni new file mode 100644 index 000000000000..d304c8a1b8ca --- /dev/null +++ b/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni @@ -0,0 +1,13 @@ +--- build/config/sanitizers/sanitizers.gni.orig 2016-10-06 04:02:08.000000000 +0300 ++++ build/config/sanitizers/sanitizers.gni 2016-10-24 22:57:06.565590000 +0300 +@@ -53,8 +53,8 @@ + # See http://clang.llvm.org/docs/ControlFlowIntegrity.html + # + # TODO(pcc): Remove this flag if/when CFI is enabled in all official builds. +- is_cfi = target_os == "linux" && !is_chromeos && target_cpu == "x64" && +- is_chrome_branded && is_official_build ++ is_cfi = (target_os == "linux" || target_os == "bsd") && !is_chromeos && ++ target_cpu == "x64" && is_chrome_branded && is_official_build + + # Enable checks for bad casts: derived cast and unrelated cast. + # TODO(krasin): remove this, when we're ready to add these checks by default. diff --git a/www/chromium/files/patch-build_config_ui.gni b/www/chromium/files/patch-build_config_ui.gni new file mode 100644 index 000000000000..172f267e37ab --- /dev/null +++ b/www/chromium/files/patch-build_config_ui.gni @@ -0,0 +1,43 @@ +--- build/config/ui.gni.orig 2016-10-06 04:02:08.000000000 +0300 ++++ build/config/ui.gni 2016-10-13 05:04:25.545377000 +0300 +@@ -31,7 +31,7 @@ + + # Indicates if Aura is enabled. Aura is a low-level windowing library, sort + # of a replacement for GDI or GTK. +- use_aura = is_win || is_linux ++ use_aura = is_win || is_linux || is_bsd + + # True means the UI is built using the "views" framework. + toolkit_views = +@@ -47,7 +47,7 @@ + use_xkbcommon = false + + # Whether we should use glib, a low level C utility library. +- use_glib = is_linux ++ use_glib = is_linux || is_bsd + + # Indicates if Wayland display server support is enabled. + enable_wayland_server = is_chromeos +@@ -65,19 +65,19 @@ + + # Use GPU accelerated cross process image transport by default on linux builds + # with the Aura window manager. +-ui_compositor_image_transport = use_aura && is_linux ++ui_compositor_image_transport = use_aura && (is_linux || is_bsd) + + use_default_render_theme = use_aura && !is_android + + # Indicates if the UI toolkit depends on X11. +-use_x11 = is_linux && !use_ozone ++use_x11 = (is_linux || is_bsd) && !use_ozone + + # Turn off glib if Ozone is enabled. + if (use_ozone) { + use_glib = false + } + +-if (is_linux && !use_ozone) { ++if ((is_linux || is_bsd) && !use_ozone) { + use_cairo = true + use_pango = true + } else { diff --git a/www/chromium/files/patch-build_filename__rules.gypi b/www/chromium/files/patch-build_filename__rules.gypi deleted file mode 100644 index 38cb26b1260a..000000000000 --- a/www/chromium/files/patch-build_filename__rules.gypi +++ /dev/null @@ -1,11 +0,0 @@ ---- build/filename_rules.gypi.orig 2016-04-08 16:02:06 UTC -+++ build/filename_rules.gypi -@@ -89,7 +89,7 @@ - ['exclude', '_ashwin\\.(h|cc)$'] - ] - }], -- ['<(use_aura)==0 or OS!="linux" or >(nacl_untrusted_build)==1', { -+ ['<(use_aura)==0 or (OS!="linux" and OS!="openbsd" and OS!="freebsd") or >(nacl_untrusted_build)==1', { - 'sources/': [ ['exclude', '_auralinux\\.(h|cc)$'] ] - }], - ['<(use_ozone)==0 or >(nacl_untrusted_build)==1', { diff --git a/www/chromium/files/patch-build_linux_libpci_BUILD.gn b/www/chromium/files/patch-build_linux_libpci_BUILD.gn new file mode 100644 index 000000000000..9fc164da0d04 --- /dev/null +++ b/www/chromium/files/patch-build_linux_libpci_BUILD.gn @@ -0,0 +1,54 @@ +--- build/linux/libpci/BUILD.gn.orig 2016-10-06 04:02:08.000000000 +0300 ++++ build/linux/libpci/BUILD.gn 2016-10-29 18:17:51.990988000 +0300 +@@ -3,20 +3,36 @@ + # found in the LICENSE file. + + import("//tools/generate_library_loader/generate_library_loader.gni") ++import("//build/config/linux/pkg_config.gni") + +-# This generates a target named "libpci". +-generate_library_loader("libpci") { +- name = "LibPciLoader" +- output_h = "libpci.h" +- output_cc = "libpci_loader.cc" +- header = "<pci/pci.h>" +- +- functions = [ +- "pci_alloc", +- "pci_init", +- "pci_cleanup", +- "pci_scan_bus", +- "pci_fill_info", +- "pci_lookup_name", +- ] ++declare_args() { ++ use_system_libpci = is_bsd ++} ++ ++if (use_system_libpci) { ++ pkg_config("system_libpci") { ++ packages = [ "libpci" ] ++ } ++ ++ source_set("libpci") { ++ public_configs = [ ":system_libpci" ] ++ } ++ ++} else { ++ # This generates a target named "libpci". ++ generate_library_loader("libpci") { ++ name = "LibPciLoader" ++ output_h = "libpci.h" ++ output_cc = "libpci_loader.cc" ++ header = "<pci/pci.h>" ++ ++ functions = [ ++ "pci_alloc", ++ "pci_init", ++ "pci_cleanup", ++ "pci_scan_bus", ++ "pci_fill_info", ++ "pci_lookup_name", ++ ] ++ } + } diff --git a/www/chromium/files/patch-build_linux_system.gyp b/www/chromium/files/patch-build_linux_system.gyp deleted file mode 100644 index 63a63b6a52e1..000000000000 --- a/www/chromium/files/patch-build_linux_system.gyp +++ /dev/null @@ -1,16 +0,0 @@ ---- build/linux/system.gyp.orig 2016-05-11 19:02:12 UTC -+++ build/linux/system.gyp -@@ -1051,6 +1051,13 @@ - 'include_dirs': [ - '../..', - ], -+ 'conditions' : [ -+ ['OS=="freebsd"', { -+ 'include_dirs': [ -+ '<(prefix_dir)/include', -+ ], -+ }], -+ ], - 'hard_dependency': 1, - 'actions': [ - { diff --git a/www/chromium/files/patch-build_linux_unbundle_libwebp.gyp b/www/chromium/files/patch-build_linux_unbundle_libwebp.gyp deleted file mode 100644 index 2aead791fa3b..000000000000 --- a/www/chromium/files/patch-build_linux_unbundle_libwebp.gyp +++ /dev/null @@ -1,17 +0,0 @@ ---- build/linux/unbundle/libwebp.gyp.orig 2016-03-25 13:04:44 UTC -+++ build/linux/unbundle/libwebp.gyp -@@ -14,13 +14,7 @@ - }, - 'link_settings': { - 'libraries': [ -- # Check for presence of webpdemux library, use it if present. -- '<!(python <(DEPTH)/tools/compile_test/compile_test.py ' -- '--code "int main() { return 0; }" ' -- '--run-linker ' -- '--on-success "-lwebp -lwebpdemux" ' -- '--on-failure "-lwebp" ' -- '-- -lwebpdemux)', -+ '-lwebp -lwebpdemux', - ], - }, - } diff --git a/www/chromium/files/patch-build_secondary_third__party_nss_BUILD.gn b/www/chromium/files/patch-build_secondary_third__party_nss_BUILD.gn new file mode 100644 index 000000000000..9cdbc07da1f2 --- /dev/null +++ b/www/chromium/files/patch-build_secondary_third__party_nss_BUILD.gn @@ -0,0 +1,11 @@ +--- build/secondary/third_party/nss/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300 ++++ build/secondary/third_party/nss/BUILD.gn 2016-09-03 00:19:12.999091000 +0300 +@@ -4,7 +4,7 @@ + + import("//build/config/linux/pkg_config.gni") + +-if (is_linux) { ++if (is_linux || is_bsd) { + # This is a dependency on NSS with no libssl. On Linux we use a built-in SSL + # library but the system NSS libraries. Non-Linux platforms using NSS use the + # hermetic one in //third_party/nss. diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni new file mode 100644 index 000000000000..26caf74a8e2a --- /dev/null +++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -0,0 +1,38 @@ +--- build/toolchain/gcc_toolchain.gni.orig 2016-10-06 04:02:08.000000000 +0300 ++++ build/toolchain/gcc_toolchain.gni 2016-10-13 10:28:11.777849000 +0300 +@@ -453,14 +453,28 @@ + } + + gcc_toolchain(target_name) { +- prefix = rebase_path("$clang_base_path/bin", root_build_dir) +- cc = "$prefix/clang" +- cxx = "$prefix/clang++" +- ld = cxx ++ if (is_bsd) { ++ # cc = getenv("CC") ++ # assert(cc != "", "CC env must me set with >= clang39") ++ # cxx = getenv("CXX") ++ # assert(cxx != "", "CXX env must me set with >= clang++39") ++ # ld = cxx ++ cc = "${toolprefix}clang39" ++ cxx = "${toolprefix}clang++39" ++ ld = cxx ++ readelf = "readelf" ++ ar = "${toolprefix}llvm-ar39" ++ nm = "${toolprefix}llvm-nm39" ++ } else { ++ prefix = rebase_path("$clang_base_path/bin", root_build_dir) ++ cc = "$prefix/clang" ++ cxx = "$prefix/clang++" ++ ld = cxx + +- readelf = "${toolprefix}readelf" +- ar = "${toolprefix}ar" +- nm = "${toolprefix}nm" ++ readelf = "${toolprefix}readelf" ++ ar = "${toolprefix}ar" ++ nm = "${toolprefix}nm" ++ } + + forward_variables_from(invoker, [ "strip" ]) + diff --git a/www/chromium/files/patch-build_toolchain_get__concurrent__links.py b/www/chromium/files/patch-build_toolchain_get__concurrent__links.py new file mode 100644 index 000000000000..9fc41eeac1b4 --- /dev/null +++ b/www/chromium/files/patch-build_toolchain_get__concurrent__links.py @@ -0,0 +1,17 @@ +--- build/toolchain/get_concurrent_links.py.orig 2016-10-06 04:02:08.000000000 +0300 ++++ build/toolchain/get_concurrent_links.py 2016-10-13 05:28:45.448027000 +0300 +@@ -45,6 +45,14 @@ + return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize'])) + except Exception: + return 0 ++ elif sys.platform.startswith('freebsd'): ++ try: ++ avail_bytes = int(subprocess.check_output(['sysctl', '-n', 'hw.physmem'])) ++ # With -fuse-lld it doesn't take a lot of ram, feel free to change that ++ # 1 * ... to needed amount ++ return max(1, avail_bytes / (1 * (2 ** 30))) # total / 4GB ++ except Exception: ++ return 1 + # TODO(scottmg): Implement this for other platforms. + return 0 + diff --git a/www/chromium/files/patch-chrome_BUILD.gn b/www/chromium/files/patch-chrome_BUILD.gn new file mode 100644 index 000000000000..66cac7fbc3b7 --- /dev/null +++ b/www/chromium/files/patch-chrome_BUILD.gn @@ -0,0 +1,29 @@ +--- chrome/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300 ++++ chrome/BUILD.gn 2016-09-03 00:02:50.206193000 +0300 +@@ -86,7 +86,7 @@ + data = [ + "$root_out_dir/resources.pak", + ] +- if (is_linux || is_win) { ++ if (is_linux || is_bsd || is_win) { + data += [ + "$root_out_dir/chrome_100_percent.pak", + "$root_out_dir/locales/en-US.pak", +@@ -160,7 +160,7 @@ + sources += [ "app/chrome_exe_main_aura.cc" ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ + "app/chrome_dll_resource.h", + "app/chrome_main.cc", +@@ -1461,7 +1461,7 @@ + } + } + +-if (is_linux) { ++if (is_linux || is_bsd) { + action("manpage") { + if (is_chrome_branded) { + name = "Google Chrome" diff --git a/www/chromium/files/patch-chrome_app_chrome__command__ids.h b/www/chromium/files/patch-chrome_app_chrome__command__ids.h new file mode 100644 index 000000000000..97e4d2614dbe --- /dev/null +++ b/www/chromium/files/patch-chrome_app_chrome__command__ids.h @@ -0,0 +1,11 @@ +--- chrome/app/chrome_command_ids.h.orig 2016-10-06 04:02:10.000000000 +0300 ++++ chrome/app/chrome_command_ids.h 2016-10-14 06:38:03.530973000 +0300 +@@ -75,7 +75,7 @@ + #define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34049 + #define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34050 + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + #define IDC_USE_SYSTEM_TITLE_BAR 34051 + #endif + diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd index d33fe985f4f4..3e0400c14f6b 100644 --- a/www/chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,11 +1,38 @@ ---- chrome/app/generated_resources.grd.orig 2016-05-11 19:02:13 UTC -+++ chrome/app/generated_resources.grd -@@ -6564,7 +6564,7 @@ Keep your key file in a safe place. You +--- chrome/app/generated_resources.grd.orig 2016-10-06 04:02:10.000000000 +0300 ++++ chrome/app/generated_resources.grd 2016-10-14 07:09:15.305398000 +0300 +@@ -6841,7 +6841,7 @@ <message name="IDS_FLAGS_FORCE_UI_DIRECTION_RTL" desc="Name for the option to force right-to-left UI direction mode."> Right-to-left </message> - <if expr="is_win or is_linux"> -+ <if expr="is_win or is_linux or is_posix"> ++ <if expr="is_win or is_linux or is_bsd"> <message name="IDS_FLAGS_ENABLE_INPUT_IME_API_NAME" desc="Name of the flag to enable che chrome.input.ime API."> Enable Input IME API </message> +@@ -10134,7 +10134,7 @@ + <message name="IDS_APPEARANCE_GROUP_NAME" desc="The title of the appearance group"> + Appearance + </message> +- <if expr="not is_linux or chromeos"> ++ <if expr="not is_linux or not is_bsd or chromeos"> + <message name="IDS_THEMES_GROUP_NAME" desc="The title of the themes group"> + Themes + </message> +@@ -10142,7 +10142,7 @@ + <message name="IDS_THEMES_RESET_BUTTON" desc="The button to reset your theme"> + Reset to default theme + </message> +- <if expr="is_linux and not chromeos"> ++ <if expr="is_linux or is_bsd and not chromeos"> + <message name="IDS_THEMES_GTK_BUTTON" desc="The button to choose GTK colors and icons as the current theme."> + Use GTK+ theme + </message> +@@ -11429,7 +11429,7 @@ + Set as default + </message> + +- <if expr="is_linux and not chromeos"> ++ <if expr="is_linux or is_bsd and not chromeos"> + <message name="IDS_SHOW_WINDOW_DECORATIONS_MENU" desc="The menu entry text in the tab strip context menu. This toggles the system title bar and window borders (window decorations) on linux."> + Use system title bar and borders + </message> diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn new file mode 100644 index 000000000000..79bb41a329cc --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_BUILD.gn @@ -0,0 +1,52 @@ +--- chrome/browser/BUILD.gn.orig 2016-08-03 22:02:11.000000000 +0300 ++++ chrome/browser/BUILD.gn 2016-09-27 09:40:30.879973000 +0300 +@@ -540,7 +540,7 @@ + deps += [ "//device/udev_linux" ] + } + +- if (is_linux && !is_chromeos) { ++ if ((is_linux || is_bsd) && !is_chromeos) { + deps += [ "//third_party/speech-dispatcher" ] + } + +@@ -730,6 +730,22 @@ + sources += rebase_path(gypi_values.chrome_browser_non_mobile_sources, + ".", + "//chrome") ++ if (is_bsd) { ++ sources -= [ ++ "media_galleries/linux/mtp_device_delegate_impl_linux.cc", ++ "media_galleries/linux/mtp_device_delegate_impl_linux.h", ++ "media_galleries/linux/mtp_device_object_enumerator.cc", ++ "media_galleries/linux/mtp_device_object_enumerator.h", ++ "media_galleries/linux/mtp_device_task_helper.cc", ++ "media_galleries/linux/mtp_device_task_helper.h", ++ "media_galleries/linux/mtp_device_task_helper_map_service.cc", ++ "media_galleries/linux/mtp_device_task_helper_map_service.h", ++ "media_galleries/linux/mtp_read_file_worker.cc", ++ "media_galleries/linux/mtp_read_file_worker.h", ++ "media_galleries/linux/snapshot_file_details.cc", ++ "media_galleries/linux/snapshot_file_details.h", ++ ] ++ } + } + + if (!is_chrome_branded) { +@@ -857,7 +873,7 @@ + } + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + if (use_aura) { + configs += [ "//build/config/linux/dbus" ] + deps += [ +@@ -871,7 +887,7 @@ + } + } + +- if (is_linux || is_win) { ++ if (is_linux || is_bsd || is_win) { + sources += rebase_path(gypi_values.chrome_browser_non_mac_desktop_sources, + ".", + "//chrome") diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc new file mode 100644 index 000000000000..a8387feae0c5 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc @@ -0,0 +1,20 @@ +--- chrome/browser/browser_process_impl.cc.orig 2016-10-06 04:02:11.000000000 +0300 ++++ chrome/browser/browser_process_impl.cc 2016-10-16 22:35:35.925144000 +0300 +@@ -161,7 +161,7 @@ + #include "chrome/browser/media/webrtc_log_uploader.h" + #endif + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + #include "chrome/browser/memory/tab_manager.h" + #endif + +@@ -765,7 +765,7 @@ + + memory::TabManager* BrowserProcessImpl::GetTabManager() { + DCHECK(CalledOnValidThread()); +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + if (!tab_manager_.get()) + tab_manager_.reset(new memory::TabManager()); + return tab_manager_.get(); diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.h b/www/chromium/files/patch-chrome_browser_browser__process__impl.h new file mode 100644 index 000000000000..9c95e97cb798 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.h @@ -0,0 +1,11 @@ +--- chrome/browser/browser_process_impl.h.orig 2016-10-06 04:02:11.000000000 +0300 ++++ chrome/browser/browser_process_impl.h 2016-10-16 22:37:41.017296000 +0300 +@@ -336,7 +336,7 @@ + + std::unique_ptr<ChromeDeviceClient> device_client_; + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + // Any change to this #ifdef must be reflected as well in + // chrome/browser/memory/tab_manager_browsertest.cc + std::unique_ptr<memory::TabManager> tab_manager_; diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd deleted file mode 100644 index 72c4cde217aa..000000000000 --- a/www/chromium/files/patch-chrome_browser_browser__resources.grd +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/browser_resources.grd.orig 2016-05-11 19:02:13 UTC -+++ chrome/browser/browser_resources.grd -@@ -280,7 +280,7 @@ - <include name="IDR_ABOUT_VOICESEARCH_JS" file="resources\about_voicesearch.js" type="BINDATA" /> - <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" /> - </if> -- <if expr="desktop_linux or (is_android and enable_plugins)"> -+ <if expr="desktop_linux or (is_android and enable_plugins) or is_posix"> - <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_linux.json" type="BINDATA" /> - </if> - <if expr="is_android"> diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn new file mode 100644 index 000000000000..527c7a8642cd --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -0,0 +1,24 @@ +--- chrome/browser/extensions/BUILD.gn.orig 2016-10-06 04:02:11.000000000 +0300 ++++ chrome/browser/extensions/BUILD.gn 2016-10-13 05:50:49.572236000 +0300 +@@ -186,7 +186,7 @@ + sources -= [ "global_shortcut_listener_ozone.cc" ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + deps += [ "//build/linux:fontconfig" ] + + if (use_dbus) { +@@ -252,6 +252,12 @@ + defines += [ "ENABLE_HOTWORDING" ] + } + ++ if (is_bsd) { ++ sources -= [ ++ "api/image_writer_private/removable_storage_provider_linux.cc", ++ ] ++ } ++ + if (enable_service_discovery) { + sources += rebase_path( + gypi_values.chrome_browser_extensions_service_discovery_sources, diff --git a/www/chromium/files/patch-chrome_browser_extensions_window__open__apitest.cc b/www/chromium/files/patch-chrome_browser_extensions_window__open__apitest.cc deleted file mode 100644 index b3261d7d3623..000000000000 --- a/www/chromium/files/patch-chrome_browser_extensions_window__open__apitest.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/extensions/window_open_apitest.cc.orig 2016-05-11 19:02:14 UTC -+++ chrome/browser/extensions/window_open_apitest.cc -@@ -285,7 +285,7 @@ IN_PROC_BROWSER_TEST_F(WindowOpenPanelTe - << message_; - } - --#if defined(USE_ASH_PANELS) || defined(OS_LINUX) -+#if defined(USE_ASH_PANELS) || defined(OS_LINUX) || defined(OS_FREEBSD) - // On Ash, this currently fails because we're currently opening new panel - // windows as popup windows instead. - // We're also failing on Linux-aura due to the panel is not opened in the diff --git a/www/chromium/files/patch-chrome_browser_memory__details.cc b/www/chromium/files/patch-chrome_browser_memory__details.cc index 0d020afce397..ac6264d1e57f 100644 --- a/www/chromium/files/patch-chrome_browser_memory__details.cc +++ b/www/chromium/files/patch-chrome_browser_memory__details.cc @@ -1,6 +1,6 @@ ---- chrome/browser/memory_details.cc.orig 2016-05-11 19:02:14 UTC -+++ chrome/browser/memory_details.cc -@@ -33,7 +33,7 @@ +--- chrome/browser/memory_details.cc.orig 2016-08-03 22:02:12.000000000 +0300 ++++ chrome/browser/memory_details.cc 2016-09-30 22:07:01.106885000 +0300 +@@ -32,7 +32,7 @@ #include "content/public/common/content_constants.h" #include "ui/base/l10n/l10n_util.h" @@ -9,8 +9,8 @@ #include "content/public/browser/zygote_host_linux.h" #endif -@@ -365,7 +365,7 @@ void MemoryDetails::CollectChildInfoOnUI - } +@@ -334,7 +334,7 @@ + process.titles.push_back(title); } -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) diff --git a/www/chromium/files/patch-chrome_browser_resources_safe__browsing_BUILD.gn b/www/chromium/files/patch-chrome_browser_resources_safe__browsing_BUILD.gn new file mode 100644 index 000000000000..c7466848e5d7 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_resources_safe__browsing_BUILD.gn @@ -0,0 +1,11 @@ +--- chrome/browser/resources/safe_browsing/BUILD.gn.orig 2016-08-03 22:02:13.000000000 +0300 ++++ chrome/browser/resources/safe_browsing/BUILD.gn 2016-09-20 02:51:43.112078000 +0300 +@@ -26,6 +26,8 @@ + target_arch = "mac" + } else if (is_linux) { + target_arch = "linux" ++ } else if (is_bsd) { ++ target_arch = "bsd" + } else { + # This will cause the script to fail. + target_arch = "unknown_target_arch" diff --git a/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py b/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py index 1bb1444dee15..1e23727a076d 100644 --- a/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py +++ b/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py @@ -1,10 +1,10 @@ ---- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig 2016-08-04 11:13:17.290964000 -0400 -+++ chrome/browser/resources/safe_browsing/gen_file_type_proto.py 2016-08-04 11:13:54.901432000 -0400 +--- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig 2016-08-03 22:02:13.000000000 +0300 ++++ chrome/browser/resources/safe_browsing/gen_file_type_proto.py 2016-09-20 02:52:27.389763000 +0300 @@ -39,6 +39,7 @@ "android": config_pb2.DownloadFileType.PLATFORM_ANDROID, "chromeos": config_pb2.DownloadFileType.PLATFORM_CHROME_OS, "linux": config_pb2.DownloadFileType.PLATFORM_LINUX, -+ "freebsd": config_pb2.DownloadFileType.PLATFORM_LINUX, ++ "bsd": config_pb2.DownloadFileType.PLATFORM_LINUX, "mac": config_pb2.DownloadFileType.PLATFORM_MAC, "win": config_pb2.DownloadFileType.PLATFORM_WINDOWS, } @@ -13,7 +13,7 @@ parser.add_option('-t', '--type', help='The platform type. One of android, chromeos, ' + - 'linux, mac, win') -+ 'linux, freebsd, mac, win') ++ 'linux, bsd, mac, win') parser.add_option('-i', '--infile', help='The ASCII DownloadFileType-proto file to read.') parser.add_option('-o', '--outfile', diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc new file mode 100644 index 000000000000..459d9733adef --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc @@ -0,0 +1,11 @@ +--- chrome/browser/safe_browsing/permission_reporter.cc.orig 2016-10-06 04:02:12.000000000 +0300 ++++ chrome/browser/safe_browsing/permission_reporter.cc 2016-10-14 06:15:01.051089000 +0300 +@@ -190,7 +190,7 @@ + #if defined(OS_ANDROID) + report.set_platform_type(PermissionReport::ANDROID_PLATFORM); + #elif defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_CHROMEOS) || \ +- defined(OS_LINUX) ++ defined(OS_LINUX) || defined(OS_BSD) + report.set_platform_type(PermissionReport::DESKTOP_PLATFORM); + #else + #error Unsupported platform. diff --git a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn new file mode 100644 index 000000000000..830324d9f897 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn @@ -0,0 +1,11 @@ +--- chrome/browser/ui/BUILD.gn.orig 2016-08-03 22:02:13.000000000 +0300 ++++ chrome/browser/ui/BUILD.gn 2016-09-03 00:04:02.109457000 +0300 +@@ -503,7 +503,7 @@ + "//ui/events:dom_keycode_converter", + ] + } +- if (is_linux) { # Both desktop Linux and ChromeOS. ++ if (is_linux || is_bsd) { # Both desktop Linux and ChromeOS. + sources += rebase_path(gypi_values.chrome_browser_ui_linux_sources, + ".", + "//chrome") diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index 02878c156b89..1ea49137603f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,15 +1,15 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2016-05-11 19:02:16 UTC -+++ chrome/browser/ui/browser_command_controller.cc -@@ -77,7 +77,7 @@ +--- chrome/browser/ui/browser_command_controller.cc.orig 2016-10-06 04:02:13.000000000 +0300 ++++ chrome/browser/ui/browser_command_controller.cc 2016-10-13 05:57:01.306342000 +0300 +@@ -76,7 +76,7 @@ #include "chrome/browser/ui/browser_commands_chromeos.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" + #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -221,7 +221,7 @@ bool BrowserCommandController::IsReserve +@@ -216,7 +216,7 @@ if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN) return true; @@ -18,7 +18,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -414,7 +414,7 @@ void BrowserCommandController::ExecuteCo +@@ -419,7 +419,7 @@ break; #endif @@ -27,7 +27,7 @@ case IDC_USE_SYSTEM_TITLE_BAR: { PrefService* prefs = browser_->profile()->GetPrefs(); prefs->SetBoolean(prefs::kUseCustomChromeFrame, -@@ -815,7 +815,7 @@ void BrowserCommandController::InitComma +@@ -812,7 +812,7 @@ command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true); command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc index c6938e080f49..cce7a1ed0ab8 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc @@ -1,5 +1,5 @@ ---- chrome/browser/ui/browser_view_prefs.cc.orig 2016-05-11 19:02:16 UTC -+++ chrome/browser/ui/browser_view_prefs.cc +--- chrome/browser/ui/browser_view_prefs.cc.orig 2016-10-06 04:02:13.000000000 +0300 ++++ chrome/browser/ui/browser_view_prefs.cc 2016-10-13 05:59:52.802478000 +0300 @@ -10,7 +10,7 @@ #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" @@ -9,12 +9,12 @@ #include "ui/base/x/x11_util.h" #endif -@@ -43,7 +43,7 @@ void RegisterBrowserViewLocalPrefs(PrefR +@@ -32,7 +32,7 @@ + void RegisterBrowserViewProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { - bool custom_frame_default = false; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) - custom_frame_default = ui::GetCustomFramePrefDefault(); ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame, + ui::GetCustomFramePrefDefault()); #endif - diff --git a/www/chromium/files/patch-chrome_browser_ui_libgtk2ui_BUILD.gn b/www/chromium/files/patch-chrome_browser_ui_libgtk2ui_BUILD.gn new file mode 100644 index 000000000000..d00849258fb2 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_libgtk2ui_BUILD.gn @@ -0,0 +1,11 @@ +--- chrome/browser/ui/libgtk2ui/BUILD.gn.orig 2016-08-03 22:02:13.000000000 +0300 ++++ chrome/browser/ui/libgtk2ui/BUILD.gn 2016-09-03 00:03:44.741182000 +0300 +@@ -2,7 +2,7 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-assert(is_linux, "This file should only be referenced on Linux") ++assert(is_linux || is_bsd, "This file should only be referenced on Linux") + + import("//build/config/features.gni") + import("//build/config/ui.gni") diff --git a/www/chromium/files/patch-chrome_browser_ui_panels_panel__manager.cc b/www/chromium/files/patch-chrome_browser_ui_panels_panel__manager.cc deleted file mode 100644 index 665d64fd4d15..000000000000 --- a/www/chromium/files/patch-chrome_browser_ui_panels_panel__manager.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/panels/panel_manager.cc.orig 2016-05-11 19:02:16 UTC -+++ chrome/browser/ui/panels/panel_manager.cc -@@ -142,7 +142,7 @@ bool PanelManager::ShouldUsePanels(const - // static - bool PanelManager::IsPanelStackingEnabled() { - // Stacked panel mode is not supported in linux-aura. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_FREEBSD) - return false; - #else - return true; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc b/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc index c9743fc43d89..1546b959a781 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc @@ -1,20 +1,13 @@ ---- chrome/browser/ui/views/first_run_dialog.cc.orig 2016-05-11 19:02:16 UTC -+++ chrome/browser/ui/views/first_run_dialog.cc -@@ -114,12 +114,16 @@ views::View* FirstRunDialog::CreateExtra - bool FirstRunDialog::Accept() { - GetWidget()->Hide(); +--- chrome/browser/ui/views/first_run_dialog.cc.orig 2016-10-06 04:02:13.000000000 +0300 ++++ chrome/browser/ui/views/first_run_dialog.cc 2016-10-15 10:10:45.850050000 +0300 +@@ -35,8 +35,10 @@ + namespace { -+#if !defined(OS_BSD) - if (report_crashes_ && report_crashes_->checked()) { - if (GoogleUpdateSettings::SetCollectStatsConsent(true)) - breakpad::InitCrashReporter(std::string()); -- } else { -+ } else -+#else -+ { - GoogleUpdateSettings::SetCollectStatsConsent(false); - } + void InitCrashReporterIfEnabled(bool enabled) { ++#ifndef OS_BSD + if (enabled) + breakpad::InitCrashReporter(std::string()); +#endif + } - if (make_default_ && make_default_->checked()) - shell_integration::SetAsDefaultBrowser(); + } // namespace diff --git a/www/chromium/files/patch-chrome_browser_ui_views_panels_panel__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_panels_panel__frame__view.cc deleted file mode 100644 index 16262f47bce8..000000000000 --- a/www/chromium/files/patch-chrome_browser_ui_views_panels_panel__frame__view.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/views/panels/panel_frame_view.cc.orig 2016-05-11 19:02:16 UTC -+++ chrome/browser/ui/views/panels/panel_frame_view.cc -@@ -589,7 +589,7 @@ bool PanelFrameView::OnMousePressed(cons - } - - bool PanelFrameView::OnMouseDragged(const ui::MouseEvent& event) { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - // Converting the mouse location to screen coordinates returns an incorrect - // location while the panel is moving. See crbug.com/353393 for more details. - // TODO(pkotwicz): Fix conversion to screen coordinates diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc index 7b9077ae0b3f..0f955aaf4ebf 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc @@ -1,40 +1,56 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2016-05-11 19:02:16 UTC -+++ chrome/browser/ui/webui/about_ui.cc -@@ -74,7 +74,7 @@ +--- chrome/browser/ui/webui/about_ui.cc.orig 2016-07-20 22:03:21.000000000 +0300 ++++ chrome/browser/ui/webui/about_ui.cc 2016-08-10 15:53:44.885419000 +0300 +@@ -73,7 +73,7 @@ #include "chrome/browser/ui/webui/theme_source.h" #endif - + -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) #include "content/public/browser/zygote_host_linux.h" #include "content/public/common/sandbox_linux.h" #endif -@@ -707,7 +707,7 @@ void FinishMemoryDataRequest( - } - } - +@@ -642,7 +642,7 @@ + DISALLOW_COPY_AND_ASSIGN(AboutDnsHandler); + }; + -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -723,6 +723,7 @@ std::string AboutLinuxProxyConfig() { +@@ -658,6 +658,7 @@ return data; } - + +#if !defined(OS_BSD) void AboutSandboxRow(std::string* data, int name_id, bool good) { data->append("<tr><td>"); data->append(l10n_util::GetStringUTF8(name_id)); -@@ -791,6 +792,7 @@ std::string AboutSandbox() { - return data; +@@ -672,6 +673,7 @@ + } + data->append("</td></tr>"); } - #endif +#endif - - // AboutMemoryHandler ---------------------------------------------------------- - -@@ -963,7 +965,7 @@ void AboutUIHTMLSource::StartDataRequest + + std::string AboutSandbox() { + std::string data; +@@ -681,6 +683,7 @@ + data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_TITLE)); + data.append("</h1>"); + ++#if !defined(OS_BSD) + // Get expected sandboxing status of renderers. + const int status = + content::ZygoteHost::GetInstance()->GetRendererSandboxStatus(); +@@ -721,6 +724,7 @@ + data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_BAD)); + } + data.append("</p>"); ++#endif + + AppendFooter(&data); + return data; +@@ -769,7 +773,7 @@ } else if (source_name_ == chrome::kChromeUIDNSHost) { AboutDnsHandler::Start(profile(), callback); return; @@ -43,12 +59,12 @@ } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) { response = AboutLinuxProxyConfig(); #endif -@@ -977,7 +979,7 @@ void AboutUIHTMLSource::StartDataRequest +@@ -778,7 +782,7 @@ ChromeOSCreditsHandler::Start(path, callback); return; #endif -#if defined(OS_LINUX) || defined(OS_OPENBSD) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_FREEBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) } else if (source_name_ == chrome::kChromeUISandboxHost) { response = AboutSandbox(); #endif diff --git a/www/chromium/files/patch-chrome_chrome__browser.gypi b/www/chromium/files/patch-chrome_chrome__browser.gypi deleted file mode 100644 index d70df1435b70..000000000000 --- a/www/chromium/files/patch-chrome_chrome__browser.gypi +++ /dev/null @@ -1,51 +0,0 @@ ---- chrome/chrome_browser.gypi.orig 2016-05-11 19:02:17 UTC -+++ chrome/chrome_browser.gypi -@@ -3638,7 +3638,7 @@ - '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol', - ], - }], -- ['OS=="linux" and chromeos==0', { -+ ['(OS=="linux" and chromeos==0) or os_bsd==1', { - 'dependencies': [ - '../build/linux/system.gyp:libspeechd', - ], -@@ -3702,7 +3702,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', { - 'sources': [ - 'app/chrome_crash_reporter_client.cc', - 'app/chrome_crash_reporter_client.h', -@@ -3834,6 +3834,12 @@ - }], - ], - }], -+ ['os_bsd==1', { -+ 'sources/': [ -+ ['exclude', '^browser/media_galleries/linux/'], -+ ['exclude', '^browser/memory/system_memory_stats_recorder_linux.cc'], -+ ], -+ }], - ['OS=="mac"', { - 'dependencies': [ - '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', -@@ -3943,7 +3949,7 @@ - }], - ], - }], -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { - 'conditions': [ - ['use_aura==1', { - 'dependencies': [ -@@ -3962,7 +3968,7 @@ - }], - ], - }], -- ['OS=="linux" or OS=="win"', { -+ ['OS=="linux" or OS=="win" or os_bsd==1', { - 'sources': [ '<@(chrome_browser_non_mac_desktop_sources)' ], - }], - ['desktop_linux==1', { diff --git a/www/chromium/files/patch-chrome_chrome__browser__extensions.gypi b/www/chromium/files/patch-chrome_chrome__browser__extensions.gypi deleted file mode 100644 index f61e29c46d92..000000000000 --- a/www/chromium/files/patch-chrome_chrome__browser__extensions.gypi +++ /dev/null @@ -1,23 +0,0 @@ ---- chrome/chrome_browser_extensions.gypi.orig 2016-05-25 15:00:58.000000000 -0400 -+++ chrome/chrome_browser_extensions.gypi 2016-05-27 09:56:46.969693000 -0400 -@@ -1019,6 +1019,11 @@ - '<@(chrome_browser_extensions_task_manager_enabled_sources)', - ], - }], -+ ['os_bsd==1', { -+ 'sources/': [ -+ ['exclude', '^browser/extensions/api/image_writer_private/removable_storage_provider_linux.cc'], -+ ], -+ }], - ['chromeos==1', { - 'dependencies': [ - '../build/linux/system.gyp:dbus', -@@ -1061,7 +1066,7 @@ - '../ui/views/views.gyp:views', - ], - }], -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { - 'conditions': [ - ['use_aura==1', { - 'dependencies': [ diff --git a/www/chromium/files/patch-chrome_chrome__browser__ui.gypi b/www/chromium/files/patch-chrome_chrome__browser__ui.gypi deleted file mode 100644 index 2528ba595138..000000000000 --- a/www/chromium/files/patch-chrome_chrome__browser__ui.gypi +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/chrome_browser_ui.gypi.orig 2016-05-11 19:02:17 UTC -+++ chrome/chrome_browser_ui.gypi -@@ -3069,7 +3069,7 @@ - }], - ], - }], -- ['use_aura==1 and chromeos==0 and use_ozone==0 and OS=="linux"', { -+ ['use_aura==1 and chromeos==0 and use_ozone==0 and (OS=="linux" or OS=="freebsd" or OS=="openbsd")', { - 'dependencies': [ - # gtk2 is the only component that can interact with gtk2 in our new - # world. -@@ -3251,7 +3251,7 @@ - ], - 'sources': [ '<@(chrome_browser_ui_desktop_linux_sources)' ], - }], -- ['OS=="linux"', { # Both desktop Linux and ChromeOS. -+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { # Both desktop Linux and ChromeOS. - 'sources': [ '<@(chrome_browser_ui_linux_sources)' ], - 'conditions': [ - ['use_aura==1', { diff --git a/www/chromium/files/patch-chrome_chrome__common.gypi b/www/chromium/files/patch-chrome_chrome__common.gypi deleted file mode 100644 index d3a66f9330f4..000000000000 --- a/www/chromium/files/patch-chrome_chrome__common.gypi +++ /dev/null @@ -1,22 +0,0 @@ ---- chrome/chrome_common.gypi.orig 2016-05-11 19:02:17 UTC -+++ chrome/chrome_common.gypi -@@ -30,8 +30,8 @@ - 'common/common_param_traits.cc', - 'common/common_param_traits.h', - 'common/common_param_traits_macros.h', -- 'common/component_flash_hint_file_linux.cc', -- 'common/component_flash_hint_file_linux.h', -+# 'common/component_flash_hint_file_linux.cc', -+# 'common/component_flash_hint_file_linux.h', - 'common/content_restriction.h', - 'common/content_settings_pattern_serializer.cc', - 'common/content_settings_pattern_serializer.h', -@@ -381,7 +381,7 @@ - ['chromeos==1', { - 'sources': [ '<@(chrome_common_extensions_chromeos_sources)' ], - }], -- ['OS=="win" or OS=="linux"', { -+ ['OS=="win" or OS=="linux" or os_bsd==1', { - 'sources': [ - 'common/extensions/api/input_ime/input_components_handler.cc', - 'common/extensions/api/input_ime/input_components_handler.h', diff --git a/www/chromium/files/patch-chrome_chrome__exe.gypi b/www/chromium/files/patch-chrome_chrome__exe.gypi deleted file mode 100644 index 5867458ff063..000000000000 --- a/www/chromium/files/patch-chrome_chrome__exe.gypi +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/chrome_exe.gypi.orig 2016-05-11 19:02:17 UTC -+++ chrome/chrome_exe.gypi -@@ -182,7 +182,7 @@ - '../build/linux/system.gyp:xext', - ], - }], -- ['OS=="linux" and enable_plugins==1', { -+ ['(OS=="linux" or os_bsd==1) and enable_plugins==1', { - 'dependencies': [ - '../pdf/pdf.gyp:pdf', - ], diff --git a/www/chromium/files/patch-chrome_chrome__resources.gyp b/www/chromium/files/patch-chrome_chrome__resources.gyp deleted file mode 100644 index c47c033d99f0..000000000000 --- a/www/chromium/files/patch-chrome_chrome__resources.gyp +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/chrome_resources.gyp.orig 2016-08-04 11:15:29.707642000 -0400 -+++ chrome/chrome_resources.gyp 2016-08-04 11:17:02.866434000 -0400 -@@ -321,6 +321,8 @@ - 'platform': 'chromeos' - }, 'OS=="linux"', { - 'platform': 'linux' -+ }, 'OS=="freebsd"', { -+ 'platform': 'freebsd' - }, 'OS=="mac"', { - 'platform': 'mac' - }, 'OS=="win"', { diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn new file mode 100644 index 000000000000..9ef7bc529c4f --- /dev/null +++ b/www/chromium/files/patch-chrome_common_BUILD.gn @@ -0,0 +1,16 @@ +--- chrome/common/BUILD.gn.orig 2016-08-03 22:02:14.000000000 +0300 ++++ chrome/common/BUILD.gn 2016-09-27 19:17:20.410265000 +0300 +@@ -156,6 +156,13 @@ + ] + } + ++ if (is_bsd) { ++ sources -= [ ++ "component_flash_hint_file_linux.cc", ++ "component_flash_hint_file_linux.h", ++ ] ++ } ++ + if (enable_extensions) { + sources += rebase_path(gypi_values.chrome_common_extensions_sources, + ".", diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index 3050c72e4ca8..76c345ff90f7 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,11 +1,11 @@ ---- chrome/common/chrome_switches.cc.orig 2016-05-25 15:00:58.000000000 -0400 -+++ chrome/common/chrome_switches.cc 2016-05-27 09:57:28.188798000 -0400 -@@ -1298,7 +1298,7 @@ - "tab-management-experiment-type-elderberry"; - #endif // defined(OS_ANDROID) +--- chrome/common/chrome_switches.cc.orig 2016-10-06 04:02:14.000000000 +0300 ++++ chrome/common/chrome_switches.cc 2016-10-13 06:11:21.058074000 +0300 +@@ -1277,7 +1277,7 @@ + const char kEnableWaylandServer[] = "enable-wayland-server"; + #endif -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - extern const char kEnableInputImeAPI[] = "enable-input-ime-api"; extern const char kDisableInputImeAPI[] = "disable-input-ime-api"; + extern const char kEnableInputImeAPI[] = "enable-input-ime-api"; #endif diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h index af129c7b4187..0b39deddba1e 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/chromium/files/patch-chrome_common_chrome__switches.h @@ -1,11 +1,11 @@ ---- chrome/common/chrome_switches.h.orig 2016-05-25 15:00:58.000000000 -0400 -+++ chrome/common/chrome_switches.h 2016-05-27 10:00:47.232609000 -0400 -@@ -387,7 +387,7 @@ +--- chrome/common/chrome_switches.h.orig 2016-10-06 04:02:14.000000000 +0300 ++++ chrome/common/chrome_switches.h 2016-10-13 06:13:55.604411000 +0300 +@@ -378,7 +378,7 @@ extern const char kEnableWaylandServer[]; #endif -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - extern const char kEnableInputImeAPI[]; extern const char kDisableInputImeAPI[]; + extern const char kEnableInputImeAPI[]; #endif diff --git a/www/chromium/files/patch-chrome_common_component__flash__hint__file__linux.h b/www/chromium/files/patch-chrome_common_component__flash__hint__file__linux.h deleted file mode 100644 index fb12a692064b..000000000000 --- a/www/chromium/files/patch-chrome_common_component__flash__hint__file__linux.h +++ /dev/null @@ -1,14 +0,0 @@ ---- chrome/common/component_flash_hint_file_linux.h.orig 2016-03-25 13:04:46 UTC -+++ chrome/common/component_flash_hint_file_linux.h -@@ -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> - diff --git a/www/chromium/files/patch-chrome_common_extensions_api_schemas.gni b/www/chromium/files/patch-chrome_common_extensions_api_schemas.gni new file mode 100644 index 000000000000..8b8c3f8a7288 --- /dev/null +++ b/www/chromium/files/patch-chrome_common_extensions_api_schemas.gni @@ -0,0 +1,11 @@ +--- chrome/common/extensions/api/schemas.gni.orig 2016-10-06 04:02:14.000000000 +0300 ++++ chrome/common/extensions/api/schemas.gni 2016-10-13 06:16:40.629706000 +0300 +@@ -19,7 +19,7 @@ + } + if (is_chromeos) { + schema_sources += gypi_values.chromeos_schema_files +-} else if (is_linux || is_win) { ++} else if (is_linux || is_win || is_bsd) { + schema_sources += gypi_values.input_ime_schema_file + } + if (enable_service_discovery) { diff --git a/www/chromium/files/patch-chrome_common_extensions_api_schemas.gypi b/www/chromium/files/patch-chrome_common_extensions_api_schemas.gypi deleted file mode 100644 index af23228570f1..000000000000 --- a/www/chromium/files/patch-chrome_common_extensions_api_schemas.gypi +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/common/extensions/api/schemas.gypi.orig 2016-05-21 16:05:09 UTC -+++ chrome/common/extensions/api/schemas.gypi -@@ -177,7 +177,7 @@ - ], - }, { # chromeos==0 - 'conditions': [ -- ['OS=="linux" or OS=="win"', { -+ ['OS=="linux" or OS=="win" or os_bsd==1', { - 'schema_files': [ - '<@(input_ime_schema_file)', - ], diff --git a/www/chromium/files/patch-chrome_common_features.gni b/www/chromium/files/patch-chrome_common_features.gni new file mode 100644 index 000000000000..b6db716cf8ed --- /dev/null +++ b/www/chromium/files/patch-chrome_common_features.gni @@ -0,0 +1,11 @@ +--- chrome/common/features.gni.orig 2016-10-06 04:02:14.000000000 +0300 ++++ chrome/common/features.gni 2016-10-13 06:19:10.348914000 +0300 +@@ -21,7 +21,7 @@ + enable_background = !is_ios && !is_android && !is_chromecast + + enable_one_click_signin = +- is_win || is_mac || (is_linux && !is_chromeos && !is_chromecast) ++ is_win || is_mac || is_bsd || (is_linux && !is_chromeos && !is_chromecast) + + # Google Now is disabled to prepare for its removal. + # http://crbug.com/539674 diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index cd10342818e0..d99b19146a11 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.cc +++ b/www/chromium/files/patch-chrome_common_pref__names.cc @@ -1,15 +1,24 @@ ---- chrome/common/pref_names.cc.orig 2016-05-11 19:02:17 UTC -+++ chrome/common/pref_names.cc -@@ -885,7 +885,7 @@ const char kForceYouTubeSafetyMode[] = " - // supervised users. - const char kRecordHistory[] = "settings.history_recorded"; +--- chrome/common/pref_names.cc.orig 2016-10-06 04:02:14.000000000 +0300 ++++ chrome/common/pref_names.cc 2016-10-14 06:57:51.856679000 +0300 +@@ -952,7 +952,7 @@ + // only using an account that belongs to one of the domains from this pref. + const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps"; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif -@@ -1348,7 +1348,7 @@ const char kDownloadDefaultDirectory[] = +@@ -1035,7 +1035,7 @@ + "browser.show_update_promotion_info_bar"; + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // Boolean that is false if we should show window manager decorations. If + // true, we draw a custom chrome frame (thicker title bar and blue border). + const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; +@@ -1408,7 +1408,7 @@ // upgrade a unsafe location to a safe location. const char kDownloadDirUpgraded[] = "download.directory_upgrade"; diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index 4dc5837e22ec..fd4cd55c63f0 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.h +++ b/www/chromium/files/patch-chrome_common_pref__names.h @@ -1,15 +1,24 @@ ---- chrome/common/pref_names.h.orig 2016-05-25 15:00:58.000000000 -0400 -+++ chrome/common/pref_names.h 2016-05-27 10:03:13.560677000 -0400 -@@ -307,7 +307,7 @@ - extern const char kDeleteTimePeriod[]; +--- chrome/common/pref_names.h.orig 2016-10-06 04:02:14.000000000 +0300 ++++ chrome/common/pref_names.h 2016-10-14 07:01:22.105649000 +0300 +@@ -315,7 +315,7 @@ + extern const char kAllowedDomainsForApps[]; extern const char kLastClearBrowsingDataTime[]; extern const char kClearBrowsingDataHistoryNoticeShownTimes[]; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -477,7 +477,7 @@ +@@ -347,7 +347,7 @@ + #if defined(OS_MACOSX) + extern const char kShowUpdatePromotionInfoBar[]; + #endif +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + extern const char kUseCustomChromeFrame[]; + #endif + extern const char kBackShortcutBubbleShownCount[]; +@@ -496,7 +496,7 @@ extern const char kDownloadDefaultDirectory[]; extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadDirUpgraded[]; diff --git a/www/chromium/files/patch-chrome_common_variations_BUILD.gn b/www/chromium/files/patch-chrome_common_variations_BUILD.gn new file mode 100644 index 000000000000..8df4f5074ef7 --- /dev/null +++ b/www/chromium/files/patch-chrome_common_variations_BUILD.gn @@ -0,0 +1,11 @@ +--- chrome/common/variations/BUILD.gn.orig 2016-08-03 22:02:14.000000000 +0300 ++++ chrome/common/variations/BUILD.gn 2016-09-03 23:17:02.937969000 +0300 +@@ -12,7 +12,7 @@ + if (is_mac) { + source = "//testing/variations/fieldtrial_testing_config_mac.json" + } +- if (is_linux) { ++ if (is_linux || is_bsd) { + source = "//testing/variations/fieldtrial_testing_config_linux.json" + } + if (is_chromeos) { diff --git a/www/chromium/files/patch-chrome_common_variations_fieldtrial__testing__config.gyp b/www/chromium/files/patch-chrome_common_variations_fieldtrial__testing__config.gyp deleted file mode 100644 index e583b2d9f885..000000000000 --- a/www/chromium/files/patch-chrome_common_variations_fieldtrial__testing__config.gyp +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/common/variations/fieldtrial_testing_config.gyp.orig 2016-03-25 13:04:46 UTC -+++ chrome/common/variations/fieldtrial_testing_config.gyp -@@ -19,7 +19,7 @@ - 'conditions': [ - ['OS!="android"', {'sources/': [['exclude', '_android\\.json$']]}], - ['OS!="win"', {'sources/': [['exclude', '_win\\.json$']]}], -- ['OS!="linux" or chromeos==1', {'sources/': [['exclude', '_linux\\.json$']]}], -+ ['(OS!="linux" or chromeos==1) and os_bsd!=1', {'sources/': [['exclude', '_linux\\.json$']]}], - ['OS!="mac"', {'sources/': [['exclude', '_mac\\.json$']]}], - ['chromeos!=1', {'sources/': [['exclude', '_chromeos\\.json$']]}], - ['OS!="ios"', {'sources/': [['exclude', '_ios\\.json$']]}], diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn new file mode 100644 index 000000000000..bbcf57000c0f --- /dev/null +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -0,0 +1,176 @@ +--- chrome/test/BUILD.gn.orig 2016-10-06 04:02:14.000000000 +0300 ++++ chrome/test/BUILD.gn 2016-10-13 06:28:37.584668000 +0300 +@@ -179,7 +179,7 @@ + ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + public_deps += [ "//crypto:platform" ] + } + if (is_mac) { +@@ -383,7 +383,7 @@ + "$root_out_dir/test_page.css.mock-http-headers", + "$root_out_dir/ui_test.pak", + ] +- if (is_linux || is_win) { ++ if (is_linux || is_bsd || is_win) { + data += [ + "$root_out_dir/chrome_100_percent.pak", + "$root_out_dir/chrome_200_percent.pak", +@@ -391,7 +391,7 @@ + "$root_out_dir/locales/fr.pak", + ] + } +- if (is_linux) { ++ if (is_linux || is_bsd) { + data += [ "$root_out_dir/libppapi_tests.so" ] + } + +@@ -462,7 +462,7 @@ + ".", + "//chrome") + } +- if (is_linux) { ++ if (is_linux || is_bsd) { + if (!is_chromeos) { + # Desktop linux. + sources -= [ +@@ -1097,14 +1097,14 @@ + sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_browsertest.cc" ] + deps += [ "//chrome/browser/chromeos" ] + data_deps += [ "//third_party/liblouis:liblouis_test_data" ] +- } else if (is_linux || is_win) { ++ } else if (is_linux || is_bsd || is_win) { + sources += [ + "../browser/ui/views/ime/ime_warning_bubble_browsertest.cc", + "../browser/ui/views/ime/ime_window_browsertest.cc", + ] + } + +- if (is_win || is_linux) { ++ if (is_win || is_linux || is_bsd) { + sources += [ "../browser/nacl_host/test/nacl_gdb_browsertest.cc" ] + data_deps += [ "//chrome/browser/nacl_host/test:mock_nacl_gdb" ] + } +@@ -1116,7 +1116,7 @@ + configs += + [ "//build/config/win:default_large_module_incremental_linking" ] + } +- if (is_linux) { ++ if (is_linux || is_bsd) { + data_deps += [ "//components/nacl/loader:nacl_helper" ] + + if (enable_nacl_nonsfi) { +@@ -1176,7 +1176,7 @@ + } + } + +- if (is_linux && !is_component_build) { ++ if ((is_linux || is_bsd) && !is_component_build) { + # Set rpath to find the CDM adapter even in a non-component build. + configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] + } +@@ -1226,7 +1226,7 @@ + if (toolkit_views) { + sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ] + } +- if (is_win || is_linux) { ++ if (is_win || is_linux || is_bsd) { + sources += + [ "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc" ] + } +@@ -1385,7 +1385,7 @@ + ] + deps += [ "//components/wifi:test_support" ] + } +- if (is_linux || is_win) { ++ if (is_linux || is_bsd || is_win) { + sources += rebase_path( + chrome_tests_gypi_values.chrome_browser_tests_non_mac_desktop_sources, + ".", +@@ -1400,7 +1400,7 @@ + "../browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc", + ] + } +- if (is_mac || is_win || (is_linux && !is_chromeos)) { ++ if (is_mac || is_win || is_bsd || (is_linux && !is_chromeos)) { + sources += rebase_path( + chrome_tests_gypi_values.chrome_browser_tests_non_mobile_non_cros_sources, + ".", +@@ -1519,7 +1519,7 @@ + "$root_out_dir/pyproto/", + ] + +- if (is_linux || is_win) { ++ if (is_linux || is_bsd || is_win) { + data += [ + "$root_out_dir/chrome_100_percent.pak", + "$root_out_dir/chrome_200_percent.pak", +@@ -1768,7 +1768,7 @@ + "$root_out_dir/locales/en-US.pak", + ] + } +- if (is_linux || is_win) { ++ if (is_linux || is_bsd || is_win) { + data += [ "$root_out_dir/chrome_200_percent.pak" ] + } + +@@ -1974,7 +1974,7 @@ + "//ui/wm", + ] + } +- if (!is_chromeos && is_linux) { ++ if (!is_chromeos && (is_linux || is_bsd)) { + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_desktop_linux_sources, + ".", +@@ -1991,7 +1991,7 @@ + if (use_gio) { + deps += [ "//build/linux/libgio" ] + } +- if (!is_chromeos && !use_ozone && is_linux) { ++ if (!is_chromeos && !use_ozone && (is_linux || is_bsd)) { + deps += [ "//chrome/browser/ui/libgtk2ui" ] + } + +@@ -2119,18 +2119,18 @@ + "//components/os_crypt:gnome_keyring_direct", + ] + } +- if (is_linux && !is_chromeos) { ++ if ((is_linux || is_bsd) && !is_chromeos) { + sources += + [ "../browser/password_manager/native_backend_libsecret_unittest.cc" ] + deps += [ "//third_party/libsecret" ] + } +- if (is_linux && use_aura) { ++ if ((is_linux || is_bsd) && use_aura) { + deps += [ "//ui/aura:test_support" ] + if (use_dbus) { + deps += [ "//dbus:test_support" ] + } + } +- if (is_linux && is_chrome_branded && current_cpu == "x86") { ++ if ((is_linux || is_bsd) && is_chrome_branded && current_cpu == "x86") { + ldflags = [ "-Wl,--strip-debug" ] + } + if (is_mac) { +@@ -2365,7 +2365,7 @@ + } + } + +-if (!is_android) { ++if (!is_android && !is_bsd) { + # TODO(609855): Make this compile on Android and run on the bots. + test("chrome_app_unittests") { + sources = [ +@@ -2391,7 +2391,7 @@ + } + } + +-if (!is_android && !is_ios && !is_chromecast) { ++if (!is_android && !is_ios && !is_chromecast && !is_bsd) { + test("performance_browser_tests") { + sources = + rebase_path(chrome_tests_gypi_values.performance_browser_tests_sources, diff --git a/www/chromium/files/patch-chromecast_BUILD.gn b/www/chromium/files/patch-chromecast_BUILD.gn new file mode 100644 index 000000000000..ea5c1f16f9a9 --- /dev/null +++ b/www/chromium/files/patch-chromecast_BUILD.gn @@ -0,0 +1,11 @@ +--- chromecast/BUILD.gn.orig 2016-08-03 22:02:15.000000000 +0300 ++++ chromecast/BUILD.gn 2016-09-03 01:38:51.775473000 +0300 +@@ -44,7 +44,7 @@ + "//ui/base:ui_base_unittests", + ] + +- if (is_linux) { ++ if (is_linux || is_bsd) { + tests += [ "//chromecast/crash:cast_crash_unittests" ] + } + diff --git a/www/chromium/files/patch-chromecast_browser_BUILD.gn b/www/chromium/files/patch-chromecast_browser_BUILD.gn new file mode 100644 index 000000000000..e8628074f2a0 --- /dev/null +++ b/www/chromium/files/patch-chromecast_browser_BUILD.gn @@ -0,0 +1,11 @@ +--- chromecast/browser/BUILD.gn.orig 2016-08-03 22:02:15.000000000 +0300 ++++ chromecast/browser/BUILD.gn 2016-09-03 01:39:34.973425000 +0300 +@@ -114,7 +114,7 @@ + "//ui/gl", + ] + +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ + "cast_memory_pressure_monitor.cc", + "cast_memory_pressure_monitor.h", diff --git a/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn b/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn new file mode 100644 index 000000000000..49578dba45a2 --- /dev/null +++ b/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn @@ -0,0 +1,11 @@ +--- chromecast/browser/metrics/BUILD.gn.orig 2016-08-03 22:02:15.000000000 +0300 ++++ chromecast/browser/metrics/BUILD.gn 2016-09-03 01:39:05.920888000 +0300 +@@ -26,7 +26,7 @@ + "//content/public/common", + ] + +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ + "external_metrics.cc", + "external_metrics.h", diff --git a/www/chromium/files/patch-chromecast_crash_BUILD.gn b/www/chromium/files/patch-chromecast_crash_BUILD.gn new file mode 100644 index 000000000000..814b56bda4f9 --- /dev/null +++ b/www/chromium/files/patch-chromecast_crash_BUILD.gn @@ -0,0 +1,11 @@ +--- chromecast/crash/BUILD.gn.orig 2016-08-03 22:02:15.000000000 +0300 ++++ chromecast/crash/BUILD.gn 2016-09-03 01:38:37.198322000 +0300 +@@ -48,7 +48,7 @@ + ] + } + +-if (is_linux) { ++if (is_linux || is_bsd) { + test("cast_crash_unittests") { + sources = [ + "cast_crashdump_uploader_unittest.cc", diff --git a/www/chromium/files/patch-components_BUILD.gn b/www/chromium/files/patch-components_BUILD.gn new file mode 100644 index 000000000000..3dbddf0c0679 --- /dev/null +++ b/www/chromium/files/patch-components_BUILD.gn @@ -0,0 +1,13 @@ +--- components/BUILD.gn.orig 2016-08-03 22:02:15.000000000 +0300 ++++ components/BUILD.gn 2016-09-13 13:15:29.852531000 +0300 +@@ -167,8 +167,8 @@ + "//components/autofill/content/renderer:unit_tests", + "//components/cast_certificate:unit_tests", + "//components/certificate_transparency:unit_tests", +- "//components/crash/content/app:unit_tests", +- "//components/crash/core/common:unit_tests", ++ #"//components/crash/content/app:unit_tests", ++ #"//components/crash/core/common:unit_tests", + "//components/data_reduction_proxy/content/browser:unit_tests", + "//components/data_use_measurement/content:unit_tests", + "//components/devtools_http_handler:unit_tests", diff --git a/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc new file mode 100644 index 000000000000..b582c3179c59 --- /dev/null +++ b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc @@ -0,0 +1,12 @@ +--- components/content_settings/core/browser/website_settings_registry.cc.orig 2016-10-06 04:02:16.000000000 +0300 ++++ components/content_settings/core/browser/website_settings_registry.cc 2016-10-13 13:04:35.828985000 +0300 +@@ -88,6 +88,9 @@ + // doesn't allow the settings to be managed in the same way. See + // crbug.com/642184. + sync_status = WebsiteSettingsInfo::UNSYNCABLE; ++#elif defined(OS_BSD) ++ if (!(platform & PLATFORM_BSD)) ++ return nullptr; + #else + #error "Unsupported platform" + #endif diff --git a/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.h b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.h new file mode 100644 index 000000000000..0a4a11c988bb --- /dev/null +++ b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.h @@ -0,0 +1,15 @@ +--- components/content_settings/core/browser/website_settings_registry.h.orig 2016-10-06 04:02:16.000000000 +0300 ++++ components/content_settings/core/browser/website_settings_registry.h 2016-10-13 13:24:49.647706000 +0300 +@@ -36,10 +36,11 @@ + PLATFORM_MAC = 1 << 3, + PLATFORM_ANDROID = 1 << 4, + PLATFORM_IOS = 1 << 5, ++ PLATFORM_BSD = 1 << 6, + + // Settings only applied to win, mac, linux and chromeos. + DESKTOP = +- PLATFORM_WINDOWS | PLATFORM_LINUX | PLATFORM_CHROMEOS | PLATFORM_MAC, ++ PLATFORM_WINDOWS | PLATFORM_LINUX | PLATFORM_CHROMEOS | PLATFORM_MAC | PLATFORM_BSD, + + // Settings applied to all platforms, including win, mac, linux, chromeos, + // android, ios. diff --git a/www/chromium/files/patch-components_crash_content_app_BUILD.gn b/www/chromium/files/patch-components_crash_content_app_BUILD.gn new file mode 100644 index 000000000000..80ee737af770 --- /dev/null +++ b/www/chromium/files/patch-components_crash_content_app_BUILD.gn @@ -0,0 +1,11 @@ +--- components/crash/content/app/BUILD.gn.orig 2016-08-03 22:02:16.000000000 +0300 ++++ components/crash/content/app/BUILD.gn 2016-09-18 01:39:59.921593000 +0300 +@@ -141,7 +141,7 @@ + + #'../breakpad/breakpad.gyp:breakpad_sender', TODO(GYP) + ] +- } else if (is_posix && !is_ios) { ++ } else if (is_posix && !is_ios && !is_bsd) { + deps += [ "//breakpad:client" ] + } + } diff --git a/www/chromium/files/patch-components_crash_content_browser_BUILD.gn b/www/chromium/files/patch-components_crash_content_browser_BUILD.gn new file mode 100644 index 000000000000..d503488ecadd --- /dev/null +++ b/www/chromium/files/patch-components_crash_content_browser_BUILD.gn @@ -0,0 +1,21 @@ +--- components/crash/content/browser/BUILD.gn.orig 2016-08-03 22:02:16.000000000 +0300 ++++ components/crash/content/browser/BUILD.gn 2016-09-13 13:38:48.133784000 +0300 +@@ -16,7 +16,7 @@ + + deps = [ + "//base", +- "//breakpad:client", ++ #"//breakpad:client", + "//components/crash/content/app", + "//content/public/browser", + "//content/public/common", +@@ -39,7 +39,7 @@ + # This is not in the GYP build but this target includes breakpad client + # headers, so add the dependency here. + if (is_posix && !is_ios) { +- configs += [ "//breakpad:client_config" ] +- public_configs = [ "//breakpad:client_config" ] ++ #configs += [ "//breakpad:client_config" ] ++ #public_configs = [ "//breakpad:client_config" ] + } + } diff --git a/www/chromium/files/patch-components_dom__distiller_core_page__features.cc b/www/chromium/files/patch-components_dom__distiller_core_page__features.cc deleted file mode 100644 index 0bff4b553c5e..000000000000 --- a/www/chromium/files/patch-components_dom__distiller_core_page__features.cc +++ /dev/null @@ -1,15 +0,0 @@ ---- components/dom_distiller/core/page_features.cc.orig 2016-07-22 00:06:53.000000000 -0400 -+++ components/dom_distiller/core/page_features.cc 2016-08-03 11:25:37.908892000 -0400 -@@ -10,7 +10,11 @@ - #include <string> - - #include "base/json/json_reader.h" --#include "third_party/re2/src/re2/re2.h" -+#if defined(OS_FREEBSD) -+# include <re2/re2.h> -+#else -+# include "third_party/re2/src/re2/re2.h" -+#endif // defined(OS_FREEBSD) - #include "url/gurl.h" - - namespace dom_distiller { diff --git a/www/chromium/files/patch-components_gcm__driver_gcm__client.h b/www/chromium/files/patch-components_gcm__driver_gcm__client.h new file mode 100644 index 000000000000..17062cd1c53f --- /dev/null +++ b/www/chromium/files/patch-components_gcm__driver_gcm__client.h @@ -0,0 +1,10 @@ +--- components/gcm_driver/gcm_client.h.orig 2016-10-06 04:02:16.000000000 +0300 ++++ components/gcm_driver/gcm_client.h 2016-10-13 13:05:38.414560000 +0300 +@@ -80,6 +80,7 @@ + PLATFORM_CROS, + PLATFORM_IOS, + PLATFORM_ANDROID, ++ PLATFORM_BSD, + PLATFORM_UNKNOWN + }; + diff --git a/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc b/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc new file mode 100644 index 000000000000..ac4326de1ecd --- /dev/null +++ b/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc @@ -0,0 +1,12 @@ +--- components/gcm_driver/gcm_client_impl.cc.orig 2016-10-06 04:02:16.000000000 +0300 ++++ components/gcm_driver/gcm_client_impl.cc 2016-10-13 13:07:14.340338000 +0300 +@@ -137,6 +137,9 @@ + case GCMClient::PLATFORM_CROS: + platform = checkin_proto::ChromeBuildProto_Platform_PLATFORM_CROS; + break; ++ case GCMClient::PLATFORM_BSD: // TODO what the hell are those? ++ platform = checkin_proto::ChromeBuildProto_Platform_PLATFORM_LINUX; ++ break; + case GCMClient::PLATFORM_UNKNOWN: + // For unknown platform, return as LINUX. + platform = checkin_proto::ChromeBuildProto_Platform_PLATFORM_LINUX; diff --git a/www/chromium/files/patch-components_metrics_BUILD.gn b/www/chromium/files/patch-components_metrics_BUILD.gn new file mode 100644 index 000000000000..6a8add9bade2 --- /dev/null +++ b/www/chromium/files/patch-components_metrics_BUILD.gn @@ -0,0 +1,34 @@ +--- components/metrics/BUILD.gn.orig 2016-10-06 04:02:16.000000000 +0300 ++++ components/metrics/BUILD.gn 2016-10-16 20:52:28.476935000 +0300 +@@ -107,6 +107,13 @@ + if (is_win) { + sources -= [ "machine_id_provider_stub.cc" ] + } ++ ++ if (is_bsd) { ++ sources -= [ ++ "system_memory_stats_recorder_linux.cc" ++ ] ++ } ++ + } + + if (!is_ios) { +@@ -266,7 +273,7 @@ + ] + } + +-if (is_linux) { ++if (is_linux || is_bsd) { + # GYP version: components/metrics.gypi:metrics_serialization + static_library("serialization") { + sources = [ +@@ -321,7 +328,7 @@ + "//ui/gfx/geometry", + ] + +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ "serialization/serialization_utils_unittest.cc" ] + deps += [ ":serialization" ] + } diff --git a/www/chromium/files/patch-components_os__crypt_os__crypt.h b/www/chromium/files/patch-components_os__crypt_os__crypt.h new file mode 100644 index 000000000000..fb867c7f9c8f --- /dev/null +++ b/www/chromium/files/patch-components_os__crypt_os__crypt.h @@ -0,0 +1,20 @@ +--- components/os_crypt/os_crypt.h.orig 2016-10-06 04:02:17.000000000 +0300 ++++ components/os_crypt/os_crypt.h 2016-10-13 11:41:26.429931000 +0300 +@@ -13,7 +13,7 @@ + #include "base/strings/string16.h" + #include "build/build_config.h" + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + #include "components/os_crypt/key_storage_linux.h" + #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) + +@@ -23,7 +23,7 @@ + // true for Linux, if a password management tool is available. + class OSCrypt { + public: +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // If |store_type| is a known password store, we will attempt to use it. + // In any other case, we default to auto-detecting the store. + // This should not be changed after OSCrypt has been used. diff --git a/www/chromium/files/patch-components_plugins_renderer_BUILD.gn b/www/chromium/files/patch-components_plugins_renderer_BUILD.gn new file mode 100644 index 000000000000..7e829ee46e02 --- /dev/null +++ b/www/chromium/files/patch-components_plugins_renderer_BUILD.gn @@ -0,0 +1,17 @@ +--- components/plugins/renderer/BUILD.gn.orig 2016-08-03 22:02:16.000000000 +0300 ++++ components/plugins/renderer/BUILD.gn 2016-09-26 06:14:10.664010000 +0300 +@@ -25,6 +25,7 @@ + } + + deps = [ ++ "//v8", + "//content/public/child", + "//content/public/common", + "//content/public/renderer", +@@ -33,6 +34,5 @@ + "//third_party/WebKit/public:blink", + "//third_party/re2", + "//ui/base", +- "//v8", + ] + } diff --git a/www/chromium/files/patch-components_policy_BUILD.gn b/www/chromium/files/patch-components_policy_BUILD.gn new file mode 100644 index 000000000000..98c06d244126 --- /dev/null +++ b/www/chromium/files/patch-components_policy_BUILD.gn @@ -0,0 +1,11 @@ +--- components/policy/BUILD.gn.orig 2016-08-03 22:02:16.000000000 +0300 ++++ components/policy/BUILD.gn 2016-09-03 01:58:22.866259000 +0300 +@@ -141,7 +141,7 @@ + if (is_android) { + outputs += policy_templates_android_outputs + } +- if (is_linux) { ++ if (is_linux || is_bsd) { + outputs += policy_templates_linux_outputs + } + if (is_mac) { diff --git a/www/chromium/files/patch-components_policy_resources_policy__templates.json b/www/chromium/files/patch-components_policy_resources_policy__templates.json index 9858b0a185d8..6f1f41cc53cd 100644 --- a/www/chromium/files/patch-components_policy_resources_policy__templates.json +++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json @@ -1,6 +1,15 @@ ---- components/policy/resources/policy_templates.json.orig 2016-05-11 19:02:18 UTC -+++ components/policy/resources/policy_templates.json -@@ -1918,7 +1918,7 @@ +--- components/policy/resources/policy_templates.json.orig 2016-10-06 04:02:17.000000000 +0300 ++++ components/policy/resources/policy_templates.json 2016-10-17 00:01:03.979810000 +0300 +@@ -909,7 +909,7 @@ + 'name': 'RemoteAccessHostMatchUsername', + 'type': 'main', + 'schema': { 'type': 'boolean' }, +- 'supported_on': ['chrome.linux:25-', 'chrome.mac:25-', 'chrome_os:42-'], ++ 'supported_on': ['chrome.linux:25-', 'chrome.freebsd:25-', 'chrome.mac:25-', 'chrome_os:42-'], + 'features': { + 'dynamic_refresh': True, + 'per_profile': False, +@@ -1930,7 +1930,7 @@ 'name': 'GSSAPILibraryName', 'type': 'string', 'schema': { 'type': 'string' }, @@ -9,7 +18,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -4581,7 +4581,7 @@ +@@ -4601,7 +4601,7 @@ 'name': 'RequireOnlineRevocationChecksForLocalAnchors', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,7 +27,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -5410,7 +5410,7 @@ +@@ -5449,7 +5449,7 @@ 'name': 'BackgroundModeEnabled', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -27,3 +36,12 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, +@@ -5974,7 +5974,7 @@ + 'name': 'FullscreenAllowed', + 'type': 'main', + 'schema': { 'type': 'boolean' }, +- 'supported_on': ['chrome.win:31-', 'chrome.linux:31-', 'chrome_os:31-'], ++ 'supported_on': ['chrome.win:31-', 'chrome.linux:31-', 'chrome_os:31-', 'chrome.freebsd:31-'], + 'features': { + 'dynamic_refresh': True, + 'per_profile': True, diff --git a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py index 5d14b41d7285..01be865f8ec0 100644 --- a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py +++ b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py @@ -1,11 +1,11 @@ ---- components/policy/tools/generate_policy_source.py.orig 2016-05-11 19:02:19 UTC -+++ components/policy/tools/generate_policy_source.py -@@ -98,7 +98,7 @@ class PolicyDetails: +--- components/policy/tools/generate_policy_source.py.orig 2016-08-03 22:02:16.000000000 +0300 ++++ components/policy/tools/generate_policy_source.py 2016-09-20 17:13:04.971596000 +0300 +@@ -102,7 +102,7 @@ if platform.startswith('chrome.'): platform_sub = platform[7:] if platform_sub == '*': - self.platforms.extend(['win', 'mac', 'linux']) -+ self.platforms.extend(['win', 'mac', 'linux', 'freebsd']) ++ self.platforms.extend(['win', 'mac', 'linux', 'bsd']) else: self.platforms.append(platform_sub) else: diff --git a/www/chromium/files/patch-components_storage__monitor.gypi b/www/chromium/files/patch-components_storage__monitor.gypi deleted file mode 100644 index dc16dc406642..000000000000 --- a/www/chromium/files/patch-components_storage__monitor.gypi +++ /dev/null @@ -1,29 +0,0 @@ ---- components/storage_monitor.gypi.orig 2016-03-25 13:04:48 UTC -+++ components/storage_monitor.gypi -@@ -50,6 +50,26 @@ - 'storage_monitor/volume_mount_watcher_win.h', - ], - 'conditions': [ -+ ['os_bsd == 1', { -+ 'sources!': [ -+ 'storage_monitor/media_transfer_protocol_device_observer_linux.cc', -+ 'storage_monitor/media_transfer_protocol_device_observer_linux.h', -+ 'storage_monitor/test_media_transfer_protocol_manager_linux.cc', -+ 'storage_monitor/test_media_transfer_protocol_manager_linux.h', -+ 'storage_monitor/mtab_watcher_linux.cc', -+ 'storage_monitor/mtab_watcher_linux.h', -+ 'storage_monitor/storage_monitor_linux.cc', -+ 'storage_monitor/storage_monitor_linux.h', -+ 'storage_monitor/udev_util_linux.cc', -+ 'storage_monitor/udev_util_linux.h', -+ ], -+ }], -+ ['OS == "freebsd"', { -+ 'sources': [ -+ 'storage_monitor/storage_monitor_freebsd.cc', -+ 'storage_monitor/storage_monitor_freebsd.h', -+ ], -+ }], - ['OS == "mac"', { - 'link_settings': { - 'libraries': [ diff --git a/www/chromium/files/patch-components_storage__monitor_BUILD.gn b/www/chromium/files/patch-components_storage__monitor_BUILD.gn new file mode 100644 index 000000000000..482f377b75ca --- /dev/null +++ b/www/chromium/files/patch-components_storage__monitor_BUILD.gn @@ -0,0 +1,40 @@ +--- components/storage_monitor/BUILD.gn.orig 2016-08-03 22:02:16.000000000 +0300 ++++ components/storage_monitor/BUILD.gn 2016-09-27 19:34:46.322065000 +0300 +@@ -64,6 +64,23 @@ + ] + } + ++ if (is_bsd) { ++ sources -= [ ++ "media_transfer_protocol_device_observer_linux.cc", ++ "media_transfer_protocol_device_observer_linux.h", ++ "mtab_watcher_linux.cc", ++ "mtab_watcher_linux.h", ++ "storage_monitor_linux.cc", ++ "storage_monitor_linux.h", ++ "udev_util_linux.cc", ++ "udev_util_linux.h", ++ ] ++ sources += [ ++ "storage_monitor_freebsd.cc", ++ "storage_monitor_freebsd.h", ++ ] ++ } ++ + if (use_udev) { + deps += [ "//device/udev_linux" ] + } else if (is_linux) { +@@ -119,6 +136,13 @@ + ] + } + ++ if (is_bsd) { ++ sources -= [ ++ "test_media_transfer_protocol_manager_linux.cc", ++ "test_media_transfer_protocol_manager_linux.h", ++ ] ++ } ++ + if (is_win) { + deps = [ + "//testing/gtest", diff --git a/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc b/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc new file mode 100644 index 000000000000..eb0437e3c6fa --- /dev/null +++ b/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc @@ -0,0 +1,22 @@ +--- components/sync/base/get_session_name_linux.cc.orig 2016-10-06 04:02:17.000000000 +0300 ++++ components/sync/base/get_session_name_linux.cc 2016-10-13 13:40:16.075193000 +0300 +@@ -4,7 +4,7 @@ + + #include "components/sync/base/get_session_name_linux.h" + +-#include <limits.h> // for HOST_NAME_MAX ++#include <limits.h> // for _POSIX_HOST_NAME_MAX + #include <unistd.h> // for gethostname() + + #include "base/linux_util.h" +@@ -13,8 +13,8 @@ + namespace internal { + + std::string GetHostname() { +- char hostname[HOST_NAME_MAX]; +- if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. ++ char hostname[_POSIX_HOST_NAME_MAX]; ++ if (gethostname(hostname, _POSIX_HOST_NAME_MAX) == 0) // Success. + return hostname; + return base::GetLinuxDistro(); + } diff --git a/www/chromium/files/patch-components_variations_proto_study.proto b/www/chromium/files/patch-components_variations_proto_study.proto new file mode 100644 index 000000000000..9da668a5d2c6 --- /dev/null +++ b/www/chromium/files/patch-components_variations_proto_study.proto @@ -0,0 +1,10 @@ +--- components/variations/proto/study.proto.orig 2016-10-06 04:02:18.000000000 +0300 ++++ components/variations/proto/study.proto 2016-10-13 13:02:20.586397000 +0300 +@@ -189,6 +189,7 @@ + PLATFORM_CHROMEOS = 3; + PLATFORM_ANDROID = 4; + PLATFORM_IOS = 5; ++ PLATFORM_BSD = 6; + } + + // Possible form factors Chrome is running on. diff --git a/www/chromium/files/patch-content_app_BUILD.gn b/www/chromium/files/patch-content_app_BUILD.gn new file mode 100644 index 000000000000..147079a5bb02 --- /dev/null +++ b/www/chromium/files/patch-content_app_BUILD.gn @@ -0,0 +1,11 @@ +--- content/app/BUILD.gn.orig 2016-10-06 04:02:18.000000000 +0300 ++++ content/app/BUILD.gn 2016-10-13 06:35:58.585406000 +0300 +@@ -66,7 +66,7 @@ + ] + } + +- if (is_linux && enable_plugins) { ++ if ((is_linux || is_bsd) && enable_plugins) { + content_app_deps += [ "//content/ppapi_plugin:ppapi_plugin_sources" ] + } + diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn new file mode 100644 index 000000000000..963931ba651f --- /dev/null +++ b/www/chromium/files/patch-content_browser_BUILD.gn @@ -0,0 +1,58 @@ +--- content/browser/BUILD.gn.orig 2016-10-06 04:02:18.000000000 +0300 ++++ content/browser/BUILD.gn 2016-10-13 10:50:30.206508000 +0300 +@@ -196,7 +196,7 @@ + "//third_party/webrtc/media:rtc_media", + "//third_party/webrtc/modules/desktop_capture:primitives", + ] +- if (is_linux || is_mac || is_win) { ++ if (is_linux || is_bsd || is_mac || is_win) { + sources += [ + "media/capture/desktop_capture_device.cc", + "media/capture/desktop_capture_device.h", +@@ -288,7 +288,7 @@ + } + } + +- if (is_linux && use_aura) { ++ if ((is_linux || is_bsd) && use_aura) { + deps += [ "//build/linux:fontconfig" ] + } + +@@ -368,6 +368,19 @@ + "//chromeos", + "//chromeos:power_manager_proto", + ] ++ } else if (is_bsd) { ++ sources -= [ ++ "zygote_host/zygote_communication_linux.cc", ++ "zygote_host/zygote_communication_linux.h", ++ "zygote_host/zygote_handle_linux.cc", ++ "zygote_host/zygote_host_impl_linux.cc", ++ "zygote_host/zygote_host_impl_linux.h", ++ "../zygote/zygote_linux.cc", ++ "../zygote/zygote_linux.h", ++ "../zygote/zygote_main_linux.cc", ++ "download/file_metadata_linux.cc", ++ "download/file_metadata_linux.h", ++ ] + } + + if (use_aura) { +@@ -450,7 +463,7 @@ + deps += [ "//third_party/flac" ] + } + +- if (is_linux && use_dbus) { ++ if ((is_linux || is_bsd) && use_dbus) { + deps += [ "//dbus" ] + } + +@@ -461,7 +474,7 @@ + ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + deps += [ "//third_party/boringssl" ] + } + diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc index 7ba36644a563..a1281200bb34 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2016-05-11 19:02:20 UTC -+++ content/browser/browser_main_loop.cc -@@ -191,7 +191,7 @@ +--- content/browser/browser_main_loop.cc.orig 2016-07-20 22:03:24.000000000 +0300 ++++ content/browser/browser_main_loop.cc 2016-08-18 02:39:59.331387000 +0300 +@@ -203,7 +203,7 @@ namespace content { namespace { @@ -9,7 +9,7 @@ void SetupSandbox(const base::CommandLine& parsed_command_line) { TRACE_EVENT0("startup", "SetupSandbox"); base::FilePath sandbox_binary; -@@ -444,7 +444,7 @@ void BrowserMainLoop::EarlyInitializatio +@@ -467,7 +467,7 @@ TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization"); TRACK_SCOPED_REGION("Startup", "BrowserMainLoop::EarlyInitialization"); @@ -18,3 +18,12 @@ // No thread should be created before this call, as SetupSandbox() // will end-up using fork(). SetupSandbox(parsed_command_line_); +@@ -507,7 +507,7 @@ + // We use quite a few file descriptors for our IPC, and the default limit on + // the Mac is low (256), so bump it up. + base::SetFdLimit(1024); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + // Same for Linux. The default various per distro, but it is 1024 on Fedora. + // Low soft limits combined with liberal use of file descriptors means power + // users can easily hit this limit with many open tabs. Bump up the limit to diff --git a/www/chromium/files/patch-content_browser_device__sensors_data__fetcher__shared__memory.h b/www/chromium/files/patch-content_browser_device__sensors_data__fetcher__shared__memory.h new file mode 100644 index 000000000000..debb08cf2ffd --- /dev/null +++ b/www/chromium/files/patch-content_browser_device__sensors_data__fetcher__shared__memory.h @@ -0,0 +1,11 @@ +--- content/browser/device_sensors/data_fetcher_shared_memory.h.orig 2016-10-06 04:02:18.000000000 +0300 ++++ content/browser/device_sensors/data_fetcher_shared_memory.h 2016-10-14 15:15:34.071484000 +0300 +@@ -45,7 +45,7 @@ + bool Start(ConsumerType consumer_type, void* buffer) override; + bool Stop(ConsumerType consumer_type) override; + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + #if !defined(OS_CHROMEOS) + DeviceMotionHardwareBuffer* motion_buffer_ = nullptr; + DeviceOrientationHardwareBuffer* orientation_buffer_ = nullptr; diff --git a/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc b/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc new file mode 100644 index 000000000000..a7d118ce785f --- /dev/null +++ b/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc @@ -0,0 +1,11 @@ +--- content/browser/devtools/protocol/color_picker.cc.orig 2016-07-20 22:03:24.000000000 +0300 ++++ content/browser/devtools/protocol/color_picker.cc 2016-08-18 02:35:16.268652000 +0300 +@@ -151,7 +151,7 @@ + // magnified projection only with centered hotspot. + // Mac Retina requires cursor to be > 120px in order to render smoothly. + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + const float kCursorSize = 63; + const float kDiameter = 63; + const float kHotspotOffset = 32; diff --git a/www/chromium/files/patch-content_browser_geolocation_location__arbitrator__impl.cc b/www/chromium/files/patch-content_browser_geolocation_location__arbitrator__impl.cc deleted file mode 100644 index c99211cc3b4b..000000000000 --- a/www/chromium/files/patch-content_browser_geolocation_location__arbitrator__impl.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/browser/geolocation/location_arbitrator_impl.cc.orig 2016-05-11 19:02:20 UTC -+++ content/browser/geolocation/location_arbitrator_impl.cc -@@ -163,7 +163,7 @@ LocationProvider* LocationArbitratorImpl - } - - LocationProvider* LocationArbitratorImpl::NewSystemLocationProvider() { --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) - return NULL; - #else - return content::NewSystemLocationProvider(); diff --git a/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.cc b/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.cc deleted file mode 100644 index c1995a7c64be..000000000000 --- a/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.cc +++ /dev/null @@ -1,204 +0,0 @@ ---- content/browser/geolocation/wifi_data_provider_freebsd.cc.orig 2016-08-04 10:46:30.800769000 -0400 -+++ content/browser/geolocation/wifi_data_provider_freebsd.cc 2016-08-04 21:41:58.417450000 -0400 -@@ -0,0 +1,201 @@ -+// Copyright (c) 2010 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. -+ -+// For FreeBSD we use the getifaddrs(3) to obtain the list of interfaces -+// and then check for those with an 802.11 media type and able to return -+// a list of stations. This is similar to ifconfig(8). -+ -+#include "content/browser/geolocation/wifi_data_provider_freebsd.h" -+ -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <sys/sockio.h> -+#include <net/if.h> -+#include <net/if_media.h> -+#include <ifaddrs.h> -+#include <net80211/ieee80211_ioctl.h> -+#include <net/ethernet.h> -+ -+#include "base/strings/utf_string_conversions.h" -+#include "content/browser/geolocation/wifi_data_provider_common.h" -+#include "content/browser/geolocation/wifi_data_provider_manager.h" -+ -+namespace content { -+namespace { -+// The time periods, in milliseconds, between successive polls of the wifi data. -+const int kDefaultPollingInterval = 10000; // 10s -+const int kNoChangePollingInterval = 120000; // 2 mins -+const int kTwoNoChangePollingInterval = 600000; // 10 mins -+const int kNoWifiPollingIntervalMilliseconds = 20 * 1000; // 20s -+ -+// Convert a wifi frequency to the corresponding channel. -+// Taken from wifi_data_provider_linux.cc where it says this was -+// adapted from geolocaiton/wifilib.cc in googleclient (internal to google). -+int frquency_to_channel(int frequency_Mhz) { -+ if (frequency_Mhz >= 2412 && frequency_Mhz <= 2472) // Channels 1-13. -+ return (frequency_Mhz - 2407) / 5; -+ if (frequency_Mhz == 2484) -+ return 14; -+ if (frequency_Mhz > 5000 && frequency_Mhz < 6000) // .11a bands. -+ return (frequency_Mhz - 5000) / 5; -+ // Ignore everything else. -+ return AccessPointData().channel; // invalid channel -+} -+ -+// Provides the wifi API binding for FreeBSD. -+class AccessPointDataFreeBSD : public WifiDataProviderCommon::WlanApiInterface { -+public: -+ AccessPointDataFreeBSD(); -+ ~AccessPointDataFreeBSD(); -+ -+ // this does nothing -+ bool Init(); -+ -+ // get the AP data -+ virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data); -+ -+private: -+ DISALLOW_COPY_AND_ASSIGN(AccessPointDataFreeBSD); -+}; -+ -+AccessPointDataFreeBSD::AccessPointDataFreeBSD() { -+} -+ -+AccessPointDataFreeBSD::~AccessPointDataFreeBSD() { -+} -+ -+bool AccessPointDataFreeBSD::Init() { -+ return true; -+} -+ -+bool AccessPointDataFreeBSD::GetAccessPointData(WifiData::AccessPointDataSet* data) { -+ bool res; -+ char *dupn; -+ struct ifaddrs *ifal, *ifa; -+ struct ifreq ifr; -+ struct ifmediareq ifmr; -+ struct ieee80211req i802r; -+ int s; -+ char iscanbuf[32*1024], *vsr; -+ unsigned len; -+ AccessPointData apd; -+ -+ res = false; -+ if (getifaddrs(&ifal) < 0) -+ return res; -+ -+ dupn = NULL; -+ for (ifa = ifal; ifa; ifa = ifa->ifa_next) { -+ memset(&ifr, 0, sizeof(ifr)); -+ -+ if (dupn != NULL && strcmp(dupn, ifa->ifa_name) == 0) -+ continue; -+ dupn = ifa->ifa_name; -+ -+ strncpy(ifr.ifr_name, ifa->ifa_name, sizeof(ifr.ifr_name)); -+ ifr.ifr_addr.sa_family = AF_LOCAL; -+ -+ if ((s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0)) < 0) -+ continue; -+ -+ (void) memset(&ifmr, 0, sizeof(ifmr)); -+ (void) strncpy(ifmr.ifm_name, ifa->ifa_name, sizeof(ifmr.ifm_name)); -+ -+ if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) { -+ close(s); -+ continue; -+ } -+ if (IFM_TYPE(ifmr.ifm_active) != IFM_IEEE80211) { -+ close(s); -+ continue; -+ } -+ -+ (void) memset(&i802r, 0, sizeof(i802r)); -+ (void) strncpy(i802r.i_name, ifa->ifa_name, sizeof(i802r.i_name)); -+ i802r.i_type = IEEE80211_IOC_SCAN_RESULTS; -+ i802r.i_data = iscanbuf; -+ i802r.i_len = sizeof(iscanbuf); -+ if (ioctl(s, SIOCG80211, &i802r) < 0) { -+ close(s); -+ continue; -+ } -+ -+ close(s); -+ -+ vsr = (char *) i802r.i_data; -+ len = i802r.i_len; -+ while (len >= sizeof(struct ieee80211req_scan_result)) { -+ struct ieee80211req_scan_result *isr; -+ char *id; -+ int idlen; -+ char ssid[IEEE80211_NWID_LEN+1]; -+ -+ isr = (struct ieee80211req_scan_result *) vsr; -+ -+ if (isr->isr_meshid_len) { -+ id = vsr + isr->isr_ie_off + isr->isr_ssid_len; -+ idlen = isr->isr_meshid_len; -+ } -+ else { -+ id = vsr + isr->isr_ie_off; -+ idlen = isr->isr_ssid_len; -+ } -+ strncpy(ssid, id, idlen); -+ ssid[idlen] = '\0'; -+ apd.ssid = base::UTF8ToUTF16(ssid); -+ apd.mac_address = MacAddressAsString16(isr->isr_bssid); -+ apd.radio_signal_strength = (isr->isr_rssi/2) + isr->isr_noise; -+ apd.signal_to_noise = apd.radio_signal_strength - isr->isr_noise; -+ apd.channel = frquency_to_channel(isr->isr_freq); -+ VLOG(1) << "FreeBSD access point: " -+ << "SSID: " << apd.ssid << ", " -+ << "MAC: " << apd.mac_address << ", " -+ << "Strength: " << apd.radio_signal_strength << ":" -+ << apd.signal_to_noise << ", " -+ << "Channel: " << apd.channel; -+ data->insert(apd); -+ res = true; -+ len -= isr->isr_len; -+ vsr += isr->isr_len; -+ } -+ } -+ -+ freeifaddrs(ifal); -+ -+ return res; -+} -+ -+} // namespace -+ -+// static -+WifiDataProvider* WifiDataProviderManager::DefaultFactoryFunction() { -+ return new WifiDataProviderFreeBSD(); -+} -+ -+WifiDataProviderFreeBSD::WifiDataProviderFreeBSD() { -+} -+ -+WifiDataProviderFreeBSD::~WifiDataProviderFreeBSD() { -+} -+ -+WifiDataProviderCommon::WlanApiInterface* WifiDataProviderFreeBSD::NewWlanApi() { -+ -+ std::unique_ptr<AccessPointDataFreeBSD> wlan_api(new AccessPointDataFreeBSD); -+ if (wlan_api->Init()) -+ return wlan_api.release(); -+ -+ return NULL; -+} -+ -+WifiPollingPolicy* WifiDataProviderFreeBSD::NewPollingPolicy() { -+ return new GenericWifiPollingPolicy<kDefaultPollingInterval, -+ kNoChangePollingInterval, -+ kTwoNoChangePollingInterval, -+ kNoWifiPollingIntervalMilliseconds>; -+} -+ -+} // namespace content diff --git a/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.h b/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.h deleted file mode 100644 index 29307082f6ad..000000000000 --- a/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.h +++ /dev/null @@ -1,33 +0,0 @@ ---- content/browser/geolocation/wifi_data_provider_freebsd.h.orig 2016-05-20 17:18:26 UTC -+++ content/browser/geolocation/wifi_data_provider_freebsd.h -@@ -0,0 +1,30 @@ -+// Copyright (c) 2012 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. -+ -+#ifndef CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_FREEBSD_H_ -+#define CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_FREEBSD_H_ -+ -+#include "base/compiler_specific.h" -+#include "content/browser/geolocation/wifi_data_provider_common.h" -+#include "content/common/content_export.h" -+ -+namespace content { -+ -+class CONTENT_EXPORT WifiDataProviderFreeBSD : public WifiDataProviderCommon { -+ public: -+ WifiDataProviderFreeBSD(); -+ -+ private: -+ virtual ~WifiDataProviderFreeBSD(); -+ -+ // WifiDataProviderCommon -+ virtual WlanApiInterface* NewWlanApi() override; -+ virtual WifiPollingPolicy* NewPollingPolicy() override; -+ -+ DISALLOW_COPY_AND_ASSIGN(WifiDataProviderFreeBSD); -+}; -+ -+} // namespace content -+ -+#endif // CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_FREEBSD_H_ diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc index c64b927b3136..c0ca3352609e 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc @@ -1,34 +1,43 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2016-05-11 19:02:20 UTC -+++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -486,8 +486,10 @@ void GpuDataManagerImplPrivate::SetGLStr +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2016-10-06 04:02:18.000000000 +0300 ++++ content/browser/gpu/gpu_data_manager_impl_private.cc 2016-10-14 17:58:04.977933000 +0300 +@@ -363,7 +363,7 @@ + // strings even if all features are blacklisted. If all GPU features are + // disabled, the GPU process will only initialize GL bindings, create a GL + // context, and collect full GPU info. +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) || !defined(OS_BSD) + if (reason) { + *reason = "All GPU features are blacklisted."; + } +@@ -486,8 +486,10 @@ gpu_info.gl_renderer = gl_renderer; gpu_info.gl_version = gl_version; -+#if !defined(OS_FREEBSD) ++#if !defined(OS_BSD) gpu::IdentifyActiveGPU(&gpu_info); gpu::CollectDriverInfoGL(&gpu_info); +#endif UpdateGpuInfo(gpu_info); UpdateGpuSwitchingManager(gpu_info); -@@ -529,10 +531,12 @@ void GpuDataManagerImplPrivate::Initiali - // Also declare the driver_vendor to be osmesa to be able to specify - // exceptions based on driver_vendor==osmesa for some blacklist rules. - gpu_info.driver_vendor = gfx::kGLImplementationOSMesaName; -+#ifndef __FreeBSD__ - } else { - TRACE_EVENT0("startup", - "GpuDataManagerImpl::Initialize:CollectBasicGraphicsInfo"); - gpu::CollectBasicGraphicsInfo(&gpu_info); +@@ -542,10 +544,12 @@ + // Skip collecting the basic driver info if SetGpuInfo() is already called. + if (IsCompleteGpuInfoAvailable()) { + gpu_info = gpu_info_; ++#ifndef OS_BSD + } else { + TRACE_EVENT0("startup", + "GpuDataManagerImpl::Initialize:CollectBasicGraphicsInfo"); + gpu::CollectBasicGraphicsInfo(&gpu_info); +#endif + } if (command_line->HasSwitch(switches::kGpuTestingVendorId) && - command_line->HasSwitch(switches::kGpuTestingDeviceId)) { -@@ -631,7 +635,9 @@ void GpuDataManagerImplPrivate::UpdateGp +@@ -657,7 +661,9 @@ return; bool was_info_available = IsCompleteGpuInfoAvailable(); -+#ifndef __FreeBSD__ ++#ifndef OS_BSD gpu::MergeGPUInfo(&gpu_info_, gpu_info); +#endif if (IsCompleteGpuInfoAvailable()) { diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h new file mode 100644 index 000000000000..6235fe32c7a6 --- /dev/null +++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h @@ -0,0 +1,11 @@ +--- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2016-07-20 22:03:24.000000000 +0300 ++++ content/browser/gpu/gpu_data_manager_impl_private.h 2016-08-18 02:42:16.971805000 +0300 +@@ -154,7 +154,7 @@ + UnblockOtherDomainFrom3DAPIs); + FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplPrivateTest, + UnblockThisDomainFrom3DAPIs); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplPrivateTest, + SetGLStrings); + FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplPrivateTest, diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc new file mode 100644 index 000000000000..cde1950a4264 --- /dev/null +++ b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc @@ -0,0 +1,11 @@ +--- content/browser/gpu/gpu_process_host.cc.orig 2016-07-20 22:03:24.000000000 +0300 ++++ content/browser/gpu/gpu_process_host.cc 2016-08-18 02:45:06.533983000 +0300 +@@ -968,7 +968,7 @@ + base::CommandLine* cmd_line = + new base::CommandLine(base::CommandLine::NO_PROGRAM); + #else +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + int child_flags = gpu_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : + ChildProcessHost::CHILD_NORMAL; + #else diff --git a/www/chromium/files/patch-content_browser_indexed__db_indexed__db__backing__store.cc b/www/chromium/files/patch-content_browser_indexed__db_indexed__db__backing__store.cc deleted file mode 100644 index 0ba4c02d4e74..000000000000 --- a/www/chromium/files/patch-content_browser_indexed__db_indexed__db__backing__store.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/browser/indexed_db/indexed_db_backing_store.cc.orig 2016-05-11 19:02:20 UTC -+++ content/browser/indexed_db/indexed_db_backing_store.cc -@@ -2433,7 +2433,7 @@ bool IndexedDBBackingStore::WriteBlobFil - // The round-trip can be lossy; round to nearest millisecond. - int64_t delta = - (descriptor.last_modified() - info.last_modified).InMilliseconds(); -- if (std::abs(delta) > 1) -+ if (std::labs(delta) > 1) - return false; - } - if (!base::TouchFile(path, info.last_accessed, info.last_modified)) { diff --git a/www/chromium/files/patch-content_browser_media_media__internals.cc b/www/chromium/files/patch-content_browser_media_media__internals.cc new file mode 100644 index 000000000000..4794f3ad1570 --- /dev/null +++ b/www/chromium/files/patch-content_browser_media_media__internals.cc @@ -0,0 +1,11 @@ +--- content/browser/media/media_internals.cc.orig 2016-10-06 04:02:18.000000000 +0300 ++++ content/browser/media/media_internals.cc 2016-10-13 06:53:50.938946000 +0300 +@@ -724,7 +724,7 @@ + device_dict->SetString("name", descriptor.GetNameAndModel()); + device_dict->Set("formats", format_list); + #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ +- defined(OS_ANDROID) ++ defined(OS_ANDROID) || defined(OS_BSD) + device_dict->SetString("captureApi", descriptor.GetCaptureApiTypeString()); + #endif + video_capture_capabilities_cached_data_.Append(std::move(device_dict)); diff --git a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc index 21ed460107cd..c291a4ddaeb3 100644 --- a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc +++ b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc @@ -1,5 +1,5 @@ ---- content/browser/ppapi_plugin_process_host.cc.orig 2016-05-11 19:02:20 UTC -+++ content/browser/ppapi_plugin_process_host.cc +--- content/browser/ppapi_plugin_process_host.cc.orig 2016-07-20 22:03:24.000000000 +0300 ++++ content/browser/ppapi_plugin_process_host.cc 2016-08-18 02:36:09.470007000 +0300 @@ -49,7 +49,7 @@ namespace content { @@ -9,7 +9,7 @@ ZygoteHandle g_ppapi_zygote; #endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) -@@ -113,7 +113,7 @@ class PpapiPluginSandboxedProcessLaunche +@@ -114,7 +114,7 @@ } #elif defined(OS_POSIX) @@ -18,7 +18,7 @@ ZygoteHandle* GetZygote() override { const base::CommandLine& browser_command_line = *base::CommandLine::ForCurrentProcess(); -@@ -213,7 +213,7 @@ PpapiPluginProcessHost* PpapiPluginProce +@@ -214,7 +214,7 @@ return NULL; } @@ -27,3 +27,12 @@ // static void PpapiPluginProcessHost::EarlyZygoteLaunch() { DCHECK(!g_ppapi_zygote); +@@ -377,7 +377,7 @@ + base::CommandLine::StringType plugin_launcher = + browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + int flags = plugin_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : + ChildProcessHost::CHILD_NORMAL; + #else diff --git a/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__device__client.cc b/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__device__client.cc new file mode 100644 index 000000000000..f9df58fd0d43 --- /dev/null +++ b/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__device__client.cc @@ -0,0 +1,11 @@ +--- content/browser/renderer_host/media/video_capture_device_client.cc.orig 2016-07-20 22:03:24.000000000 +0300 ++++ content/browser/renderer_host/media/video_capture_device_client.cc 2016-08-18 02:29:10.788160000 +0300 +@@ -181,7 +181,7 @@ + // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. + // Windows RGB24 defines blue at lowest byte, + // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253 +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + origin_colorspace = libyuv::FOURCC_RAW; + #elif defined(OS_WIN) + origin_colorspace = libyuv::FOURCC_24BG; diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index 163246eac30c..5f7225b53fbe 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2016-05-20 17:18:26 UTC -+++ content/browser/renderer_host/render_process_host_impl.cc -@@ -366,7 +366,7 @@ SiteProcessMap* GetSiteProcessMapForBrow +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2016-07-20 22:03:24.000000000 +0300 ++++ content/browser/renderer_host/render_process_host_impl.cc 2016-08-18 02:32:43.439813000 +0300 +@@ -359,7 +359,7 @@ return map; } @@ -9,7 +9,7 @@ // This static member variable holds the zygote communication information for // the renderer. ZygoteHandle g_render_zygote; -@@ -399,7 +399,7 @@ class RendererSandboxedProcessLauncherDe +@@ -392,7 +392,7 @@ } #elif defined(OS_POSIX) @@ -18,7 +18,7 @@ ZygoteHandle* GetZygote() override { const base::CommandLine& browser_command_line = *base::CommandLine::ForCurrentProcess(); -@@ -539,7 +539,7 @@ void RenderProcessHost::SetMaxRendererPr +@@ -514,7 +514,7 @@ g_max_renderer_count_override = count; } @@ -27,3 +27,12 @@ // static void RenderProcessHostImpl::EarlyZygoteLaunch() { DCHECK(!g_render_zygote); +@@ -684,7 +684,7 @@ + renderer_prefix = + browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + int flags = renderer_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF + : ChildProcessHost::CHILD_NORMAL; + #else diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index 242f4c8cbcad..590ad204e091 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,29 +1,29 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2016-07-22 00:06:54.000000000 -0400 -+++ content/browser/renderer_host/render_widget_host_view_aura.cc 2016-08-03 12:34:00.357612000 -0400 -@@ -105,7 +105,7 @@ +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2016-10-06 04:02:18.000000000 +0300 ++++ content/browser/renderer_host/render_widget_host_view_aura.cc 2016-10-13 07:01:47.728403000 +0300 +@@ -106,7 +106,7 @@ #include "ui/gfx/gdi_util.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) - #include "content/common/input_messages.h" - #include "ui/events/linux/text_edit_command_auralinux.h" - #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -2376,7 +2376,7 @@ + #include "ui/base/ime/linux/text_edit_command_auralinux.h" + #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" + #endif +@@ -2479,7 +2479,7 @@ } bool RenderWidgetHostViewAura::NeedsMouseCapture() { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) return NeedsInputGrab(); #endif return false; -@@ -2608,7 +2608,7 @@ +@@ -2711,7 +2711,7 @@ if (!target_host) return; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) ui::TextEditKeyBindingsDelegateAuraLinux* keybinding_delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; diff --git a/www/chromium/files/patch-content_browser_tracing_tracing__controller__impl.cc b/www/chromium/files/patch-content_browser_tracing_tracing__controller__impl.cc new file mode 100644 index 000000000000..c780f5ed2d9f --- /dev/null +++ b/www/chromium/files/patch-content_browser_tracing_tracing__controller__impl.cc @@ -0,0 +1,11 @@ +--- content/browser/tracing/tracing_controller_impl.cc.orig 2016-07-20 22:03:24.000000000 +0300 ++++ content/browser/tracing/tracing_controller_impl.cc 2016-08-18 02:46:09.991782000 +0300 +@@ -496,7 +496,7 @@ + return; + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // On Linux the browser process dumps process metrics for child process due to + // sandbox. + tracing::ProcessMetricsMemoryDumpProvider::RegisterForProcess( diff --git a/www/chromium/files/patch-content_browser_utility__process__host__impl.cc b/www/chromium/files/patch-content_browser_utility__process__host__impl.cc index b1e9f23de73c..222b19f6c754 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_utility__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/utility_process_host_impl.cc.orig 2016-05-11 19:02:21 UTC -+++ content/browser/utility_process_host_impl.cc -@@ -37,7 +37,7 @@ +--- content/browser/utility_process_host_impl.cc.orig 2016-07-20 22:03:24.000000000 +0300 ++++ content/browser/utility_process_host_impl.cc 2016-08-18 02:26:27.996136000 +0300 +@@ -38,7 +38,7 @@ #include "ipc/ipc_switches.h" #include "ui/base/ui_base_switches.h" @@ -9,7 +9,7 @@ #include "content/public/browser/zygote_handle_linux.h" #endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) -@@ -48,7 +48,7 @@ +@@ -49,7 +49,7 @@ namespace content { @@ -18,7 +18,7 @@ namespace { ZygoteHandle g_utility_zygote; } // namespace -@@ -68,7 +68,7 @@ class UtilitySandboxedProcessLauncherDel +@@ -69,7 +69,7 @@ launch_elevated_(launch_elevated) #elif defined(OS_POSIX) env_(env), @@ -27,7 +27,7 @@ no_sandbox_(no_sandbox), #endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) ipc_fd_(host->TakeClientFileDescriptor()) -@@ -100,7 +100,7 @@ class UtilitySandboxedProcessLauncherDel +@@ -101,7 +101,7 @@ #elif defined(OS_POSIX) @@ -36,7 +36,7 @@ ZygoteHandle* GetZygote() override { if (no_sandbox_ || !exposed_dir_.empty()) return nullptr; -@@ -122,7 +122,7 @@ class UtilitySandboxedProcessLauncherDel +@@ -123,7 +123,7 @@ bool launch_elevated_; #elif defined(OS_POSIX) base::EnvironmentMap env_; @@ -45,7 +45,16 @@ bool no_sandbox_; #endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) base::ScopedFD ipc_fd_; -@@ -238,7 +238,7 @@ void UtilityProcessHostImpl::SetName(con +@@ -151,7 +151,7 @@ + is_batch_mode_(false), + no_sandbox_(false), + run_elevated_(false), +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + child_flags_(ChildProcessHost::CHILD_ALLOW_SELF), + #else + child_flags_(ChildProcessHost::CHILD_NORMAL), +@@ -232,7 +232,7 @@ name_ = name; } diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn new file mode 100644 index 000000000000..47214f449a01 --- /dev/null +++ b/www/chromium/files/patch-content_common_BUILD.gn @@ -0,0 +1,27 @@ +--- content/common/BUILD.gn.orig 2016-08-03 22:02:18.000000000 +0300 ++++ content/common/BUILD.gn 2016-10-09 05:21:51.439131000 +0300 +@@ -179,7 +179,7 @@ + if (use_seccomp_bpf) { + defines += [ "USE_SECCOMP_BPF" ] + } else { +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources -= [ + "sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc", + "sandbox_linux/bpf_cros_arm_gpu_policy_linux.h", +@@ -193,6 +193,15 @@ + "sandbox_linux/bpf_utility_policy_linux.h", + "sandbox_linux/sandbox_bpf_base_policy_linux.cc", + "sandbox_linux/sandbox_bpf_base_policy_linux.h", ++ "sandbox_linux/sandbox_seccomp_bpf_linux.cc", ++ "sandbox_linux/sandbox_seccomp_bpf_linux.h", ++ ] ++ } ++ if (is_bsd) { ++ sources -= [ ++ "sandbox_linux/sandbox_linux.cc", ++ "sandbox_linux/sandbox_linux.h", ++ "sandbox_linux/sandbox_init_linux.cc", + ] + } + if (is_android) { diff --git a/www/chromium/files/patch-content_content__browser.gypi b/www/chromium/files/patch-content_content__browser.gypi deleted file mode 100644 index e0c694c2d71b..000000000000 --- a/www/chromium/files/patch-content_content__browser.gypi +++ /dev/null @@ -1,77 +0,0 @@ ---- content/content_browser.gypi.orig 2016-05-11 19:02:21 UTC -+++ content/content_browser.gypi -@@ -843,6 +843,8 @@ - 'browser/geolocation/wifi_data_provider_common_win.cc', - 'browser/geolocation/wifi_data_provider_common_win.h', - 'browser/geolocation/wifi_data_provider_corewlan_mac.mm', -+ 'browser/geolocation/wifi_data_provider_freebsd.cc', -+ 'browser/geolocation/wifi_data_provider_freebsd.h', - 'browser/geolocation/wifi_data_provider_linux.cc', - 'browser/geolocation/wifi_data_provider_linux.h', - 'browser/geolocation/wifi_data_provider_mac.cc', -@@ -1988,7 +1990,7 @@ - }, - }, - }], -- ['OS=="linux" and chromeos==0 and use_x11==1', { -+ ['(os_bsd==1 or OS=="linux") and chromeos==0 and use_x11==1', { - 'dependencies': [ - '../build/linux/system.gyp:atk', - '../build/linux/system.gyp:gconf', -@@ -2014,7 +2016,7 @@ - 'browser/gamepad/gamepad_platform_data_fetcher_linux.cc', - ], - }], -- ['OS=="linux" and use_aura==1', { -+ ['(os_bsd==1 or OS=="linux") and use_aura==1', { - 'dependencies': [ - '../build/linux/system.gyp:fontconfig', - ], -@@ -2109,8 +2111,24 @@ - ], - }], - ['os_bsd==1', { -- 'sources/': [ -- ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$'], -+ 'sources!': [ -+ 'public/browser/zygote_host_linux.h', -+ 'browser/zygote_host/zygote_communication_linux.cc', -+ 'browser/zygote_host/zygote_communication_linux.h', -+ 'browser/zygote_host/zygote_handle_linux.cc', -+ 'browser/zygote_host/zygote_host_impl_linux.cc', -+ 'browser/zygote_host/zygote_host_impl_linux.h', -+ 'zygote/zygote_linux.cc', -+ 'zygote/zygote_linux.h', -+ 'zygote/zygote_main_linux.cc', -+ 'browser/device_monitor_linux.cc', -+ 'browser/download/file_metadata_linux.cc', -+ 'browser/gamepad/gamepad_platform_data_fetcher_linux.cc', -+ 'browser/geolocation/wifi_data_provider_linux.cc', -+ 'browser/udev_linux.cc', -+ ], -+ 'dependencies': [ -+ '../build/linux/system.gyp:dbus', - ], - }], - ['use_aura==1', { -@@ -2159,10 +2177,7 @@ - 'browser/geolocation/empty_wifi_data_provider.cc', - ], - }], -- ['OS == "linux" and use_dbus==1', { -- 'sources!': [ -- 'browser/geolocation/empty_wifi_data_provider.cc', -- ], -+ ['(OS == "linux" or os_bsd==1) and use_dbus==1', { - 'dependencies': [ - '../build/linux/system.gyp:dbus', - '../dbus/dbus.gyp:dbus', -@@ -2178,7 +2193,7 @@ - 'browser/media/cdm/browser_cdm_manager.h', - ], - }], -- ['OS == "linux"', { -+ ['(os_bsd==1 or OS == "linux")', { - 'dependencies': [ - '../third_party/boringssl/boringssl.gyp:boringssl', - ], diff --git a/www/chromium/files/patch-content_content__common.gypi b/www/chromium/files/patch-content_content__common.gypi deleted file mode 100644 index 1d2f69bde4e5..000000000000 --- a/www/chromium/files/patch-content_content__common.gypi +++ /dev/null @@ -1,24 +0,0 @@ ---- content/content_common.gypi.orig 2016-05-11 19:02:21 UTC -+++ content/content_common.gypi -@@ -737,6 +737,21 @@ - 'content.gyp:common_aidl', - ], - }], -+ ['os_bsd==1', { -+ 'sources!': [ -+ 'common/sandbox_linux.cc', -+ 'common/sandbox_linux.h', -+ 'common/sandbox_init_linux.cc', -+ 'common/sandbox_seccomp_bpf_linux.cc', -+ 'common/sandbox_seccomp_bpf_linux.h', -+ 'common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc', -+ 'common/sandbox_linux/bpf_gpu_policy_linux.cc', -+ 'common/sandbox_linux/bpf_ppapi_policy_linux.cc', -+ 'common/sandbox_linux/bpf_renderer_policy_linux.cc', -+ 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc', -+ 'common/sandbox_linux/sandbox_seccomp_bpf_linux.cc', -+ ], -+ }], - ['use_pango == 1', { - 'dependencies': [ - '../build/linux/system.gyp:pangocairo', diff --git a/www/chromium/files/patch-content_content__tests.gypi b/www/chromium/files/patch-content_content__tests.gypi deleted file mode 100644 index 68960cfaf8ac..000000000000 --- a/www/chromium/files/patch-content_content__tests.gypi +++ /dev/null @@ -1,18 +0,0 @@ ---- content/content_tests.gypi.orig 2016-05-25 15:01:01.000000000 -0400 -+++ content/content_tests.gypi 2016-05-27 10:58:38.919413000 -0400 -@@ -1186,6 +1186,15 @@ - 'renderer/media/video_track_recorder_unittest.cc', - ], - }], -+ ['OS == "freebsd"', { -+ 'sources!': [ -+ 'browser/download/file_metadata_unittest_linux.cc', -+ 'browser/geolocation/wifi_data_provider_linux_unittest.cc', -+ 'browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc', -+ 'browser/renderer_host/media/media_stream_manager_unittest.cc', -+ 'browser/renderer_host/media/media_stream_ui_controller_unittest.cc' -+ ] -+ }], - # Avoid windows due to non-availability of cursor resources in test. - ['OS != "linux"', { - 'sources!': [ diff --git a/www/chromium/files/patch-content_gpu_BUILD.gn b/www/chromium/files/patch-content_gpu_BUILD.gn new file mode 100644 index 000000000000..86bec6a06170 --- /dev/null +++ b/www/chromium/files/patch-content_gpu_BUILD.gn @@ -0,0 +1,10 @@ +--- content/gpu/BUILD.gn.orig 2016-10-06 04:02:19.000000000 +0300 ++++ content/gpu/BUILD.gn 2016-10-15 10:05:38.417673000 +0300 +@@ -98,6 +98,7 @@ + + if (use_x11) { + deps += [ "//ui/events/platform/x11" ] ++ configs += [ "//build/config/linux:x11" ] + } + + if (use_ozone) { diff --git a/www/chromium/files/patch-content_gpu_gpu__child__thread.cc b/www/chromium/files/patch-content_gpu_gpu__child__thread.cc index e7d1b0b616ac..7a75e262f186 100644 --- a/www/chromium/files/patch-content_gpu_gpu__child__thread.cc +++ b/www/chromium/files/patch-content_gpu_gpu__child__thread.cc @@ -1,14 +1,14 @@ ---- content/gpu/gpu_child_thread.cc.orig 2016-05-11 19:02:21 UTC -+++ content/gpu/gpu_child_thread.cc -@@ -382,6 +382,7 @@ void GpuChildThread::StopWatchdog() { - } +--- content/gpu/gpu_child_thread.cc.orig 2016-10-06 04:02:19.000000000 +0300 ++++ content/gpu/gpu_child_thread.cc 2016-10-14 15:27:34.081648000 +0300 +@@ -419,6 +419,7 @@ + if (dead_on_arrival_) + return; - void GpuChildThread::OnCollectGraphicsInfo() { -+#if !defined(OS_FREEBSD) ++#if !defined(OS_BSD) #if defined(OS_WIN) // GPU full info collection should only happen on un-sandboxed GPU process // or single process/in-process gpu mode on Windows. -@@ -424,6 +425,7 @@ void GpuChildThread::OnCollectGraphicsIn +@@ -461,6 +462,7 @@ base::MessageLoop::current()->QuitWhenIdle(); } #endif // OS_WIN diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index 7e9e8c9ec584..375788043118 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,14 +1,14 @@ ---- content/gpu/gpu_main.cc.orig 2016-07-22 00:06:54.000000000 -0400 -+++ content/gpu/gpu_main.cc 2016-08-03 12:37:05.590978000 -0400 +--- content/gpu/gpu_main.cc.orig 2016-07-20 22:03:24.000000000 +0300 ++++ content/gpu/gpu_main.cc 2016-08-10 15:59:24.697490000 +0300 @@ -102,7 +102,7 @@ const base::CommandLine& command_line); bool WarmUpSandbox(const base::CommandLine& command_line); - + -#if !defined(OS_MACOSX) -+#if !defined(OS_MACOSX) && !defined(OS_FREEBSD) //XXX(rene) added !FreeBSD ++#if !defined(OS_MACOSX) && !defined(OS_BSD) bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info); #endif - + @@ -192,13 +192,13 @@ // Use a UI message loop because ANGLE and the desktop GL platform can // create child windows to render to. @@ -21,7 +21,7 @@ std::unique_ptr<ui::PlatformEventSource> event_source = ui::PlatformEventSource::CreateDefault(); -#elif defined(OS_LINUX) -+#elif (defined(OS_LINUX) || defined(OS_BSD)) ++#elif defined(OS_LINUX) || defined(OS_BSD) base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT); #elif defined(OS_MACOSX) // This is necessary for CoreAnimation layers hosted in the GPU process to be @@ -30,16 +30,16 @@ base::TimeTicks before_collect_context_graphics_info = base::TimeTicks::Now(); -#if !defined(OS_MACOSX) -+#if !defined(OS_MACOSX) && !defined(OS_FREEBSD) //XXX(rene) added !FreeBSD ++#if !defined(OS_MACOSX) && !defined(OS_BSD) if (!CollectGraphicsInfo(gpu_info)) dead_on_arrival = true; - + @@ -491,7 +491,7 @@ return true; } - + -#if !defined(OS_MACOSX) -+#if !defined(OS_MACOSX) && !defined(OS_FREEBSD)//XXX(rene) added !FreeBSD ++#if !defined(OS_MACOSX) && !defined(OS_BSD) bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) { TRACE_EVENT0("gpu,startup", "Collect Graphics Info"); - + diff --git a/www/chromium/files/patch-content_public_common_child__process__host.h b/www/chromium/files/patch-content_public_common_child__process__host.h new file mode 100644 index 000000000000..38b7fa8204a3 --- /dev/null +++ b/www/chromium/files/patch-content_public_common_child__process__host.h @@ -0,0 +1,20 @@ +--- ./content/public/common/child_process_host.h.orig 2016-07-20 22:03:24.000000000 +0300 ++++ ./content/public/common/child_process_host.h 2016-08-18 02:52:30.173927000 +0300 +@@ -50,7 +50,7 @@ + // No special behavior requested. + CHILD_NORMAL = 0, + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Indicates that the child execed after forking may be execced from + // /proc/self/exe rather than using the "real" app path. This prevents + // autoupdate from confusing us if it changes the file out from under us. +@@ -59,7 +59,7 @@ + // gdb). In this case, you'd use GetChildPath to get the real executable + // file name, and then prepend the GDB command to the command line. + CHILD_ALLOW_SELF = 1 << 0, +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + }; + + // Returns the pathname to be used for a child process. If a subprocess diff --git a/www/chromium/files/patch-content_renderer_devtools_v8__sampling__profiler.cc b/www/chromium/files/patch-content_renderer_devtools_v8__sampling__profiler.cc index 7c90141b376e..d7038be92971 100644 --- a/www/chromium/files/patch-content_renderer_devtools_v8__sampling__profiler.cc +++ b/www/chromium/files/patch-content_renderer_devtools_v8__sampling__profiler.cc @@ -4,7 +4,7 @@ state.pc = reinterpret_cast<void*>(mcontext->__ss.REG_64_32(__rip, __eip)); state.sp = reinterpret_cast<void*>(mcontext->__ss.REG_64_32(__rsp, __esp)); state.fp = reinterpret_cast<void*>(mcontext->__ss.REG_64_32(__rbp, __ebp)); -+#elif defined(OS_FREEBSD) ++#elif defined(OS_BSD) + state.pc = reinterpret_cast<void*>(mcontext.REG_64_32(mc_rip, mc_eip)); + state.sp = reinterpret_cast<void*>(mcontext.REG_64_32(mc_rsp, mc_esp)); + state.fp = reinterpret_cast<void*>(mcontext.REG_64_32(mc_rbp, mc_ebp)); diff --git a/www/chromium/files/patch-content_renderer_media_webrtc__audio__renderer.cc b/www/chromium/files/patch-content_renderer_media_webrtc__audio__renderer.cc deleted file mode 100644 index d5c000fba7bc..000000000000 --- a/www/chromium/files/patch-content_renderer_media_webrtc__audio__renderer.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/renderer/media/webrtc_audio_renderer.cc.orig 2016-06-08 12:04:14.328279000 -0400 -+++ content/renderer/media/webrtc_audio_renderer.cc 2016-06-08 12:04:28.210758000 -0400 -@@ -162,7 +162,7 @@ - // Windows below. - int frames_per_buffer = hardware_buffer_size; - --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - // On Linux and MacOS, the low level IO implementations on the browser side - // supports all buffer size the clients want. We use the native peer - // connection buffer size (10ms) to achieve best possible performance. diff --git a/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc b/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc index 46c453cfd5f8..f782c2785c06 100644 --- a/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc +++ b/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc @@ -1,11 +1,13 @@ ---- ./content/renderer/media/webrtc/processed_local_audio_source.cc.orig 2016-08-03 12:48:04.721257000 -0400 -+++ ./content/renderer/media/webrtc/processed_local_audio_source.cc 2016-08-03 12:48:34.201210000 -0400 -@@ -269,7 +269,7 @@ +--- content/renderer/media/webrtc/processed_local_audio_source.cc.orig 2016-07-20 22:03:24.000000000 +0300 ++++ content/renderer/media/webrtc/processed_local_audio_source.cc 2016-08-01 03:25:27.013281000 +0300 +@@ -269,8 +269,8 @@ bool key_pressed) { #if defined(OS_WIN) || defined(OS_MACOSX) DCHECK_LE(volume, 1.0); -#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_OPENBSD) -+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - // We have a special situation on Linux where the microphone volume can be +- // We have a special situation on Linux where the microphone volume can be ++#elif defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) ++ // We have a special situation on POSIX where the microphone volume can be // "higher than maximum". The input volume slider in the sound preference // allows the user to set a scaling that is higher than 100%. It means that + // even if the reported maximum levels is N, the actual microphone level can diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc index 09cfb360e816..f90ce6b384af 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,5 +1,5 @@ ---- content/renderer/render_thread_impl.cc.orig 2016-07-22 00:06:54.000000000 -0400 -+++ content/renderer/render_thread_impl.cc 2016-08-03 14:17:16.736255000 -0400 +--- content/renderer/render_thread_impl.cc.orig 2016-07-20 22:03:24.000000000 +0300 ++++ content/renderer/render_thread_impl.cc 2016-08-01 04:09:35.329085000 +0300 @@ -1424,7 +1424,7 @@ const bool enable_video_accelerator = !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode); diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc index 3891bb30c241..e52b7c4ed5ad 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,56 +1,56 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2016-05-27 22:47:40.255637000 -0400 -+++ content/renderer/renderer_blink_platform_impl.cc 2016-05-28 10:09:25.718992000 -0400 -@@ -116,7 +116,7 @@ +--- content/renderer/renderer_blink_platform_impl.cc.orig 2016-10-06 04:02:19.000000000 +0300 ++++ content/renderer/renderer_blink_platform_impl.cc 2016-10-13 07:15:18.714150000 +0300 +@@ -114,7 +114,7 @@ #if defined(OS_POSIX) #include "base/file_descriptor_posix.h" -#if !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_FREEBSD) ++#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) #include <map> #include <string> -@@ -207,7 +207,7 @@ +@@ -219,7 +219,7 @@ scoped_refptr<ThreadSafeSender> thread_safe_sender_; }; -#if !defined(OS_ANDROID) && !defined(OS_WIN) -+#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FREEBSD) ++#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD) class RendererBlinkPlatformImpl::SandboxSupport : public blink::WebSandboxSupport { public: -@@ -253,7 +253,7 @@ - web_scrollbar_behavior_(new WebScrollbarBehaviorImpl), +@@ -266,7 +266,7 @@ renderer_scheduler_(renderer_scheduler), - blink_service_registry_(new BlinkServiceRegistryImpl(service_registry)) { + blink_interface_provider_( + new BlinkInterfaceProviderImpl(remote_interfaces)) { -#if !defined(OS_ANDROID) && !defined(OS_WIN) -+#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FREEBSD) ++#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD) if (g_sandbox_enabled && sandboxEnabled()) { sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport); } else { -@@ -284,7 +284,7 @@ +@@ -297,7 +297,7 @@ } void RendererBlinkPlatformImpl::Shutdown() { -#if !defined(OS_ANDROID) && !defined(OS_WIN) -+#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FREEBSD) ++#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD) // SandboxSupport contains a map of WebFontFamily objects, which hold // WebCStrings, which become invalidated when blink is shut down. Hence, we // need to clear that map now, just before blink::shutdown() is called. -@@ -334,7 +334,7 @@ +@@ -349,7 +349,7 @@ } blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() { -#if defined(OS_ANDROID) || defined(OS_WIN) -+#if defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_FREEBSD) ++#if defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_BSD) // These platforms do not require sandbox support. return NULL; #else -@@ -562,7 +562,7 @@ +@@ -602,7 +602,7 @@ return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out); } -#elif defined(OS_POSIX) && !defined(OS_ANDROID) -+#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_FREEBSD) ++#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) void RendererBlinkPlatformImpl::SandboxSupport::getFallbackFontForCharacter( blink::WebUChar32 character, diff --git a/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__gtkoraura.cc b/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__gtkoraura.cc index d85e56786d1c..24bd97157802 100644 --- a/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__gtkoraura.cc +++ b/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__gtkoraura.cc @@ -1,15 +1,15 @@ ---- content/renderer/webscrollbarbehavior_impl_gtkoraura.cc.orig 2016-03-25 13:04:49 UTC -+++ content/renderer/webscrollbarbehavior_impl_gtkoraura.cc -@@ -14,7 +14,7 @@ bool WebScrollbarBehaviorImpl::shouldCen - blink::WebScrollbarBehavior::Button mouseButton, +--- content/renderer/webscrollbarbehavior_impl_gtkoraura.cc.orig 2016-10-06 04:02:19.000000000 +0300 ++++ content/renderer/webscrollbarbehavior_impl_gtkoraura.cc 2016-10-13 07:18:08.506709000 +0300 +@@ -14,7 +14,7 @@ + blink::WebPointerProperties::Button mouseButton, bool shiftKeyPressed, bool altKeyPressed) { -#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - if (mouseButton == blink::WebScrollbarBehavior::ButtonMiddle) ++#if ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)) + if (mouseButton == blink::WebPointerProperties::Button::Middle) return true; #endif -@@ -50,7 +50,7 @@ bool WebScrollbarBehaviorImpl::shouldSna +@@ -50,7 +50,7 @@ // On most platforms, we should snap iff the event is outside our calculated // rect. On Linux, however, we should not snap for events off the ends, but // not the sides, of the rect. diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn new file mode 100644 index 000000000000..3ef7b969c366 --- /dev/null +++ b/www/chromium/files/patch-content_shell_BUILD.gn @@ -0,0 +1,38 @@ +--- content/shell/BUILD.gn.orig 2016-08-03 22:02:18.000000000 +0300 ++++ content/shell/BUILD.gn 2016-09-18 01:45:17.587900000 +0300 +@@ -275,7 +275,7 @@ + ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + deps += [ + "//build/linux:fontconfig", + "//ui/gfx:test_support", +@@ -296,7 +296,7 @@ + deps += [ "//content/shell/android:content_shell_jni_headers" ] + } + +- if (is_posix && !is_mac) { ++ if (is_posix && !is_mac && !is_bsd) { + deps += [ + "//components/crash/content/app", + "//components/crash/content/browser", +@@ -338,7 +338,7 @@ + ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + deps += [ "//third_party/freetype2" ] + } + +@@ -496,7 +496,7 @@ + } + } + +- if (is_linux && !is_component_build) { ++ if ((is_linux || is_bsd) && !is_component_build) { + # Set rpath to find our own libfreetype even in a non-component build. + configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] + } diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc index 1f930f0de54b..867fc33f8a92 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc @@ -1,5 +1,5 @@ ---- content/shell/browser/shell_browser_context.cc.orig 2016-07-22 00:06:54.000000000 -0400 -+++ content/shell/browser/shell_browser_context.cc 2016-08-03 15:17:20.501518000 -0400 +--- content/shell/browser/shell_browser_context.cc.orig 2016-07-20 22:03:24.000000000 +0300 ++++ content/shell/browser/shell_browser_context.cc 2016-08-01 04:13:15.131738000 +0300 @@ -24,7 +24,7 @@ #if defined(OS_WIN) diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn new file mode 100644 index 000000000000..6b9b941e091d --- /dev/null +++ b/www/chromium/files/patch-content_test_BUILD.gn @@ -0,0 +1,49 @@ +--- content/test/BUILD.gn.orig 2016-10-06 04:02:19.000000000 +0300 ++++ content/test/BUILD.gn 2016-10-27 21:01:00.854720000 +0300 +@@ -377,7 +377,7 @@ + ".", + "//content") + +- if (is_android || is_linux || is_mac || is_win) { ++ if (is_android || is_linux || is_bsd || is_mac || is_win) { + data = [ + "$root_out_dir/content_shell.pak", + "data/", +@@ -615,7 +615,7 @@ + ".", + "//content") + +- if (is_android || is_linux || is_mac || is_win) { ++ if (is_android || is_linux || is_bsd || is_mac || is_win) { + data = [ + "$root_out_dir/content_shell.pak", + "data/", +@@ -738,7 +738,7 @@ + "//ui/shell_dialogs:shell_dialogs", + ] + +- if (is_linux || is_mac || is_win) { ++ if (is_linux || is_bsd || is_mac || is_win) { + sources += + [ "../browser/media/capture/desktop_capture_device_unittest.cc" ] + deps += [ "//third_party/webrtc/modules/desktop_capture" ] +@@ -772,7 +772,7 @@ + "//content") + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + if (use_dbus) { + deps += [ "//dbus:test_support" ] + } +@@ -855,6 +855,10 @@ + sources -= [ "../common/plugin_list_unittest.cc" ] + } + ++ if (is_bsd) { ++ sources -= [ "../browser/download/file_metadata_unittest_linux.cc"] ++ } ++ + if (use_ozone) { + deps += [ "//ui/ozone" ] + } else { diff --git a/www/chromium/files/patch-crypto_nss__util.cc b/www/chromium/files/patch-crypto_nss__util.cc index 959c18c16d41..616e6a71f124 100644 --- a/www/chromium/files/patch-crypto_nss__util.cc +++ b/www/chromium/files/patch-crypto_nss__util.cc @@ -1,7 +1,7 @@ ---- crypto/nss_util.cc.orig 2016-05-11 19:02:22 UTC -+++ crypto/nss_util.cc -@@ -15,7 +15,7 @@ - +--- crypto/nss_util.cc.orig 2016-10-06 04:02:19.000000000 +0300 ++++ crypto/nss_util.cc 2016-10-13 07:19:30.151634000 +0300 +@@ -20,7 +20,7 @@ + #include "base/threading/thread_task_runner_handle.h" #include "crypto/nss_util_internal.h" -#if defined(OS_OPENBSD) @@ -9,16 +9,7 @@ #include <sys/mount.h> #include <sys/param.h> #endif -@@ -147,7 +147,7 @@ char* PKCS11PasswordFunc(PK11SlotInfo* s - // detection when database_dir is on NFS. See http://crbug.com/48585. - // - // TODO(wtc): port this function to other USE_NSS_CERTS platforms. It is --// defined only for OS_LINUX and OS_OPENBSD simply because the statfs structure -+// defined only for OS_LINUX and OS_BSD simply because the statfs structure - // is OS-specific. - // - // Because this function sets an environment variable it must be run before we -@@ -158,10 +158,10 @@ void UseLocalCacheOfNSSDatabaseIfNFS(con +@@ -150,10 +150,10 @@ base::FileSystemType fs_type = base::FILE_SYSTEM_UNKNOWN; if (base::GetFileSystemType(database_dir, &fs_type)) db_on_nfs = (fs_type == base::FILE_SYSTEM_NFS); diff --git a/www/chromium/files/patch-device_BUILD.gn b/www/chromium/files/patch-device_BUILD.gn new file mode 100644 index 000000000000..66bdcaaffc3f --- /dev/null +++ b/www/chromium/files/patch-device_BUILD.gn @@ -0,0 +1,11 @@ +--- device/BUILD.gn.orig 2016-08-03 22:02:18.000000000 +0300 ++++ device/BUILD.gn 2016-09-03 02:02:55.005651000 +0300 +@@ -162,7 +162,7 @@ + ] + } + +- if ((is_chromeos || is_linux) && use_dbus) { ++ if ((is_chromeos || is_linux || is_bsd) && use_dbus) { + configs += [ "//build/config/linux/dbus" ] + + sources += [ diff --git a/www/chromium/files/patch-device_battery_BUILD.gn b/www/chromium/files/patch-device_battery_BUILD.gn new file mode 100644 index 000000000000..d619e1345600 --- /dev/null +++ b/www/chromium/files/patch-device_battery_BUILD.gn @@ -0,0 +1,11 @@ +--- device/battery/BUILD.gn.orig 2016-08-03 22:02:18.000000000 +0300 ++++ device/battery/BUILD.gn 2016-09-03 02:03:11.489591000 +0300 +@@ -47,7 +47,7 @@ + ] + } + +- if (is_linux && !is_chromeos) { ++ if ((is_linux || is_bsd) && !is_chromeos) { + if (use_dbus) { + configs += [ "//build/config/linux/dbus" ] + deps += [ "//dbus" ] diff --git a/www/chromium/files/patch-device_geolocation_BUILD.gn b/www/chromium/files/patch-device_geolocation_BUILD.gn new file mode 100644 index 000000000000..682d0d88105a --- /dev/null +++ b/www/chromium/files/patch-device_geolocation_BUILD.gn @@ -0,0 +1,11 @@ +--- device/geolocation/BUILD.gn.orig 2016-10-06 04:02:19.000000000 +0300 ++++ device/geolocation/BUILD.gn 2016-10-13 13:27:05.983826000 +0300 +@@ -93,7 +93,7 @@ + if (is_android) { + sources -= [ "wifi_data_provider_common.cc" ] + } +- if (is_chromeos || (is_linux && !use_dbus)) { ++ if (is_chromeos || (is_linux && !use_dbus) || is_bsd) { + sources -= [ "wifi_data_provider_linux.cc" ] + } + if (is_linux && use_dbus) { diff --git a/www/chromium/files/patch-device_geolocation_location__arbitrator__impl.cc b/www/chromium/files/patch-device_geolocation_location__arbitrator__impl.cc new file mode 100644 index 000000000000..790d463cbf77 --- /dev/null +++ b/www/chromium/files/patch-device_geolocation_location__arbitrator__impl.cc @@ -0,0 +1,11 @@ +--- device/geolocation/location_arbitrator_impl.cc.orig 2016-10-06 04:02:19.000000000 +0300 ++++ device/geolocation/location_arbitrator_impl.cc 2016-10-14 20:31:25.130350000 +0300 +@@ -167,7 +167,7 @@ + + std::unique_ptr<LocationProvider> + LocationArbitratorImpl::NewSystemLocationProvider() { +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + return nullptr; + #else + return device::NewSystemLocationProvider(); diff --git a/www/chromium/files/patch-device_hid_BUILD.gn b/www/chromium/files/patch-device_hid_BUILD.gn new file mode 100644 index 000000000000..3ae9f0f999ed --- /dev/null +++ b/www/chromium/files/patch-device_hid_BUILD.gn @@ -0,0 +1,16 @@ +--- device/hid/BUILD.gn.orig 2016-08-03 22:02:18.000000000 +0300 ++++ device/hid/BUILD.gn 2016-09-24 04:03:54.837948000 +0300 +@@ -57,6 +57,13 @@ + deps += [ "//device/udev_linux" ] + } + ++ if (is_bsd) { ++ sources -= [ ++ "hid_connection_linux.cc", ++ "hid_connection_linux.h", ++ ] ++ } ++ + if (is_chromeos) { + deps += [ "//chromeos" ] + } diff --git a/www/chromium/files/patch-device_hid_hid.gyp b/www/chromium/files/patch-device_hid_hid.gyp deleted file mode 100644 index 1a073aa9270e..000000000000 --- a/www/chromium/files/patch-device_hid_hid.gyp +++ /dev/null @@ -1,21 +0,0 @@ ---- device/hid/hid.gyp.orig 2016-05-11 19:02:22 UTC -+++ device/hid/hid.gyp -@@ -64,6 +64,18 @@ - 'input_service_linux.h', - ], - }], -+ ['os_bsd==1', { -+ 'sources!': [ -+ 'device_monitor_linux.cc', -+ 'device_monitor_linux.h', -+ 'hid_connection_linux.cc', -+ 'hid_connection_linux.h', -+ 'hid_service_linux.cc', -+ 'hid_service_linux.h', -+ 'input_service_linux.cc', -+ 'input_service_linux.h', -+ ], -+ }], - ], - }, - { diff --git a/www/chromium/files/patch-device_media__transfer__protocol_media__transfer__protocol__manager.h b/www/chromium/files/patch-device_media__transfer__protocol_media__transfer__protocol__manager.h new file mode 100644 index 000000000000..f637914078fb --- /dev/null +++ b/www/chromium/files/patch-device_media__transfer__protocol_media__transfer__protocol__manager.h @@ -0,0 +1,11 @@ +--- device/media_transfer_protocol/media_transfer_protocol_manager.h.orig 2016-07-17 14:17:13.836047000 +0300 ++++ device/media_transfer_protocol/media_transfer_protocol_manager.h 2016-07-17 14:16:48.004323000 +0300 +@@ -15,7 +15,7 @@ + #include "base/memory/ref_counted.h" + #include "build/build_config.h" + +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_FREEBSD) + #error "Only used on Linux and ChromeOS" + #endif + diff --git a/www/chromium/files/patch-device_serial_BUILD.gn b/www/chromium/files/patch-device_serial_BUILD.gn new file mode 100644 index 000000000000..4644abb3961e --- /dev/null +++ b/www/chromium/files/patch-device_serial_BUILD.gn @@ -0,0 +1,24 @@ +--- device/serial/BUILD.gn.orig 2016-08-03 22:02:18.000000000 +0300 ++++ device/serial/BUILD.gn 2016-09-24 04:10:00.137337000 +0300 +@@ -6,7 +6,7 @@ + import("//mojo/public/tools/bindings/mojom.gni") + + # Library works only on desktop platforms. +-assert(is_win || is_linux || is_mac) ++assert(is_win || is_linux || is_bsd || is_mac) + + config("platform_support") { + visibility = [ ":serial" ] +@@ -70,6 +70,12 @@ + if (use_udev) { + deps += [ "//device/udev_linux" ] + } ++ if (is_bsd) { ++ sources -= [ ++ "serial_device_enumerator_linux.cc", ++ "serial_device_enumerator_linux.h" ++ ] ++ } + if (is_chromeos) { + deps += [ + "//chromeos", diff --git a/www/chromium/files/patch-device_serial_serial.gyp b/www/chromium/files/patch-device_serial_serial.gyp deleted file mode 100644 index 74bbfd082396..000000000000 --- a/www/chromium/files/patch-device_serial_serial.gyp +++ /dev/null @@ -1,15 +0,0 @@ ---- device/serial/serial.gyp.orig 2016-04-08 16:02:09 UTC -+++ device/serial/serial.gyp -@@ -71,6 +71,12 @@ - }, - }, - }], -+ ['os_bsd==1', { -+ 'sources!': [ -+ 'serial_device_enumerator_linux.cc', -+ 'serial_device_enumerator_linux.h', -+ ], -+ }], - ], - 'dependencies': [ - 'device_serial_mojo', diff --git a/www/chromium/files/patch-device_usb_usb.gyp b/www/chromium/files/patch-device_usb_usb.gyp deleted file mode 100644 index e540b4fd19a7..000000000000 --- a/www/chromium/files/patch-device_usb_usb.gyp +++ /dev/null @@ -1,19 +0,0 @@ ---- device/usb/usb.gyp.orig 2016-05-25 15:01:02.000000000 -0400 -+++ device/usb/usb.gyp 2016-05-30 13:54:50.903083000 -0400 -@@ -117,6 +117,16 @@ - 'usb_service_impl.h', - ] - }], -+ ['OS == "freebsd"', { -+ 'dependencies!': [ -+ '../../third_party/libusb/libusb.gyp:libusb', -+ ], -+ 'link_settings': { -+ 'ldflags': [ -+ '-L/usr/lib -lusb', -+ ], -+ }, -+ }], - ['chromeos==1', { - 'dependencies': [ - '../../chromeos/chromeos.gyp:chromeos', diff --git a/www/chromium/files/patch-device_usb_usb__service__impl.cc b/www/chromium/files/patch-device_usb_usb__service__impl.cc index d27c286e834f..4953aea84351 100644 --- a/www/chromium/files/patch-device_usb_usb__service__impl.cc +++ b/www/chromium/files/patch-device_usb_usb__service__impl.cc @@ -1,6 +1,6 @@ ---- device/usb/usb_service_impl.cc.orig 2016-05-11 19:02:22 UTC -+++ device/usb/usb_service_impl.cc -@@ -24,7 +24,11 @@ +--- device/usb/usb_service_impl.cc.orig 2016-10-06 04:02:19.000000000 +0300 ++++ device/usb/usb_service_impl.cc 2016-10-13 07:29:44.662206000 +0300 +@@ -26,7 +26,11 @@ #include "device/usb/usb_error.h" #include "device/usb/webusb_descriptors.h" #include "net/base/io_buffer.h" @@ -13,7 +13,7 @@ #if defined(OS_WIN) #include <setupapi.h> -@@ -292,6 +296,7 @@ UsbServiceImpl::UsbServiceImpl( +@@ -213,6 +217,7 @@ } context_ = new UsbContext(platform_context); @@ -21,7 +21,7 @@ rv = libusb_hotplug_register_callback( context_->context(), static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | -@@ -304,6 +309,8 @@ UsbServiceImpl::UsbServiceImpl( +@@ -225,6 +230,8 @@ } RefreshDevices(); @@ -30,19 +30,18 @@ #if defined(OS_WIN) DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces(); if (device_monitor) { -@@ -313,9 +320,11 @@ UsbServiceImpl::UsbServiceImpl( +@@ -234,8 +241,10 @@ } UsbServiceImpl::~UsbServiceImpl() { +#if !defined(OS_FREEBSD) - if (hotplug_enabled_) { + if (hotplug_enabled_) libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_); - } +#endif // !defined(OS_FREEBSD) - for (const auto& map_entry : devices_) { - map_entry.second->OnDisconnect(); - } -@@ -553,6 +562,7 @@ void UsbServiceImpl::RemoveDevice(scoped + for (auto* platform_device : ignored_devices_) + libusb_unref_device(platform_device); + } +@@ -477,6 +486,7 @@ device->OnDisconnect(); } @@ -50,7 +49,7 @@ // static int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, PlatformUsbDevice device, -@@ -590,6 +600,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugC +@@ -514,6 +524,7 @@ return 0; } diff --git a/www/chromium/files/patch-extensions_browser_BUILD.gn b/www/chromium/files/patch-extensions_browser_BUILD.gn new file mode 100644 index 000000000000..2d6f3e75bb67 --- /dev/null +++ b/www/chromium/files/patch-extensions_browser_BUILD.gn @@ -0,0 +1,11 @@ +--- extensions/browser/BUILD.gn.orig 2016-10-06 04:02:19.000000000 +0300 ++++ extensions/browser/BUILD.gn 2016-10-13 07:31:49.246712000 +0300 +@@ -85,7 +85,7 @@ + "//extensions") + sources += nonchromeos_sources + +- if (is_linux) { ++ if (is_linux || is_bsd) { + if (use_dbus) { + deps += [ "//dbus" ] + } diff --git a/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc b/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc index ba7d75caef7c..c551aa4881a2 100644 --- a/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc +++ b/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc @@ -1,9 +1,10 @@ ---- extensions/browser/api/serial/serial_api.cc.orig 2016-07-22 00:06:55.000000000 -0400 -+++ extensions/browser/api/serial/serial_api.cc 2016-08-03 15:23:41.022195000 -0400 -@@ -86,11 +86,13 @@ +--- extensions/browser/api/serial/serial_api.cc.orig 2016-08-12 04:05:07.712438000 +0300 ++++ extensions/browser/api/serial/serial_api.cc 2016-08-12 04:06:56.974572000 +0300 +@@ -85,12 +85,13 @@ + void SerialGetDevicesFunction::Work() { DCHECK_CURRENTLY_ON(BrowserThread::FILE); - +- +#if !defined(OS_BSD) std::unique_ptr<device::SerialDeviceEnumerator> enumerator = device::SerialDeviceEnumerator::Create(); diff --git a/www/chromium/files/patch-gpu_BUILD.gn b/www/chromium/files/patch-gpu_BUILD.gn new file mode 100644 index 000000000000..84053ad88efe --- /dev/null +++ b/www/chromium/files/patch-gpu_BUILD.gn @@ -0,0 +1,11 @@ +--- gpu/BUILD.gn.orig 2016-08-03 22:02:19.000000000 +0300 ++++ gpu/BUILD.gn 2016-09-02 23:58:15.934039000 +0300 +@@ -122,7 +122,7 @@ + libs += [ "android" ] + deps += [ "//ui/android:ui_java" ] + } +- if (is_linux && !is_component_build) { ++ if ((is_linux || is_bsd) && !is_component_build) { + configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] + } + } diff --git a/www/chromium/files/patch-gpu_config_BUILD.gn b/www/chromium/files/patch-gpu_config_BUILD.gn new file mode 100644 index 000000000000..0298598669f4 --- /dev/null +++ b/www/chromium/files/patch-gpu_config_BUILD.gn @@ -0,0 +1,27 @@ +--- gpu/config/BUILD.gn.orig 2016-10-06 04:02:20.000000000 +0300 ++++ gpu/config/BUILD.gn 2016-10-29 18:18:32.848959000 +0300 +@@ -8,7 +8,8 @@ + + declare_args() { + # Use the PCI lib to collect GPU information on Linux. +- use_libpci = is_linux && (!is_chromecast || is_cast_desktop_build) && ++ use_libpci = (is_linux || is_bsd) && ++ (!is_chromecast || is_cast_desktop_build) && + (use_x11 || use_ozone) + } + +@@ -97,6 +98,14 @@ + ] + } + } ++ ++ if (is_bsd) { ++ sources -= [ ++ "gpu_info_collector_linux.cc", ++ "gpu_info_collector_linux.h" ++ ] ++ } ++ + if (is_mac) { + libs = [ + "IOKit.framework", diff --git a/www/chromium/files/patch-gpu_config_gpu__control__list.cc b/www/chromium/files/patch-gpu_config_gpu__control__list.cc index a6c03a0ae8f9..37b43f3f02d4 100644 --- a/www/chromium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/chromium/files/patch-gpu_config_gpu__control__list.cc @@ -1,5 +1,5 @@ ---- gpu/config/gpu_control_list.cc.orig 2016-05-11 19:02:23 UTC -+++ gpu/config/gpu_control_list.cc +--- gpu/config/gpu_control_list.cc.orig 2016-07-20 22:03:25.000000000 +0300 ++++ gpu/config/gpu_control_list.cc 2016-08-11 00:15:11.700069000 +0300 @@ -17,7 +17,11 @@ #include "base/sys_info.h" #include "gpu/config/gpu_info.h" @@ -9,6 +9,24 @@ +#else #include "third_party/re2/src/re2/re2.h" +#endif - + namespace gpu { namespace { +@@ -1137,7 +1141,7 @@ + GpuControlList::GpuControlListEntry::GetDefaultGLType() { + #if defined(OS_CHROMEOS) + return kGLTypeGL; +-#elif defined(OS_LINUX) || defined(OS_OPENBSD) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return kGLTypeGL; + #elif defined(OS_MACOSX) + return kGLTypeGL; +@@ -1575,7 +1579,7 @@ + return kOsWin; + #elif defined(OS_ANDROID) + return kOsAndroid; +-#elif defined(OS_LINUX) || defined(OS_OPENBSD) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return kOsLinux; + #elif defined(OS_MACOSX) + return kOsMacosx; diff --git a/www/chromium/files/patch-gpu_gles2__conform__support_BUILD.gn b/www/chromium/files/patch-gpu_gles2__conform__support_BUILD.gn new file mode 100644 index 000000000000..f5f6a43af132 --- /dev/null +++ b/www/chromium/files/patch-gpu_gles2__conform__support_BUILD.gn @@ -0,0 +1,20 @@ +--- gpu/gles2_conform_support/BUILD.gn.orig 2016-08-03 22:02:19.000000000 +0300 ++++ gpu/gles2_conform_support/BUILD.gn 2016-09-02 23:59:14.071065000 +0300 +@@ -62,7 +62,7 @@ + "//gpu/gles2_conform_support/egl", + "//ui/gl", + ] +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ + "native/egl_native_aura.cc", + "native/egl_native_x11.cc", +@@ -132,7 +132,7 @@ + # Must be done this way for warning flags to be ordered correctly. + ":gles2_conform_test_warnings", + ] +- if (is_linux) { ++ if (is_linux || is_bsd) { + if (!is_chromeos) { + deps += [ "//build/config/linux/gtk2" ] + } diff --git a/www/chromium/files/patch-gpu_gles2__conform__support_native_BUILD.gn b/www/chromium/files/patch-gpu_gles2__conform__support_native_BUILD.gn new file mode 100644 index 000000000000..f3d752410d38 --- /dev/null +++ b/www/chromium/files/patch-gpu_gles2__conform__support_native_BUILD.gn @@ -0,0 +1,11 @@ +--- gpu/gles2_conform_support/native/BUILD.gn.orig 2016-08-03 22:02:19.000000000 +0300 ++++ gpu/gles2_conform_support/native/BUILD.gn 2016-09-02 23:58:43.787930000 +0300 +@@ -21,7 +21,7 @@ + "//gpu/gles2_conform_support/egl", + "//ui/gl", + ] +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ + "egl_native_aura.cc", + "egl_native_x11.cc", diff --git a/www/chromium/files/patch-gpu_gpu__config.gypi b/www/chromium/files/patch-gpu_gpu__config.gypi deleted file mode 100644 index bb49c8e9832b..000000000000 --- a/www/chromium/files/patch-gpu_gpu__config.gypi +++ /dev/null @@ -1,23 +0,0 @@ ---- gpu/gpu_config.gypi.orig 2016-05-11 19:02:23 UTC -+++ gpu/gpu_config.gypi -@@ -71,7 +71,7 @@ - '../build/linux/system.gyp:libpci', - ], - }], -- ['OS=="linux" and use_x11==1', { -+ ['(OS=="linux" or os_bsd==1) and use_x11==1', { - 'dependencies': [ - '../build/linux/system.gyp:x11', - '../build/linux/system.gyp:xext', -@@ -79,5 +79,11 @@ - '../ui/gfx/x/gfx_x11.gyp:gfx_x11', - ], - }], -+ ['os_bsd==1', { -+ 'sources!': [ -+ 'config/gpu_info_collector_linux.cc', -+ 'config/gpu_info_collector_linux.h', -+ ], -+ }] - ], - } diff --git a/www/chromium/files/patch-gpu_gpu__ipc__service.gypi b/www/chromium/files/patch-gpu_gpu__ipc__service.gypi deleted file mode 100644 index fc305796f4e1..000000000000 --- a/www/chromium/files/patch-gpu_gpu__ipc__service.gypi +++ /dev/null @@ -1,11 +0,0 @@ ---- gpu/gpu_ipc_service.gypi.orig 2016-05-27 10:20:52.022966000 -0400 -+++ gpu/gpu_ipc_service.gypi 2016-05-27 10:21:13.721757000 -0400 -@@ -82,7 +82,7 @@ - ], - }, - }], -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { - 'sources': [ 'ipc/service/image_transport_surface_linux.cc' ], - }], - ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', { diff --git a/www/chromium/files/patch-gpu_ipc_client_BUILD.gn b/www/chromium/files/patch-gpu_ipc_client_BUILD.gn new file mode 100644 index 000000000000..620944b9f9b4 --- /dev/null +++ b/www/chromium/files/patch-gpu_ipc_client_BUILD.gn @@ -0,0 +1,10 @@ +--- gpu/ipc/client/BUILD.gn.orig 2016-08-03 22:02:19.000000000 +0300 ++++ gpu/ipc/client/BUILD.gn 2016-10-10 14:54:17.518422000 +0300 +@@ -53,6 +53,7 @@ + configs += [ + "//build/config/compiler:no_size_t_to_int_warning", + "//gpu:gpu_implementation", ++ "//build/config/linux:x11", + ] + deps = [ + "//base", diff --git a/www/chromium/files/patch-gpu_ipc_service_BUILD.gn b/www/chromium/files/patch-gpu_ipc_service_BUILD.gn new file mode 100644 index 000000000000..642b0d1235f4 --- /dev/null +++ b/www/chromium/files/patch-gpu_ipc_service_BUILD.gn @@ -0,0 +1,16 @@ +--- gpu/ipc/service/BUILD.gn.orig 2016-08-03 22:02:19.000000000 +0300 ++++ gpu/ipc/service/BUILD.gn 2016-10-10 14:57:36.952170000 +0300 +@@ -92,11 +92,12 @@ + ] + libs += [ "android" ] + } +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ "image_transport_surface_linux.cc" ] + } + if (use_x11) { + sources += [ "x_util.h" ] ++ configs += [ "//build/config/linux:x11" ] + } + if (use_ozone) { + sources += [ diff --git a/www/chromium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn b/www/chromium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn new file mode 100644 index 000000000000..a39587bcb130 --- /dev/null +++ b/www/chromium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn @@ -0,0 +1,11 @@ +--- gpu/tools/compositor_model_bench/BUILD.gn.orig 2016-10-06 04:02:20.000000000 +0300 ++++ gpu/tools/compositor_model_bench/BUILD.gn 2016-10-13 07:33:53.916483000 +0300 +@@ -4,7 +4,7 @@ + + import("//build/config/ui.gni") + +-if (is_linux && !is_chromeos && current_cpu != "arm" && use_x11) { ++if ((is_linux || is_bsd) && !is_chromeos && current_cpu != "arm" && use_x11) { + # GYP version: //gpu/tools/tools.gyp:compositor_model_bench + executable("compositor_model_bench") { + sources = [ diff --git a/www/chromium/files/patch-gpu_vulkan_BUILD.gn b/www/chromium/files/patch-gpu_vulkan_BUILD.gn new file mode 100644 index 000000000000..ee3ff927bdab --- /dev/null +++ b/www/chromium/files/patch-gpu_vulkan_BUILD.gn @@ -0,0 +1,11 @@ +--- gpu/vulkan/BUILD.gn.orig 2016-08-03 22:02:19.000000000 +0300 ++++ gpu/vulkan/BUILD.gn 2016-09-02 23:57:07.910753000 +0300 +@@ -13,7 +13,7 @@ + component("vulkan") { + output_name = "vulkan_wrapper" + +- if (is_linux) { ++ if (is_linux || is_bsd) { + assert(use_x11, "Vulkan only support x11 at this point.") + sources = [ + "vulkan_command_buffer.cc", diff --git a/www/chromium/files/patch-ipc_ipc__channel.h b/www/chromium/files/patch-ipc_ipc__channel.h new file mode 100644 index 000000000000..c40e63eebca4 --- /dev/null +++ b/www/chromium/files/patch-ipc_ipc__channel.h @@ -0,0 +1,11 @@ +--- ipc/ipc_channel.h.orig 2016-08-13 00:25:04.291611000 +0300 ++++ ipc/ipc_channel.h 2016-08-13 00:09:06.758895000 +0300 +@@ -223,7 +223,7 @@ + static std::string GenerateVerifiedChannelID(const std::string& prefix); + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Sandboxed processes live in a PID namespace, so when sending the IPC hello + // message from client to server we need to send the PID from the global + // PID namespace. diff --git a/www/chromium/files/patch-ipc_ipc__channel__posix.cc b/www/chromium/files/patch-ipc_ipc__channel__posix.cc new file mode 100644 index 000000000000..b22538341b23 --- /dev/null +++ b/www/chromium/files/patch-ipc_ipc__channel__posix.cc @@ -0,0 +1,64 @@ +--- ipc/ipc_channel_posix.cc.orig 2016-07-20 22:03:25.000000000 +0300 ++++ ipc/ipc_channel_posix.cc 2016-08-13 00:06:40.205716000 +0300 +@@ -183,9 +183,9 @@ + + //------------------------------------------------------------------------------ + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + int ChannelPosix::global_pid_ = 0; +-#endif // OS_LINUX ++#endif // OS_LINUX || defined(OS_BSD) + + ChannelPosix::ChannelPosix(const IPC::ChannelHandle& channel_handle, + Mode mode, +@@ -613,7 +613,7 @@ + return base::PathExists(base::FilePath(channel_id)); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // static + void ChannelPosix::SetGlobalPid(int pid) { + global_pid_ = pid; +@@ -622,7 +622,7 @@ + int ChannelPosix::GetGlobalPid() { + return global_pid_; + } +-#endif // OS_LINUX ++#endif // OS_LINUX || defined(OS_BSD) + + // Called by libevent when we can read from the pipe without blocking. + void ChannelPosix::OnFileCanReadWithoutBlocking(int fd) { +@@ -813,12 +813,12 @@ + return -1; + #else + int pid = base::GetCurrentProcId(); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Our process may be in a sandbox with a separate PID namespace. + if (global_pid_) { + pid = global_pid_; + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + return pid; + #endif // defined(OS_NACL_NONSFI) + } +@@ -1135,7 +1135,7 @@ + return ChannelPosix::IsNamedServerInitialized(channel_id); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // static + void Channel::SetGlobalPid(int pid) { + ChannelPosix::SetGlobalPid(pid); +@@ -1143,6 +1143,6 @@ + int Channel::GetGlobalPid() { + return ChannelPosix::GetGlobalPid(); + } +-#endif // OS_LINUX ++#endif // OS_LINUX || defined(OS_BSD) + + } // namespace IPC diff --git a/www/chromium/files/patch-ipc_ipc__channel__posix.h b/www/chromium/files/patch-ipc_ipc__channel__posix.h new file mode 100644 index 000000000000..e0d4690c6c55 --- /dev/null +++ b/www/chromium/files/patch-ipc_ipc__channel__posix.h @@ -0,0 +1,28 @@ +--- ipc/ipc_channel_posix.h.orig 2016-08-13 00:22:20.959322000 +0300 ++++ ipc/ipc_channel_posix.h 2016-08-13 00:07:29.393338000 +0300 +@@ -63,10 +63,10 @@ + void CloseClientFileDescriptor(); + + static bool IsNamedServerInitialized(const std::string& channel_id); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + static void SetGlobalPid(int pid); + static int GetGlobalPid(); +-#endif // OS_LINUX ++#endif // OS_LINUX || defined(OS_BSD) + + private: + bool CreatePipe(const IPC::ChannelHandle& channel_handle); +@@ -209,10 +209,10 @@ + // True if we are responsible for unlinking the unix domain socket file. + bool must_unlink_; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // If non-zero, overrides the process ID sent in the hello message. + static int global_pid_; +-#endif // OS_LINUX ++#endif // OS_LINUX || defined(OS_BSD) + + DISALLOW_IMPLICIT_CONSTRUCTORS(ChannelPosix); + }; diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn new file mode 100644 index 000000000000..04c0e993ed51 --- /dev/null +++ b/www/chromium/files/patch-media_audio_BUILD.gn @@ -0,0 +1,25 @@ +--- media/audio/BUILD.gn.orig 2016-08-03 22:02:19.000000000 +0300 ++++ media/audio/BUILD.gn 2016-09-25 15:11:18.731892000 +0300 +@@ -202,7 +202,7 @@ + deps += [ "//media/base/android:media_jni_headers" ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ "linux/audio_manager_linux.cc" ] + } + +@@ -251,10 +251,12 @@ + configs += [ ":libpulse" ] + } else { + # TODO(ajwong): Technically, this dl should go in the action. +- libs += [ "dl" ] + deps += [ ":pulse_generate_stubs" ] + sources += get_target_outputs(":pulse_generate_stubs") + } ++ if (is_linux) { ++ libs += [ "dl" ] ++ } + } + + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] diff --git a/www/chromium/files/patch-media_audio_audio__manager.cc b/www/chromium/files/patch-media_audio_audio__manager.cc index b4a2f727dd80..ee816c3b18e5 100644 --- a/www/chromium/files/patch-media_audio_audio__manager.cc +++ b/www/chromium/files/patch-media_audio_audio__manager.cc @@ -1,5 +1,5 @@ ---- media/audio/audio_manager.cc.orig 2016-07-22 00:06:55.000000000 -0400 -+++ media/audio/audio_manager.cc 2016-08-03 15:25:47.683860000 -0400 +--- media/audio/audio_manager.cc.orig 2016-07-20 22:03:25.000000000 +0300 ++++ media/audio/audio_manager.cc 2016-08-01 04:22:25.372043000 +0300 @@ -92,7 +92,7 @@ } #endif diff --git a/www/chromium/files/patch-media_base_BUILD.gn b/www/chromium/files/patch-media_base_BUILD.gn new file mode 100644 index 000000000000..c8c23b19edbc --- /dev/null +++ b/www/chromium/files/patch-media_base_BUILD.gn @@ -0,0 +1,20 @@ +--- media/base/BUILD.gn.orig 2016-08-03 22:02:19.000000000 +0300 ++++ media/base/BUILD.gn 2016-09-03 01:53:50.754526000 +0300 +@@ -281,7 +281,7 @@ + allow_circular_includes_from += [ "//media/base/android" ] + } + +- if (is_linux && use_x11) { ++ if ((is_linux || is_bsd) && use_x11) { + configs += [ + "//build/config/linux:x11", + "//build/config/linux:xext", +@@ -317,7 +317,7 @@ + deps += [ ":media_yasm" ] + } + +- if (is_linux || is_win) { ++ if (is_linux || is_bsd || is_win) { + sources += [ + "keyboard_event_counter.cc", + "keyboard_event_counter.h", diff --git a/www/chromium/files/patch-media_base_audio__splicer.cc b/www/chromium/files/patch-media_base_audio__splicer.cc deleted file mode 100644 index 5353fd742fbb..000000000000 --- a/www/chromium/files/patch-media_base_audio__splicer.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- media/base/audio_splicer.cc.orig 2016-05-11 19:02:23 UTC -+++ media/base/audio_splicer.cc -@@ -167,7 +167,7 @@ bool AudioStreamSanitizer::AddInput(cons - output_timestamp_helper_.GetTimestamp(); - const base::TimeDelta delta = timestamp - expected_timestamp; - -- if (std::abs(delta.InMilliseconds()) > -+ if (std::labs(delta.InMilliseconds()) > - AudioSplicer::kMaxTimeDeltaInMilliseconds) { - MEDIA_LOG(ERROR, media_log_) - << "Audio splicing failed: coded frame timestamp differs from " -@@ -183,7 +183,7 @@ bool AudioStreamSanitizer::AddInput(cons - if (delta != base::TimeDelta()) - frames_to_fill = output_timestamp_helper_.GetFramesToTarget(timestamp); - -- if (frames_to_fill == 0 || std::abs(frames_to_fill) < kMinGapSize) { -+ if (frames_to_fill == 0 || std::labs(frames_to_fill) < kMinGapSize) { - AddOutputBuffer(input); - return true; - } diff --git a/www/chromium/files/patch-media_capture_BUILD.gn b/www/chromium/files/patch-media_capture_BUILD.gn new file mode 100644 index 000000000000..cd11feceaf7e --- /dev/null +++ b/www/chromium/files/patch-media_capture_BUILD.gn @@ -0,0 +1,19 @@ +--- media/capture/BUILD.gn.orig 2016-08-03 22:02:20.000000000 +0300 ++++ media/capture/BUILD.gn 2016-10-10 16:10:21.736539000 +0300 +@@ -114,6 +114,16 @@ + ] + } + ++ if (is_bsd) { ++ sources -= [ ++ "video/linux/video_capture_device_linux.cc", ++ "video/linux/video_capture_device_linux.h", ++ "video/linux/video_capture_device_factory_linux.cc", ++ "video/linux/video_capture_device_factory_linux.h", ++ "video/linux/v4l2_capture_delegate.cc", ++ ] ++ } ++ + if (is_win) { + public_deps += [ "//media/base/win" ] + libs = [ diff --git a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc index 1d14f7164790..02f3ff7c8e3f 100644 --- a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc @@ -1,11 +1,11 @@ ---- media/capture/video/fake_video_capture_device_factory.cc.orig 2016-05-11 19:02:23 UTC -+++ media/capture/video/fake_video_capture_device_factory.cc -@@ -49,7 +49,7 @@ void FakeVideoCaptureDeviceFactory::GetD +--- media/capture/video/fake_video_capture_device_factory.cc.orig 2016-10-06 04:02:21.000000000 +0300 ++++ media/capture/video/fake_video_capture_device_factory.cc 2016-10-13 07:39:17.908794000 +0300 +@@ -49,7 +49,7 @@ for (int n = 0; n < number_of_devices_; ++n) { - VideoCaptureDevice::Name name(base::StringPrintf("fake_device_%d", n), - base::StringPrintf("/dev/video%d", n) + device_descriptors->emplace_back(base::StringPrintf("fake_device_%d", n), + base::StringPrintf("/dev/video%d", n), -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - , - VideoCaptureDevice::Name::V4L2_SINGLE_PLANE + VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE #elif defined(OS_MACOSX) + VideoCaptureApi::MACOSX_AVFOUNDATION diff --git a/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc index 6433055a8b44..e1e7e96cab8b 100644 --- a/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc @@ -1,11 +1,11 @@ ---- media/capture/video/file_video_capture_device_factory.cc.orig 2016-05-11 19:02:23 UTC -+++ media/capture/video/file_video_capture_device_factory.cc -@@ -50,7 +50,7 @@ void FileVideoCaptureDeviceFactory::GetD - device_names->push_back(VideoCaptureDevice::Name( +--- media/capture/video/file_video_capture_device_factory.cc.orig 2016-10-06 04:02:21.000000000 +0300 ++++ media/capture/video/file_video_capture_device_factory.cc 2016-10-13 07:41:41.678945000 +0300 +@@ -49,7 +49,7 @@ + #elif defined(OS_MACOSX) command_line_file_path.value(), kFileVideoCaptureDeviceName, - VideoCaptureDevice::Name::AVFOUNDATION)); + VideoCaptureApi::MACOSX_AVFOUNDATION -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - device_names->push_back(VideoCaptureDevice::Name( command_line_file_path.value(), kFileVideoCaptureDeviceName, - VideoCaptureDevice::Name::V4L2_SINGLE_PLANE)); + VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE + #else diff --git a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc index 16eb11d6224d..8b15e5a31fe2 100644 --- a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc +++ b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc @@ -1,22 +1,22 @@ ---- media/capture/video/linux/video_capture_device_linux.cc.orig 2016-07-22 00:06:55.000000000 -0400 -+++ media/capture/video/linux/video_capture_device_linux.cc 2016-08-04 15:59:29.808311000 -0400 -@@ -44,6 +44,7 @@ - return true; - } +--- media/capture/video/linux/video_capture_device_linux.cc.orig 2016-10-06 04:02:21.000000000 +0300 ++++ media/capture/video/linux/video_capture_device_linux.cc 2016-10-13 09:50:59.750346000 +0300 +@@ -21,6 +21,7 @@ + + namespace media { +#if !defined(OS_FREEBSD) // Translates Video4Linux pixel formats to Chromium pixel formats. // static VideoPixelFormat VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat( -@@ -57,6 +58,7 @@ +@@ -34,6 +35,7 @@ bool favour_mjpeg) { return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg); } +#endif // !defined(OS_FREEBSD) - const std::string VideoCaptureDevice::Name::GetModel() const { - // |unique_id| is of the form "/dev/video2". |file_name| is "video2". -@@ -90,6 +92,7 @@ + VideoCaptureDeviceLinux::VideoCaptureDeviceLinux( + const VideoCaptureDeviceDescriptor& device_descriptor) +@@ -47,6 +49,7 @@ v4l2_thread_.Stop(); } @@ -24,7 +24,7 @@ void VideoCaptureDeviceLinux::AllocateAndStart( const VideoCaptureParams& params, std::unique_ptr<VideoCaptureDevice::Client> client) { -@@ -113,7 +116,13 @@ +@@ -70,7 +73,13 @@ params.requested_format.frame_size.height(), params.requested_format.frame_rate, base::Passed(&client))); } @@ -38,7 +38,7 @@ void VideoCaptureDeviceLinux::StopAndDeAllocate() { if (!v4l2_thread_.IsRunning()) return; // Wrong state. -@@ -124,7 +133,11 @@ +@@ -81,7 +90,11 @@ capture_impl_ = NULL; } @@ -49,8 +49,8 @@ +#if !defined(OS_FREEBSD) void VideoCaptureDeviceLinux::SetRotation(int rotation) { if (v4l2_thread_.IsRunning()) { - v4l2_thread_.message_loop()->PostTask( -@@ -132,6 +145,9 @@ + v4l2_thread_.task_runner()->PostTask( +@@ -89,6 +102,9 @@ base::Bind(&V4L2CaptureDelegate::SetRotation, capture_impl_, rotation)); } } diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device.cc b/www/chromium/files/patch-media_capture_video_video__capture__device.cc deleted file mode 100644 index 08e1f2b78c65..000000000000 --- a/www/chromium/files/patch-media_capture_video_video__capture__device.cc +++ /dev/null @@ -1,31 +0,0 @@ ---- media/capture/video/video_capture_device.cc.orig 2016-05-11 19:02:23 UTC -+++ media/capture/video/video_capture_device.cc -@@ -13,6 +13,10 @@ - - namespace media { - -+const std::string VideoCaptureDevice::Name::GetModel() const { -+ return ""; -+} -+ - // TODO(msu.koo): http://crbug.com/532272, remove checking the switch in favour - // of deferring GetModel() call to the actual VideoCaptureDevice object. - const std::string VideoCaptureDevice::Name::GetNameAndModel() const { -@@ -35,7 +39,7 @@ VideoCaptureDevice::Name::Name(const std - : device_name_(name), unique_id_(id) { - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - VideoCaptureDevice::Name::Name(const std::string& name, - const std::string& id, - const CaptureApiType api_type) -@@ -82,7 +86,7 @@ VideoCaptureDevice::Name::Name(const std - VideoCaptureDevice::Name::~Name() { - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - const char* VideoCaptureDevice::Name::GetCaptureApiTypeString() const { - switch (capture_api_type()) { - case V4L2_SINGLE_PLANE: diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device.h b/www/chromium/files/patch-media_capture_video_video__capture__device.h deleted file mode 100644 index 4eff99efb46c..000000000000 --- a/www/chromium/files/patch-media_capture_video_video__capture__device.h +++ /dev/null @@ -1,38 +0,0 @@ ---- media/capture/video/video_capture_device.h.orig 2016-05-11 19:02:23 UTC -+++ media/capture/video/video_capture_device.h -@@ -51,7 +51,7 @@ class MEDIA_EXPORT VideoCaptureDevice { - Name(); - Name(const std::string& name, const std::string& id); - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // Linux/CrOS targets Capture Api type: it can only be set on construction. - enum CaptureApiType { - V4L2_SINGLE_PLANE, -@@ -82,7 +82,7 @@ class MEDIA_EXPORT VideoCaptureDevice { - #endif - - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_ANDROID) -+ defined(OS_ANDROID) || defined(OS_BSD) - Name(const std::string& name, - const std::string& id, - const CaptureApiType api_type); -@@ -119,7 +119,7 @@ class MEDIA_EXPORT VideoCaptureDevice { - bool operator<(const Name& other) const { return unique_id_ < other.id(); } - - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_ANDROID) -+ defined(OS_ANDROID) || defined(OS_BSD) - CaptureApiType capture_api_type() const { - return capture_api_class_.capture_api_type(); - } -@@ -143,7 +143,7 @@ class MEDIA_EXPORT VideoCaptureDevice { - std::string device_name_; - std::string unique_id_; - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_ANDROID) -+ defined(OS_ANDROID) || defined(OS_BSD) - // This class wraps the CaptureApiType to give it a by default value if not - // initialized. - class CaptureApiClass { diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc index 89d551be3bee..1f6d879508b7 100644 --- a/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc @@ -1,12 +1,12 @@ ---- media/capture/video/video_capture_device_factory.cc.orig 2016-07-22 00:06:55.000000000 -0400 -+++ media/capture/video/video_capture_device_factory.cc 2016-08-04 16:01:12.907434000 -0400 +--- media/capture/video/video_capture_device_factory.cc.orig 2016-08-13 01:27:17.328942000 +0300 ++++ media/capture/video/video_capture_device_factory.cc 2016-08-13 01:16:43.725148000 +0300 @@ -18,6 +18,10 @@ std::unique_ptr<VideoCaptureDeviceFactory> VideoCaptureDeviceFactory::CreateFactory( scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { +#if defined(OS_BSD) -+ return std::unique_ptr<VideoCaptureDeviceFactory>(new -+ media::FakeVideoCaptureDeviceFactory()); ++ return std::unique_ptr<VideoCaptureDeviceFactory>( ++ new media::FakeVideoCaptureDeviceFactory()); +#else const base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); @@ -17,5 +17,14 @@ } +#endif } - + VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() { +@@ -56,7 +61,7 @@ + callback.Run(std::move(device_names)); + } + +-#if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_ANDROID) && \ ++#if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_BSD) && !defined(OS_ANDROID) && \ + !defined(OS_WIN) + // static + VideoCaptureDeviceFactory* diff --git a/www/chromium/files/patch-media_cast_BUILD.gn b/www/chromium/files/patch-media_cast_BUILD.gn new file mode 100644 index 000000000000..76376818a5ee --- /dev/null +++ b/www/chromium/files/patch-media_cast_BUILD.gn @@ -0,0 +1,29 @@ +--- media/cast/BUILD.gn.orig 2016-08-03 22:02:20.000000000 +0300 ++++ media/cast/BUILD.gn 2016-09-03 01:55:19.016112000 +0300 +@@ -385,7 +385,7 @@ + } + } + +-if (is_win || is_mac || (is_linux && !is_chromeos)) { ++if (is_win || is_mac || (is_linux && !is_chromeos) || is_bsd) { + # This is a target for the collection of cast development tools. They are + # not built/linked into the Chromium browser. + group("testing_tools") { +@@ -430,7 +430,7 @@ + "//build/win:default_exe_manifest", + ] + +- if (is_linux && !is_chromeos && use_x11) { ++ if ((is_linux || is_bsd) && !is_chromeos && use_x11) { + sources += [ + "test/linux_output_window.cc", + "test/linux_output_window.h", +@@ -525,7 +525,7 @@ + } + } + +-if (is_linux && !is_chromeos) { ++if ((is_linux || is_bsd) && !is_chromeos) { + test("tap_proxy") { + sources = [ + "test/utility/tap_proxy.cc", diff --git a/www/chromium/files/patch-media_cdm_ppapi_ppapi__cdm__adapter.gni b/www/chromium/files/patch-media_cdm_ppapi_ppapi__cdm__adapter.gni new file mode 100644 index 000000000000..62f26d603133 --- /dev/null +++ b/www/chromium/files/patch-media_cdm_ppapi_ppapi__cdm__adapter.gni @@ -0,0 +1,20 @@ +--- media/cdm/ppapi/ppapi_cdm_adapter.gni.orig 2016-08-03 22:02:20.000000000 +0300 ++++ media/cdm/ppapi/ppapi_cdm_adapter.gni 2016-09-03 01:55:54.607135000 +0300 +@@ -7,7 +7,7 @@ + # depend on media/media_cdm_adapter.gyp:cdmadapter which would in turn modify + # your target with direct_dependent_settings. + template("ppapi_cdm_adapter") { +- if (is_mac || is_linux) { ++ if (is_mac || is_linux || is_bsd) { + _target_type = "loadable_module" + } else { + _target_type = "shared_library" +@@ -59,7 +59,7 @@ + libs += [ "rt" ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + # CDM adapter depends on a CDM in component and non-component builds. + configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] + } diff --git a/www/chromium/files/patch-media_filters_decrypting__audio__decoder.cc b/www/chromium/files/patch-media_filters_decrypting__audio__decoder.cc deleted file mode 100644 index 8db3560b49e8..000000000000 --- a/www/chromium/files/patch-media_filters_decrypting__audio__decoder.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- media/filters/decrypting_audio_decoder.cc.orig 2016-05-11 19:02:24 UTC -+++ media/filters/decrypting_audio_decoder.cc -@@ -29,7 +29,7 @@ static inline bool IsOutOfSync(const bas - // Out of sync of 100ms would be pretty noticeable and we should keep any - // drift below that. - const int64_t kOutOfSyncThresholdInMilliseconds = 100; -- return std::abs(timestamp_1.InMilliseconds() - timestamp_2.InMilliseconds()) > -+ return std::labs(timestamp_1.InMilliseconds() - timestamp_2.InMilliseconds()) > - kOutOfSyncThresholdInMilliseconds; - } - diff --git a/www/chromium/files/patch-media_media.gyp b/www/chromium/files/patch-media_media.gyp deleted file mode 100644 index 9650e2b4f95c..000000000000 --- a/www/chromium/files/patch-media_media.gyp +++ /dev/null @@ -1,26 +0,0 @@ ---- media/media.gyp.orig 2016-05-11 19:02:24 UTC -+++ media/media.gyp -@@ -745,7 +745,13 @@ - ['exclude', '_alsa\\.(h|cc)$'], - ], - }], -- ['OS=="linux"', { -+ ['OS=="freebsd"', { -+ 'sources!': [ -+ 'capture/video/linux/v4l2_capture_delegate.cc', -+ 'capture/video/linux/video_capture_device_factory_linux.cc', -+ ], -+ }], -+ ['OS=="linux" or os_bsd==1', { - 'conditions': [ - ['use_x11==1', { - 'dependencies': [ -@@ -1095,7 +1101,7 @@ - 'base/simd/filter_yuv_sse2.cc', - ], - }], -- ['OS!="linux" and OS!="win"', { -+ ['OS!="linux" and OS!="win" and os_bsd!=1', { - 'sources!': [ - 'base/keyboard_event_counter.cc', - 'base/keyboard_event_counter.h', diff --git a/www/chromium/files/patch-mojo_BUILD.gn b/www/chromium/files/patch-mojo_BUILD.gn new file mode 100644 index 000000000000..e107c0b031cc --- /dev/null +++ b/www/chromium/files/patch-mojo_BUILD.gn @@ -0,0 +1,11 @@ +--- mojo/BUILD.gn.orig 2016-10-06 04:02:21.000000000 +0300 ++++ mojo/BUILD.gn 2016-10-13 07:50:28.562419000 +0300 +@@ -12,7 +12,7 @@ + "//mojo/common", + ] + +- if (!(is_linux && current_cpu == "x86")) { ++ if (!((is_linux || is_bsd) && current_cpu == "x86")) { + # TODO(GYP): Figure out if this needs to be supported. Right now + # it won't work on x86 official builds because it needs stuff in the + # sysroot that doesn't exist. diff --git a/www/chromium/files/patch-mojo_edk_test_BUILD.gn b/www/chromium/files/patch-mojo_edk_test_BUILD.gn new file mode 100644 index 000000000000..04d924099fc3 --- /dev/null +++ b/www/chromium/files/patch-mojo_edk_test_BUILD.gn @@ -0,0 +1,20 @@ +--- mojo/edk/test/BUILD.gn.orig 2016-08-03 22:02:20.000000000 +0300 ++++ mojo/edk/test/BUILD.gn 2016-09-02 23:44:49.826221000 +0300 +@@ -43,7 +43,7 @@ + "//testing/gtest", + ] + +- if (is_linux && !is_component_build) { ++ if ((is_linux || is_bsd) && !is_component_build) { + public_configs = [ "//build/config/gcc:rpath_for_built_shared_libraries" ] + } + } +@@ -63,7 +63,7 @@ + "run_all_perftests.cc", + ] + +- if (is_linux && !is_component_build) { ++ if ((is_linux || is_bsd) && !is_component_build) { + public_configs = [ "//build/config/gcc:rpath_for_built_shared_libraries" ] + } + } diff --git a/www/chromium/files/patch-native__client__sdk_src_BUILD.gn b/www/chromium/files/patch-native__client__sdk_src_BUILD.gn new file mode 100644 index 000000000000..1fd657b08cce --- /dev/null +++ b/www/chromium/files/patch-native__client__sdk_src_BUILD.gn @@ -0,0 +1,20 @@ +--- native_client_sdk/src/BUILD.gn.orig 2016-08-03 22:02:20.000000000 +0300 ++++ native_client_sdk/src/BUILD.gn 2016-09-02 23:46:03.429042000 +0300 +@@ -7,7 +7,7 @@ + declare_args() { + # Set to true if cross compiling trusted (e.g. building sel_ldr_arm on x86) + # binaries is supported. +- enable_cross_trusted = is_linux ++ enable_cross_trusted = is_linux || is_bsd + + # Build the nacl SDK untrusted components. This is disabled by default since + # not all NaCl untrusted compilers are in goma (e.g arm-nacl-glibc) +@@ -28,7 +28,7 @@ + "//native_client/src/trusted/service_runtime:sel_ldr", + "//native_client/src/trusted/validator/driver:ncval_new", + ] +- if (is_linux) { ++ if (is_linux || is_bsd) { + deps += [ "//native_client/src/nonsfi/loader:nonsfi_loader" ] + } + } diff --git a/www/chromium/files/patch-native__client_build_common.gypi b/www/chromium/files/patch-native__client_build_common.gypi deleted file mode 100644 index d50a9951bf64..000000000000 --- a/www/chromium/files/patch-native__client_build_common.gypi +++ /dev/null @@ -1,11 +0,0 @@ ---- native_client/build/common.gypi.orig 2016-05-11 19:03:08 UTC -+++ native_client/build/common.gypi -@@ -58,7 +58,7 @@ - ], - }, - 'conditions': [ -- ['OS=="linux" or OS=="android"', { -+ ['OS=="linux" or OS=="android" or OS=="freebsd"', { - 'target_defaults': { - 'defines': [ - '_POSIX_C_SOURCE=199506', diff --git a/www/chromium/files/patch-native__client_src_shared_platform_platform.gyp b/www/chromium/files/patch-native__client_src_shared_platform_platform.gyp deleted file mode 100644 index a2ada9987b9d..000000000000 --- a/www/chromium/files/patch-native__client_src_shared_platform_platform.gyp +++ /dev/null @@ -1,11 +0,0 @@ ---- native_client/src/shared/platform/platform.gyp.orig 2016-05-11 19:03:08 UTC -+++ native_client/src/shared/platform/platform.gyp -@@ -36,7 +36,7 @@ - 'refcount_base.cc', - ], - 'conditions': [ -- ['OS=="linux" or OS=="android"', { -+ ['OS=="linux" or OS=="android" or OS=="freebsd"', { - 'platform_sources': [ - 'linux/nacl_clock.c', - 'linux/nacl_host_dir.c', diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn new file mode 100644 index 000000000000..df612dae3ecd --- /dev/null +++ b/www/chromium/files/patch-net_BUILD.gn @@ -0,0 +1,86 @@ +--- net/BUILD.gn.orig 2016-10-06 04:02:22.000000000 +0300 ++++ net/BUILD.gn 2016-10-18 00:25:21.260605000 +0300 +@@ -175,6 +175,11 @@ + ] + if (is_android) { + sources -= [ "base/openssl_private_key_store_android.cc" ] ++ } else if (is_bsd) { ++ sources -= [ ++ "base/address_tracker_linux.cc", ++ "base/address_tracker_linux.h", ++ ] + } + } else { + if (is_android) { +@@ -298,6 +303,13 @@ + sources -= [ "disk_cache/blockfile/file_posix.cc" ] + } + ++ if (is_bsd) { ++ sources -= [ ++ "base/network_change_notifier_linux.cc", ++ "base/network_change_notifier_linux.h", ++ ] ++ } ++ + if (is_ios || is_mac) { + sources += gypi_values.net_base_mac_ios_sources + } +@@ -1025,7 +1037,7 @@ + } + } + +-if (is_linux || is_mac) { ++if (is_linux || is_bsd || is_mac) { + executable("cachetool") { + testonly = true + sources = [ +@@ -1054,7 +1066,7 @@ + } + } + +-if (is_linux) { ++if (is_linux || is_bsd) { + static_library("epoll_server") { + sources = [ + "tools/epoll_server/epoll_server.cc", +@@ -1160,7 +1172,7 @@ + } + } + +-if (is_android || is_linux) { ++if (is_android || is_linux || is_bsd) { + executable("disk_cache_memory_test") { + testonly = true + sources = [ +@@ -1353,7 +1365,7 @@ + "third_party/nist-pkits/", + ] + +- if (is_linux || is_mac || is_win) { ++ if (is_linux || is_bsd || is_mac || is_win) { + deps += [ + "//third_party/pyftpdlib/", + "//third_party/pywebsocket/", +@@ -1376,7 +1388,7 @@ + if (is_desktop_linux) { + deps += [ ":epoll_quic_tools" ] + } +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += gypi_values.net_linux_test_sources + deps += [ + ":epoll_quic_tools", +@@ -1392,6 +1404,12 @@ + sources -= [ "proxy/proxy_config_service_linux_unittest.cc" ] + } + ++ if (is_bsd) { ++ sources -= [ ++ "base/address_tracker_linux_unittest.cc", ++ ] ++ } ++ + if (v8_use_external_startup_data) { + deps += [ "//gin" ] + } diff --git a/www/chromium/files/patch-net_base_address__tracker__linux.cc b/www/chromium/files/patch-net_base_address__tracker__linux.cc deleted file mode 100644 index e870a3a9a963..000000000000 --- a/www/chromium/files/patch-net_base_address__tracker__linux.cc +++ /dev/null @@ -1,94 +0,0 @@ ---- net/base/address_tracker_linux.cc.orig 2016-05-25 15:01:03.000000000 -0400 -+++ net/base/address_tracker_linux.cc 2016-05-27 11:16:09.919235000 -0400 -@@ -5,7 +5,9 @@ - #include "net/base/address_tracker_linux.h" - - #include <errno.h> -+#if !defined(OS_FREEBSD) - #include <linux/if.h> -+#endif - #include <stdint.h> - #include <sys/ioctl.h> - -@@ -39,6 +41,7 @@ - bool GetAddress(const struct nlmsghdr* header, - IPAddress* out, - bool* really_deprecated) { -+#if !defined(OS_FREEBSD) - if (really_deprecated) - *really_deprecated = false; - const struct ifaddrmsg* msg = -@@ -91,6 +94,9 @@ - return false; - *out = IPAddress(address, address_length); - return true; -+#else -+ return false; -+#endif - } - - } // namespace -@@ -148,6 +154,7 @@ - } - - void AddressTrackerLinux::Init() { -+#if !defined(OS_FREEBSD) - netlink_fd_ = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); - if (netlink_fd_ < 0) { - PLOG(ERROR) << "Could not create NETLINK socket"; -@@ -235,6 +242,10 @@ - return; - } - } -+#else -+ AbortAndForceOnline(); -+ return; -+#endif - } - - void AddressTrackerLinux::AbortAndForceOnline() { -@@ -281,6 +292,7 @@ - void AddressTrackerLinux::ReadMessages(bool* address_changed, - bool* link_changed, - bool* tunnel_changed) { -+#if !defined(OS_FREEBSD) - *address_changed = false; - *link_changed = false; - *tunnel_changed = false; -@@ -307,6 +319,7 @@ - } - if (*link_changed || *address_changed) - UpdateCurrentConnectionType(); -+#endif - } - - void AddressTrackerLinux::HandleMessage(char* buffer, -@@ -314,6 +327,7 @@ - bool* address_changed, - bool* link_changed, - bool* tunnel_changed) { -+#if !defined(OS_FREEBSD) - DCHECK(buffer); - for (struct nlmsghdr* header = reinterpret_cast<struct nlmsghdr*>(buffer); - NLMSG_OK(header, length); -@@ -410,6 +424,7 @@ - break; - } - } -+#endif - } - - void AddressTrackerLinux::OnFileCanReadWithoutBlocking(int fd) { -@@ -436,8 +451,12 @@ - - bool AddressTrackerLinux::IsTunnelInterface(int interface_index) const { - // Linux kernel drivers/net/tun.c uses "tun" name prefix. -+#if !defined(OS_FREEBSD) - char buf[IFNAMSIZ] = {0}; - return strncmp(get_interface_name_(interface_index, buf), "tun", 3) == 0; -+#else -+ return false; -+#endif - } - - void AddressTrackerLinux::UpdateCurrentConnectionType() { diff --git a/www/chromium/files/patch-net_base_address__tracker__linux.h b/www/chromium/files/patch-net_base_address__tracker__linux.h index f7549a49be2a..feef6a125605 100644 --- a/www/chromium/files/patch-net_base_address__tracker__linux.h +++ b/www/chromium/files/patch-net_base_address__tracker__linux.h @@ -1,5 +1,5 @@ ---- net/base/address_tracker_linux.h.orig 2016-07-22 00:06:56.000000000 -0400 -+++ net/base/address_tracker_linux.h 2016-08-04 16:22:00.122898000 -0400 +--- net/base/address_tracker_linux.h.orig 2016-05-25 15:01:03.000000000 -0400 ++++ net/base/address_tracker_linux.h 2016-05-27 11:17:51.228810000 -0400 @@ -6,10 +6,12 @@ #define NET_BASE_ADDRESS_TRACKER_LINUX_H_ diff --git a/www/chromium/files/patch-net_base_network__change__notifier.cc b/www/chromium/files/patch-net_base_network__change__notifier.cc index ad22ff4abbde..c6c013b68d7f 100644 --- a/www/chromium/files/patch-net_base_network__change__notifier.cc +++ b/www/chromium/files/patch-net_base_network__change__notifier.cc @@ -1,6 +1,6 @@ ---- net/base/network_change_notifier.cc.orig 2016-05-11 19:02:24 UTC -+++ net/base/network_change_notifier.cc -@@ -532,7 +532,6 @@ NetworkChangeNotifier* NetworkChangeNoti +--- net/base/network_change_notifier.cc.orig 2016-10-06 04:02:22.000000000 +0300 ++++ net/base/network_change_notifier.cc 2016-10-14 20:28:12.376281000 +0300 +@@ -533,7 +533,6 @@ #elif defined(OS_MACOSX) return new NetworkChangeNotifierMac(); #else @@ -8,3 +8,21 @@ return NULL; #endif } +@@ -753,7 +752,7 @@ + #endif + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // static + const internal::AddressTrackerLinux* + NetworkChangeNotifier::GetAddressTracker() { +@@ -978,7 +977,7 @@ + network_change_calculator_->Init(); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + const internal::AddressTrackerLinux* + NetworkChangeNotifier::GetAddressTrackerInternal() const { + return NULL; diff --git a/www/chromium/files/patch-net_base_network__change__notifier.h b/www/chromium/files/patch-net_base_network__change__notifier.h new file mode 100644 index 000000000000..a647fbfac5fd --- /dev/null +++ b/www/chromium/files/patch-net_base_network__change__notifier.h @@ -0,0 +1,29 @@ +--- net/base/network_change_notifier.h.orig 2016-08-03 22:02:21.000000000 +0300 ++++ net/base/network_change_notifier.h 2016-09-26 03:54:03.417293000 +0300 +@@ -26,7 +26,7 @@ + typedef std::vector<NetworkInterface> NetworkInterfaceList; + class URLRequest; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + namespace internal { + class AddressTrackerLinux; + } +@@ -329,7 +329,7 @@ + // a large HOSTS file. + static void GetDnsConfig(DnsConfig* config); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Returns the AddressTrackerLinux if present. + static const internal::AddressTrackerLinux* GetAddressTracker(); + #endif +@@ -485,7 +485,7 @@ + const NetworkChangeCalculatorParams& params = + NetworkChangeCalculatorParams()); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Returns the AddressTrackerLinux if present. + // TODO(szym): Retrieve AddressMap from NetworkState. http://crbug.com/144212 + virtual const internal::AddressTrackerLinux* diff --git a/www/chromium/files/patch-net_dns_dns__session.cc b/www/chromium/files/patch-net_dns_dns__session.cc deleted file mode 100644 index e504bd5cb7f5..000000000000 --- a/www/chromium/files/patch-net_dns_dns__session.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- net/dns/dns_session.cc.orig 2016-05-11 19:02:24 UTC -+++ net/dns/dns_session.cc -@@ -190,7 +190,7 @@ void DnsSession::RecordRTT(unsigned serv - base::TimeDelta current_error = rtt - estimate; - estimate += current_error / 8; // * alpha - base::TimeDelta abs_error = base::TimeDelta::FromInternalValue( -- std::abs(current_error.ToInternalValue())); -+ std::labs(current_error.ToInternalValue())); - deviation += (abs_error - deviation) / 4; // * delta - - // Histogram-based method. diff --git a/www/chromium/files/patch-net_net.gyp b/www/chromium/files/patch-net_net.gyp deleted file mode 100644 index 56c16bb2e355..000000000000 --- a/www/chromium/files/patch-net_net.gyp +++ /dev/null @@ -1,23 +0,0 @@ ---- net/net.gyp.orig 2016-05-11 19:02:24 UTC -+++ net/net.gyp -@@ -163,7 +163,7 @@ - '<@(net_test_sources)', - ], - 'conditions': [ -- ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { -+ ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and os_bsd != 1', { - 'dependencies': [ - 'epoll_quic_tools', - 'epoll_server', -@@ -678,6 +678,11 @@ - 'url_request/test_url_request_interceptor.h', - ], - }], -+ [ 'os_bsd == 1', { -+ 'sources!': [ -+ 'base/address_tracker_linux_unittest.cc', -+ ], -+ }], - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], diff --git a/www/chromium/files/patch-net_net.gypi b/www/chromium/files/patch-net_net.gypi deleted file mode 100644 index 4a6fbca50305..000000000000 --- a/www/chromium/files/patch-net_net.gypi +++ /dev/null @@ -1,22 +0,0 @@ ---- net/net.gypi.orig 2016-05-11 19:02:24 UTC -+++ net/net.gypi -@@ -439,8 +439,8 @@ - 'android/network_library.h', - 'android/traffic_stats.cc', - 'android/traffic_stats.h', -- 'base/address_tracker_linux.cc', -- 'base/address_tracker_linux.h', -+# 'base/address_tracker_linux.cc', -+# 'base/address_tracker_linux.h', - 'base/backoff_entry.cc', - 'base/backoff_entry.h', - 'base/backoff_entry_serializer.cc', -@@ -1310,7 +1310,7 @@ - 'android/traffic_stats_unittest.cc', - 'base/address_family_unittest.cc', - 'base/address_list_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', diff --git a/www/chromium/files/patch-net_net__common.gypi b/www/chromium/files/patch-net_net__common.gypi deleted file mode 100644 index a82d04961410..000000000000 --- a/www/chromium/files/patch-net_net__common.gypi +++ /dev/null @@ -1,14 +0,0 @@ ---- net/net_common.gypi.orig 2016-05-11 19:02:24 UTC -+++ net/net_common.gypi -@@ -242,9 +242,10 @@ - 'conditions': [ - ['os_bsd==1', { - 'sources!': [ -+ 'base/address_tracker_linux.cc', - 'base/network_change_notifier_linux.cc', - 'base/network_change_notifier_netlink_linux.cc', -- 'proxy/proxy_config_service_linux.cc', -+# 'proxy/proxy_config_service_linux.cc', - ], - },{ - 'dependencies': [ diff --git a/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc b/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc index cf82ff8b3b38..22dcd0459b90 100644 --- a/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc +++ b/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc @@ -1,5 +1,5 @@ ---- net/proxy/proxy_config_service_linux.cc.orig 2016-05-11 19:02:24 UTC -+++ net/proxy/proxy_config_service_linux.cc +--- net/proxy/proxy_config_service_linux.cc.orig 2016-10-06 04:02:23.000000000 +0300 ++++ net/proxy/proxy_config_service_linux.cc 2016-10-13 08:05:04.653281000 +0300 @@ -11,7 +11,14 @@ #include <limits.h> #include <stdio.h> @@ -15,37 +15,37 @@ #include <unistd.h> #include <map> -@@ -859,6 +866,7 @@ class SettingGetterImplKDE : public Prox +@@ -863,6 +870,7 @@ public: explicit SettingGetterImplKDE(base::Environment* env_var_getter) : inotify_fd_(-1), + config_fd_(-1), - notify_delegate_(NULL), + notify_delegate_(nullptr), debounce_timer_(new base::OneShotTimer()), indirect_manual_(false), -@@ -933,9 +941,10 @@ class SettingGetterImplKDE : public Prox +@@ -937,9 +945,10 @@ // and pending tasks may then be deleted without being run. // Here in the KDE version, we can safely close the file descriptor // anyway. (Not that it really matters; the process is exiting.) - if (inotify_fd_ >= 0) + if (inotify_fd_ >= 0 || config_fd_ >= 0) ShutDown(); - DCHECK(inotify_fd_ < 0); -+ DCHECK(config_fd_ < 0); + DCHECK_LT(inotify_fd_, 0); ++ DCHECK_LT(config_fd_, 0); } bool Init(const scoped_refptr<base::SingleThreadTaskRunner>& glib_task_runner, -@@ -944,9 +953,17 @@ class SettingGetterImplKDE : public Prox +@@ -948,9 +957,17 @@ // This has to be called on the UI thread (http://crbug.com/69057). base::ThreadRestrictions::ScopedAllowIO allow_io; - DCHECK(inotify_fd_ < 0); -+#if defined(OS_FREEBSD) + DCHECK_LT(inotify_fd_, 0); ++#if defined(OS_BSD) + inotify_fd_ = kqueue(); +#else inotify_fd_ = inotify_init(); +#endif if (inotify_fd_ < 0) { -+#if defined(OS_FREEBSD) ++#if defined(OS_BSD) + PLOG(ERROR) << "kqueue failed"; +#else PLOG(ERROR) << "inotify_init failed"; @@ -53,7 +53,7 @@ return false; } if (!base::SetNonBlocking(inotify_fd_)) { -@@ -970,22 +987,40 @@ class SettingGetterImplKDE : public Prox +@@ -974,22 +991,40 @@ close(inotify_fd_); inotify_fd_ = -1; } @@ -66,15 +66,15 @@ bool SetUpNotifications( ProxyConfigServiceLinux::Delegate* delegate) override { - DCHECK(inotify_fd_ >= 0); -+ DCHECK(config_fd_ >= 0); + DCHECK_GE(inotify_fd_, 0); ++ DCHECK_GE(config_fd_, 0); DCHECK(file_task_runner_->BelongsToCurrentThread()); // We can't just watch the kioslaverc file directly, since KDE will write // a new copy of it and then rename it whenever settings are changed and // inotify watches inodes (so we'll be watching the old deleted file after // the first change, and it will never change again). So, we watch the // directory instead. We then act only on changes to the kioslaverc entry. -+#if defined(OS_FREEBSD) ++#if defined(OS_BSD) + config_fd_ = HANDLE_EINTR(open(kde_config_dir_.value().c_str(), O_RDONLY)); + + if (config_fd_ == -1) @@ -94,11 +94,11 @@ notify_delegate_ = delegate; if (!base::MessageLoopForIO::current()->WatchFileDescriptor( inotify_fd_, true, base::MessageLoopForIO::WATCH_READ, -@@ -1006,7 +1041,19 @@ class SettingGetterImplKDE : public Prox +@@ -1010,7 +1045,19 @@ void OnFileCanReadWithoutBlocking(int fd) override { DCHECK_EQ(fd, inotify_fd_); DCHECK(file_task_runner_->BelongsToCurrentThread()); -+#if defined(OS_FREEBSD) ++#if defined(OS_BSD) + struct kevent ev; + int rv = kevent(inotify_fd_, NULL, 0, &ev, 1, NULL); + @@ -114,20 +114,20 @@ } void OnFileCanWriteWithoutBlocking(int fd) override { NOTREACHED(); } -@@ -1279,8 +1326,11 @@ class SettingGetterImplKDE : public Prox +@@ -1283,8 +1330,11 @@ void OnChangeNotification() { DCHECK_GE(inotify_fd_, 0); DCHECK(file_task_runner_->BelongsToCurrentThread()); - char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4]; bool kioslaverc_touched = false; -+#if defined(OS_FREEBSD) ++#if defined(OS_BSD) + kioslaverc_touched = true; +#else + char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4]; ssize_t r; while ((r = read(inotify_fd_, event_buf, sizeof(event_buf))) > 0) { // inotify returns variable-length structures, which is why we have -@@ -1317,6 +1367,7 @@ class SettingGetterImplKDE : public Prox +@@ -1321,6 +1371,7 @@ inotify_fd_ = -1; } } @@ -135,11 +135,11 @@ if (kioslaverc_touched) { // We don't use Reset() because the timer may not yet be running. // (In that case Stop() is a no-op.) -@@ -1332,6 +1383,7 @@ class SettingGetterImplKDE : public Prox +@@ -1336,6 +1387,7 @@ std::vector<std::string> > strings_map_type; int inotify_fd_; + int config_fd_; base::MessagePumpLibevent::FileDescriptorWatcher inotify_watcher_; ProxyConfigServiceLinux::Delegate* notify_delegate_; - scoped_ptr<base::OneShotTimer> debounce_timer_; + std::unique_ptr<base::OneShotTimer> debounce_timer_; diff --git a/www/chromium/files/patch-net_proxy_proxy__service.cc b/www/chromium/files/patch-net_proxy_proxy__service.cc index a62b22850592..46fc16d702e0 100644 --- a/www/chromium/files/patch-net_proxy_proxy__service.cc +++ b/www/chromium/files/patch-net_proxy_proxy__service.cc @@ -1,5 +1,5 @@ ---- net/proxy/proxy_service.cc.orig 2016-07-22 00:06:56.000000000 -0400 -+++ net/proxy/proxy_service.cc 2016-08-03 15:29:21.017256000 -0400 +--- net/proxy/proxy_service.cc.orig 2016-07-20 22:03:27.000000000 +0300 ++++ net/proxy/proxy_service.cc 2016-08-01 04:25:47.866569000 +0300 @@ -48,7 +48,7 @@ #elif defined(OS_MACOSX) #include "net/proxy/proxy_config_service_mac.h" @@ -14,7 +14,7 @@ << "be used only for examples."; return base::WrapUnique(new UnsetProxyConfigService); -#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_FREEBSD) ++#elif defined(OS_LINUX) || defined(OS_BSD) std::unique_ptr<ProxyConfigServiceLinux> linux_config_service( new ProxyConfigServiceLinux()); - + diff --git a/www/chromium/files/patch-net_quic_congestion__control_rtt__stats.cc b/www/chromium/files/patch-net_quic_congestion__control_rtt__stats.cc deleted file mode 100644 index 41aa42027f0d..000000000000 --- a/www/chromium/files/patch-net_quic_congestion__control_rtt__stats.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- net/quic/congestion_control/rtt_stats.cc.orig 2016-05-11 19:02:24 UTC -+++ net/quic/congestion_control/rtt_stats.cc -@@ -4,7 +4,7 @@ - - #include "net/quic/congestion_control/rtt_stats.h" - --#include <cstdlib> // std::abs -+#include <cstdlib> // std::labs - - using std::max; - -@@ -41,7 +41,7 @@ void RttStats::ExpireSmoothedMetrics() { - mean_deviation_ = - max(mean_deviation_, - QuicTime::Delta::FromMicroseconds( -- std::abs(smoothed_rtt_.Subtract(latest_rtt_).ToMicroseconds()))); -+ std::labs(smoothed_rtt_.Subtract(latest_rtt_).ToMicroseconds()))); - smoothed_rtt_ = max(smoothed_rtt_, latest_rtt_); - } - -@@ -81,7 +81,7 @@ void RttStats::UpdateRtt(QuicTime::Delta - } else { - mean_deviation_ = QuicTime::Delta::FromMicroseconds(static_cast<int64_t>( - kOneMinusBeta * mean_deviation_.ToMicroseconds() + -- kBeta * std::abs(smoothed_rtt_.Subtract(rtt_sample).ToMicroseconds()))); -+ kBeta * std::labs(smoothed_rtt_.Subtract(rtt_sample).ToMicroseconds()))); - smoothed_rtt_ = - smoothed_rtt_.Multiply(kOneMinusAlpha).Add(rtt_sample.Multiply(kAlpha)); - DVLOG(1) << " smoothed_rtt(us):" << smoothed_rtt_.ToMicroseconds() diff --git a/www/chromium/files/patch-ppapi_tests_extensions_BUILD.gn b/www/chromium/files/patch-ppapi_tests_extensions_BUILD.gn new file mode 100644 index 000000000000..5fd3a8d4ecfa --- /dev/null +++ b/www/chromium/files/patch-ppapi_tests_extensions_BUILD.gn @@ -0,0 +1,11 @@ +--- ppapi/tests/extensions/BUILD.gn.orig 2016-10-06 04:02:23.000000000 +0300 ++++ ppapi/tests/extensions/BUILD.gn 2016-10-13 08:10:32.687869000 +0300 +@@ -20,7 +20,7 @@ + ":ppapi_tests_extensions_popup($newlib)", + ":ppapi_tests_extensions_socket_permissions($newlib)", + ] +- if ((target_cpu == "x86" || target_cpu == "x64") && is_linux && ++ if ((target_cpu == "x86" || target_cpu == "x64") && (is_linux || is_bsd) && + enable_nacl_nonsfi) { + nonsfi = "//build/toolchain/nacl:newlib_pnacl_nonsfi" + data_deps += [ ":ppapi_tests_extensions_packaged_app($nonsfi)" ] diff --git a/www/chromium/files/patch-printing_BUILD.gn b/www/chromium/files/patch-printing_BUILD.gn new file mode 100644 index 000000000000..f99aabe202bb --- /dev/null +++ b/www/chromium/files/patch-printing_BUILD.gn @@ -0,0 +1,20 @@ +--- printing/BUILD.gn.orig 2016-10-06 04:02:23.000000000 +0300 ++++ printing/BUILD.gn 2016-10-13 08:13:38.178051000 +0300 +@@ -125,7 +125,7 @@ + if (use_cups) { + configs += [ ":cups" ] + +- if (is_linux) { ++ if (is_linux || is_bsd) { + # rebase_path does not accept an empty string + if (use_sysroot) { + cups_sysroot = rebase_path(sysroot) +@@ -202,7 +202,7 @@ + "printing_context_no_system_dialog.cc", + "printing_context_no_system_dialog.h", + ] +- } else if (is_linux) { # Non-ChromeOS Linux. ++ } else if (is_linux || is_bsd) { # Non-ChromeOS Linux/BSD. + sources += [ + "printed_document_linux.cc", + "printing_context_linux.cc", diff --git a/www/chromium/files/patch-printing_backend_print__backend__cups.cc b/www/chromium/files/patch-printing_backend_print__backend__cups.cc deleted file mode 100644 index 87c91034e00d..000000000000 --- a/www/chromium/files/patch-printing_backend_print__backend__cups.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- printing/backend/print_backend_cups.cc.orig 2016-08-03 19:02:22 UTC -+++ printing/backend/print_backend_cups.cc -@@ -4,6 +4,7 @@ - - #include "printing/backend/print_backend.h" - -+#include <cups/ppd.h> - #include <dlfcn.h> - #include <errno.h> - #include <pthread.h> diff --git a/www/chromium/files/patch-printing_cups__config__helper.py b/www/chromium/files/patch-printing_cups__config__helper.py new file mode 100644 index 000000000000..8f6a58894b56 --- /dev/null +++ b/www/chromium/files/patch-printing_cups__config__helper.py @@ -0,0 +1,11 @@ +--- printing/cups_config_helper.py.orig 2016-08-03 22:02:22.000000000 +0300 ++++ printing/cups_config_helper.py 2016-09-02 22:48:48.706284000 +0300 +@@ -65,7 +65,7 @@ + mode = sys.argv[1] + if len(sys.argv) > 2 and sys.argv[2]: + sysroot = sys.argv[2] +- cups_config = os.path.join(sysroot, 'usr', 'bin', 'cups-config') ++ cups_config = os.path.join(sysroot, 'bin', 'cups-config') + if not os.path.exists(cups_config): + print 'cups-config not found: %s' % cups_config + return 1 diff --git a/www/chromium/files/patch-printing_printing.gyp b/www/chromium/files/patch-printing_printing.gyp deleted file mode 100644 index fbc288bf9ac6..000000000000 --- a/www/chromium/files/patch-printing_printing.gyp +++ /dev/null @@ -1,11 +0,0 @@ ---- printing/printing.gyp.orig 2016-04-08 16:02:10 UTC -+++ printing/printing.gyp -@@ -187,7 +187,7 @@ - 'backend/print_backend_chromeos.cc', - ], - }], -- ['OS=="linux" and chromeos==0', { -+ ['(OS=="linux" or os_bsd == 1) and chromeos==0', { - 'sources': [ - 'printing_context_linux.cc', - 'printing_context_linux.h', diff --git a/www/chromium/files/patch-remoting_host_BUILD.gn b/www/chromium/files/patch-remoting_host_BUILD.gn new file mode 100644 index 000000000000..98bcc5396506 --- /dev/null +++ b/www/chromium/files/patch-remoting_host_BUILD.gn @@ -0,0 +1,47 @@ +--- remoting/host/BUILD.gn.orig 2016-10-06 04:02:23.000000000 +0300 ++++ remoting/host/BUILD.gn 2016-10-13 08:18:22.564549000 +0300 +@@ -420,7 +420,7 @@ + deps += [ "//components/policy:generated" ] + } + +- if (is_linux && !is_chromeos) { ++ if ((is_linux || is_bsd) && !is_chromeos) { + libs += [ "pam" ] + } + +@@ -439,7 +439,7 @@ + "input_injector_x11.cc", + "local_input_monitor_x11.cc", + ] +- if (is_linux) { ++ if (is_linux || is_bsd) { + # These will already be filtered out on non-Linux. + sources -= [ + "linux/unicode_to_keysym.cc", +@@ -648,7 +648,7 @@ + "win/worker_process_launcher_unittest.cc", + ] + +- if (!use_x11 && is_linux) { ++ if (!use_x11 && (is_linux || is_bsd)) { + sources -= [ "linux/unicode_to_keysym_unittest.cc" ] + } + if (use_ozone || is_chromeos) { +@@ -1217,7 +1217,7 @@ + if (is_desktop_linux) { + deps += [ "//build/config/linux/gtk2" ] + } +- if ((is_linux && !is_chromeos) || is_mac) { ++ if ((is_linux && !is_chromeos) || is_mac || is_bsd) { + libs = [ "pam" ] + } + +@@ -1359,7 +1359,7 @@ + } + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + copy("remoting_me2me_host_copy_script") { + sources = [ + "linux/linux_me2me_host.py", diff --git a/www/chromium/files/patch-remoting_remoting__host.gypi b/www/chromium/files/patch-remoting_remoting__host.gypi deleted file mode 100644 index 3e69de760f13..000000000000 --- a/www/chromium/files/patch-remoting_remoting__host.gypi +++ /dev/null @@ -1,29 +0,0 @@ ---- remoting/remoting_host.gypi.orig 2016-05-11 19:02:25 UTC -+++ remoting/remoting_host.gypi -@@ -18,7 +18,7 @@ - 'remoting_host_win.gypi', - ], - }], -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { - 'includes': [ - 'remoting_host_linux.gypi', - ], -@@ -57,7 +57,7 @@ - '<@(remoting_host_sources)', - ], - 'conditions': [ -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { - 'conditions': [ - ['use_x11==1', { - 'dependencies': [ -@@ -652,7 +652,7 @@ - 'host/it2me/it2me_native_messaging_host_main.h', - ], - 'conditions': [ -- ['OS=="linux" and chromeos==0 and use_ozone==0', { -+ ['(OS=="linux" or os_bsd==1) and chromeos==0 and use_ozone==0', { - 'dependencies': [ - # Always use GTK on Linux, even for Aura builds. - '../build/linux/system.gyp:gtk2', diff --git a/www/chromium/files/patch-sdch_BUILD.gn b/www/chromium/files/patch-sdch_BUILD.gn new file mode 100644 index 000000000000..5e3c54857742 --- /dev/null +++ b/www/chromium/files/patch-sdch_BUILD.gn @@ -0,0 +1,20 @@ +--- sdch/BUILD.gn.orig 2016-08-03 22:02:22.000000000 +0300 ++++ sdch/BUILD.gn 2016-09-13 17:24:52.015350000 +0300 +@@ -11,7 +11,7 @@ + # from a config and can't be on the target directly. + config("sdch_warnings") { + cflags = [] +- if (is_linux) { ++ if (is_linux || is_bsd) { + # TODO(mostynb): remove this if open-vcdiff is ever updated for c++11: + cflags += [ "-Wno-deprecated-declarations" ] + } +@@ -61,7 +61,7 @@ + "//third_party/zlib", + ] + +- if (is_linux || is_android) { ++ if (is_linux || is_bsd || is_android) { + include_dirs = [ "linux" ] + } else if (is_ios) { + include_dirs = [ "ios" ] diff --git a/www/chromium/files/patch-services_shell_public_cpp_lib_initialize__base__and__icu.cc b/www/chromium/files/patch-services_shell_public_cpp_lib_initialize__base__and__icu.cc deleted file mode 100644 index e331fafc1152..000000000000 --- a/www/chromium/files/patch-services_shell_public_cpp_lib_initialize__base__and__icu.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- services/shell/public/cpp/lib/initialize_base_and_icu.cc.orig 2016-08-05 14:07:55.178818000 -0400 -+++ services/shell/public/cpp/lib/initialize_base_and_icu.cc 2016-08-05 14:08:22.862094000 -0400 -@@ -35,6 +35,7 @@ - base::SysInfo::MaxSharedMemorySize(); - #endif - -+#if !defined(__FreeBSD__) - #if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE - // Initialize core ICU. We must perform the full initialization before we - // initialize icu::TimeZone subsystem because otherwise ICU gets in a state -@@ -42,6 +43,7 @@ - // cause crashes. - CHECK(base::i18n::InitializeICUFromRawMemory(icu_data)); - #endif // ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE -+#endif - - #if !defined(OS_ANDROID) - // ICU DateFormat class (used in base/time_format.cc) needs to get the diff --git a/www/chromium/files/patch-services_shell_runner_init.cc b/www/chromium/files/patch-services_shell_runner_init.cc deleted file mode 100644 index 41879efdde77..000000000000 --- a/www/chromium/files/patch-services_shell_runner_init.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- services/shell/runner/init.cc.orig 2016-08-05 14:09:25.990401000 -0400 -+++ services/shell/runner/init.cc 2016-08-05 14:09:42.644514000 -0400 -@@ -77,6 +77,7 @@ - void CallLibraryEarlyInitialization(base::NativeLibrary app_library) { - // Do whatever warming that the mojo application wants. - -+#if !defined(__FreeBSD__) - #if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE - typedef void (*LibraryEarlyInitFunction)(const uint8_t*); - LibraryEarlyInitFunction init_function = -@@ -90,6 +91,7 @@ - init_function(icu_data); - } - #endif // ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE -+#endif - - // TODO(erg): All chromium binaries load base. We might want to make a - // general system for other people. diff --git a/www/chromium/files/patch-services_shell_standalone_context.cc b/www/chromium/files/patch-services_shell_standalone_context.cc new file mode 100644 index 000000000000..671ae2b563fb --- /dev/null +++ b/www/chromium/files/patch-services_shell_standalone_context.cc @@ -0,0 +1,11 @@ +--- services/shell/standalone/context.cc.orig 2016-10-06 04:02:24.000000000 +0300 ++++ services/shell/standalone/context.cc 2016-10-23 13:44:14.656275000 +0300 +@@ -198,7 +198,7 @@ + tracing_remote_interfaces->GetInterface( + tracing::mojom::StartupPerformanceDataCollector::Name_, + mojo::GetProxy(&collector).PassMessagePipe()); +-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + // CurrentProcessInfo::CreationTime is only defined on some platforms. + const base::Time creation_time = base::CurrentProcessInfo::CreationTime(); + collector->SetShellProcessCreationTime(creation_time.ToInternalValue()); diff --git a/www/chromium/files/patch-services_ui_ws_BUILD.gn b/www/chromium/files/patch-services_ui_ws_BUILD.gn new file mode 100644 index 000000000000..5228cb89f9d7 --- /dev/null +++ b/www/chromium/files/patch-services_ui_ws_BUILD.gn @@ -0,0 +1,14 @@ +--- services/ui/ws/BUILD.gn.orig 2016-10-06 04:02:24.000000000 +0300 ++++ services/ui/ws/BUILD.gn 2016-10-19 11:13:25.102806000 +0300 +@@ -103,6 +103,11 @@ + "window_tree_host_factory.h", + ] + ++ # Work around base r261801 ++ if (is_bsd) { ++ defines = ["_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1"] ++ } ++ + deps = [ + # TODO(sad): Temporary, until the GPU process is split out of ws. + "//services/ui/gpu", diff --git a/www/chromium/files/patch-skia_BUILD.gn b/www/chromium/files/patch-skia_BUILD.gn new file mode 100644 index 000000000000..5f5fcda18d85 --- /dev/null +++ b/www/chromium/files/patch-skia_BUILD.gn @@ -0,0 +1,46 @@ +--- skia/BUILD.gn.orig 2016-08-03 22:02:22.000000000 +0300 ++++ skia/BUILD.gn 2016-10-09 06:26:37.625935000 +0300 +@@ -213,7 +213,7 @@ + } + + # Settings for text blitting, chosen to approximate the system browser. +- if (is_linux) { ++ if (is_linux || is_bsd) { + defines += [ + "SK_GAMMA_EXPONENT=1.2", + "SK_GAMMA_CONTRAST=0.2", +@@ -405,7 +405,7 @@ + sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ] + } + +- if (!is_linux) { ++ if (!is_linux && !is_bsd) { + sources -= [ + "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp", + "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp", +@@ -416,14 +416,14 @@ + + # Add the files for the SkFontMgr_Android. This is used to emulate android + # fonts on linux. See content/zygote/zygote_main_linux.cc +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ + "//third_party/skia/src/ports/SkFontMgr_android.cpp", + "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp", + ] + } + +- if (!is_linux && !is_android) { ++ if (!is_linux && !is_bsd && !is_android) { + sources -= [ + "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", + "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", +@@ -463,7 +463,7 @@ + "//third_party/zlib", + ] + +- if (is_linux) { ++ if (is_linux || is_bsd) { + if (use_pango) { + configs += [ "//build/config/linux/pangocairo" ] + } diff --git a/www/chromium/files/patch-skia_skia__chrome.gypi b/www/chromium/files/patch-skia_skia__chrome.gypi deleted file mode 100644 index 3718b0a25895..000000000000 --- a/www/chromium/files/patch-skia_skia__chrome.gypi +++ /dev/null @@ -1,14 +0,0 @@ ---- skia/skia_chrome.gypi.orig 2016-04-08 16:02:10 UTC -+++ skia/skia_chrome.gypi -@@ -61,6 +61,11 @@ - 'ext/platform_canvas.cc', - ], - }], -+ [ 'use_cairo == 1', { -+ 'dependencies': [ -+ '../build/linux/system.gyp:pangocairo', -+ ], -+ }], - [ 'OS == "android" and ' - 'enable_basic_printing==0 and enable_print_preview==0', { - 'sources!': [ diff --git a/www/chromium/files/patch-skia_skia__common.gypi b/www/chromium/files/patch-skia_skia__common.gypi deleted file mode 100644 index a5d29e9b768c..000000000000 --- a/www/chromium/files/patch-skia_skia__common.gypi +++ /dev/null @@ -1,11 +0,0 @@ ---- skia/skia_common.gypi.orig 2016-05-11 19:02:26 UTC -+++ skia/skia_common.gypi -@@ -65,7 +65,7 @@ - }], - - #Settings for text blitting, chosen to approximate the system browser. -- [ 'OS == "linux"', { -+ [ 'OS == "linux" or os_bsd == 1', { - 'defines': [ - 'SK_GAMMA_EXPONENT=1.2', - 'SK_GAMMA_CONTRAST=0.2', diff --git a/www/chromium/files/patch-sync_util_get__session__name.cc b/www/chromium/files/patch-sync_util_get__session__name.cc deleted file mode 100644 index 8737638f1a5d..000000000000 --- a/www/chromium/files/patch-sync_util_get__session__name.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- sync/util/get_session_name.cc.orig 2016-03-25 13:04:51 UTC -+++ sync/util/get_session_name.cc -@@ -15,7 +15,7 @@ - - #if defined(OS_CHROMEOS) - #include "chromeos/system/devicetype.h" --#elif defined(OS_LINUX) -+#elif (defined(OS_LINUX) || defined(OS_BSD)) - #include "sync/util/get_session_name_linux.h" - #elif defined(OS_IOS) - #include "sync/util/get_session_name_ios.h" -@@ -51,7 +51,7 @@ std::string GetSessionNameSynchronously( - session_name = "Chromebook"; - break; - } --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - session_name = internal::GetHostname(); - #elif defined(OS_IOS) - session_name = internal::GetComputerName(); diff --git a/www/chromium/files/patch-sync_util_get__session__name__linux.cc b/www/chromium/files/patch-sync_util_get__session__name__linux.cc deleted file mode 100644 index 0cfde4554c97..000000000000 --- a/www/chromium/files/patch-sync_util_get__session__name__linux.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- sync/util/get_session_name_linux.cc.orig 2016-03-25 13:04:51 UTC -+++ sync/util/get_session_name_linux.cc -@@ -13,8 +13,9 @@ namespace syncer { - namespace internal { - - std::string GetHostname() { -- char hostname[HOST_NAME_MAX]; -- if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. -+ int len = sysconf(_SC_HOST_NAME_MAX); -+ char hostname[len]; -+ if (gethostname(hostname, len) == 0) // Success. - return hostname; - return base::GetLinuxDistro(); - } diff --git a/www/chromium/files/patch-third__party_WebKit_Source_core_BUILD.gn b/www/chromium/files/patch-third__party_WebKit_Source_core_BUILD.gn new file mode 100644 index 000000000000..ef053b3f5408 --- /dev/null +++ b/www/chromium/files/patch-third__party_WebKit_Source_core_BUILD.gn @@ -0,0 +1,11 @@ +--- third_party/WebKit/Source/core/BUILD.gn.orig 2016-08-03 22:02:34.000000000 +0300 ++++ third_party/WebKit/Source/core/BUILD.gn 2016-09-29 17:55:09.476348000 +0300 +@@ -249,7 +249,7 @@ + ] + } + +- if (!is_linux) { ++ if (!(is_linux || is_bsd)) { + sources -= [ + "layout/LayoutThemeLinux.cpp", + "layout/LayoutThemeLinux.h", diff --git a/www/chromium/files/patch-third__party_WebKit_Source_core_core.gyp b/www/chromium/files/patch-third__party_WebKit_Source_core_core.gyp deleted file mode 100644 index 43e86331b281..000000000000 --- a/www/chromium/files/patch-third__party_WebKit_Source_core_core.gyp +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/WebKit/Source/core/core.gyp.orig 2016-05-11 19:02:30 UTC -+++ third_party/WebKit/Source/core/core.gyp -@@ -367,7 +367,7 @@ - 'layout/LayoutThemeMac.mm', - ], - }], -- ['OS != "linux"', { -+ ['OS != "linux" and os_bsd != 1', { - 'sources!': [ - 'layout/LayoutThemeLinux.cpp', - 'layout/LayoutThemeLinux.h', -@@ -644,7 +644,7 @@ - 'layout/LayoutThemeMac.mm', - ], - }], -- ['OS != "linux"', { -+ ['OS != "linux" and OS != "openbsd" and OS != "freebsd"', { - 'sources!': [ - 'layout/LayoutThemeLinux.cpp', - 'layout/LayoutThemeLinux.h', diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_blink__platform.gyp b/www/chromium/files/patch-third__party_WebKit_Source_platform_blink__platform.gyp deleted file mode 100644 index 0b49ff6cd7ff..000000000000 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_blink__platform.gyp +++ /dev/null @@ -1,42 +0,0 @@ ---- third_party/WebKit/Source/platform/blink_platform.gyp.orig 2016-05-25 15:01:11.000000000 -0400 -+++ third_party/WebKit/Source/platform/blink_platform.gyp 2016-05-27 12:20:28.640442000 -0400 -@@ -38,6 +38,9 @@ - 'targets': [{ - 'target_name': 'blink_common', - 'type': '<(component)', -+ 'include_dirs': [ -+ '<(prefix_dir)/include', -+ ], - 'variables': { 'enable_wexit_time_destructors': 1 }, - 'dependencies': [ - '../config.gyp:config', -@@ -222,7 +225,7 @@ - ['include', 'graphics/cpu/x86/WebGLImageConversionSSE\\.h$'], - ], - }], -- ['OS=="linux" or OS=="android"', { -+ ['OS=="linux" or OS=="android" or os_bsd==1', { - 'sources/': [ - ['include', 'fonts/linux/FontPlatformDataLinux\\.cpp$'], - ] -@@ -301,7 +304,7 @@ - ['exclude', 'scroll/ScrollbarThemeMac'], - ], - }], -- ['OS != "linux" and OS != "mac" and OS != "win"', { -+ ['OS != "linux" and OS != "mac" and OS != "win" and os_bsd != 1', { - 'sources/': [ - ['exclude', 'VDMX[^/]+\\.(cpp|h)$'], - ], -@@ -347,6 +350,11 @@ - ['exclude', 'scroll/ScrollbarThemeAura\\.(cpp|h)'], - ], - }], -+ ['use_system_icu==1', { -+ 'defines': [ -+ 'USING_SYSTEM_ICU', -+ ], -+ }], - ['"WTF_USE_WEBAUDIO_FFMPEG=1" in feature_defines', { - 'include_dirs': [ - '<(DEPTH)/third_party/ffmpeg', diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp index 07f516a6adbe..c0f70f399448 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp @@ -1,11 +1,11 @@ ---- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2016-08-04 11:20:01.382167000 -0400 -+++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp 2016-08-04 11:21:00.605035000 -0400 +--- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2016-07-20 22:03:41.000000000 +0300 ++++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp 2016-08-12 10:17:15.872857000 +0300 @@ -93,7 +93,7 @@ , m_syntheticBold(source.m_syntheticBold) , m_syntheticItalic(source.m_syntheticItalic) , m_orientation(source.m_orientation) -#if OS(LINUX) || OS(ANDROID) -+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) , m_style(source.m_style) #endif , m_harfBuzzFace(nullptr) @@ -14,7 +14,7 @@ , m_syntheticItalic(src.m_syntheticItalic) , m_orientation(src.m_orientation) -#if OS(LINUX) || OS(ANDROID) -+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) , m_style(FontRenderStyle::querySystem(m_family, m_textSize, m_typeface->style())) #endif , m_harfBuzzFace(nullptr) @@ -23,7 +23,7 @@ , m_syntheticItalic(syntheticItalic) , m_orientation(orientation) -#if OS(LINUX) || OS(ANDROID) -+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) , m_style(FontRenderStyle::querySystem(m_family, m_textSize, m_typeface->style())) #endif , m_isHashTableDeletedValue(false) @@ -32,16 +32,16 @@ m_harfBuzzFace = nullptr; m_orientation = other.m_orientation; -#if OS(LINUX) || OS(ANDROID) -+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) m_style = other.m_style; #endif - + @@ -216,7 +216,7 @@ && m_isHashTableDeletedValue == a.m_isHashTableDeletedValue && m_syntheticBold == a.m_syntheticBold && m_syntheticItalic == a.m_syntheticItalic -#if OS(LINUX) || OS(ANDROID) -+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) && m_style == a.m_style #endif && m_orientation == a.m_orientation; diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h index de5b1e659765..61ffc211b09a 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h @@ -1,14 +1,14 @@ ---- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig 2016-08-04 11:21:45.907982000 -0400 -+++ third_party/WebKit/Source/platform/fonts/FontPlatformData.h 2016-08-04 11:22:32.571069000 -0400 +--- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig 2016-08-05 04:20:03.099630000 +0300 ++++ third_party/WebKit/Source/platform/fonts/FontPlatformData.h 2016-08-05 04:18:22.356719000 +0300 @@ -46,9 +46,9 @@ #include "wtf/text/CString.h" #include "wtf/text/StringImpl.h" -#if OS(LINUX) || OS(ANDROID) -+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) #include "platform/fonts/linux/FontRenderStyle.h" -#endif // OS(LINUX) || OS(ANDROID) -+#endif // OS(LINUX) || OS(ANDROID) || OS(FREEBSD) ++#endif // OS(LINUX) || OS(ANDROID) || OS(BSD) #if OS(MACOSX) OBJC_CLASS NSFont; @@ -17,7 +17,7 @@ PassRefPtr<SharedBuffer> openTypeTable(SkFontTableTag) const; -#if OS(LINUX) || OS(ANDROID) -+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) // The returned styles are all actual styles without FontRenderStyle::NoPreference. const FontRenderStyle& getFontRenderStyle() const { return m_style; } #endif @@ -26,7 +26,7 @@ FontOrientation m_orientation; private: -#if OS(LINUX) || OS(ANDROID) -+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) FontRenderStyle m_style; #endif diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp new file mode 100644 index 000000000000..e5cf447a419d --- /dev/null +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp @@ -0,0 +1,29 @@ +--- third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp.orig 2016-07-20 22:03:41.000000000 +0300 ++++ third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp 2016-08-12 10:20:18.427009000 +0300 +@@ -49,7 +49,7 @@ + const float smallCapsFontSizeMultiplier = 0.7f; + const float emphasisMarkFontSizeMultiplier = 0.5f; + +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) + // This is the largest VDMX table which we'll try to load and parse. + static const size_t maxVDMXTableSize = 1024 * 1024; // 1 MB + #endif +@@ -102,7 +102,7 @@ + int vdmxAscent = 0, vdmxDescent = 0; + bool isVDMXValid = false; + +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) + // Manually digging up VDMX metrics is only applicable when bytecode hinting using FreeType. + // With DirectWrite or CoreText, no bytecode hinting is ever done. + // This code should be pushed into FreeType (hinted font metrics). +@@ -135,7 +135,7 @@ + } else { + ascent = SkScalarRoundToInt(-metrics.fAscent); + descent = SkScalarRoundToInt(metrics.fDescent); +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) + // When subpixel positioning is enabled, if the descent is rounded down, the descent part + // of the glyph may be truncated when displayed in a 'overflow: hidden' container. + // To avoid that, borrow 1 unit from the ascent when possible. diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp index cb8109f87eae..0227d80833d2 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp @@ -1,11 +1,11 @@ ---- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig 2016-07-22 00:07:09.000000000 -0400 -+++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp 2016-08-03 15:39:36.482884000 -0400 +--- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig 2016-07-20 22:03:41.000000000 +0300 ++++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp 2016-08-01 04:30:26.468814000 +0300 @@ -60,7 +60,7 @@ namespace blink { -#if OS(ANDROID) || OS(LINUX) -+#if OS(ANDROID) || OS(LINUX) || OS(FREEBSD) ++#if OS(ANDROID) || OS(LINUX) || OS(BSD) // Android special locale for retrieving the color emoji font // based on the proposed changes in UTR #51 for introducing // an Emoji script code: @@ -14,7 +14,7 @@ #endif -#if OS(LINUX) || OS(WIN) -+#if OS(LINUX) || OS(WIN) || OS(FREEBSD) ++#if OS(LINUX) || OS(WIN) || OS(BSD) // On linux if the fontManager has been overridden then we should be calling the embedder // provided font Manager rather than calling SkTypeface::CreateFromName which may redirect the // call to the default font Manager. diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_image-decoders_png_PNGImageDecoder.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_image-decoders_png_PNGImageDecoder.cpp deleted file mode 100644 index 51fe19ef8bc1..000000000000 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_image-decoders_png_PNGImageDecoder.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp.orig 2016-05-27 18:46:06.992656000 -0400 -+++ third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp 2016-05-27 18:46:37.983471000 -0400 -@@ -234,7 +234,7 @@ - #endif - png_uint_32 profileLength = 0; - if (png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) { -- setColorProfileAndTransform(profile, profileLength, imageHasAlpha, false /* useSRGB */); -+ setColorProfileAndTransform(reinterpret_cast<const char*>(profile), profileLength, imageHasAlpha, false /* useSRGB */); - } - } - #endif // PNG_iCCP_SUPPORTED diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_text_CharacterPropertyDataGenerator.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_text_CharacterPropertyDataGenerator.cpp deleted file mode 100644 index 25416db38d88..000000000000 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_text_CharacterPropertyDataGenerator.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp.orig 2016-05-27 12:26:56.689563000 -0400 -+++ third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp 2016-05-27 12:27:22.119336000 -0400 -@@ -11,12 +11,12 @@ - #include <cassert> - #include <cstring> - #include <stdio.h> --#if !defined(USING_SYSTEM_ICU) -+#if !defined(__FreeBSD__) - #define MUTEX_H // Prevent compile failure of utrie2.h on Windows - #include <utrie2.h> - #endif - --#if defined(USING_SYSTEM_ICU) -+#if defined(__FreeBSD__) - static void generate(FILE*) - { - } diff --git a/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp b/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp new file mode 100644 index 000000000000..771cb56c9888 --- /dev/null +++ b/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp @@ -0,0 +1,11 @@ +--- third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig 2016-07-20 22:03:42.000000000 +0300 ++++ third_party/WebKit/Source/web/PopupMenuImpl.cpp 2016-08-12 10:26:08.695632000 +0300 +@@ -155,7 +155,7 @@ + , m_buffer(buffer) + { + DCHECK(m_buffer); +-#if OS(LINUX) ++#if OS(LINUX) || OS(BSD) + // On other platforms, the <option> background color is the same as the + // <select> background color. On Linux, that makes the <option> + // background color very dark, so by default, try to use a lighter diff --git a/www/chromium/files/patch-third__party_WebKit_Source_web_web.gyp b/www/chromium/files/patch-third__party_WebKit_Source_web_web.gyp deleted file mode 100644 index bfa20a2d99ad..000000000000 --- a/www/chromium/files/patch-third__party_WebKit_Source_web_web.gyp +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/WebKit/Source/web/web.gyp.orig 2016-05-11 19:02:33 UTC -+++ third_party/WebKit/Source/web/web.gyp -@@ -160,7 +160,7 @@ - '../core/core.gyp:webcore', - ], - }], -- ['OS == "linux"', { -+ ['OS == "linux" or os_bsd == 1', { - 'dependencies': [ - '<(DEPTH)/build/linux/system.gyp:fontconfig', - ], diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp b/www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp new file mode 100644 index 000000000000..07583e5fec70 --- /dev/null +++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp @@ -0,0 +1,29 @@ +--- third_party/WebKit/Source/wtf/Assertions.cpp.orig 2016-07-20 22:03:42.000000000 +0300 ++++ third_party/WebKit/Source/wtf/Assertions.cpp 2016-08-12 11:13:22.515917000 +0300 +@@ -59,7 +59,7 @@ + #include <windows.h> + #endif + +-#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__)) ++#if OS(MACOSX) || ((OS(LINUX) || OS(BSD)) && !defined(__UCLIBC__)) + #include <cxxabi.h> + #include <dlfcn.h> + #include <execinfo.h> +@@ -159,7 +159,7 @@ + + void WTFGetBacktrace(void** stack, int* size) + { +-#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__)) ++#if OS(MACOSX) || ((OS(LINUX) || OS(BSD)) && !defined(__UCLIBC__)) + *size = backtrace(stack, *size); + #elif OS(WIN) + // The CaptureStackBackTrace function is available in XP, but it is not defined +@@ -210,7 +210,7 @@ + : m_name(0) + , m_cxaDemangled(0) + { +-#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__)) ++#if OS(MACOSX) || ((OS(LINUX) || OS(BSD)) && !defined(__UCLIBC__)) + Dl_info info; + if (!dladdr(addr, &info) || !info.dli_sname) + return; diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h b/www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h new file mode 100644 index 000000000000..6220da37556f --- /dev/null +++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h @@ -0,0 +1,11 @@ +--- third_party/WebKit/Source/wtf/Atomics.h.orig 2016-07-20 22:03:42.000000000 +0300 ++++ third_party/WebKit/Source/wtf/Atomics.h 2016-08-12 13:10:55.631853000 +0300 +@@ -137,7 +137,7 @@ + #if defined(THREAD_SANITIZER) + // The definitions below assume an LP64 data model. This is fine because + // TSan is only supported on x86_64 Linux. +-#if CPU(64BIT) && OS(LINUX) ++#if CPU(64BIT) && (OS(LINUX) || OS(BSD)) + ALWAYS_INLINE void releaseStore(volatile int* ptr, int value) + { + __tsan_atomic32_store(ptr, value, __tsan_memory_order_release); diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h new file mode 100644 index 000000000000..e2bc16e6a717 --- /dev/null +++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h @@ -0,0 +1,11 @@ +--- third_party/WebKit/Source/wtf/ContainerAnnotations.h.orig 2016-07-20 22:03:42.000000000 +0300 ++++ third_party/WebKit/Source/wtf/ContainerAnnotations.h 2016-08-12 11:30:35.829840000 +0300 +@@ -10,7 +10,7 @@ + + // TODO(ochang): Remove the CPU(X86_64) condition to enable this for X86 once + // the crashes there have been fixed: http://crbug.com/461406 +-#if defined(ADDRESS_SANITIZER) && OS(LINUX) && CPU(X86_64) ++#if defined(ADDRESS_SANITIZER) && (OS(LINUX) || OS(BSD)) && CPU(X86_64) + #define ANNOTATE_CONTIGUOUS_CONTAINER + #define ANNOTATE_NEW_BUFFER(buffer, capacity, newSize) \ + if (buffer) { \ diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp new file mode 100644 index 000000000000..b7a3c9972d47 --- /dev/null +++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp @@ -0,0 +1,29 @@ +--- third_party/WebKit/Source/wtf/ThreadingPthreads.cpp.orig 2016-07-20 22:03:42.000000000 +0300 ++++ third_party/WebKit/Source/wtf/ThreadingPthreads.cpp 2016-08-12 11:08:14.275410000 +0300 +@@ -51,11 +51,15 @@ + #include <objc/objc-auto.h> + #endif + +-#if OS(LINUX) ++#if OS(LINUX) || OS(BSD) + #include <sys/syscall.h> + #endif + +-#if OS(LINUX) || OS(ANDROID) ++#if OS(BSD) ++#include <pthread_np.h> ++#endif ++ ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) + #include <unistd.h> + #endif + +@@ -97,6 +101,8 @@ + return pthread_mach_thread_np(pthread_self()); + #elif OS(LINUX) + return syscall(__NR_gettid); ++#elif OS(BSD) ++ return pthread_getthreadid_np(); + #elif OS(ANDROID) + return gettid(); + #else diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_wtf.gyp b/www/chromium/files/patch-third__party_WebKit_Source_wtf_wtf.gyp deleted file mode 100644 index 2e6cf99cc709..000000000000 --- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_wtf.gyp +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/WebKit/Source/wtf/wtf.gyp.orig 2016-03-25 13:05:01 UTC -+++ third_party/WebKit/Source/wtf/wtf.gyp -@@ -57,7 +57,7 @@ - 'target_name': 'wtf', - 'type': '<(component)', - 'include_dirs': [ -- '..', -+ '..', '<(prefix_dir)/include', - ], - 'dependencies': [ - 'wtf_config', diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn new file mode 100644 index 000000000000..42b23d0b773b --- /dev/null +++ b/www/chromium/files/patch-third__party_angle_BUILD.gn @@ -0,0 +1,37 @@ +--- third_party/angle/BUILD.gn.orig 2016-10-06 04:04:51.000000000 +0300 ++++ third_party/angle/BUILD.gn 2016-10-31 01:36:29.431524000 +0200 +@@ -15,6 +15,12 @@ + } + } + ++if (use_x11) { ++ pkg_config("x11") { ++ packages = [ "x11", "xi", "xext" ] ++ } ++} ++ + angle_git_is_present = exec_script("src/commit_id.py", + [ + "check", +@@ -350,11 +356,7 @@ + if (use_x11) { + sources += rebase_path(gles_gypi.libangle_gl_glx_sources, ".", "src") + deps += [ "src/third_party/libXNVCtrl:libXNVCtrl" ] +- libs += [ +- "X11", +- "Xi", +- "Xext", +- ] ++ configs += [ ":x11" ] + } + if (is_mac) { + sources += rebase_path(gles_gypi.libangle_gl_cgl_sources, ".", "src") +@@ -492,7 +494,7 @@ + + config("angle_util_config") { + include_dirs = [ "util" ] +- if (is_linux && use_x11) { ++ if ((is_linux || is_bsd) && use_x11) { + libs = [ "X11" ] + } + } diff --git a/www/chromium/files/patch-third__party_angle_build_angle__common.gni b/www/chromium/files/patch-third__party_angle_build_angle__common.gni new file mode 100644 index 000000000000..f1f807c7bb2e --- /dev/null +++ b/www/chromium/files/patch-third__party_angle_build_angle__common.gni @@ -0,0 +1,11 @@ +--- third_party/angle/build/angle_common.gni.orig 2016-10-06 04:04:51.000000000 +0300 ++++ third_party/angle/build/angle_common.gni 2016-10-13 08:24:01.038996000 +0300 +@@ -18,6 +18,8 @@ + import("//build/config/win/visual_studio_version.gni") + } else if (is_linux && use_x11 && !is_chromeos) { + angle_enable_gl = true ++} else if (is_bsd) { ++ angle_enable_gl = true + } else if (is_mac || use_ozone) { + angle_enable_gl = true + } else if (is_android) { diff --git a/www/chromium/files/patch-third__party_angle_src_tests_BUILD.gn b/www/chromium/files/patch-third__party_angle_src_tests_BUILD.gn new file mode 100644 index 000000000000..820173b8371a --- /dev/null +++ b/www/chromium/files/patch-third__party_angle_src_tests_BUILD.gn @@ -0,0 +1,65 @@ +--- third_party/angle/src/tests/BUILD.gn.orig 2016-10-06 04:04:51.000000000 +0300 ++++ third_party/angle/src/tests/BUILD.gn 2016-10-13 10:42:09.229978000 +0300 +@@ -41,7 +41,7 @@ + ] + } + +-if (is_win || is_linux || is_mac || is_android) { ++if (is_win || is_linux || is_mac || is_android || is_bsd) { + end2end_gypi = exec_script("//build/gypi_to_gn.py", + [ + rebase_path("angle_end2end_tests.gypi"), +@@ -82,7 +82,7 @@ + "//third_party/angle:libANGLE_config", + ] + +- if (is_linux && !is_component_build) { ++ if ((is_linux || is_bsd) && !is_component_build) { + # Set rpath to find libEGL.so and libGLESv2.so even in a non-component build. + configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] + } +@@ -175,7 +175,7 @@ + # Ask the system headers to expose all the regular function otherwise + # dEQP doesn't compile and produces warnings about implicitly defined + # functions. +- if (is_linux) { ++ if (is_linux || is_bsd) { + # This has to be GNU_SOURCE as on Linux dEQP uses syscall() + defines += [ "_GNU_SOURCE" ] + } +@@ -198,7 +198,7 @@ + ] + } + +- if (is_linux || is_android) { ++ if (is_linux || is_android || is_bsd) { + deqp_undefine_configs += [ "//build/config/gcc:no_exceptions" ] + } + +@@ -234,7 +234,7 @@ + if (is_win) { + sources += rebase_path(deqp_gypi.deqp_libtester_sources_win, ".", "../..") + } +- if (is_linux || is_android) { ++ if (is_linux || is_android || is_bsd) { + sources += + rebase_path(deqp_gypi.deqp_libtester_sources_unix, ".", "../..") + } +@@ -262,7 +262,7 @@ + + # Taken from gpu/BUILD.gn + # TODO(jmadill): this should be in a shared location +- if (is_linux && !is_chromecast) { ++ if ((is_linux || is_bsd) && !is_chromecast) { + libs = [ "pci" ] + } + } +@@ -334,7 +334,7 @@ + "../../../deqp/src/data/", + ] + +- if (is_linux && !is_component_build) { ++ if ((is_linux || is_bsd) && !is_component_build) { + # Set rpath to find *.so files even in a non-component build. + configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] + } diff --git a/www/chromium/files/patch-third__party_boringssl_BUILD.gn b/www/chromium/files/patch-third__party_boringssl_BUILD.gn new file mode 100644 index 000000000000..af7efde3d8de --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_BUILD.gn @@ -0,0 +1,29 @@ +--- third_party/boringssl/BUILD.gn.orig 2016-08-03 22:02:37.000000000 +0300 ++++ third_party/boringssl/BUILD.gn 2016-09-03 01:48:31.761556000 +0300 +@@ -83,7 +83,7 @@ + } else if (current_cpu == "x64") { + if (is_mac) { + sources += crypto_sources_mac_x86_64 +- } else if (is_linux || is_android) { ++ } else if (is_linux || is_bsd || is_android) { + sources += crypto_sources_linux_x86_64 + } else { + public_configs = [ ":no_asm_config" ] +@@ -91,14 +91,14 @@ + } else if (current_cpu == "x86") { + if (is_mac) { + sources += crypto_sources_mac_x86 +- } else if (is_linux || is_android) { ++ } else if (is_linux || is_bsd || is_android) { + sources += crypto_sources_linux_x86 + } else { + public_configs = [ ":no_asm_config" ] + } +- } else if (current_cpu == "arm" && (is_linux || is_android)) { ++ } else if (current_cpu == "arm" && (is_linux || is_bsd || is_android)) { + sources += crypto_sources_linux_arm +- } else if (current_cpu == "arm64" && (is_linux || is_android)) { ++ } else if (current_cpu == "arm64" && (is_linux || is_bsd || is_android)) { + sources += crypto_sources_linux_aarch64 + + # TODO(davidben): Remove explicit arch flag once https://crbug.com/576858 diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c b/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c new file mode 100644 index 000000000000..96951ade050b --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c @@ -0,0 +1,13 @@ +--- third_party/boringssl/src/crypto/ex_data.c.orig 2016-08-03 22:03:20.000000000 +0300 ++++ third_party/boringssl/src/crypto/ex_data.c 2016-09-17 04:02:25.959140000 +0300 +@@ -188,7 +188,9 @@ + } + } + +- sk_void_set(ad->sk, index, val); ++ // expression result unused; should this cast be to 'void'? ++ // seems it should, feel free to investigate those #def ++ (void) sk_void_set(ad->sk, index, val); + return 1; + } + diff --git a/www/chromium/files/patch-third__party_cython_rules.gni b/www/chromium/files/patch-third__party_cython_rules.gni new file mode 100644 index 000000000000..b005160ded2b --- /dev/null +++ b/www/chromium/files/patch-third__party_cython_rules.gni @@ -0,0 +1,29 @@ +--- third_party/cython/rules.gni.orig 2016-08-03 22:02:38.000000000 +0300 ++++ third_party/cython/rules.gni 2016-09-03 01:42:35.847781000 +0300 +@@ -6,7 +6,7 @@ + + template("python_binary_source_set") { + # Only available on linux for now. +- assert(is_linux) ++ assert(is_linux || is_bsd) + assert(defined(invoker.cython_sources) || defined(invoker.sources)) + + config_name = target_name + "_python_config" +@@ -81,7 +81,7 @@ + + template("python_binary_module") { + # Only available on linux for now. +- assert(is_linux) ++ assert(is_linux || is_bsd) + + has_sources = defined(invoker.cython_sources) || defined(invoker.sources) + +@@ -92,7 +92,7 @@ + sources_target_name = target_name + "_cython_sources" + shared_library_name = target_name + "_shared_library" + +- if (is_linux) { ++ if (is_linux || is_bsd) { + shared_library_prefix = "lib" + shared_library_suffix = ".so" + python_module_suffix = ".so" diff --git a/www/chromium/files/patch-third__party_expat_BUILD.gn b/www/chromium/files/patch-third__party_expat_BUILD.gn new file mode 100644 index 000000000000..c0cbe40714c3 --- /dev/null +++ b/www/chromium/files/patch-third__party_expat_BUILD.gn @@ -0,0 +1,11 @@ +--- third_party/expat/BUILD.gn.orig 2016-10-06 04:02:41.000000000 +0300 ++++ third_party/expat/BUILD.gn 2016-10-13 08:30:21.841353000 +0300 +@@ -9,7 +9,7 @@ + # let's not pull it in twice. + # Chromecast doesn't ship expat as a system library. + # Libfuzzer and AFL need to build library from sources. +-if (is_linux && !is_chromecast && !use_libfuzzer && !use_afl) { ++if ((is_linux || is_bsd) && !is_chromecast && !use_libfuzzer && !use_afl) { + config("expat_config") { + libs = [ "expat" ] + } diff --git a/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn b/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn new file mode 100644 index 000000000000..68f4514881c1 --- /dev/null +++ b/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn @@ -0,0 +1,18 @@ +--- third_party/ffmpeg/BUILD.gn.orig 2016-08-03 22:03:29.000000000 +0300 ++++ third_party/ffmpeg/BUILD.gn 2016-10-10 14:53:20.790578000 +0300 +@@ -6,8 +6,13 @@ + import("ffmpeg_generated.gni") + + # Path to platform configuration files. +-platform_config_root = +- "chromium/config/$ffmpeg_branding/$os_config/$ffmpeg_arch" ++if (!is_bsd) { ++ platform_config_root = ++ "chromium/config/$ffmpeg_branding/$os_config/$ffmpeg_arch" ++} else { ++ platform_config_root = ++ "chromium/config/$ffmpeg_branding/linux/$ffmpeg_arch" ++} + + has_yasm_deps = ffmpeg_yasm_sources != [] && (current_cpu == "x86" || current_cpu == "x64") && os_config != "linux-noasm" + if (has_yasm_deps) { diff --git a/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni b/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni index 5b9045a804c7..d2768672822c 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni +++ b/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni @@ -5,7 +5,7 @@ ffmpeg_yasm_sources = [] -if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (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 == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && 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" && 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 == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (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 == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && 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" && 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" && 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")) { ++if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (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 == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && 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 || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && 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/allcodecs.c", "libavcodec/autorename_libavcodec_utils.c", @@ -14,7 +14,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" && 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")) { ++if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && 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", @@ -23,14 +23,14 @@ } -if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && 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 && 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 == "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" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && 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")) { ++if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && 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 || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && 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" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && 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 == "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 == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && 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")) { ++if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && 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 || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && 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", @@ -39,7 +39,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")) { ++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 || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && 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", @@ -48,7 +48,7 @@ } -if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && 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_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")) { ++if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && 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_yasm_sources += [ "libavcodec/x86/fft.asm", "libavcodec/x86/vorbisdsp.asm", @@ -57,7 +57,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_branding == "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")) { ++if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && 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", @@ -66,7 +66,7 @@ } -if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (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" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (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")) { ++if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) { ffmpeg_c_sources += [ "libavcodec/arm/fft_fixed_init_arm.c", "libavcodec/arm/fft_init_arm.c", @@ -75,7 +75,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")) { ++if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS")) { ffmpeg_c_sources += [ "libavcodec/flac.c", "libavcodec/flac_parser.c", @@ -84,7 +84,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")) { ++if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) { ffmpeg_c_sources += [ "libavcodec/arm/h264pred_init_arm.c", "libavcodec/arm/hpeldsp_init_arm.c", @@ -93,7 +93,7 @@ } -if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (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" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (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")) { ++if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS")) { ffmpeg_c_sources += [ "libavutil/arm/float_dsp_init_neon.c", ] @@ -102,7 +102,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 && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { ++if (((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && 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_videodsp_init.c", "libavcodec/x86/h264_intrapred_init.c", @@ -111,14 +111,14 @@ } -if ((is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chromium") || (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 == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chromium") || (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")) { ++if ((is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS")) { ffmpeg_c_sources += [ "libavutil/mips/float_dsp_mips.c", ] } -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")) { ++if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && 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", @@ -127,7 +127,7 @@ } -if ((is_android && current_cpu == "x64" && 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_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")) { ++if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && 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_yasm_sources += [ "libavcodec/x86/aacpsdsp.asm", "libavcodec/x86/dct32.asm", @@ -136,7 +136,7 @@ } -if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (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" && arm_use_neon && ffmpeg_branding == "Chrome") || (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")) { ++if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) { ffmpeg_c_sources += [ "libavcodec/arm/aacpsdsp_init_arm.c", "libavcodec/arm/mpegaudiodsp_init_arm.c", @@ -145,7 +145,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")) { ++if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { ffmpeg_c_sources += [ "libavcodec/acelp_filters.c", "libavcodec/acelp_pitch_delay.c", @@ -154,7 +154,7 @@ } -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")) { ++if (((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS")) { ffmpeg_c_sources += [ "libavcodec/mips/h264pred_init_mips.c", "libavcodec/mips/hpeldsp_init_mips.c", @@ -163,7 +163,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")) { ++if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS")) { ffmpeg_c_sources += [ "libavcodec/aarch64/fft_init_aarch64.c", "libavcodec/aarch64/vorbisdsp_init.c", @@ -172,7 +172,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")) { ++if (((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS")) { ffmpeg_c_sources += [ "libavcodec/aarch64/h264pred_init.c", "libavcodec/aarch64/hpeldsp_init_aarch64.c", @@ -181,7 +181,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")) { ++if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) { ffmpeg_c_sources += [ "libavcodec/arm/flacdsp_init_arm.c", ] @@ -190,7 +190,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")) { -+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")) { ++if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) { ffmpeg_c_sources += [ "libavcodec/arm/h264chroma_init_arm.c", "libavcodec/arm/h264dsp_init_arm.c", @@ -199,7 +199,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")) { -+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")) { ++if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS")) { ffmpeg_c_sources += [ "libavcodec/arm/hpeldsp_init_neon.c", "libavcodec/arm/vp8dsp_init_neon.c", @@ -208,7 +208,7 @@ } -if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (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")) { -+if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (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")) { ++if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS")) { ffmpeg_gas_sources += [ "libavcodec/arm/aacpsdsp_neon.S", "libavcodec/arm/sbrdsp_neon.S", @@ -216,7 +216,7 @@ } -if ((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_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")) { ++if (((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && 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/h264_qpel.c", "libavcodec/x86/h264chroma_init.c", @@ -225,7 +225,7 @@ } -if ((is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS")) { -+if ((is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS")) { ++if ((is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS")) { ffmpeg_c_sources += [ "libavcodec/mips/aacdec_mips.c", "libavcodec/mips/aacpsdsp_mips.c", @@ -234,7 +234,7 @@ } -if ((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 == "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")) { ++if (((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS")) { ffmpeg_c_sources += [ "libavcodec/x86/flacdsp_init.c", ] @@ -243,7 +243,7 @@ } -if ((is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS")) { -+if (((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS")) { ++if (((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS")) { ffmpeg_c_sources += [ "libavcodec/mips/h264chroma_init_mips.c", "libavcodec/mips/h264dsp_init_mips.c", @@ -252,7 +252,7 @@ } -if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) { -+if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) { ++if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) { ffmpeg_c_sources += [ "libavcodec/aarch64/imdct15_init.c", "libavcodec/aarch64/mpegaudiodsp_init.c", @@ -261,7 +261,7 @@ } -if ((is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) { -+if (((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) { ++if (((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) { ffmpeg_c_sources += [ "libavcodec/aarch64/h264chroma_init_aarch64.c", "libavcodec/aarch64/h264dsp_init_aarch64.c", @@ -270,7 +270,7 @@ } -if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && 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")) { ++if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) { ffmpeg_c_sources += [ "libavcodec/arm/blockdsp_init_arm.c", "libavcodec/arm/idctdsp_init_arm.c", @@ -279,14 +279,14 @@ } -if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && 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 == "arm64" && ffmpeg_branding == "ChromeOS")) { ++if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) { ffmpeg_c_sources += [ "libavcodec/neon/autorename_libavcodec_neon_mpegvideo.c", ] } -if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS")) { -+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")) { ++if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS")) { ffmpeg_gas_sources += [ "libavcodec/arm/h264cmc_neon.S", "libavcodec/arm/h264dsp_neon.S", @@ -295,7 +295,7 @@ } -if ((is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { -+if (((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { ++if (((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { ffmpeg_c_sources += [ "libavcodec/x86/blockdsp_init.c", "libavcodec/x86/fdct.c", @@ -304,7 +304,7 @@ } -if (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") { -+if ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") { ++if ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") { ffmpeg_c_sources += [ "libavcodec/mips/blockdsp_init_mips.c", "libavcodec/mips/h263dsp_init_mips.c", @@ -313,7 +313,7 @@ } -if (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") { -+if ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") { ++if ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") { ffmpeg_c_sources += [ "libavcodec/arm/blockdsp_init_neon.c", "libavcodec/arm/idctdsp_init_neon.c", diff --git a/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gypi b/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gypi deleted file mode 100644 index d7c1c1d7c17a..000000000000 --- a/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gypi +++ /dev/null @@ -1,395 +0,0 @@ ---- third_party/ffmpeg/ffmpeg_generated.gypi.orig 2016-05-11 19:03:23 UTC -+++ third_party/ffmpeg/ffmpeg_generated.gypi -@@ -8,7 +8,7 @@ - { - 'variables': { - 'conditions': [ -- ['OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS"', { -+ ['(OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS"', { - 'c_sources': [ - 'libavcodec/arm/blockdsp_init_neon.c', - 'libavcodec/arm/idctdsp_init_neon.c', -@@ -19,8 +19,8 @@ - 'libavcodec/arm/mpegvideo_neon.S', - 'libavcodec/arm/simple_idct_neon.S', - ], -- }], # OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS" -- ['OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS"', { -+ }], # (OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS" -+ ['(OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS"', { - 'c_sources': [ - 'libavcodec/mips/blockdsp_init_mips.c', - 'libavcodec/mips/h263dsp_init_mips.c', -@@ -31,8 +31,8 @@ - 'libavcodec/mips/qpeldsp_init_mips.c', - 'libavcodec/mips/xvididct_init_mips.c', - ], -- }], # OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS" -- ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS")', { -+ }], # (OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS" -+ ['((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS")', { - 'c_sources': [ - 'libavcodec/x86/blockdsp_init.c', - 'libavcodec/x86/fdct.c', -@@ -57,26 +57,26 @@ - 'libavcodec/x86/simple_idct10.asm', - 'libavcodec/x86/xvididct.asm', - ], -- }], # (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") -+ }], # ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") - ['(OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { - 'asm_sources': [ - 'libavutil/x86/emms.asm', - ], - }], # (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") -- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")', { -+ ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")', { - 'asm_sources': [ - 'libavcodec/arm/h264cmc_neon.S', - 'libavcodec/arm/h264dsp_neon.S', - 'libavcodec/arm/h264idct_neon.S', - 'libavcodec/arm/h264qpel_neon.S', - ], -- }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") -- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', { -+ }], # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") -+ ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', { - 'c_sources': [ - 'libavcodec/neon/autorename_libavcodec_neon_mpegvideo.c', - ], -- }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") -- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', { -+ }], # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") -+ ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', { - 'c_sources': [ - 'libavcodec/arm/blockdsp_init_arm.c', - 'libavcodec/arm/idctdsp_init_arm.c', -@@ -98,8 +98,8 @@ - 'libavcodec/arm/simple_idct_armv5te.S', - 'libavcodec/arm/simple_idct_armv6.S', - ], -- }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") -- ['(OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', { -+ }], # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") -+ ['((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', { - 'c_sources': [ - 'libavcodec/aarch64/h264chroma_init_aarch64.c', - 'libavcodec/aarch64/h264dsp_init_aarch64.c', -@@ -111,8 +111,8 @@ - 'libavcodec/aarch64/autorename_libavcodec_aarch64_h264idct_neon.S', - 'libavcodec/aarch64/autorename_libavcodec_aarch64_h264qpel_neon.S', - ], -- }], # (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") -- ['(OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', { -+ }], # ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") -+ ['(OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', { - 'c_sources': [ - 'libavcodec/aarch64/imdct15_init.c', - 'libavcodec/aarch64/mpegaudiodsp_init.c', -@@ -121,36 +121,36 @@ - 'libavcodec/aarch64/imdct15_neon.S', - 'libavcodec/aarch64/mpegaudiodsp_neon.S', - ], -- }], # (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") -- ['(OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")', { -+ }], # (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") -+ ['((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")', { - 'c_sources': [ - 'libavcodec/mips/h264chroma_init_mips.c', - 'libavcodec/mips/h264dsp_init_mips.c', - 'libavcodec/mips/h264qpel_init_mips.c', - ], -- }], # (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") -+ }], # ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") - ['(OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { - 'c_sources': [ - 'compat/msvcrt/snprintf.c', - ], - }], # (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") -- ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")', { -+ ['((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")', { - 'c_sources': [ - 'libavcodec/x86/flacdsp_init.c', - ], - 'asm_sources': [ - 'libavcodec/x86/flacdsp.asm', - ], -- }], # (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") -- ['(OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")', { -+ }], # ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") -+ ['(OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")', { - 'c_sources': [ - 'libavcodec/mips/aacdec_mips.c', - 'libavcodec/mips/aacpsdsp_mips.c', - 'libavcodec/mips/aacsbr_mips.c', - 'libavcodec/mips/sbrdsp_mips.c', - ], -- }], # (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") -- ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { -+ }], # (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") -+ ['((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { - 'c_sources': [ - 'libavcodec/x86/h264_qpel.c', - 'libavcodec/x86/h264chroma_init.c', -@@ -169,14 +169,14 @@ - 'libavcodec/x86/h264_weight_10bit.asm', - 'libavcodec/x86/qpel.asm', - ], -- }], # (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -- ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")', { -+ }], # ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -+ ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")', { - 'asm_sources': [ - 'libavcodec/arm/aacpsdsp_neon.S', - 'libavcodec/arm/sbrdsp_neon.S', - ], -- }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") -- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")', { -+ }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") -+ ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")', { - 'c_sources': [ - 'libavcodec/arm/hpeldsp_init_neon.c', - 'libavcodec/arm/vp8dsp_init_neon.c', -@@ -187,8 +187,8 @@ - 'libavcodec/arm/vp3dsp_neon.S', - 'libavcodec/arm/vp8dsp_neon.S', - ], -- }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") -- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', { -+ }], # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") -+ ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', { - 'c_sources': [ - 'libavcodec/arm/h264chroma_init_arm.c', - 'libavcodec/arm/h264dsp_init_arm.c', -@@ -197,16 +197,16 @@ - 'asm_sources': [ - 'libavcodec/arm/startcode_armv6.S', - ], -- }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") -- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', { -+ }], # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") -+ ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', { - 'c_sources': [ - 'libavcodec/arm/flacdsp_init_arm.c', - ], - 'asm_sources': [ - 'libavcodec/arm/flacdsp_arm.S', - ], -- }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") -- ['(OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")', { -+ }], # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") -+ ['((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")', { - 'c_sources': [ - 'libavcodec/aarch64/h264pred_init.c', - 'libavcodec/aarch64/hpeldsp_init_aarch64.c', -@@ -217,8 +217,8 @@ - 'libavcodec/aarch64/autorename_libavcodec_aarch64_hpeldsp_neon.S', - 'libavcodec/aarch64/videodsp.S', - ], -- }], # (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") -- ['(OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")', { -+ }], # ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") -+ ['(OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")', { - 'c_sources': [ - 'libavcodec/aarch64/fft_init_aarch64.c', - 'libavcodec/aarch64/vorbisdsp_init.c', -@@ -231,15 +231,15 @@ - 'libavcodec/aarch64/vorbisdsp_neon.S', - 'libavutil/aarch64/float_dsp_neon.S', - ], -- }], # (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") -- ['(OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")', { -+ }], # (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") -+ ['((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")', { - 'c_sources': [ - 'libavcodec/mips/h264pred_init_mips.c', - 'libavcodec/mips/hpeldsp_init_mips.c', - 'libavcodec/mips/vp8dsp_init_mips.c', - ], -- }], # (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") -- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS")', { -+ }], # ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") -+ ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS")', { - 'c_sources': [ - 'libavcodec/acelp_filters.c', - 'libavcodec/acelp_pitch_delay.c', -@@ -292,8 +292,8 @@ - 'libavformat/avidec.c', - 'libavformat/gsmdec.c', - ], -- }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") -- ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', { -+ }], # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") -+ ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', { - 'c_sources': [ - 'libavcodec/arm/aacpsdsp_init_arm.c', - 'libavcodec/arm/mpegaudiodsp_init_arm.c', -@@ -302,29 +302,29 @@ - 'asm_sources': [ - 'libavcodec/arm/mpegaudiodsp_fixed_armv6.S', - ], -- }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") -- ['(OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { -+ }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") -+ ['(OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { - 'asm_sources': [ - 'libavcodec/x86/aacpsdsp.asm', - 'libavcodec/x86/dct32.asm', - 'libavcodec/x86/imdct36.asm', - 'libavcodec/x86/sbrdsp.asm', - ], -- }], # (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -- ['(OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { -+ }], # (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -+ ['(OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { - 'c_sources': [ - 'libavcodec/x86/aacpsdsp_init.c', - 'libavcodec/x86/dct_init.c', - 'libavcodec/x86/mpegaudiodsp.c', - 'libavcodec/x86/sbrdsp_init.c', - ], -- }], # (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -- ['(OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")', { -+ }], # (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -+ ['(OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")', { - 'c_sources': [ - 'libavutil/mips/float_dsp_mips.c', - ], -- }], # (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") -- ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { -+ }], # (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") -+ ['((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { - 'c_sources': [ - 'libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c', - 'libavcodec/x86/h264_intrapred_init.c', -@@ -342,8 +342,8 @@ - 'libavcodec/x86/vp8dsp.asm', - 'libavcodec/x86/vp8dsp_loopfilter.asm', - ], -- }], # (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") -- ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")', { -+ }], # ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") -+ ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")', { - 'c_sources': [ - 'libavutil/arm/float_dsp_init_neon.c', - ], -@@ -356,8 +356,8 @@ - 'libavcodec/arm/rdft_neon.S', - 'libavutil/arm/autorename_libavutil_arm_float_dsp_neon.S', - ], -- }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") -- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', { -+ }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") -+ ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', { - 'c_sources': [ - 'libavcodec/arm/h264pred_init_arm.c', - 'libavcodec/arm/hpeldsp_init_arm.c', -@@ -375,8 +375,8 @@ - 'libavcodec/arm/vp8_armv6.S', - 'libavcodec/arm/vp8dsp_armv6.S', - ], -- }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") -- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")', { -+ }], # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") -+ ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")', { - 'c_sources': [ - 'libavcodec/flac.c', - 'libavcodec/flac_parser.c', -@@ -385,8 +385,8 @@ - 'libavcodec/flacdsp.c', - 'libavformat/autorename_libavformat_flacdec.c', - ], -- }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") -- ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', { -+ }], # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") -+ ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', { - 'c_sources': [ - 'libavcodec/arm/fft_fixed_init_arm.c', - 'libavcodec/arm/fft_init_arm.c', -@@ -400,8 +400,8 @@ - 'libavcodec/arm/mdct_vfp.S', - 'libavutil/arm/float_dsp_vfp.S', - ], -- }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") -- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { -+ }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") -+ ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { - 'c_sources': [ - 'libavcodec/cabac.c', - 'libavcodec/h264.c', -@@ -422,8 +422,8 @@ - 'libavcodec/h264qpel.c', - 'libavcodec/startcode.c', - ], -- }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -- ['(OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { -+ }], # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -+ ['(OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { - 'asm_sources': [ - 'libavcodec/x86/fft.asm', - 'libavcodec/x86/vorbisdsp.asm', -@@ -431,8 +431,8 @@ - 'libavutil/x86/float_dsp.asm', - 'libavutil/x86/lls.asm', - ], -- }], # (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") -- ['(OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { -+ }], # (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") -+ ['(OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { - 'c_sources': [ - 'libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c', - 'libavcodec/x86/constants.c', -@@ -441,13 +441,13 @@ - 'libavutil/x86/autorename_libavutil_x86_float_dsp_init.c', - 'libavutil/x86/lls_init.c', - ], -- }], # (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") -+ }], # (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") - ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { - 'c_sources': [ - 'compat/strtod.c', - ], - }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") -- ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { -+ ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { - 'c_sources': [ - 'libavcodec/aac_ac3_parser.c', - 'libavcodec/aac_parser.c', -@@ -481,13 +481,13 @@ - 'libavformat/mov_chan.c', - 'libavformat/mp3dec.c', - ], -- }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -- ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { -+ }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -+ ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', { - 'c_sources': [ - 'libavformat/rawdec.c', - ], -- }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { -+ }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") -+ ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { - 'c_sources': [ - 'libavcodec/h264pred.c', - 'libavcodec/hpeldsp.c', -@@ -500,8 +500,8 @@ - 'libavcodec/vp8_parser.c', - 'libavcodec/vp8dsp.c', - ], -- }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") -- ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { -+ }], # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") -+ ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', { - 'c_sources': [ - 'libavcodec/allcodecs.c', - 'libavcodec/autorename_libavcodec_utils.c', -@@ -631,7 +631,7 @@ - 'libavutil/twofish.c', - 'libavutil/utils.c', - ], -- }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") -+ }], # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") - ], # conditions - }, - } diff --git a/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c b/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c index dae3c972ddbb..9da8be9030d5 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c +++ b/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c @@ -1,11 +1,12 @@ ---- third_party/ffmpeg/libavutil/mem.c.orig 2016-05-11 19:03:23 UTC -+++ third_party/ffmpeg/libavutil/mem.c -@@ -32,7 +32,7 @@ +--- third_party/ffmpeg/libavutil/mem.c.orig 2016-08-03 22:03:29.000000000 +0300 ++++ third_party/ffmpeg/libavutil/mem.c 2016-10-11 02:40:34.765488000 +0300 +@@ -32,9 +32,6 @@ #include <stdint.h> #include <stdlib.h> #include <string.h> -#if HAVE_MALLOC_H -+#if HAVE_MALLOC_H && !defined(__FreeBSD__) - #include <malloc.h> - #endif +-#include <malloc.h> +-#endif + #include "avassert.h" + #include "avutil.h" diff --git a/www/chromium/files/patch-third__party_fontconfig_BUILD.gn b/www/chromium/files/patch-third__party_fontconfig_BUILD.gn new file mode 100644 index 000000000000..7f10de8c5af2 --- /dev/null +++ b/www/chromium/files/patch-third__party_fontconfig_BUILD.gn @@ -0,0 +1,11 @@ +--- third_party/fontconfig/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300 ++++ third_party/fontconfig/BUILD.gn 2016-09-03 01:45:52.485587000 +0300 +@@ -2,7 +2,7 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-assert(is_linux) ++assert(is_linux || is_bsd) + + config("fontconfig_config") { + include_dirs = [ "src" ] diff --git a/www/chromium/files/patch-third__party_freetype2_BUILD.gn b/www/chromium/files/patch-third__party_freetype2_BUILD.gn new file mode 100644 index 000000000000..d2c7a7ad94e4 --- /dev/null +++ b/www/chromium/files/patch-third__party_freetype2_BUILD.gn @@ -0,0 +1,11 @@ +--- third_party/freetype2/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300 ++++ third_party/freetype2/BUILD.gn 2016-09-03 01:41:52.625191000 +0300 +@@ -2,7 +2,7 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-assert(is_linux, "This file should only be depended on from Linux.") ++assert(is_linux || is_bsd, "This file should only be depended on from Linux.") + + config("freetype2_config") { + include_dirs = [ diff --git a/www/chromium/files/patch-third__party_glslang_BUILD.gn b/www/chromium/files/patch-third__party_glslang_BUILD.gn new file mode 100644 index 000000000000..2377c332ade0 --- /dev/null +++ b/www/chromium/files/patch-third__party_glslang_BUILD.gn @@ -0,0 +1,20 @@ +--- third_party/glslang/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300 ++++ third_party/glslang/BUILD.gn 2016-09-03 01:42:51.603010000 +0300 +@@ -8,7 +8,7 @@ + include_dirs = [ "src" ] + + defines = [] +- if (is_linux || is_android) { ++ if (is_linux || is_bsd || is_android) { + defines += [ "GLSLANG_OSINCLUDE_UNIX" ] + } else if (is_win) { + defines += [ "GLSLANG_OSINCLUDE_WIN32" ] +@@ -132,7 +132,7 @@ + "src/glslang/Public/ShaderLang.h", + ] + +- if (is_linux || is_android) { ++ if (is_linux || is_bsd || is_android) { + sources += [ "src/glslang/OSDependent/Unix/ossource.cpp" ] + } else if (is_win) { + sources += [ diff --git a/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn b/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn new file mode 100644 index 000000000000..bbd18e15440b --- /dev/null +++ b/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn @@ -0,0 +1,20 @@ +--- third_party/harfbuzz-ng/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300 ++++ third_party/harfbuzz-ng/BUILD.gn 2016-09-03 01:51:35.889144000 +0300 +@@ -48,7 +48,7 @@ + + # See also chrome/browser/ui/libgtk2ui/BUILD.gn which pulls this. + config("pangoft2_link_hack") { +- if (is_linux && use_pango && !is_chromeos && !is_official_build && ++ if ((is_linux || is_bsd) && use_pango && !is_chromeos && !is_official_build && + current_cpu != "arm" && current_cpu != "mipsel" && !is_component_build) { + # These symbols are referenced from libpangoft2, which will be + # dynamically linked later. +@@ -186,7 +186,7 @@ + # in the tree, all symbols pango needs must be included, or + # pango uses mixed versions of harfbuzz and leads to crash. + # See crbug.com/462689. +- if (is_linux && use_pango && !is_chromeos && !is_official_build && ++ if ((is_linux || is_bsd) && use_pango && !is_chromeos && !is_official_build && + current_cpu != "arm" && current_cpu != "mipsel") { + deps += [ "//build/linux:freetype2" ] + configs -= [ "//build/config/gcc:symbol_visibility_hidden" ] diff --git a/www/chromium/files/patch-third__party_jsoncpp_jsoncpp.gyp b/www/chromium/files/patch-third__party_jsoncpp_jsoncpp.gyp deleted file mode 100644 index 83dae0b715d4..000000000000 --- a/www/chromium/files/patch-third__party_jsoncpp_jsoncpp.gyp +++ /dev/null @@ -1,54 +0,0 @@ ---- third_party/jsoncpp/jsoncpp.gyp.orig 2016-05-20 17:19:03 UTC -+++ third_party/jsoncpp/jsoncpp.gyp -@@ -1,21 +1,39 @@ --# Copyright (c) 2012 The Chromium Authors. All rights reserved. -+# Copyright 2013 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. - - { -- 'includes': [ -- 'jsoncpp.gypi', -- ], - 'targets': [ - { - 'target_name': 'jsoncpp', -- 'type': 'static_library', -- }, -+ 'type': 'none', -+ 'variables': { -+ 'headers_root_path': 'source/include', -+ 'header_filenames': [ -+ 'json/assertions.h', -+ 'json/autolink.h', -+ 'json/config.h', -+ 'json/features.h', -+ 'json/forwards.h', -+ 'json/json.h', -+ 'json/reader.h', -+ 'json/value.h', -+ 'json/writer.h', -+ ], -+ }, -+ 'includes': [ -+ '../../build/shim_headers.gypi', -+ ], -+ 'direct_dependent_settings': { -+ 'include_dirs': [ -+ '/usr/include/jsoncpp', -+ ], -+ }, -+ 'link_settings': { -+ 'libraries': [ -+ '-ljsoncpp', -+ ], -+ }, -+ } - ], - } -- --# Local Variables: --# tab-width:2 --# indent-tabs-mode:nil --# End: --# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/www/chromium/files/patch-third__party_khronos_khronos.gyp b/www/chromium/files/patch-third__party_khronos_khronos.gyp deleted file mode 100644 index 965773d99807..000000000000 --- a/www/chromium/files/patch-third__party_khronos_khronos.gyp +++ /dev/null @@ -1,10 +0,0 @@ ---- third_party/khronos/khronos.gyp.orig 2016-03-25 13:05:02 UTC -+++ third_party/khronos/khronos.gyp -@@ -11,6 +11,7 @@ - 'include_dirs': [ - '.', - '../../gpu', # Contains GLES2/gl2chromium.h -+ '<(prefix_dir)/include', - ], - }, - }, diff --git a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc index ecd92f6ea753..8610fd482103 100644 --- a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc +++ b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc @@ -1,9 +1,9 @@ ---- third_party/leveldatabase/env_chromium.cc.orig 2016-05-11 19:02:34 UTC -+++ third_party/leveldatabase/env_chromium.cc -@@ -21,7 +21,11 @@ - #include "base/threading/thread_restrictions.h" +--- third_party/leveldatabase/env_chromium.cc.orig 2016-10-06 04:02:41.000000000 +0300 ++++ third_party/leveldatabase/env_chromium.cc 2016-10-13 08:33:43.174604000 +0300 +@@ -23,7 +23,11 @@ #include "base/trace_event/trace_event.h" #include "third_party/leveldatabase/chromium_logger.h" + #include "third_party/leveldatabase/src/include/leveldb/options.h" +#if defined(OS_BSD) +#include <re2/re2.h> +#else diff --git a/www/chromium/files/patch-third__party_libXNVCtrl_libXNVCtrl.gyp b/www/chromium/files/patch-third__party_libXNVCtrl_libXNVCtrl.gyp deleted file mode 100644 index 23e519d5ff11..000000000000 --- a/www/chromium/files/patch-third__party_libXNVCtrl_libXNVCtrl.gyp +++ /dev/null @@ -1,12 +0,0 @@ ---- third_party/libXNVCtrl/libXNVCtrl.gyp.orig 2016-03-25 13:05:02 UTC -+++ third_party/libXNVCtrl/libXNVCtrl.gyp -@@ -13,6 +13,9 @@ - 'NVCtrlLib.h', - 'nv_control.h', - ], -+ 'include_dirs': [ -+ '<(prefix_dir)/include', -+ ], - }, - ], - } diff --git a/www/chromium/files/patch-third__party_libjingle_libjingle.gyp b/www/chromium/files/patch-third__party_libjingle_libjingle.gyp deleted file mode 100644 index 5a821b0dabcd..000000000000 --- a/www/chromium/files/patch-third__party_libjingle_libjingle.gyp +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/libjingle/libjingle.gyp.orig 2016-05-25 15:01:12.000000000 -0400 -+++ third_party/libjingle/libjingle.gyp 2016-05-27 11:30:30.507965000 -0400 -@@ -121,6 +121,8 @@ - ['os_bsd==1', { - 'defines': [ - 'BSD', -+ 'WEBRTC_LINUX', -+ 'WEBRTC_BSD', - ], - }], - ['OS=="openbsd"', { -@@ -191,6 +193,8 @@ - ['os_bsd==1', { - 'defines': [ - 'BSD', -+ 'WEBRTC_LINUX', -+ 'WEBRTC_BSD', - ], - }], - ['OS=="openbsd"', { diff --git a/www/chromium/files/patch-third__party_libjpeg_libjpeg.gyp b/www/chromium/files/patch-third__party_libjpeg_libjpeg.gyp deleted file mode 100644 index 5011f403fc15..000000000000 --- a/www/chromium/files/patch-third__party_libjpeg_libjpeg.gyp +++ /dev/null @@ -1,133 +0,0 @@ ---- third_party/libjpeg/libjpeg.gyp.orig 2016-05-20 17:19:03 UTC -+++ third_party/libjpeg/libjpeg.gyp -@@ -1,109 +1,29 @@ --# Copyright (c) 2009 The Chromium Authors. All rights reserved. -+# Copyright 2013 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. - - { -- # This file handles building both with our local libjpeg and with the system -- # libjpeg. -- 'conditions': [ -- ['use_system_libjpeg==0', { -- 'targets': [ -- { -- 'target_name': 'libjpeg', -- 'type': 'static_library', -- 'defines': [ -- 'NO_GETENV', # getenv() is not thread-safe. -- ], -- 'sources': [ -- 'jcapimin.c', -- 'jcapistd.c', -- 'jccoefct.c', -- 'jccolor.c', -- 'jcdctmgr.c', -- 'jchuff.c', -- 'jchuff.h', -- 'jcinit.c', -- 'jcmainct.c', -- 'jcmarker.c', -- 'jcmaster.c', -- 'jcomapi.c', -- 'jconfig.h', -- 'jcparam.c', -- 'jcphuff.c', -- 'jcprepct.c', -- 'jcsample.c', -- 'jdapimin.c', -- 'jdapistd.c', -- 'jdatadst.c', -- 'jdatasrc.c', -- 'jdcoefct.c', -- 'jdcolor.c', -- 'jdct.h', -- 'jddctmgr.c', -- 'jdhuff.c', -- 'jdhuff.h', -- 'jdinput.c', -- 'jdmainct.c', -- 'jdmarker.c', -- 'jdmaster.c', -- 'jdmerge.c', -- 'jdphuff.c', -- 'jdpostct.c', -- 'jdsample.c', -- 'jerror.c', -- 'jerror.h', -- 'jfdctflt.c', -- 'jfdctfst.c', -- 'jfdctint.c', -- 'jidctflt.c', -- 'jidctfst.c', -- 'jidctint.c', -- 'jinclude.h', -- 'jmemmgr.c', -- 'jmemnobs.c', -- 'jmemsys.h', -- 'jmorecfg.h', -- 'jpegint.h', -- 'jpeglib.h', -- 'jquant1.c', -- 'jquant2.c', -- 'jutils.c', -- 'jversion.h', -- ], -- 'direct_dependent_settings': { -+ 'targets': [ -+ { -+ 'target_name': 'libjpeg', -+ 'type': 'none', -+ 'direct_dependent_settings': { -+ 'defines': [ -+ 'USE_SYSTEM_LIBJPEG', -+ ], -+ 'conditions': [ -+ ['os_bsd==1', { - 'include_dirs': [ -- '.', -- ], -- }, -- 'conditions': [ -- ['OS!="win"', {'product_name': 'jpeg'}], -- ], -- }, -- ], -- }, { -- 'targets': [ -- { -- 'target_name': 'libjpeg', -- 'type': 'none', -- 'direct_dependent_settings': { -- 'defines': [ -- 'USE_SYSTEM_LIBJPEG', -- ], -- 'conditions': [ -- ['os_bsd==1', { -- 'include_dirs': [ -- '/usr/local/include', -- ], -- }], -- ], -- }, -- 'link_settings': { -- 'libraries': [ -- '-ljpeg', -+ '/usr/local/include', - ], -- }, -- } -- ], -- }], -+ }], -+ ], -+ }, -+ 'link_settings': { -+ 'libraries': [ -+ '-ljpeg', -+ ], -+ }, -+ } - ], - } diff --git a/www/chromium/files/patch-third__party_libphonenumber_libphonenumber.gyp b/www/chromium/files/patch-third__party_libphonenumber_libphonenumber.gyp deleted file mode 100644 index aeb2d004d93c..000000000000 --- a/www/chromium/files/patch-third__party_libphonenumber_libphonenumber.gyp +++ /dev/null @@ -1,10 +0,0 @@ ---- third_party/libphonenumber/libphonenumber.gyp.orig 2016-05-11 19:02:34 UTC -+++ third_party/libphonenumber/libphonenumber.gyp -@@ -11,6 +11,7 @@ - # generated protocol headers to be available with "phonenumbers" include - # path, e.g. #include "phonenumbers/foo.pb.h". - '<(SHARED_INTERMEDIATE_DIR)/protoc_out/third_party/libphonenumber', -+ '<(prefix_dir)/include', - ], - 'defines': [ - 'I18N_PHONENUMBERS_USE_ICU_REGEXP=1', diff --git a/www/chromium/files/patch-third__party_libusb_BUILD.gn b/www/chromium/files/patch-third__party_libusb_BUILD.gn new file mode 100644 index 000000000000..0091eae4b1f8 --- /dev/null +++ b/www/chromium/files/patch-third__party_libusb_BUILD.gn @@ -0,0 +1,261 @@ +--- third_party/libusb/BUILD.gn.orig 2016-10-06 04:02:41.000000000 +0300 ++++ third_party/libusb/BUILD.gn 2016-10-13 08:47:17.152284000 +0300 +@@ -6,8 +6,25 @@ + + import("//build/config/features.gni") + +-config("libusb_config") { +- include_dirs = [ "src/libusb" ] ++declare_args() { ++ use_system_libusb = is_bsd ++} ++ ++ ++if (use_system_libusb) { ++ config("libusb_config") { ++ defines = ["USE_SYSTEM_LIBUSB"] ++ libs = ["usb"] ++ } ++ ++ source_set("libusb") { ++ public_configs = [ ":libusb_config" ] ++ } ++} else { ++ ++ config("libusb_config") { ++ include_dirs = [ "src/libusb" ] ++ } + } + + config("libusb_warnings") { +@@ -21,118 +38,119 @@ + } + } + +-static_library("libusb") { +- sources = [ +- "src/config.h", +- "src/libusb/core.c", +- "src/libusb/descriptor.c", +- "src/libusb/hotplug.c", +- "src/libusb/hotplug.h", +- "src/libusb/interrupt.c", +- "src/libusb/interrupt.h", +- "src/libusb/io.c", +- "src/libusb/libusb.h", +- "src/libusb/libusbi.h", +- "src/libusb/os/darwin_usb.c", +- "src/libusb/os/darwin_usb.h", +- "src/libusb/os/poll_posix.c", +- "src/libusb/os/poll_posix.h", +- "src/libusb/os/poll_windows.c", +- "src/libusb/os/poll_windows.h", +- "src/libusb/os/threads_posix.c", +- "src/libusb/os/threads_posix.h", +- "src/libusb/os/threads_windows.c", +- "src/libusb/os/threads_windows.h", +- "src/libusb/os/windows_common.h", +- "src/libusb/os/windows_usb.c", +- "src/libusb/os/windows_usb.h", +- "src/libusb/strerror.c", +- "src/libusb/sync.c", +- "src/libusb/version.h", +- "src/libusb/version_nano.h", +- "src/msvc/config.h", +- "src/msvc/inttypes.h", +- "src/msvc/stdint.h", +- ] +- deps = [] +- include_dirs = [ "src/libusb/os" ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ +- "//build/config/compiler:no_chromium_code", +- +- # Must be after no_chromium_code for warning flags to be ordered correctly. +- ":libusb_warnings", +- ] +- +- public_configs = [ ":libusb_config" ] +- +- if (is_posix) { +- defines = [ +- "DEFAULT_VISIBILITY=", +- "HAVE_GETTIMEOFDAY=1", +- "HAVE_POLL_H=1", +- "HAVE_SYS_TIME_H=1", +- "LIBUSB_DESCRIBE=\"1.0.16\"", +- "POLL_NFDS_TYPE=nfds_t", +- "THREADS_POSIX=1", +- ] +- } +- +- if (is_mac) { +- defines += [ +- "OS_DARWIN=1", ++if (!use_system_libusb) { ++ static_library("libusb") { ++ sources = [ ++ "src/config.h", ++ "src/libusb/core.c", ++ "src/libusb/descriptor.c", ++ "src/libusb/hotplug.c", ++ "src/libusb/hotplug.h", ++ "src/libusb/interrupt.c", ++ "src/libusb/interrupt.h", ++ "src/libusb/io.c", ++ "src/libusb/libusb.h", ++ "src/libusb/libusbi.h", ++ "src/libusb/os/darwin_usb.c", ++ "src/libusb/os/darwin_usb.h", ++ "src/libusb/os/poll_posix.c", ++ "src/libusb/os/poll_posix.h", ++ "src/libusb/os/poll_windows.c", ++ "src/libusb/os/poll_windows.h", ++ "src/libusb/os/threads_posix.c", ++ "src/libusb/os/threads_posix.h", ++ "src/libusb/os/threads_windows.c", ++ "src/libusb/os/threads_windows.h", ++ "src/libusb/os/windows_common.h", ++ "src/libusb/os/windows_usb.c", ++ "src/libusb/os/windows_usb.h", ++ "src/libusb/strerror.c", ++ "src/libusb/sync.c", ++ "src/libusb/version.h", ++ "src/libusb/version_nano.h", ++ "src/msvc/config.h", ++ "src/msvc/inttypes.h", ++ "src/msvc/stdint.h", ++ ] ++ deps = [] ++ include_dirs = [ "src/libusb/os" ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ ++ "//build/config/compiler:no_chromium_code", ++ ++# Must be after no_chromium_code for warning flags to be ordered correctly. ++ ":libusb_warnings", ++ ] ++ ++ public_configs = [ ":libusb_config" ] ++ ++ if (is_posix) { ++ defines = [ ++ "DEFAULT_VISIBILITY=", ++ "HAVE_GETTIMEOFDAY=1", ++ "HAVE_POLL_H=1", ++ "HAVE_SYS_TIME_H=1", ++ "LIBUSB_DESCRIBE=\"1.0.16\"", ++ "POLL_NFDS_TYPE=nfds_t", ++ "THREADS_POSIX=1", ++ ] ++ } ++ ++ if (is_mac) { ++ defines += [ ++ "OS_DARWIN=1", + +- # Needed on OSX 10.12 to silence a deprecation warning. ++# Needed on OSX 10.12 to silence a deprecation warning. + "OBJC_SILENCE_GC_DEPRECATIONS=1", +- ] +- } else { +- sources -= [ +- "src/libusb/os/darwin_usb.c", ++ ] ++ } else { ++ sources -= [ ++ "src/libusb/os/darwin_usb.c", + "src/libusb/os/darwin_usb.h", +- ] +- } ++ ] ++ } + +- if (is_linux) { +- sources += [ +- "src/libusb/os/linux_usbfs.c", ++ if (is_linux) { ++ sources += [ ++ "src/libusb/os/linux_usbfs.c", + "src/libusb/os/linux_usbfs.h", +- ] +- defines += [ +- "OS_LINUX=1", ++ ] ++ defines += [ ++ "OS_LINUX=1", + "_GNU_SOURCE=1", +- ] +- } ++ ] ++ } + +- if (is_chromeos) { +- defines += [ "USBI_TIMERFD_AVAILABLE" ] +- } ++ if (is_chromeos) { ++ defines += [ "USBI_TIMERFD_AVAILABLE" ] ++ } + +- if (use_udev) { +- sources += [ "src/libusb/os/linux_udev.cc" ] +- defines += [ +- "HAVE_LIBUDEV=1", +- "USE_UDEV=1", +- ] +- deps += [ "//build/linux/libudev" ] +- } ++ if (use_udev) { ++ sources += [ "src/libusb/os/linux_udev.cc" ] ++ defines += [ ++ "HAVE_LIBUDEV=1", ++ "USE_UDEV=1", ++ ] ++ deps += [ "//build/linux/libudev" ] ++ } + +- if (is_linux && !use_udev) { +- sources += [ "src/libusb/os/linux_netlink.c" ] +- defines += [ "HAVE_LINUX_NETLINK_H" ] +- } ++ if (is_linux && !use_udev) { ++ sources += [ "src/libusb/os/linux_netlink.c" ] ++ defines += [ "HAVE_LINUX_NETLINK_H" ] ++ } + +- if (is_win) { +- include_dirs += [ "src/msvc" ] +- sources -= [ +- "src/libusb/os/poll_posix.c", +- "src/libusb/os/threads_posix.c", +- ] +- libs = [ "setupapi.lib" ] +- } else { +- include_dirs += [ "src" ] +- sources -= [ +- "src/libusb/os/poll_windows.c", ++ if (is_win) { ++ include_dirs += [ "src/msvc" ] ++ sources -= [ ++ "src/libusb/os/poll_posix.c", ++ "src/libusb/os/threads_posix.c", ++ ] ++ libs = [ "setupapi.lib" ] ++ } else { ++ include_dirs += [ "src" ] ++ sources -= [ ++ "src/libusb/os/poll_windows.c", + "src/libusb/os/poll_windows.h", + "src/libusb/os/threads_windows.c", + "src/libusb/os/threads_windows.h", +@@ -142,6 +160,7 @@ + "src/msvc/config.h", + "src/msvc/inttypes.h", + "src/msvc/stdint.h", +- ] ++ ] ++ } + } + } diff --git a/www/chromium/files/patch-third__party_libusb_libusb.gyp b/www/chromium/files/patch-third__party_libusb_libusb.gyp deleted file mode 100644 index 57989f8c20ee..000000000000 --- a/www/chromium/files/patch-third__party_libusb_libusb.gyp +++ /dev/null @@ -1,157 +0,0 @@ ---- third_party/libusb/libusb.gyp.orig 2016-05-20 17:19:03 UTC -+++ third_party/libusb/libusb.gyp -@@ -1,4 +1,4 @@ --# Copyright (c) 2012 The Chromium Authors. All rights reserved. -+# Copyright 2013 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. - -@@ -6,133 +6,29 @@ - 'targets': [ - { - 'target_name': 'libusb', -- 'type': 'static_library', -- 'sources': [ -- 'src/config.h', -- 'src/libusb/core.c', -- 'src/libusb/descriptor.c', -- 'src/libusb/hotplug.c', -- 'src/libusb/hotplug.h', -- 'src/libusb/interrupt.c', -- 'src/libusb/interrupt.h', -- 'src/libusb/io.c', -- 'src/libusb/libusb.h', -- 'src/libusb/libusbi.h', -- 'src/libusb/strerror.c', -- 'src/libusb/sync.c', -- 'src/libusb/version.h', -- 'src/libusb/version_nano.h', -- ], -+ 'type': 'none', - 'variables': { -- 'clang_warning_flags': [ -- # guid_eq in windows_usb.c is unused. -- '-Wno-unused-function', -+ 'headers_root_path': 'src/libusb', -+ 'header_filenames': [ -+ 'libusb.h', - ], - }, -- 'include_dirs': [ -- 'src', -- 'src/libusb', -- 'src/libusb/os', -+ 'includes': [ -+ '../../build/shim_headers.gypi', - ], - 'direct_dependent_settings': { -- 'include_dirs': [ -- 'src/libusb', -+ 'cflags': [ -+ '<!@(pkg-config --cflags libusb-1.0)', - ], -- }, -- 'conditions': [ -- ['OS=="linux" or OS=="mac"', { -- 'sources': [ -- 'src/libusb/os/poll_posix.c', -- 'src/libusb/os/poll_posix.h', -- 'src/libusb/os/threads_posix.c', -- 'src/libusb/os/threads_posix.h', -- ], -- 'defines': [ -- 'DEFAULT_VISIBILITY=', -- 'HAVE_GETTIMEOFDAY=1', -- 'HAVE_POLL_H=1', -- 'HAVE_SYS_TIME_H=1', -- 'LIBUSB_DESCRIBE="1.0.16"', -- 'POLL_NFDS_TYPE=nfds_t', -- 'THREADS_POSIX=1', -- ], -- }], -- ['OS=="linux"', { -- 'sources': [ -- 'src/libusb/os/linux_usbfs.c', -- 'src/libusb/os/linux_usbfs.h', -- ], -- 'defines': [ -- 'OS_LINUX=1', -- '_GNU_SOURCE=1', -- ], -- }], -- ['chromeos==1', { -- 'defines': [ -- 'USBI_TIMERFD_AVAILABLE', -- ] -- }], -- ['use_udev==1', { -- 'sources': [ -- 'src/libusb/os/linux_udev.cc', -- ], -- 'defines': [ -- 'HAVE_LIBUDEV=1', -- 'USE_UDEV=1', -- ], -- 'dependencies': [ -- '../../device/udev_linux/udev.gyp:udev_linux', -- ], -- 'include_dirs': [ -- '../..', -- ], -- }], -- ['OS=="linux" and use_udev==0', { -- 'sources': [ -- 'src/libusb/os/linux_netlink.c', -- ], -- 'defines': [ -- 'HAVE_LINUX_NETLINK_H', -- ], -- 'conditions': [ -- ['clang==1', { -- 'cflags': [ -- '-Wno-pointer-sign', -- ] -- }] -- ], -- }], -- ['OS=="mac"', { -- 'sources': [ -- 'src/libusb/os/darwin_usb.c', -- 'src/libusb/os/darwin_usb.h', -- ], -- 'defines': [ -- 'OS_DARWIN=1', -- ], -- }], -- ['OS=="win"', { -- 'sources': [ -- 'src/libusb/os/poll_windows.c', -- 'src/libusb/os/poll_windows.h', -- 'src/libusb/os/threads_windows.c', -- 'src/libusb/os/threads_windows.h', -- 'src/libusb/os/windows_common.h', -- 'src/libusb/os/windows_usb.c', -- 'src/libusb/os/windows_usb.h', -- 'src/msvc/config.h', -- 'src/msvc/inttypes.h', -- 'src/msvc/stdint.h', -- ], -- 'include_dirs!': [ -- 'src', -+ 'link_settings': { -+ 'ldflags': [ -+ '<!@(pkg-config --libs-only-L --libs-only-other libusb-1.0)', - ], -- 'include_dirs': [ -- 'src/msvc', -+ 'libraries': [ -+ '<!@(pkg-config --libs-only-l libusb-1.0)', - ], -- 'msvs_disabled_warnings': [ 4267 ], -- }], -- ], -+ }, -+ }, - }, - ], - } diff --git a/www/chromium/files/patch-third__party_libxml_BUILD.gn b/www/chromium/files/patch-third__party_libxml_BUILD.gn new file mode 100644 index 000000000000..b66aa863040e --- /dev/null +++ b/www/chromium/files/patch-third__party_libxml_BUILD.gn @@ -0,0 +1,11 @@ +--- third_party/libxml/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300 ++++ third_party/libxml/BUILD.gn 2016-09-02 23:25:19.267995000 +0300 +@@ -4,7 +4,7 @@ + + # Define an "os_include" variable that points at the OS-specific generated + # headers. These were generated by running the configure script offline. +-if (is_linux || is_android || is_nacl) { ++if (is_linux || is_bsd || is_android || is_nacl) { + os_include = "linux" + } else if (is_mac || is_ios) { + os_include = "mac" diff --git a/www/chromium/files/patch-third__party_libxml_libxml.gyp b/www/chromium/files/patch-third__party_libxml_libxml.gyp deleted file mode 100644 index 79968c84cd87..000000000000 --- a/www/chromium/files/patch-third__party_libxml_libxml.gyp +++ /dev/null @@ -1,309 +0,0 @@ ---- third_party/libxml/libxml.gyp.orig 2016-05-20 17:19:03 UTC -+++ third_party/libxml/libxml.gyp -@@ -1,279 +1,38 @@ --# Copyright (c) 2012 The Chromium Authors. All rights reserved. -+# Copyright 2013 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. - - { -- 'variables': { -- 'conditions': [ -- # Define an "os_include" variable that points at the OS-specific generated -- # headers. These were generated by running the configure script offline. -- ['os_posix == 1 and OS != "mac" and OS != "ios"', { -- 'os_include': 'linux' -- }], -- ['OS=="mac"', {'os_include': 'mac'}], -- ['OS=="win"', {'os_include': 'win32'}], -- ], -- 'use_system_libxml%': 0, -- }, - 'targets': [ - { - 'target_name': 'libxml', -- 'conditions': [ -- ['use_system_libxml', { -- 'conditions': [ -- ['os_posix == 1 and OS != "mac" and OS != "ios"', { -- 'type': 'static_library', -- 'sources': [ -- 'chromium/libxml_utils.h', -- 'chromium/libxml_utils.cc', -- ], -- 'cflags': [ -- '<!@(pkg-config --cflags libxml-2.0)', -- ], -- 'defines': [ -- 'USE_SYSTEM_LIBXML', -- ], -- 'direct_dependent_settings': { -- 'cflags': [ -- '<!@(pkg-config --cflags libxml-2.0)', -- ], -- 'defines': [ -- 'USE_SYSTEM_LIBXML', -- ], -- }, -- 'link_settings': { -- 'ldflags': [ -- '<!@(pkg-config --libs-only-L --libs-only-other libxml-2.0)', -- ], -- 'libraries': [ -- '<!@(pkg-config --libs-only-l libxml-2.0)', -- ], -- }, -- }], -- ['OS == "ios"', { -- 'type': 'static_library', -- 'sources': [ -- 'chromium/libxml_utils.h', -- 'chromium/libxml_utils.cc', -- ], -- 'include_dirs': [ -- '$(SDKROOT)/usr/include/libxml2', -- ], -- 'all_dependent_settings': { -- 'defines': [ -- 'USE_SYSTEM_LIBXML', -- ], -- 'include_dirs': [ -- '$(SDKROOT)/usr/include/libxml2', -- ], -- }, -- 'link_settings': { -- 'xcode_settings': { -- 'OTHER_LDFLAGS': [ -- '-lxml2', -- ], -- }, -- }, -- }], -- ], -- }, { # else: !use_system_libxml -- 'type': 'static_library', -- 'sources': [ -- 'chromium/libxml_utils.h', -- 'chromium/libxml_utils.cc', -- 'linux/config.h', -- 'linux/include/libxml/xmlversion.h', -- 'mac/config.h', -- 'mac/include/libxml/xmlversion.h', -- 'src/include/libxml/c14n.h', -- 'src/include/libxml/catalog.h', -- 'src/include/libxml/chvalid.h', -- 'src/include/libxml/debugXML.h', -- 'src/include/libxml/dict.h', -- 'src/include/libxml/DOCBparser.h', -- 'src/include/libxml/encoding.h', -- 'src/include/libxml/entities.h', -- 'src/include/libxml/globals.h', -- 'src/include/libxml/hash.h', -- 'src/include/libxml/HTMLparser.h', -- 'src/include/libxml/HTMLtree.h', -- 'src/include/libxml/list.h', -- 'src/include/libxml/parser.h', -- 'src/include/libxml/parserInternals.h', -- 'src/include/libxml/pattern.h', -- 'src/include/libxml/relaxng.h', -- 'src/include/libxml/SAX.h', -- 'src/include/libxml/SAX2.h', -- 'src/include/libxml/schemasInternals.h', -- 'src/include/libxml/schematron.h', -- 'src/include/libxml/threads.h', -- 'src/include/libxml/tree.h', -- 'src/include/libxml/uri.h', -- 'src/include/libxml/valid.h', -- 'src/include/libxml/xinclude.h', -- 'src/include/libxml/xlink.h', -- 'src/include/libxml/xmlautomata.h', -- 'src/include/libxml/xmlerror.h', -- 'src/include/libxml/xmlexports.h', -- 'src/include/libxml/xmlIO.h', -- 'src/include/libxml/xmlmemory.h', -- 'src/include/libxml/xmlmodule.h', -- 'src/include/libxml/xmlreader.h', -- 'src/include/libxml/xmlregexp.h', -- 'src/include/libxml/xmlsave.h', -- 'src/include/libxml/xmlschemas.h', -- 'src/include/libxml/xmlschemastypes.h', -- 'src/include/libxml/xmlstring.h', -- 'src/include/libxml/xmlunicode.h', -- 'src/include/libxml/xmlwriter.h', -- 'src/include/libxml/xpath.h', -- 'src/include/libxml/xpathInternals.h', -- 'src/include/libxml/xpointer.h', -- 'src/include/win32config.h', -- 'src/include/wsockcompat.h', -- 'src/buf.c', -- 'src/buf.h', -- 'src/c14n.c', -- 'src/catalog.c', -- 'src/chvalid.c', -- 'src/debugXML.c', -- 'src/dict.c', -- 'src/DOCBparser.c', -- 'src/elfgcchack.h', -- 'src/enc.h', -- 'src/encoding.c', -- 'src/entities.c', -- 'src/error.c', -- 'src/globals.c', -- 'src/hash.c', -- 'src/HTMLparser.c', -- 'src/HTMLtree.c', -- 'src/legacy.c', -- 'src/libxml.h', -- 'src/list.c', -- 'src/parser.c', -- 'src/parserInternals.c', -- 'src/pattern.c', -- 'src/relaxng.c', -- 'src/save.h', -- 'src/SAX.c', -- 'src/SAX2.c', -- 'src/schematron.c', -- 'src/threads.c', -- 'src/timsort.h', -- 'src/tree.c', -- #'src/trio.c', -- #'src/trio.h', -- #'src/triodef.h', -- #'src/trionan.c', -- #'src/trionan.h', -- #'src/triop.h', -- #'src/triostr.c', -- #'src/triostr.h', -- 'src/uri.c', -- 'src/valid.c', -- 'src/xinclude.c', -- 'src/xlink.c', -- 'src/xmlIO.c', -- 'src/xmlmemory.c', -- 'src/xmlmodule.c', -- 'src/xmlreader.c', -- 'src/xmlregexp.c', -- 'src/xmlsave.c', -- 'src/xmlschemas.c', -- 'src/xmlschemastypes.c', -- 'src/xmlstring.c', -- 'src/xmlunicode.c', -- 'src/xmlwriter.c', -- 'src/xpath.c', -- 'src/xpointer.c', -- #'src/xzlib.c', -- 'src/xzlib.h', -- 'win32/config.h', -- 'win32/include/libxml/xmlversion.h', -- ], -- 'defines': [ -- # Define LIBXML_STATIC as nothing to match how libxml.h -- # (an internal header) defines LIBXML_STATIC, otherwise -- # we get the macro redefined warning from GCC. (-DFOO -- # defines the macro FOO as 1.) -- 'LIBXML_STATIC=', -- ], -- 'variables': { -- 'clang_warning_flags': [ -- # libxml passes `const unsigned char*` through `const char*`. -- '-Wno-pointer-sign', -- # pattern.c and uri.c both have an intentional -- # `for (...);` / `while(...);` loop. I submitted a patch to -- # move the `'` to its own line, but until that's landed -- # suppress the warning: -- '-Wno-empty-body', -- # debugXML.c compares array 'arg' to NULL. -- '-Wno-tautological-pointer-compare', -- # See http://crbug.com/138571#c8 -- '-Wno-ignored-attributes', -- # libxml casts from int to long to void*. -- '-Wno-int-to-void-pointer-cast', -- # libxml passes a volatile LPCRITICAL_SECTION* to a function -- # expecting a void* volatile*. -- '-Wno-incompatible-pointer-types', -- # trio_is_special_quantity and trio_is_negative are only -- # used with certain preprocessor defines set. -- '-Wno-unused-function', -- ], -- }, -- 'include_dirs': [ -- '<(os_include)', -- '<(os_include)/include', -- 'src/include', -- ], -- 'dependencies': [ -- '../icu/icu.gyp:icuuc', -- '../zlib/zlib.gyp:zlib', -- ], -- 'export_dependent_settings': [ -- '../icu/icu.gyp:icuuc', -- ], -- 'direct_dependent_settings': { -- 'defines': [ -- 'LIBXML_STATIC', -- ], -- 'include_dirs': [ -- '<(os_include)/include', -- 'src/include', -- ], -- }, -- 'conditions': [ -- ['OS=="linux"', { -- 'link_settings': { -- 'libraries': [ -- # We need dl for dlopen() and friends. -- '-ldl', -- '-lm', -- ], -- }, -- }], -- # http://www.xmlsoft.org/threads.html says that this is required -- # when using libxml from several threads, which can possibly happen -- # in chrome. On linux, this is picked up by transitivity from -- # pkg-config output from build/linux/system.gyp. -- ['OS=="mac" or OS=="android"', {'defines': ['_REENTRANT']}], -- ['OS=="win"', { -- 'product_name': 'libxml2', -- # Disable unimportant 'unused variable' warning. -- # TODO(jschuh): http://crbug.com/167187 size_t -> int -- # TODO(brucedawson): http://crbug.com/554200 fix C4311 warnings -- # C4311 is a VS 2015 64-bit warning for pointer truncation -- 'msvs_disabled_warnings': [ 4018, 4267, 4311, ], -- }, { # else: OS!="win" -- 'product_name': 'xml2', -- }], -- ], -- }], -- ['OS == "ios"', { -- 'toolsets': ['host', 'target'], -- }], -+ 'type': 'static_library', -+ 'sources': [ -+ 'chromium/libxml_utils.h', -+ 'chromium/libxml_utils.cc', -+ ], -+ 'cflags': [ -+ '<!@(pkg-config --cflags libxml-2.0)', -+ ], -+ 'defines': [ -+ 'USE_SYSTEM_LIBXML', - ], -+ 'direct_dependent_settings': { -+ 'cflags': [ -+ '<!@(pkg-config --cflags libxml-2.0)', -+ ], -+ 'defines': [ -+ 'USE_SYSTEM_LIBXML', -+ ], -+ }, -+ 'link_settings': { -+ 'ldflags': [ -+ '<!@(pkg-config --libs-only-L --libs-only-other libxml-2.0)', -+ ], -+ 'libraries': [ -+ '<!@(pkg-config --libs-only-l libxml-2.0)', -+ ], -+ }, - }, - ], - } diff --git a/www/chromium/files/patch-third__party_libxslt_BUILD.gn b/www/chromium/files/patch-third__party_libxslt_BUILD.gn new file mode 100644 index 000000000000..f9bc3e848b4a --- /dev/null +++ b/www/chromium/files/patch-third__party_libxslt_BUILD.gn @@ -0,0 +1,11 @@ +--- third_party/libxslt/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300 ++++ third_party/libxslt/BUILD.gn 2016-09-03 01:40:07.403577000 +0300 +@@ -82,7 +82,7 @@ + public_configs = [ ":libxslt_config" ] + + cflags = [] +- if (is_linux || is_android) { ++ if (is_linux || is_bsd || is_android) { + include_dirs = [ "linux" ] + } else if (is_win) { + include_dirs = [ "win32" ] diff --git a/www/chromium/files/patch-third__party_libxslt_libxslt.gyp b/www/chromium/files/patch-third__party_libxslt_libxslt.gyp deleted file mode 100644 index 5f6d0674452e..000000000000 --- a/www/chromium/files/patch-third__party_libxslt_libxslt.gyp +++ /dev/null @@ -1,150 +0,0 @@ ---- third_party/libxslt/libxslt.gyp.orig 2016-05-20 17:19:03 UTC -+++ third_party/libxslt/libxslt.gyp -@@ -1,132 +1,25 @@ --# Copyright (c) 2009 The Chromium Authors. All rights reserved. -+# Copyright 2013 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. - - { -- 'variables': { -- 'conditions': [ -- ['os_posix == 1 and OS != "mac"', { -- 'os_include': 'linux' -- }], -- ['OS=="mac"', {'os_include': 'mac'}], -- ['OS=="win"', {'os_include': 'win32'}], -- ], -- # We used to have a separate flag for using the system -- # libxslt, but it seems mixing Chrome libxml and system -- # libxslt causes crashes that nobody has had time to diagnose. -- # So just put them both behind the same flag for now. -- 'use_system_libxml%': 0, -- }, - 'targets': [ - { - 'target_name': 'libxslt', -- 'conditions': [ -- ['os_posix == 1 and OS != "mac" and use_system_libxml', { -- 'type': 'none', -- 'direct_dependent_settings': { -- 'cflags': [ -- '<!@(pkg-config --cflags libxslt)', -- ], -- }, -- 'link_settings': { -- 'ldflags': [ -- '<!@(pkg-config --libs-only-L --libs-only-other libxslt)', -- ], -- 'libraries': [ -- '<!@(pkg-config --libs-only-l libxslt)', -- ], -- }, -- }, { # else: os_posix != 1 or OS == "mac" or ! use_system_libxml -- 'type': 'static_library', -- 'sources': [ -- 'libxslt/attributes.c', -- 'libxslt/attributes.h', -- 'libxslt/attrvt.c', -- 'libxslt/documents.c', -- 'libxslt/documents.h', -- 'libxslt/extensions.c', -- 'libxslt/extensions.h', -- 'libxslt/extra.c', -- 'libxslt/extra.h', -- 'libxslt/functions.c', -- 'libxslt/functions.h', -- 'libxslt/imports.c', -- 'libxslt/imports.h', -- 'libxslt/keys.c', -- 'libxslt/keys.h', -- 'libxslt/libxslt.h', -- 'libxslt/namespaces.c', -- 'libxslt/namespaces.h', -- 'libxslt/numbers.c', -- 'libxslt/numbersInternals.h', -- 'libxslt/pattern.c', -- 'libxslt/pattern.h', -- 'libxslt/preproc.c', -- 'libxslt/preproc.h', -- 'libxslt/security.c', -- 'libxslt/security.h', -- 'libxslt/templates.c', -- 'libxslt/templates.h', -- 'libxslt/transform.c', -- 'libxslt/transform.h', -- 'libxslt/trio.h', -- 'libxslt/triodef.h', -- 'libxslt/variables.c', -- 'libxslt/variables.h', -- 'libxslt/win32config.h', -- 'libxslt/xslt.c', -- 'libxslt/xslt.h', -- 'libxslt/xsltconfig.h', -- 'libxslt/xsltexports.h', -- 'libxslt/xsltInternals.h', -- 'libxslt/xsltlocale.c', -- 'libxslt/xsltlocale.h', -- 'libxslt/xsltutils.c', -- 'libxslt/xsltutils.h', -- 'libxslt/xsltwin32config.h', -- 'linux/config.h', -- 'mac/config.h', -- # TODO(port): Need a pregenerated win32/config.h? -- ], -- 'defines': [ -- 'LIBXSLT_STATIC', -- ], -- 'include_dirs': [ -- '<(os_include)', -- '.', -- ], -- 'dependencies': [ -- '../libxml/libxml.gyp:libxml', -- ], -- 'direct_dependent_settings': { -- 'defines': [ -- 'LIBXSLT_STATIC', -- ], -- 'include_dirs': [ -- '.', -- ], -- }, -- 'msvs_disabled_warnings': [ -- # size_t to int conversion. -- 4267, -- # TODO(brucedawson): http://crbug.com/554200 4311 is a -- # VS 2015 64-bit warning for pointer truncation -- 4311, -- ], -- 'variables': { -- 'clang_warning_flags': [ -- # libxslt stores a char[3] in a `const unsigned char*`. -- '-Wno-pointer-sign', -- # xsltDefaultRegion and xsltCalibrateTimestamps are only -- # used with certain preprocessor defines set. -- '-Wno-unused-function', -- ], -- }, -- 'conditions': [ -- ['OS!="win"', {'product_name': 'xslt'}], -- ], -- }], -- ], -+ 'type': 'none', -+ 'direct_dependent_settings': { -+ 'cflags': [ -+ '<!@(pkg-config --cflags libxslt)', -+ ], -+ }, -+ 'link_settings': { -+ 'ldflags': [ -+ '<!@(pkg-config --libs-only-L --libs-only-other libxslt)', -+ ], -+ 'libraries': [ -+ '<!@(pkg-config --libs-only-l libxslt)', -+ ], -+ }, - }, - ], - } diff --git a/www/chromium/files/patch-third__party_mesa_BUILD.gn b/www/chromium/files/patch-third__party_mesa_BUILD.gn new file mode 100644 index 000000000000..1b13828745d0 --- /dev/null +++ b/www/chromium/files/patch-third__party_mesa_BUILD.gn @@ -0,0 +1,23 @@ +--- third_party/mesa/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300 ++++ third_party/mesa/BUILD.gn 2016-09-25 07:24:36.558482000 +0300 +@@ -88,6 +88,10 @@ + defines += [ "_GNU_SOURCE" ] + } + ++ if (is_bsd) { ++ defines += [ "_BSD_SOURCE" ] ++ } ++ + if (is_win) { + defines += [ + # Generated files use const only if __cplusplus or __STDC__ is defined. +@@ -755,7 +759,8 @@ + ] + + # Required for the allocator implementation, which is not used on Mac. +- if (!is_mac) { ++ # For BSD, there's no poing to include everything. ++ if (!is_mac && !is_bsd) { + deps += [ "//base" ] + } + diff --git a/www/chromium/files/patch-third__party_minigbm_BUILD.gn b/www/chromium/files/patch-third__party_minigbm_BUILD.gn new file mode 100644 index 000000000000..e705ebfd1e48 --- /dev/null +++ b/www/chromium/files/patch-third__party_minigbm_BUILD.gn @@ -0,0 +1,11 @@ +--- third_party/minigbm/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300 ++++ third_party/minigbm/BUILD.gn 2016-09-03 01:40:26.605383000 +0300 +@@ -4,7 +4,7 @@ + + import("//build/config/linux/pkg_config.gni") + +-assert(is_linux) ++assert(is_linux || is_bsd) + + declare_args() { + # Controls whether the build should use the version of minigbm library diff --git a/www/chromium/files/patch-third__party_opus_BUILD.gn b/www/chromium/files/patch-third__party_opus_BUILD.gn new file mode 100644 index 000000000000..bbce2177c554 --- /dev/null +++ b/www/chromium/files/patch-third__party_opus_BUILD.gn @@ -0,0 +1,11 @@ +--- third_party/opus/BUILD.gn.orig 2016-10-06 04:02:42.000000000 +0300 ++++ third_party/opus/BUILD.gn 2016-10-13 08:49:39.874353000 +0300 +@@ -14,7 +14,7 @@ + # If OPUS Run Time CPU Detections (RTCD) shall be used. + # Based on the conditions in celt/arm/armcpu.c: + # defined(_MSC_VER) || defined(__linux__). +-use_opus_rtcd = current_cpu == "arm" && (is_win || is_android || is_linux) ++use_opus_rtcd = current_cpu == "arm" && (is_win || is_android || is_linux || is_bsd) + + config("opus_config") { + include_dirs = [ "src/include" ] diff --git a/www/chromium/files/patch-third__party_pdfium_BUILD.gn b/www/chromium/files/patch-third__party_pdfium_BUILD.gn new file mode 100644 index 000000000000..ffdaa34a546d --- /dev/null +++ b/www/chromium/files/patch-third__party_pdfium_BUILD.gn @@ -0,0 +1,11 @@ +--- third_party/pdfium/BUILD.gn.orig 2016-10-06 04:05:20.000000000 +0300 ++++ third_party/pdfium/BUILD.gn 2016-10-13 08:51:40.306487000 +0300 +@@ -40,7 +40,7 @@ + cflags = [] + configs = [ ":pdfium_common_config" ] + defines = [ "V8_DEPRECATION_WARNINGS" ] +- if (is_linux) { ++ if (is_linux || is_bsd) { + if (current_cpu == "x64") { + defines += [ "_FX_CPU_=_FX_X64_" ] + cflags += [ "-fPIC" ] diff --git a/www/chromium/files/patch-third__party_pdfium_build__gyp_standalone.gypi b/www/chromium/files/patch-third__party_pdfium_build__gyp_standalone.gypi deleted file mode 100644 index 57364a627b0f..000000000000 --- a/www/chromium/files/patch-third__party_pdfium_build__gyp_standalone.gypi +++ /dev/null @@ -1,38 +0,0 @@ ---- third_party/pdfium/build_gyp/standalone.gypi.orig 2016-08-03 16:25:54.875923000 -0400 -+++ third_party/pdfium/build_gyp/standalone.gypi 2016-08-03 16:28:57.583883000 -0400 -@@ -19,7 +19,7 @@ - 'variables': { - 'variables': { - 'conditions': [ -- ['OS=="linux" or OS=="mac"', { -+ ['OS=="linux" or OS=="mac" or OS=="freebsd"', { - # This handles the Unix platforms we generally deal with. - # Anything else gets passed through, which probably won't work - # very well; such hosts should pass an explicit target_arch -@@ -32,7 +32,7 @@ - s/aarch64/arm64/;\ - s/mips.*/mipsel/")', - }, { -- # OS!="linux" and OS!="mac" -+ # OS!="linux" and OS!="mac" and OS!="freebsd" - 'host_arch%': 'ia32', - }], - ], -@@ -59,7 +59,7 @@ - }, { - 'os_posix%': 1, - }], -- ['OS=="linux" or OS=="mac"', { -+ ['OS=="linux" or OS=="mac" or OS=="freebsd"', { - 'clang%': 1, - 'host_clang%': 1, - }, { -@@ -141,7 +141,7 @@ - }, - }, - 'conditions': [ -- ['OS=="linux"', { -+ ['OS=="linux" or OS=="freebsd"', { - 'cflags': [ - '-fdata-sections', - '-ffunction-sections', diff --git a/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp b/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp index 7e02b2f556d8..7075150fd373 100644 --- a/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp +++ b/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp @@ -1,9 +1,9 @@ ---- third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp.orig 2016-07-22 00:09:02.000000000 -0400 -+++ third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp 2016-08-03 16:33:48.931305000 -0400 +--- third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp.orig 2016-07-20 22:04:51.000000000 +0300 ++++ third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp 2016-08-01 18:53:01.768097000 +0300 @@ -62,6 +62,103 @@ L"July", L"August", L"September", L"October", L"November", L"December"}; - + +#if defined(__FreeBSD__) +/* + * cvt.c - IEEE floating point formatting routines for FreeBSD diff --git a/www/chromium/files/patch-third__party_pdfium_pdfium.gyp b/www/chromium/files/patch-third__party_pdfium_pdfium.gyp deleted file mode 100644 index 2bef54d1d4fd..000000000000 --- a/www/chromium/files/patch-third__party_pdfium_pdfium.gyp +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/pdfium/pdfium.gyp.orig 2016-05-11 19:03:45 UTC -+++ third_party/pdfium/pdfium.gyp -@@ -44,7 +44,7 @@ - ['pdf_enable_xfa==1', { - 'defines': ['PDF_ENABLE_XFA'], - }], -- ['OS=="linux"', { -+ ['OS=="linux" or OS=="freebsd"', { - 'conditions': [ - ['target_arch=="x64"', { - 'defines' : [ '_FX_CPU_=_FX_X64_', ], diff --git a/www/chromium/files/patch-third__party_pdfium_skia_BUILD.gn b/www/chromium/files/patch-third__party_pdfium_skia_BUILD.gn new file mode 100644 index 000000000000..f2f9b7490d57 --- /dev/null +++ b/www/chromium/files/patch-third__party_pdfium_skia_BUILD.gn @@ -0,0 +1,29 @@ +--- third_party/pdfium/skia/BUILD.gn.orig 2016-10-06 04:05:20.000000000 +0300 ++++ third_party/pdfium/skia/BUILD.gn 2016-10-13 08:54:45.371706000 +0300 +@@ -180,7 +180,7 @@ + } + + # Settings for text blitting, chosen to approximate the system browser. +- if (is_linux) { ++ if (is_linux || is_bsd) { + defines += [ + "SK_GAMMA_EXPONENT=1.2", + "SK_GAMMA_CONTRAST=0.2", +@@ -329,7 +329,7 @@ + "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp", + ] + } +- if (!is_linux && !is_android && !is_win && !is_mac) { ++ if (!is_linux && !is_android && !is_win && !is_mac || !is_bsd) { + sources -= [ + "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", + "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", +@@ -358,7 +358,7 @@ + "../third_party:fx_zlib", + ] + +- if (is_linux) { ++ if (is_linux || is_bsd) { + deps += [ "//third_party/icu:icuuc" ] + } + diff --git a/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h b/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h deleted file mode 100644 index 96789ec58acd..000000000000 --- a/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2016-08-04 11:23:35.218593000 -0400 -+++ third_party/protobuf/src/google/protobuf/stubs/platform_macros.h 2016-08-04 11:24:32.984837000 -0400 -@@ -111,7 +111,7 @@ - - #undef GOOGLE_PROTOBUF_PLATFORM_ERROR - --#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_APPLE) -+#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_APPLE) || defined(__OpenBSD__) || defined(__FreeBSD__) - // Android ndk does not support the __thread keyword very well yet. Here - // we use pthread_key_create()/pthread_getspecific()/... methods for - // TLS support on android. diff --git a/www/chromium/files/patch-third__party_re2_re2.gyp b/www/chromium/files/patch-third__party_re2_re2.gyp deleted file mode 100644 index 2b11d34e0ebe..000000000000 --- a/www/chromium/files/patch-third__party_re2_re2.gyp +++ /dev/null @@ -1,112 +0,0 @@ ---- third_party/re2/re2.gyp.orig 2016-05-20 17:19:03 UTC -+++ third_party/re2/re2.gyp -@@ -1,84 +1,37 @@ --# Copyright 2014 The Chromium Authors. All rights reserved. -+# Copyright 2013 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. - - { -- 'variables': { -- 'build_for_tool%': '', -- }, - 'targets': [ - { - 'target_name': 're2', -- 'type': 'static_library', -- 'include_dirs': [ -- 'src', -- '<(DEPTH)', -- ], -- 'direct_dependent_settings': { -- 'include_dirs': [ -- 'src', -- '<(DEPTH)', -+ 'type': 'none', -+ 'variables': { -+ 'headers_root_path': '.', -+ 'header_filenames': [ -+ 're2/filtered_re2.h', -+ 're2/re2.h', -+ 're2/set.h', -+ 're2/stringpiece.h', -+ 're2/variadic_function.h', -+ ], -+ 'shim_generator_additional_args': [ -+ # Chromium copy of re2 is patched to rename POSIX to POSIX_SYNTAX -+ # because of collision issues that break the build. -+ # Upstream refuses to make changes: -+ # http://code.google.com/p/re2/issues/detail?id=73 . -+ '--define', 'POSIX=POSIX_SYNTAX', - ], - }, -- 'sources': [ -- 'src/re2/bitstate.cc', -- 'src/re2/compile.cc', -- 'src/re2/dfa.cc', -- 'src/re2/filtered_re2.cc', -- 'src/re2/filtered_re2.h', -- 'src/re2/mimics_pcre.cc', -- 'src/re2/nfa.cc', -- 'src/re2/onepass.cc', -- 'src/re2/parse.cc', -- 'src/re2/perl_groups.cc', -- 'src/re2/prefilter.cc', -- 'src/re2/prefilter.h', -- 'src/re2/prefilter_tree.cc', -- 'src/re2/prefilter_tree.h', -- 'src/re2/prog.cc', -- 'src/re2/prog.h', -- 'src/re2/re2.cc', -- 'src/re2/re2.h', -- 'src/re2/regexp.cc', -- 'src/re2/regexp.h', -- 'src/re2/set.cc', -- 'src/re2/set.h', -- 'src/re2/simplify.cc', -- 'src/re2/stringpiece.cc', -- 'src/re2/stringpiece.h', -- 'src/re2/tostring.cc', -- 'src/re2/unicode_casefold.cc', -- 'src/re2/unicode_casefold.h', -- 'src/re2/unicode_groups.cc', -- 'src/re2/unicode_groups.h', -- 'src/re2/variadic_function.h', -- 'src/re2/walker-inl.h', -- 'src/util/atomicops.h', -- 'src/util/flags.h', -- 'src/util/hash.cc', -- 'src/util/logging.cc', -- 'src/util/logging.h', -- 'src/util/mutex.h', -- 'src/util/rune.cc', -- 'src/util/sparse_array.h', -- 'src/util/sparse_set.h', -- 'src/util/stringprintf.cc', -- 'src/util/strutil.cc', -- 'src/util/utf.h', -- 'src/util/util.h', -- 'src/util/valgrind.cc', -- 'src/util/valgrind.h', -+ 'includes': [ -+ '../../build/shim_headers.gypi', - ], -- 'conditions': [ -- ['build_for_tool=="drmemory"', { -- # Treat builds for Dr. Memory as builds for MSAN to prevent false -- # positives created by lazily initialized memory. -- # See crbug.com/568119#3 . -- 'defines': [ -- 'MEMORY_SANITIZER' -- ], -- }], -- ] -- }, -+ 'link_settings': { -+ 'libraries': [ -+ '-lre2', -+ ], -+ }, -+ } - ], - } diff --git a/www/chromium/files/patch-third__party_sfntly_sfntly.gyp b/www/chromium/files/patch-third__party_sfntly_sfntly.gyp deleted file mode 100644 index 45671b494153..000000000000 --- a/www/chromium/files/patch-third__party_sfntly_sfntly.gyp +++ /dev/null @@ -1,10 +0,0 @@ ---- third_party/sfntly/sfntly.gyp.orig 2016-03-25 13:05:02 UTC -+++ third_party/sfntly/sfntly.gyp -@@ -127,6 +127,7 @@ - ], - 'include_dirs': [ - 'src/cpp/src', -+ '<(prefix_dir)/include', - ], - # This macro must be define to suppress the use of exception - 'defines': [ diff --git a/www/chromium/files/patch-third__party_snappy_snappy.gyp b/www/chromium/files/patch-third__party_snappy_snappy.gyp deleted file mode 100644 index ed9733f76e7f..000000000000 --- a/www/chromium/files/patch-third__party_snappy_snappy.gyp +++ /dev/null @@ -1,121 +0,0 @@ ---- third_party/snappy/snappy.gyp.orig 2016-05-20 17:19:03 UTC -+++ third_party/snappy/snappy.gyp -@@ -1,104 +1,29 @@ --# Copyright (c) 2012 The Chromium Authors. All rights reserved. -+# Copyright 2013 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. - - { --'variables': { -- 'conditions': [ -- # Define an "os_include" variable that points at the OS-specific generated -- # headers. These were generated by running the configure script offline. -- ['os_posix == 1 and OS != "mac"', { -- 'os_include': 'linux' -- }], -- ['OS=="mac"', {'os_include': 'mac'}], -- ['OS=="win"', {'os_include': 'win32'}], -- ], -- 'use_system_libxml%': 0, -- }, - 'targets': [ - { - 'target_name': 'snappy', -- 'type': 'static_library', -- 'include_dirs': [ -- '<(os_include)', -- 'src', -- '../..', -- ], -- 'direct_dependent_settings': { -- 'include_dirs': [ -- '<(os_include)', -- 'src', -- ], -- }, -+ 'type': 'none', - 'variables': { -- 'clang_warning_flags': [ -- # ComputeTable is unused, -- # https://code.google.com/p/snappy/issues/detail?id=96 -- '-Wno-unused-function', -- ], -- 'clang_warning_flags_unset': [ -- # snappy-stubs-internal.h unapologetically has: using namespace std -- # https://code.google.com/p/snappy/issues/detail?id=70 -- '-Wheader-hygiene', -+ 'headers_root_path': 'src', -+ 'header_filenames': [ -+ 'snappy-c.h', -+ 'snappy-sinksource.h', -+ 'snappy-stubs-public.h', -+ 'snappy.h', - ], - }, -- 'sources': [ -- 'src/snappy-internal.h', -- 'src/snappy-sinksource.cc', -- 'src/snappy-sinksource.h', -- 'src/snappy-stubs-internal.cc', -- 'src/snappy-stubs-internal.h', -- 'src/snappy.cc', -- 'src/snappy.h', -- ], -- 'conditions': [ -- ['OS=="linux" or OS=="mac"', { -- 'defines': [ -- # TODO(tfarina): Only Mac and Linux has the generated config.h for -- # now. Generate the config.h for Windows too and enable this there -- # as well. -- 'HAVE_CONFIG_H=1', -- ], -- }], -- ['OS=="win"', { -- # Signed/unsigned comparison -- 'msvs_disabled_warnings': [ -- # https://code.google.com/p/snappy/issues/detail?id=71 -- 4018, -- # https://code.google.com/p/snappy/issues/detail?id=75 -- 4267, -- ], -- }], -- ], -- }, -- { -- 'target_name': 'snappy_unittest', -- 'type': 'executable', -- 'sources': [ -- 'src/snappy-test.cc', -- 'src/snappy-test.h', -- 'src/snappy_unittest.cc', -- ], -- 'dependencies': [ -- 'snappy', -- '../../base/base.gyp:base', -- '../../testing/gtest.gyp:gtest', -- '../../third_party/zlib/zlib.gyp:zlib', -+ 'includes': [ -+ '../../build/shim_headers.gypi', - ], -- 'variables': { -- 'clang_warning_flags': [ '-Wno-return-type' ], -- 'clang_warning_flags_unset': [ '-Wheader-hygiene' ], -+ 'link_settings': { -+ 'libraries': [ -+ '-lsnappy', -+ ], - }, -- 'conditions': [ -- ['OS=="linux" or OS=="mac"', { -- 'defines': [ -- # TODO(tfarina): Only Mac and Linux has the generated config.h for -- # now. Generate the config.h for Windows too and enable this there -- # as well. -- 'HAVE_CONFIG_H=1', -- ], -- }], -- ], - }, - ], - } diff --git a/www/chromium/files/patch-third__party_sqlite_BUILD.gn b/www/chromium/files/patch-third__party_sqlite_BUILD.gn new file mode 100644 index 000000000000..864bb10c6ac2 --- /dev/null +++ b/www/chromium/files/patch-third__party_sqlite_BUILD.gn @@ -0,0 +1,38 @@ +--- third_party/sqlite/BUILD.gn.orig 2016-10-06 04:02:42.000000000 +0300 ++++ third_party/sqlite/BUILD.gn 2016-10-30 23:32:40.983715000 +0200 +@@ -20,7 +20,7 @@ + # sqlite3Fts3InitTok). + cflags += [ "-Wno-unused-function" ] + } +- if (is_linux) { ++ if (is_linux || is_bsd) { + cflags += [ + # SQLite doesn"t believe in compiler warnings, + # preferring testing. +@@ -177,7 +177,7 @@ + public_configs = [ ":sqlite_export" ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + executable("sqlite_shell") { + # So shell.c can find the correct sqlite3.h. + include_dirs = [ "amalgamation" ] +@@ -206,7 +206,7 @@ + + config("sqlite_config") { + defines = [ "USE_SYSTEM_SQLITE" ] +- if (is_ios) { ++ if (is_ios || is_bsd) { + libs = [ "sqlite3" ] + } else { + assert(false, "extra flags to use system sqlite3 library missing") +@@ -225,7 +225,7 @@ + } + } + +- if (is_ios) { ++ if (is_ios || is_bsd) { + source_set("sqlite_recover") { + sources = [ + # TODO(shess): Move out of the SQLite source tree, perhaps to ext/. diff --git a/www/chromium/files/patch-third__party_sqlite_sqlite.gyp b/www/chromium/files/patch-third__party_sqlite_sqlite.gyp deleted file mode 100644 index 7b072469fa38..000000000000 --- a/www/chromium/files/patch-third__party_sqlite_sqlite.gyp +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/sqlite/sqlite.gyp.orig 2016-05-11 19:02:34 UTC -+++ third_party/sqlite/sqlite.gyp -@@ -153,6 +153,8 @@ - }, - 'include_dirs': [ - 'amalgamation', -+ # FreeBSD ... -+ '<(prefix_dir)/include', - ], - 'dependencies': [ - '../icu/icu.gyp:icui18n', diff --git a/www/chromium/files/patch-third__party_usrsctp_BUILD.gn b/www/chromium/files/patch-third__party_usrsctp_BUILD.gn new file mode 100644 index 000000000000..5f147fa94ca6 --- /dev/null +++ b/www/chromium/files/patch-third__party_usrsctp_BUILD.gn @@ -0,0 +1,15 @@ +--- third_party/usrsctp/BUILD.gn.orig 2016-08-03 22:02:40.000000000 +0300 ++++ third_party/usrsctp/BUILD.gn 2016-09-20 02:42:29.328962000 +0300 +@@ -112,6 +112,12 @@ + "__Userspace_os_Linux", + "_GNU_SOURCE", + ] ++ } else if (is_bsd) { ++ # For now, freebsd hard coding, differentiate different bsd is a plan ++ defines += [ ++ "__Userspace_os_FreeBSD", ++ ] ++ cflags += [ "-U__FreeBSD__" ] + } else if (is_mac || is_ios) { + defines += [ + "HAVE_SA_LEN", diff --git a/www/chromium/files/patch-third__party_usrsctp_usrsctp.gyp b/www/chromium/files/patch-third__party_usrsctp_usrsctp.gyp deleted file mode 100644 index 480846c5dc76..000000000000 --- a/www/chromium/files/patch-third__party_usrsctp_usrsctp.gyp +++ /dev/null @@ -1,17 +0,0 @@ ---- third_party/usrsctp/usrsctp.gyp.orig 2016-05-31 16:52:03.000000000 -0400 -+++ third_party/usrsctp/usrsctp.gyp 2016-06-05 17:25:20.996841000 -0400 -@@ -111,6 +111,14 @@ - 'cflags!': [ '-Werror', '-Wall' ], - 'cflags': [ '-w' ], - }], -+ ['OS=="freebsd"', { -+ 'defines': [ -+ 'HAVE_SCONN_LEN', -+ '__Userspace_os_FreeBSD', -+ ], -+ 'cflags!': [ '-Werror', '-Wall' ], -+ 'cflags': [ '-U__FreeBSD__', '-w' ], -+ }], - ['OS=="mac" or OS=="ios"', { - 'defines': [ - 'HAVE_SA_LEN', diff --git a/www/chromium/files/patch-third__party_webrtc_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_BUILD.gn new file mode 100644 index 000000000000..70f875e8ff45 --- /dev/null +++ b/www/chromium/files/patch-third__party_webrtc_BUILD.gn @@ -0,0 +1,12 @@ +--- third_party/webrtc/BUILD.gn.orig 2016-10-06 04:05:35.000000000 +0300 ++++ third_party/webrtc/BUILD.gn 2016-10-14 17:24:44.301409000 +0300 +@@ -60,6 +60,9 @@ + if (is_linux) { + defines += [ "WEBRTC_LINUX" ] + } ++ if (is_bsd) { ++ defines += [ "WEBRTC_LINUX", "WEBRTC_BSD", "WEBRTC_THREAD_RR" ] ++ } + if (is_mac) { + defines += [ "WEBRTC_MAC" ] + } diff --git a/www/chromium/files/patch-third__party_webrtc_base_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_base_BUILD.gn new file mode 100644 index 000000000000..b39eab962833 --- /dev/null +++ b/www/chromium/files/patch-third__party_webrtc_base_BUILD.gn @@ -0,0 +1,10 @@ +--- third_party/webrtc/base/BUILD.gn.orig 2016-08-03 22:04:03.000000000 +0300 ++++ third_party/webrtc/base/BUILD.gn 2016-09-25 15:11:54.051352000 +0300 +@@ -525,7 +525,6 @@ + "x11windowpicker.h", + ] + libs += [ +- "dl", + "rt", + "Xext", + "X11", diff --git a/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc b/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc index 0331a8ba5f2b..23e83006204a 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc +++ b/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc @@ -1,6 +1,18 @@ ---- third_party/webrtc/base/physicalsocketserver.cc.orig 2016-05-11 19:04:03 UTC -+++ third_party/webrtc/base/physicalsocketserver.cc -@@ -250,7 +250,7 @@ int PhysicalSocket::GetOption(Option opt +--- third_party/webrtc/base/physicalsocketserver.cc.orig 2016-10-06 04:05:35.000000000 +0300 ++++ third_party/webrtc/base/physicalsocketserver.cc 2016-10-13 12:57:59.467761000 +0300 +@@ -63,7 +63,11 @@ + + int64_t GetSocketRecvTimestamp(int socket) { + struct timeval tv_ioctl; ++#if defined(WEBRTC_BSD) ++ int ret = ioctl(socket, SO_TIMESTAMP, &tv_ioctl); ++#else + int ret = ioctl(socket, SIOCGSTAMP, &tv_ioctl); ++#endif + if (ret != 0) + return -1; + int64_t timestamp = +@@ -276,7 +280,7 @@ socklen_t optlen = sizeof(*value); int ret = ::getsockopt(s_, slevel, sopt, (SockOptArg)value, &optlen); if (ret != -1 && opt == OPT_DONTFRAGMENT) { @@ -9,7 +21,7 @@ *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0; #endif } -@@ -263,7 +263,7 @@ int PhysicalSocket::SetOption(Option opt +@@ -289,7 +293,7 @@ if (TranslateOption(opt, &slevel, &sopt) == -1) return -1; if (opt == OPT_DONTFRAGMENT) { @@ -18,7 +30,7 @@ value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; #endif } -@@ -538,10 +538,10 @@ int PhysicalSocket::TranslateOption(Opti +@@ -571,10 +575,10 @@ *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; diff --git a/www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc b/www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc index 4dec0072f348..bf9ffec5a5f9 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc +++ b/www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc @@ -25,7 +25,7 @@ #if defined(WEBRTC_MAC) || defined(WEBRTC_IOS) ret = pthread_mach_thread_np(pthread_self()); +#elif defined(WEBRTC_BSD) -+ ret = static_cast<int>(pthread_getthreadid_np()); ++ ret = reinterpret_cast<int>(pthread_getthreadid_np()); #elif defined(WEBRTC_LINUX) ret = syscall(__NR_gettid); #elif defined(WEBRTC_ANDROID) diff --git a/www/chromium/files/patch-third__party_webrtc_build_common.gypi b/www/chromium/files/patch-third__party_webrtc_build_common.gypi deleted file mode 100644 index 5eebe839726b..000000000000 --- a/www/chromium/files/patch-third__party_webrtc_build_common.gypi +++ /dev/null @@ -1,25 +0,0 @@ ---- third_party/webrtc/build/common.gypi.orig 2016-05-25 15:02:41.000000000 -0400 -+++ third_party/webrtc/build/common.gypi 2016-06-05 15:36:40.916550000 -0400 -@@ -402,6 +402,13 @@ - 'WEBRTC_LINUX', - ], - }], -+ ['os_bsd==1', { -+ 'defines': [ -+ 'WEBRTC_BSD', -+ 'WEBRTC_LINUX', -+ 'WEBRTC_THREAD_RR', -+ ], -+ }], - ['OS=="mac"', { - 'defines': [ - 'WEBRTC_MAC', -@@ -485,7 +492,7 @@ - 'WEBRTC_WIN', - ], - }], -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { - 'defines': [ - 'WEBRTC_LINUX', - ], diff --git a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn new file mode 100644 index 000000000000..03aad130fb5f --- /dev/null +++ b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn @@ -0,0 +1,20 @@ +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2016-10-06 04:05:36.000000000 +0300 ++++ third_party/webrtc/modules/audio_device/BUILD.gn 2016-10-17 00:53:40.915668000 +0300 +@@ -52,7 +52,7 @@ + ] + + include_dirs = [] +- if (is_linux) { ++ if (is_linux || is_bsd) { + include_dirs += [ "linux" ] + } + if (is_ios) { +@@ -98,7 +98,7 @@ + if (rtc_use_dummy_audio_file_devices) { + defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] + } else { +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ + "linux/alsasymboltable_linux.cc", + "linux/alsasymboltable_linux.h", diff --git a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_audio__device.gypi b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_audio__device.gypi deleted file mode 100644 index 4d2f4b28b54b..000000000000 --- a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_audio__device.gypi +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/webrtc/modules/audio_device/audio_device.gypi.orig 2016-05-11 19:04:03 UTC -+++ third_party/webrtc/modules/audio_device/audio_device.gypi -@@ -47,7 +47,7 @@ - 'fine_audio_buffer.h', - ], - 'conditions': [ -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { - 'include_dirs': [ - 'linux', - ], -@@ -113,7 +113,7 @@ - ], - }, - }], -- ['OS=="linux"', { -+ ['OS=="linux" or OS=="freebsd"', { - 'sources': [ - 'linux/alsasymboltable_linux.cc', - 'linux/alsasymboltable_linux.h', diff --git a/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_desktop__capture.gypi b/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_desktop__capture.gypi deleted file mode 100644 index db98666418e1..000000000000 --- a/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_desktop__capture.gypi +++ /dev/null @@ -1,14 +0,0 @@ ---- third_party/webrtc/modules/desktop_capture/desktop_capture.gypi.orig 2016-05-11 19:04:03 UTC -+++ third_party/webrtc/modules/desktop_capture/desktop_capture.gypi -@@ -114,6 +114,11 @@ - ], - }, - }], -+ ['os_bsd==1', { -+ 'include_dirs': [ -+ '<(prefix_dir)/include', -+ ], -+ }], - ['OS!="win" and OS!="mac" and use_x11==0', { - 'sources': [ - "mouse_cursor_monitor_null.cc", diff --git a/www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn new file mode 100644 index 000000000000..c06774497d2f --- /dev/null +++ b/www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn @@ -0,0 +1,40 @@ +--- third_party/webrtc/modules/video_coding/BUILD.gn.orig 2016-08-03 22:04:03.000000000 +0300 ++++ third_party/webrtc/modules/video_coding/BUILD.gn 2016-09-25 02:37:44.041881000 +0300 +@@ -135,9 +135,6 @@ + "codecs/h264/include/h264.h", + ] + +- configs += [ "../..:common_config" ] +- public_configs = [ "../..:common_inherited_config" ] +- + if (is_clang) { + # Suppress warnings from Chrome's Clang plugins. + # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. +@@ -145,9 +142,7 @@ + } + + defines = [] +- deps = [ +- "../../system_wrappers", +- ] ++ deps = [] + + if (rtc_use_h264) { + defines += [ "WEBRTC_USE_H264" ] +@@ -161,11 +156,15 @@ + "codecs/h264/h264_encoder_impl.h", + ] + deps += [ +- "../../common_video", + "//third_party/ffmpeg:ffmpeg", + "//third_party/openh264:encoder", ++ "../../common_video", + ] + } ++ deps += ["../../system_wrappers"] ++ configs += [ "../..:common_config" ] ++ public_configs = [ "../..:common_inherited_config" ] ++ + } + + # TODO(tkchin): Source set for webrtc_h264_video_toolbox. Currently not diff --git a/www/chromium/files/patch-third__party_webrtc_modules_video__coding_receiver.cc b/www/chromium/files/patch-third__party_webrtc_modules_video__coding_receiver.cc deleted file mode 100644 index d5eefc9ee4f0..000000000000 --- a/www/chromium/files/patch-third__party_webrtc_modules_video__coding_receiver.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- third_party/webrtc/modules/video_coding/receiver.cc.orig 2016-05-11 19:04:03 UTC -+++ third_party/webrtc/modules/video_coding/receiver.cc -@@ -121,8 +121,8 @@ VCMEncodedFrame* VCMReceiver::FrameForDe - // Assume that render timing errors are due to changes in the video stream. - if (*next_render_time_ms < 0) { - timing_error = true; -- } else if (std::abs(*next_render_time_ms - now_ms) > max_video_delay_ms_) { -- int frame_delay = static_cast<int>(std::abs(*next_render_time_ms - now_ms)); -+ } else if (std::labs(*next_render_time_ms - now_ms) > max_video_delay_ms_) { -+ int frame_delay = static_cast<int>(std::labs(*next_render_time_ms - now_ms)); - LOG(LS_WARNING) << "A frame about to be decoded is out of the configured " - << "delay bounds (" << frame_delay << " > " - << max_video_delay_ms_ diff --git a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn new file mode 100644 index 000000000000..9de1139ab87a --- /dev/null +++ b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn @@ -0,0 +1,20 @@ +--- third_party/webrtc/system_wrappers/BUILD.gn.orig 2016-10-06 04:05:36.000000000 +0300 ++++ third_party/webrtc/system_wrappers/BUILD.gn 2016-10-14 17:26:56.594097000 +0300 +@@ -105,7 +105,7 @@ + libs += [ "log" ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + defines += [ "WEBRTC_THREAD_RR" ] + + if (!build_with_chromium) { +@@ -115,7 +115,7 @@ + libs += [ "rt" ] + } + +- if (is_linux || is_android) { ++ if (is_linux || is_android || is_bsd) { + sources += [ "source/atomic32_non_darwin_unix.cc" ] + } + diff --git a/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__non__darwin__unix.cc b/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__non__darwin__unix.cc new file mode 100644 index 000000000000..ae133b7f60dc --- /dev/null +++ b/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__non__darwin__unix.cc @@ -0,0 +1,11 @@ +--- third_party/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc.orig 2016-10-06 04:05:36.000000000 +0300 ++++ third_party/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc 2016-10-14 17:25:37.203869000 +0300 +@@ -12,7 +12,7 @@ + + #include <assert.h> + #include <inttypes.h> +-#include <malloc.h> ++#include <stdlib.h> + + #include "webrtc/common_types.h" + diff --git a/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__posix.cc b/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__posix.cc deleted file mode 100644 index 1ece795a1e4e..000000000000 --- a/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__posix.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- third_party/webrtc/system_wrappers/source/atomic32_posix.cc.orig 2016-05-11 19:04:03 UTC -+++ third_party/webrtc/system_wrappers/source/atomic32_posix.cc -@@ -12,7 +12,11 @@ - - #include <assert.h> - #include <inttypes.h> -+#if defined(WEBRTC_BSD) -+#include <stdlib.h> -+#else - #include <malloc.h> -+#endif - - #include "webrtc/common_types.h" - diff --git a/www/chromium/files/patch-third__party_widevine_cdm_BUILD.gn b/www/chromium/files/patch-third__party_widevine_cdm_BUILD.gn new file mode 100644 index 000000000000..5b2b6dff2b39 --- /dev/null +++ b/www/chromium/files/patch-third__party_widevine_cdm_BUILD.gn @@ -0,0 +1,29 @@ +--- third_party/widevine/cdm/BUILD.gn.orig 2016-08-03 22:02:40.000000000 +0300 ++++ third_party/widevine/cdm/BUILD.gn 2016-09-03 01:41:31.936198000 +0300 +@@ -22,7 +22,7 @@ + widevine_cdm_version_h_file = + "chromeos/$widevine_arch/widevine_cdm_version.h" + widevine_cdm_binary_files = [ "chromeos/$widevine_arch/libwidevinecdm.so" ] +- } else if (is_linux) { ++ } else if (is_linux || is_bsd) { + widevine_cdm_version_h_file = "linux/$widevine_arch/widevine_cdm_version.h" + widevine_cdm_binary_files = [ "linux/$widevine_arch/libwidevinecdm.so" ] + } else if (is_win) { +@@ -130,7 +130,7 @@ + ":widevinecdmadapter_resources", + ] + +- if (is_linux) { ++ if (is_linux || is_bsd) { + ldflags = + [ rebase_path("$root_out_dir/libwidevinecdm.so", root_build_dir) ] + } else if (is_win) { +@@ -150,7 +150,7 @@ + # This target exists for tests to depend on that pulls in a runtime dependency + # on the license server. + source_set("widevine_test_license_server") { +- if (is_chrome_branded && is_linux) { ++ if (is_chrome_branded && is_linux || is_bsd) { + deps = [ + # TODO(jrummell) + # This target should be removed and targets should have data_deps on this target: diff --git a/www/chromium/files/patch-third__party_yasm_BUILD.gn b/www/chromium/files/patch-third__party_yasm_BUILD.gn new file mode 100644 index 000000000000..ffd2e3cdb793 --- /dev/null +++ b/www/chromium/files/patch-third__party_yasm_BUILD.gn @@ -0,0 +1,16 @@ +--- third_party/yasm/BUILD.gn.orig 2016-08-03 22:02:40.000000000 +0300 ++++ third_party/yasm/BUILD.gn 2016-09-05 21:50:53.007490000 +0300 +@@ -32,7 +32,12 @@ + if (current_toolchain == host_toolchain) { + # Various files referenced by multiple targets. + yasm_gen_include_dir = "$target_gen_dir/include" +- config_makefile = "source/config/$host_os/Makefile" ++ # HACK for All BSD derivatives use openbsd include directory ++ if (is_bsd) { ++ config_makefile = "source/config/openbsd/Makefile" ++ } else { ++ config_makefile = "source/config/$host_os/Makefile" ++ } + version_file = "version.mac" + + import("//build/compiled_action.gni") diff --git a/www/chromium/files/patch-third__party_zlib_BUILD.gn b/www/chromium/files/patch-third__party_zlib_BUILD.gn new file mode 100644 index 000000000000..36cc995e2a8f --- /dev/null +++ b/www/chromium/files/patch-third__party_zlib_BUILD.gn @@ -0,0 +1,11 @@ +--- third_party/zlib/BUILD.gn.orig 2016-08-03 22:02:40.000000000 +0300 ++++ third_party/zlib/BUILD.gn 2016-09-29 17:46:32.878236000 +0300 +@@ -115,7 +115,7 @@ + "contrib/minizip/iowin32.h", + ] + } +- if (is_mac || is_ios || is_android) { ++ if (is_mac || is_ios || is_android || is_bsd) { + # Mac, Android and the BSDs don't have fopen64, ftello64, or fseeko64. We + # use fopen, ftell, and fseek instead on these systems. + defines = [ "USE_FILE32API" ] diff --git a/www/chromium/files/patch-tools_battor__agent_BUILD.gn b/www/chromium/files/patch-tools_battor__agent_BUILD.gn new file mode 100644 index 000000000000..09633e35e6f7 --- /dev/null +++ b/www/chromium/files/patch-tools_battor__agent_BUILD.gn @@ -0,0 +1,11 @@ +--- tools/battor_agent/BUILD.gn.orig 2016-08-03 22:02:40.000000000 +0300 ++++ tools/battor_agent/BUILD.gn 2016-09-01 02:14:55.585315000 +0300 +@@ -5,7 +5,7 @@ + import("//testing/test.gni") + + # Works only on desktop platforms. +-assert(is_win || is_linux || is_mac) ++assert(is_win || is_linux || is_bsd || is_mac) + + executable("battor_agent") { + sources = [ diff --git a/www/chromium/files/patch-tools_gn_args.cc b/www/chromium/files/patch-tools_gn_args.cc new file mode 100644 index 000000000000..52dd76c33592 --- /dev/null +++ b/www/chromium/files/patch-tools_gn_args.cc @@ -0,0 +1,11 @@ +--- tools/gn/args.cc.orig 2016-08-13 15:22:20.957491000 +0300 ++++ tools/gn/args.cc 2016-08-13 15:22:40.739449000 +0300 +@@ -222,6 +222,8 @@ + os = "mac"; + #elif defined(OS_LINUX) + os = "linux"; ++#elif defined(OS_BSD) ++ os = "bsd"; + #elif defined(OS_ANDROID) + os = "android"; + #else diff --git a/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py b/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py new file mode 100644 index 000000000000..9e3d8b4d3df5 --- /dev/null +++ b/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py @@ -0,0 +1,61 @@ +--- tools/gn/bootstrap/bootstrap.py.orig 2016-10-06 04:02:43.000000000 +0300 ++++ tools/gn/bootstrap/bootstrap.py 2016-10-31 01:50:52.450019000 +0200 +@@ -23,6 +23,7 @@ + import shutil + import subprocess + import sys ++import platform + import tempfile + + BOOTSTRAP_DIR = os.path.dirname(os.path.abspath(__file__)) +@@ -31,8 +32,9 @@ + + is_win = sys.platform.startswith('win') + is_linux = sys.platform.startswith('linux') ++is_bsd = platform.system().lower().endswith('bsd') + is_mac = sys.platform.startswith('darwin') +-is_posix = is_linux or is_mac ++is_posix = is_linux or is_mac or is_bsd + + def check_call(cmd, **kwargs): + logging.debug('Running: %s', ' '.join(cmd)) +@@ -594,6 +596,39 @@ + 'base/third_party/libevent/epoll.c', + ]) + ++ if is_bsd: ++ libs.extend(['-lexecinfo', '-lkvm']) ++ ldflags.extend(['-pthread']) ++ ++ static_libraries['xdg_user_dirs'] = { ++ 'sources': [ ++ 'base/third_party/xdg_user_dirs/xdg_user_dir_lookup.cc', ++ ], ++ 'tool': 'cxx', ++ } ++ static_libraries['base']['sources'].extend([ ++ 'base/allocator/allocator_shim.cc', ++ 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc', ++ 'base/memory/shared_memory_posix.cc', ++ 'base/nix/xdg_util.cc', ++ #'base/process/internal_linux.cc', ++ 'base/process/process_handle_' + platform.system().lower() + '.cc', ++ 'base/process/process_iterator_' + platform.system().lower() + '.cc', ++ # 'base/process/process_linux.cc', ++ 'base/process/process_metrics_'+ platform.system().lower() + '.cc', ++ 'base/strings/sys_string_conversions_posix.cc', ++ 'base/sys_info_' + platform.system().lower() + '.cc', ++ 'base/threading/platform_thread_' + platform.system().lower() + '.cc', ++ # 'base/trace_event/malloc_dump_provider.cc', ++ ]) ++ static_libraries['libevent']['include_dirs'].extend([ ++ os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'freebsd') ++ ]) ++ static_libraries['libevent']['sources'].extend([ ++ 'base/third_party/libevent/kqueue.c', ++ ]) ++ # Suppressing warnings ++ cflags.extend(['-Wno-deprecated-register', '-Wno-parentheses-equality']) + + if is_mac: + static_libraries['base']['sources'].extend([ diff --git a/www/chromium/files/patch-tools_gn_gn__unittests.isolate b/www/chromium/files/patch-tools_gn_gn__unittests.isolate new file mode 100644 index 000000000000..73db746f1191 --- /dev/null +++ b/www/chromium/files/patch-tools_gn_gn__unittests.isolate @@ -0,0 +1,11 @@ +--- tools/gn/gn_unittests.isolate.orig 2016-08-03 22:02:40.000000000 +0300 ++++ tools/gn/gn_unittests.isolate 2016-09-02 20:40:26.667487000 +0300 +@@ -3,7 +3,7 @@ + # found in the LICENSE file. + { + 'conditions': [ +- ['OS=="linux" or OS=="mac" or OS=="win"', { ++ ['OS=="linux" or OS=="bsd" or OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '<(PRODUCT_DIR)/gn_unittests<(EXECUTABLE_SUFFIX)', diff --git a/www/chromium/files/patch-tools_gyp_pylib_gyp_generator_make.py b/www/chromium/files/patch-tools_gyp_pylib_gyp_generator_make.py deleted file mode 100644 index 393a83b05eb1..000000000000 --- a/www/chromium/files/patch-tools_gyp_pylib_gyp_generator_make.py +++ /dev/null @@ -1,41 +0,0 @@ ---- tools/gyp/pylib/gyp/generator/make.py.orig 2016-05-11 19:04:05 UTC -+++ tools/gyp/pylib/gyp/generator/make.py -@@ -276,7 +276,7 @@ CC.target ?= %(CC.target)s - CFLAGS.target ?= $(CPPFLAGS) $(CFLAGS) - CXX.target ?= %(CXX.target)s - CXXFLAGS.target ?= $(CPPFLAGS) $(CXXFLAGS) --LINK.target ?= %(LINK.target)s -+LINK.target ?= %(CXX.target)s - LDFLAGS.target ?= $(LDFLAGS) - AR.target ?= $(AR) - -@@ -285,13 +285,13 @@ LINK ?= $(CXX.target) - - # TODO(evan): move all cross-compilation logic to gyp-time so we don't need - # to replicate this environment fallback in make as well. --CC.host ?= %(CC.host)s --CFLAGS.host ?= $(CPPFLAGS_host) $(CFLAGS_host) --CXX.host ?= %(CXX.host)s --CXXFLAGS.host ?= $(CPPFLAGS_host) $(CXXFLAGS_host) --LINK.host ?= %(LINK.host)s --LDFLAGS.host ?= --AR.host ?= %(AR.host)s -+CC.host ?= $(CC) -+CFLAGS.host ?= $(CFLAGS) -+CXX.host ?= $(CXX) -+CXXFLAGS.host ?= $(CXXFLAGS) -+LINK.host ?= $(CXX) -+LDFLAGS.host ?= $(LDFLAGS) -+AR.host ?= $(AR) - - # Define a dir function that can handle spaces. - # http://www.gnu.org/software/make/manual/make.html#Syntax-of-Functions -@@ -1816,7 +1816,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj) - return modules - - # Retrieve the default value of 'SHARED_LIB_SUFFIX' -- params = {'flavor': 'linux'} -+ params = {'flavor': 'freebsd'} - default_variables = {} - CalculateVariables(default_variables, params) - diff --git a/www/chromium/files/patch-tools_gyp_test_additional-targets_src_dir1_actions.gyp b/www/chromium/files/patch-tools_gyp_test_additional-targets_src_dir1_actions.gyp deleted file mode 100644 index 19036271ced1..000000000000 --- a/www/chromium/files/patch-tools_gyp_test_additional-targets_src_dir1_actions.gyp +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig 2016-05-11 19:04:05 UTC -+++ tools/gyp/test/additional-targets/src/dir1/actions.gyp -@@ -47,7 +47,7 @@ - }, - ], - 'conditions': [ -- ['OS=="linux"', { -+ ['OS=="linux" or OS=="freebsd"', { - 'target_defaults': { - 'cflags': ['-fPIC'], - }, diff --git a/www/chromium/files/patch-tools_gyp_test_library_src_library.gyp b/www/chromium/files/patch-tools_gyp_test_library_src_library.gyp deleted file mode 100644 index faaab1766a2b..000000000000 --- a/www/chromium/files/patch-tools_gyp_test_library_src_library.gyp +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/gyp/test/library/src/library.gyp.orig 2016-05-11 19:04:05 UTC -+++ tools/gyp/test/library/src/library.gyp -@@ -48,7 +48,7 @@ - }, - ], - 'conditions': [ -- ['OS=="linux"', { -+ ['OS=="linux" or OS=="freebsd"', { - 'target_defaults': { - # Support 64-bit shared libs (also works fine for 32-bit). - 'cflags': ['-fPIC'], diff --git a/www/chromium/files/patch-ui_accessibility_accessibility.gyp b/www/chromium/files/patch-ui_accessibility_accessibility.gyp deleted file mode 100644 index 2176fb46728d..000000000000 --- a/www/chromium/files/patch-ui_accessibility_accessibility.gyp +++ /dev/null @@ -1,20 +0,0 @@ ---- ui/accessibility/accessibility.gyp.orig 2016-05-11 19:02:35 UTC -+++ ui/accessibility/accessibility.gyp -@@ -64,7 +64,7 @@ - '../../third_party/iaccessible2/iaccessible2.gyp:iaccessible2' - ], - }], -- ['OS=="linux" and chromeos==0 and use_x11==1', { -+ ['(OS=="linux" or os_bsd==1) and chromeos==0 and use_x11==1', { - 'dependencies': [ - '../../build/linux/system.gyp:atk', - '../../build/linux/system.gyp:gconf', -@@ -81,7 +81,7 @@ - ], - }, - }], -- ['OS!="linux" or chromeos==1 or use_x11==0', { -+ ['(OS!="linux" and os_bsd==0) or chromeos==1 or use_x11==0', { - 'sources!': [ - 'platform/ax_platform_node_auralinux.cc', - 'platform/ax_platform_node_auralinux.h', diff --git a/www/chromium/files/patch-ui_app__list_app__list__menu.cc b/www/chromium/files/patch-ui_app__list_app__list__menu.cc index 0d27b8827d81..1a67519d5df8 100644 --- a/www/chromium/files/patch-ui_app__list_app__list__menu.cc +++ b/www/chromium/files/patch-ui_app__list_app__list__menu.cc @@ -1,11 +1,11 @@ ---- ui/app_list/app_list_menu.cc.orig 2016-03-25 13:05:03 UTC -+++ ui/app_list/app_list_menu.cc -@@ -35,7 +35,7 @@ void AppListMenu::InitMenu() { - users_[i].email.empty() ? users_[i].name - : users_[i].email, - 0 /* group_id */); --#elif defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#elif defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) +--- ui/app_list/app_list_menu.cc.orig 2016-10-06 04:02:44.000000000 +0300 ++++ ui/app_list/app_list_menu.cc 2016-10-13 09:13:00.191033000 +0300 +@@ -30,7 +30,7 @@ + // only 1 user. + if (users_.size() > 1) { + for (size_t i = 0; i < users_.size(); ++i) { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) menu_model_.AddItem(SELECT_PROFILE + i, users_[i].name); int menu_index = menu_model_.GetIndexOfCommandId(SELECT_PROFILE + i); menu_model_.SetSublabel(menu_index, users_[i].email); diff --git a/www/chromium/files/patch-ui_app__list_views_app__list__item__view.cc b/www/chromium/files/patch-ui_app__list_views_app__list__item__view.cc new file mode 100644 index 000000000000..07b1c137f8c9 --- /dev/null +++ b/www/chromium/files/patch-ui_app__list_views_app__list__item__view.cc @@ -0,0 +1,11 @@ +--- ui/app_list/views/app_list_item_view.cc.orig 2016-08-03 22:02:40.000000000 +0300 ++++ ui/app_list/views/app_list_item_view.cc 2016-08-19 05:58:12.763965000 +0300 +@@ -62,7 +62,7 @@ + const gfx::FontList& font_list = rb.GetFontList(kItemTextFontStyle); + // The font is different on each platform. The font size is adjusted on some + // platforms to keep a consistent look. +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && defined(OS_BSD)) && !defined(OS_CHROMEOS) + // Reducing the font size by 2 makes it the same as the Windows font size. + const int kFontSizeDelta = -2; + return font_list.DeriveWithSizeDelta(kFontSizeDelta); diff --git a/www/chromium/files/patch-ui_app__list_views_app__list__view.cc b/www/chromium/files/patch-ui_app__list_views_app__list__view.cc index 9687ce8b664c..ad3c02e21d36 100644 --- a/www/chromium/files/patch-ui_app__list_views_app__list__view.cc +++ b/www/chromium/files/patch-ui_app__list_views_app__list__view.cc @@ -1,20 +1,20 @@ ---- ui/app_list/views/app_list_view.cc.orig 2016-05-11 19:02:35 UTC -+++ ui/app_list/views/app_list_view.cc -@@ -80,7 +80,7 @@ bool SupportsShadow() { - ::switches::kDisableDwmComposition)) { - return false; - } --#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) +--- ui/app_list/views/app_list_view.cc.orig 2016-10-06 04:02:44.000000000 +0300 ++++ ui/app_list/views/app_list_view.cc 2016-10-13 09:16:02.654490000 +0300 +@@ -70,7 +70,7 @@ + + // Determines whether the current environment supports shadows bubble borders. + bool SupportsShadow() { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // Shadows are not supported on (non-ChromeOS) Linux. return false; #endif -@@ -606,7 +606,7 @@ void AppListView::OnBeforeBubbleWidgetIn - // the taskbar for these versions of Windows. - if (base::win::GetVersion() >= base::win::VERSION_WIN7) - params->force_show_in_taskbar = true; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +@@ -567,7 +567,7 @@ + if (!params->native_widget && delegate_ && delegate_->ForceNativeDesktop()) + params->native_widget = new views::DesktopNativeWidgetAura(widget); + #endif +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) // Set up a custom WM_CLASS for the app launcher window. This allows task // switchers in X11 environments to distinguish it from main browser windows. params->wm_class_name = kAppListWMClass; diff --git a/www/chromium/files/patch-ui_aura_BUILD.gn b/www/chromium/files/patch-ui_aura_BUILD.gn new file mode 100644 index 000000000000..9578703a8faa --- /dev/null +++ b/www/chromium/files/patch-ui_aura_BUILD.gn @@ -0,0 +1,11 @@ +--- ui/aura/BUILD.gn.orig 2016-08-03 22:02:40.000000000 +0300 ++++ ui/aura/BUILD.gn 2016-09-03 00:18:30.181232000 +0300 +@@ -275,7 +275,7 @@ + "//ui/gl:test_support", + ] + +- if (is_linux) { ++ if (is_linux || is_bsd) { + deps += [ "//third_party/mesa" ] + } + diff --git a/www/chromium/files/patch-ui_base_BUILD.gn b/www/chromium/files/patch-ui_base_BUILD.gn new file mode 100644 index 000000000000..914e7ef00631 --- /dev/null +++ b/www/chromium/files/patch-ui_base_BUILD.gn @@ -0,0 +1,65 @@ +--- ui/base/BUILD.gn.orig 2016-08-03 22:02:41.000000000 +0300 ++++ ui/base/BUILD.gn 2016-09-28 09:32:40.317599000 +0300 +@@ -341,7 +341,7 @@ + sources += [ "touch/touch_device_android.cc" ] + } else if (is_ios) { + sources += [ "touch/touch_device_ios.cc" ] +- } else if (is_linux) { ++ } else if (is_linux || is_bsd) { + sources += [ "touch/touch_device_linux.cc" ] + } else { + # Empty implementation for all other cases. +@@ -443,7 +443,7 @@ + ] + } + +- if (!use_aura || !is_linux) { ++ if (!use_aura || !(is_linux || is_bsd)) { + sources -= [ "resource/resource_bundle_auralinux.cc" ] + } + +@@ -451,7 +451,7 @@ + sources -= [ "dragdrop/drag_utils_aura.cc" ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + deps += [ "//build/linux:fontconfig" ] + } + +@@ -459,7 +459,7 @@ + configs += [ "//build/config/linux:glib" ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + if (!toolkit_views && !use_aura) { + sources -= [ + "dragdrop/drag_utils.cc", +@@ -794,7 +794,7 @@ + "ime/win/imm32_manager_unittest.cc", + "ime/win/tsf_input_scope_unittest.cc", + ] +- if (is_linux && use_aura && !is_chromeos) { ++ if ((is_linux || is_bsd) && use_aura && !is_chromeos) { + sources += [ "ime/input_method_auralinux_unittest.cc" ] + } + if (is_mac) { +@@ -919,7 +919,7 @@ + ] + } + +- if (is_android || is_linux || is_mac || is_win) { ++ if (is_android || is_linux || is_bsd || is_mac || is_win) { + # TODO(brettw): We should be able to depend on //ui/resources:ui_test_pak + # instead of depending directly on the non-test .pak files, but depending + # on ui_test_pak seems to have no effect. +@@ -932,7 +932,7 @@ + "//third_party/mesa:osmesa", + ] + } +- if (is_linux || is_win) { ++ if (is_linux || is_bsd || is_win) { + data += [ + # TODO(brettw): Remove these two lines. + "$root_out_dir/ui/en-US.pak", diff --git a/www/chromium/files/patch-ui_base_ime_BUILD.gn b/www/chromium/files/patch-ui_base_ime_BUILD.gn new file mode 100644 index 000000000000..ee5cb14a2a2f --- /dev/null +++ b/www/chromium/files/patch-ui_base_ime_BUILD.gn @@ -0,0 +1,20 @@ +--- ui/base/ime/BUILD.gn.orig 2016-10-06 04:02:44.000000000 +0300 ++++ ui/base/ime/BUILD.gn 2016-10-14 18:28:15.896660000 +0300 +@@ -123,7 +123,7 @@ + ":text_input_types", + ] + +- if (!use_aura || (!is_linux && !use_ozone)) { ++ if (!use_aura || (!(is_linux || is_bsd) && !use_ozone) || !is_bsd) { + sources -= [ + "input_method_auralinux.cc", + "input_method_auralinux.h", +@@ -137,7 +137,7 @@ + ] + } + +- if (!is_chromeos && is_linux) { ++ if (!is_chromeos && (is_linux || is_bsd)) { + sources += [ + "linux/text_edit_command_auralinux.cc", + "linux/text_edit_command_auralinux.h", diff --git a/www/chromium/files/patch-ui_base_ime_input__method__factory.cc b/www/chromium/files/patch-ui_base_ime_input__method__factory.cc index 1ce4caeb3050..d0e4e68ce86a 100644 --- a/www/chromium/files/patch-ui_base_ime_input__method__factory.cc +++ b/www/chromium/files/patch-ui_base_ime_input__method__factory.cc @@ -1,20 +1,24 @@ ---- ui/base/ime/input_method_factory.cc.orig 2016-07-22 00:07:12.000000000 -0400 -+++ ui/base/ime/input_method_factory.cc 2016-08-03 16:35:19.855521000 -0400 -@@ -15,7 +15,7 @@ +--- ui/base/ime/input_method_factory.cc.orig 2016-10-06 04:02:44.000000000 +0300 ++++ ui/base/ime/input_method_factory.cc 2016-10-13 09:19:24.642495000 +0300 +@@ -14,8 +14,8 @@ + #include "ui/base/ime/input_method_win.h" #elif defined(OS_MACOSX) #include "ui/base/ime/input_method_mac.h" - #elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \ +-#elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \ - !defined(OS_CHROMEOS) -+ !defined(OS_CHROMEOS) || defined(OS_BSD) ++#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) && \ ++ defined(USE_X11) && !defined(OS_CHROMEOS) #include "ui/base/ime/input_method_auralinux.h" #elif defined(OS_ANDROID) #include "ui/base/ime/input_method_android.h" -@@ -57,7 +57,7 @@ +@@ -56,8 +56,8 @@ + return base::MakeUnique<InputMethodWin>(delegate, widget); #elif defined(OS_MACOSX) - return base::WrapUnique(new InputMethodMac(delegate)); - #elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \ + return base::MakeUnique<InputMethodMac>(delegate); +-#elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \ - !defined(OS_CHROMEOS) -+ !defined(OS_CHROMEOS) || defined(OS_BSD) - return base::WrapUnique(new InputMethodAuraLinux(delegate)); ++#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) && \ ++ defined(USE_X11) && !defined(OS_CHROMEOS) + return base::MakeUnique<InputMethodAuraLinux>(delegate); #elif defined(OS_ANDROID) - return base::WrapUnique(new InputMethodAndroid(delegate)); + return base::MakeUnique<InputMethodAndroid>(delegate); diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc index f55f3b15efa2..e5c803678063 100644 --- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,5 +1,5 @@ ---- ui/base/resource/resource_bundle.cc.orig 2016-07-22 00:07:12.000000000 -0400 -+++ ui/base/resource/resource_bundle.cc 2016-08-03 16:45:43.939993000 -0400 +--- ui/base/resource/resource_bundle.cc.orig 2016-07-20 22:03:45.000000000 +0300 ++++ ui/base/resource/resource_bundle.cc 2016-08-01 22:13:38.986790000 +0300 @@ -626,7 +626,7 @@ } diff --git a/www/chromium/files/patch-ui_base_ui__base.gyp b/www/chromium/files/patch-ui_base_ui__base.gyp deleted file mode 100644 index 64535b07ee0a..000000000000 --- a/www/chromium/files/patch-ui_base_ui__base.gyp +++ /dev/null @@ -1,29 +0,0 @@ ---- ui/base/ui_base.gyp.orig 2016-05-11 19:02:35 UTC -+++ ui/base/ui_base.gyp -@@ -454,7 +454,7 @@ - 'x/selection_utils.h', - ] - }], -- ['use_aura==0 or OS!="linux"', { -+ ['use_aura==0 or (OS!="linux" and os_bsd!=1)', { - 'sources!': [ - 'resource/resource_bundle_auralinux.cc', - ], -@@ -477,7 +477,7 @@ - '../../build/linux/system.gyp:glib', - ], - }], -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { - 'conditions': [ - ['toolkit_views==0 and use_aura==0', { - # Note: because of gyp predence rules this has to be defined as -@@ -510,7 +510,7 @@ - 'clipboard/clipboard_aurax11.cc', - ], - }], -- ['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', { -+ ['chromeos==1 or (use_aura==1 and (OS=="linux" or os_bsd==1) and use_x11==0)', { - 'sources!': [ - 'dragdrop/os_exchange_data_provider_aurax11.cc', - ], diff --git a/www/chromium/files/patch-ui_base_ui__features.gni b/www/chromium/files/patch-ui_base_ui__features.gni new file mode 100644 index 000000000000..eb3495112483 --- /dev/null +++ b/www/chromium/files/patch-ui_base_ui__features.gni @@ -0,0 +1,8 @@ +--- ui/base/ui_features.gni.orig 2016-08-03 22:02:41.000000000 +0300 ++++ ui/base/ui_features.gni 2016-09-01 03:07:44.861869000 +0300 +@@ -2,4 +2,4 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-enable_hidpi = is_mac || is_win || is_linux ++enable_hidpi = is_mac || is_win || is_linux || is_bsd diff --git a/www/chromium/files/patch-ui_compositor_BUILD.gn b/www/chromium/files/patch-ui_compositor_BUILD.gn new file mode 100644 index 000000000000..1ae744465c1f --- /dev/null +++ b/www/chromium/files/patch-ui_compositor_BUILD.gn @@ -0,0 +1,11 @@ +--- ui/compositor/BUILD.gn.orig 2016-08-03 22:02:41.000000000 +0300 ++++ ui/compositor/BUILD.gn 2016-09-03 00:17:02.164382000 +0300 +@@ -199,7 +199,7 @@ + "//ui/gl", + "//ui/resources", + ] +- if (is_linux) { ++ if (is_linux || is_bsd) { + deps += [ "//third_party/mesa:osmesa" ] + } + } diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn new file mode 100644 index 000000000000..2273e5eac03b --- /dev/null +++ b/www/chromium/files/patch-ui_gfx_BUILD.gn @@ -0,0 +1,20 @@ +--- ui/gfx/BUILD.gn.orig 2016-08-03 22:02:41.000000000 +0300 ++++ ui/gfx/BUILD.gn 2016-09-03 00:17:18.862703000 +0300 +@@ -360,7 +360,7 @@ + } + + # Linux. +- if (is_linux) { ++ if (is_linux || is_bsd) { + deps += [ "//build/linux:fontconfig" ] + } + +@@ -668,7 +668,7 @@ + "test/ui_cocoa_test_helper.mm", + ] + } +- if (is_linux) { ++ if (is_linux || is_bsd) { + deps += [ "//build/linux:fontconfig" ] + } + } diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn new file mode 100644 index 000000000000..c37f4a7b28ac --- /dev/null +++ b/www/chromium/files/patch-ui_gl_BUILD.gn @@ -0,0 +1,20 @@ +--- ui/gl/BUILD.gn.orig 2016-08-03 22:02:41.000000000 +0300 ++++ ui/gl/BUILD.gn 2016-09-03 00:16:34.776838000 +0300 +@@ -5,7 +5,7 @@ + import("//build/config/ui.gni") + import("//testing/test.gni") + +-use_egl = is_win || is_android || is_linux ++use_egl = is_win || is_android || is_linux || is_bsd + use_glx = use_x11 + + if (is_android) { +@@ -163,7 +163,7 @@ + "gl_surface_egl.h", + ] + } +- if (is_android || is_linux) { ++ if (is_android || is_linux || is_bsd) { + sources += [ + "gl_implementation_osmesa.cc", + "gl_implementation_osmesa.h", diff --git a/www/chromium/files/patch-ui_gl_gl.gyp b/www/chromium/files/patch-ui_gl_gl.gyp deleted file mode 100644 index bfd5ff2530f6..000000000000 --- a/www/chromium/files/patch-ui_gl_gl.gyp +++ /dev/null @@ -1,20 +0,0 @@ ---- ui/gl/gl.gyp.orig 2016-05-11 19:02:35 UTC -+++ ui/gl/gl.gyp -@@ -130,7 +130,7 @@ - 'trace_util.h', - ], - 'conditions': [ -- ['OS in ("win", "android", "linux")', { -+ ['OS in ("win", "android", "linux", "freebsd", "openbsd")', { - 'sources': [ - 'egl_util.cc', - 'egl_util.h', -@@ -151,7 +151,7 @@ - '<(DEPTH)/third_party/khronos', - ], - }], -- ['OS in ("android", "linux")', { -+ ['OS in ("android", "linux", "freebsd", "openbsd")', { - 'sources': [ - 'gl_implementation_osmesa.cc', - 'gl_implementation_osmesa.h', diff --git a/www/chromium/files/patch-ui_gl_gl__surface__glx.cc b/www/chromium/files/patch-ui_gl_gl__surface__glx.cc deleted file mode 100644 index 64773975d47e..000000000000 --- a/www/chromium/files/patch-ui_gl_gl__surface__glx.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/gl/gl_surface_glx.cc.orig 2016-05-11 19:02:35 UTC -+++ ui/gl/gl_surface_glx.cc -@@ -48,7 +48,7 @@ bool g_glx_get_msc_rate_oml_supported = - bool g_glx_sgi_video_sync_supported = false; - - static const int kGetVSyncParametersMinSeconds = --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // See crbug.com/373489 - // On Linux, querying the vsync parameters might burn CPU for up to an - // entire vsync, so we only query periodically to reduce CPU usage. diff --git a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc index deb1518d0ed8..e0971f3db0b5 100644 --- a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc +++ b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc @@ -1,5 +1,5 @@ ---- ui/gl/sync_control_vsync_provider.cc.orig 2016-07-22 00:07:12.000000000 -0400 -+++ ui/gl/sync_control_vsync_provider.cc 2016-08-04 11:26:39.590057000 -0400 +--- ui/gl/sync_control_vsync_provider.cc.orig 2016-05-11 19:02:35 UTC ++++ ui/gl/sync_control_vsync_provider.cc @@ -11,7 +11,7 @@ #include "base/trace_event/trace_event.h" #include "build/build_config.h" @@ -9,16 +9,7 @@ // These constants define a reasonable range for a calculated refresh interval. // Calculating refreshes out of this range will be considered a fatal error. const int64_t kMinVsyncIntervalUs = base::Time::kMicrosecondsPerSecond / 400; -@@ -26,7 +26,7 @@ - namespace gfx { - - SyncControlVSyncProvider::SyncControlVSyncProvider() : VSyncProvider() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // On platforms where we can't get an accurate reading on the refresh - // rate we fall back to the assumption that we're displaying 60 frames - // per second. -@@ -39,7 +39,7 @@ +@@ -38,7 +38,7 @@ SyncControlVSyncProvider::~SyncControlVS void SyncControlVSyncProvider::GetVSyncParameters( const UpdateVSyncCallback& callback) { TRACE_EVENT0("gpu", "SyncControlVSyncProvider::GetVSyncParameters"); @@ -27,7 +18,7 @@ base::TimeTicks timebase; // The actual clock used for the system time returned by glXGetSyncValuesOML -@@ -155,7 +155,7 @@ +@@ -154,7 +154,7 @@ void SyncControlVSyncProvider::GetVSyncP last_timebase_ = timebase; last_media_stream_counter_ = media_stream_counter; callback.Run(timebase, last_good_interval_); diff --git a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h index 426789abcc76..76376fa7b548 100644 --- a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h +++ b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h @@ -1,5 +1,5 @@ ---- ui/gl/sync_control_vsync_provider.h.orig 2016-08-04 11:25:35.143308000 -0400 -+++ ui/gl/sync_control_vsync_provider.h 2016-08-04 11:25:53.646783000 -0400 +--- ui/gl/sync_control_vsync_provider.h.orig 2016-08-04 17:39:12.324777000 +0300 ++++ ui/gl/sync_control_vsync_provider.h 2016-08-04 17:39:19.973676000 +0300 @@ -31,7 +31,7 @@ virtual bool GetMscRate(int32_t* numerator, int32_t* denominator) = 0; diff --git a/www/chromium/files/patch-ui_views_BUILD.gn b/www/chromium/files/patch-ui_views_BUILD.gn new file mode 100644 index 000000000000..3ff9c820886e --- /dev/null +++ b/www/chromium/files/patch-ui_views_BUILD.gn @@ -0,0 +1,20 @@ +--- ui/views/BUILD.gn.orig 2016-08-03 22:02:41.000000000 +0300 ++++ ui/views/BUILD.gn 2016-09-03 00:17:57.369360000 +0300 +@@ -60,7 +60,7 @@ + if (use_x11 && !is_chromeos) { + deps += [ "//ui/display/util" ] + } +- if (is_linux && !is_chromeos) { ++ if ((is_linux || is_bsd) && !is_chromeos) { + sources -= [ "window/window_button_order_provider.cc" ] + deps += [ "//ui/shell_dialogs" ] + } else { +@@ -128,7 +128,7 @@ + } else if (use_ozone) { + sources += gypi_values.views_desktop_aura_ozone_sources + } +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += gypi_values.views_desktop_aura_linux_sources + } + } diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc index bfebeb7ee029..1ea8c8651e22 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,41 +1,32 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2016-08-04 09:54:43.724487000 -0400 -+++ ui/views/controls/textfield/textfield.cc 2016-08-04 09:57:23.923660000 -0400 -@@ -48,7 +48,7 @@ - #include "base/win/win_util.h" +--- ui/views/controls/textfield/textfield.cc.orig 2016-10-06 04:02:45.000000000 +0300 ++++ ui/views/controls/textfield/textfield.cc 2016-10-13 09:32:03.632280000 +0300 +@@ -51,7 +51,7 @@ + #include "ui/base/win/osk_display_manager.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) #include "base/strings/utf_string_conversions.h" - #include "ui/events/linux/text_edit_command_auralinux.h" - #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -131,14 +131,14 @@ + #include "ui/base/ime/linux/text_edit_command_auralinux.h" + #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" +@@ -156,14 +156,14 @@ case ui::VKEY_BACK: if (!control) - return IDS_DELETE_BACKWARD; + return ui::TextEditCommand::DELETE_BACKWARD; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Only erase by line break on Linux and ChromeOS. if (shift) - return IDS_DELETE_TO_BEGINNING_OF_LINE; + return ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE; #endif - return IDS_DELETE_WORD_BACKWARD; + return ui::TextEditCommand::DELETE_WORD_BACKWARD; case ui::VKEY_DELETE: -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Only erase by line break on Linux and ChromeOS. if (shift && control) - return IDS_DELETE_TO_END_OF_LINE; -@@ -155,7 +155,7 @@ - } - } - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - // Convert a custom text edit |command| to the equivalent views command ID. - int GetViewsCommand(const ui::TextEditCommandAuraLinux& command, bool rtl) { - const bool select = command.extend_selection(); -@@ -643,7 +643,7 @@ + return ui::TextEditCommand::DELETE_TO_END_OF_LINE; +@@ -596,7 +596,7 @@ OnAfterUserAction(); } @@ -44,7 +35,7 @@ if (event.IsOnlyMiddleMouseButton()) { if (GetRenderText()->IsPointInSelection(event.location())) { OnBeforeUserAction(); -@@ -712,7 +712,7 @@ +@@ -665,7 +665,7 @@ if (!textfield) return handled; @@ -53,7 +44,7 @@ ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -847,7 +847,7 @@ +@@ -805,7 +805,7 @@ } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -62,7 +53,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -1106,7 +1106,7 @@ +@@ -1065,7 +1065,7 @@ std::unique_ptr<gfx::Canvas> canvas( GetCanvasForDragImage(GetWidget(), label.size())); label.SetEnabledColor(GetTextColor()); @@ -71,7 +62,7 @@ // Desktop Linux Aura does not yet support transparency in drag images. canvas->DrawColor(GetBackgroundColor()); #endif -@@ -1908,7 +1908,7 @@ +@@ -2004,7 +2004,7 @@ } void Textfield::UpdateSelectionClipboard() const { diff --git a/www/chromium/files/patch-ui_views_controls_webview_BUILD.gn b/www/chromium/files/patch-ui_views_controls_webview_BUILD.gn new file mode 100644 index 000000000000..d24b1e573678 --- /dev/null +++ b/www/chromium/files/patch-ui_views_controls_webview_BUILD.gn @@ -0,0 +1,11 @@ +--- ui/views/controls/webview/BUILD.gn.orig 2016-08-03 22:02:41.000000000 +0300 ++++ ui/views/controls/webview/BUILD.gn 2016-09-03 00:18:20.159623000 +0300 +@@ -39,7 +39,7 @@ + "//ui/views", + ] + +- if (is_linux || is_android) { ++ if (is_linux || is_bsd || is_android) { + sources += [ "unhandled_keyboard_event_handler_default.cc" ] + } + } diff --git a/www/chromium/files/patch-ui_views_controls_webview_webview.gyp b/www/chromium/files/patch-ui_views_controls_webview_webview.gyp deleted file mode 100644 index 7fdff669581b..000000000000 --- a/www/chromium/files/patch-ui_views_controls_webview_webview.gyp +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/views/controls/webview/webview.gyp.orig 2016-03-25 13:05:04 UTC -+++ ui/views/controls/webview/webview.gyp -@@ -42,7 +42,7 @@ - 'webview_export.h', - ], - 'conditions': [ -- ['OS=="linux" or OS=="android"', { -+ ['OS=="linux" or OS=="android" or os_bsd==1', { - 'sources': [ 'unhandled_keyboard_event_handler_default.cc', ], - }], - ], diff --git a/www/chromium/files/patch-ui_views_style_platform__style.cc b/www/chromium/files/patch-ui_views_style_platform__style.cc index 75689f078c62..9ed05e523bb8 100644 --- a/www/chromium/files/patch-ui_views_style_platform__style.cc +++ b/www/chromium/files/patch-ui_views_style_platform__style.cc @@ -1,11 +1,11 @@ ---- ui/views/style/platform_style.cc.orig 2016-07-22 00:07:12.000000000 -0400 -+++ ui/views/style/platform_style.cc 2016-08-04 10:02:49.187133000 -0400 +--- ui/views/style/platform_style.cc.orig 2016-08-03 22:02:41.000000000 +0300 ++++ ui/views/style/platform_style.cc 2016-09-26 05:44:41.103708000 +0300 @@ -17,7 +17,7 @@ #include "ui/views/controls/focusable_border.h" #include "ui/views/controls/scrollbar/native_scroll_bar.h" -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #define DESKTOP_LINUX #endif diff --git a/www/chromium/files/patch-ui_views_views.gyp b/www/chromium/files/patch-ui_views_views.gyp deleted file mode 100644 index fae217585cca..000000000000 --- a/www/chromium/files/patch-ui_views_views.gyp +++ /dev/null @@ -1,26 +0,0 @@ ---- ui/views/views.gyp.orig 2016-05-11 19:02:36 UTC -+++ ui/views/views.gyp -@@ -693,12 +693,12 @@ - '../display/display.gyp:display_util', - ], - }], -- ['OS=="linux" and chromeos==0 and use_ozone==0', { -+ ['(OS=="linux" or os_bsd==1) and chromeos==0 and use_ozone==0', { - 'dependencies': [ - '../../build/linux/system.gyp:atk', - ], - }], -- ['OS=="linux" and chromeos==0', { -+ ['(OS=="linux" or os_bsd==1) and chromeos==0', { - 'dependencies': [ - '../shell_dialogs/shell_dialogs.gyp:shell_dialogs', - ], -@@ -767,7 +767,7 @@ - ['use_aura and chromeos == 0', { - 'sources': [ '<@(views_desktop_aura_sources)' ], - 'conditions': [ -- ['OS == "linux"', { -+ ['OS == "linux" or os_bsd == 1', { - 'sources': [ '<@(views_desktop_aura_linux_sources)' ], - }], - ['use_x11 == 1', { diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn new file mode 100644 index 000000000000..abcb1ecacd9f --- /dev/null +++ b/www/chromium/files/patch-v8_BUILD.gn @@ -0,0 +1,23 @@ +--- v8/BUILD.gn.orig 2016-10-06 04:05:41.000000000 +0300 ++++ v8/BUILD.gn 2016-10-14 04:33:56.674783000 +0300 +@@ -2096,6 +2096,12 @@ + "dl", + "rt", + ] ++ } else if (is_bsd) { ++ sources += [ ++ "src/base/debug/stack_trace_posix.cc", ++ "src/base/platform/platform-freebsd.cc", ++ ] ++ libs = [ "rt", "execinfo" ] + } else if (is_android) { + if (current_toolchain == host_toolchain) { + libs = [ +@@ -2227,6 +2233,7 @@ + sources = [ + "src/snapshot/mksnapshot.cc", + ] ++ libs = ["execinfo"] + + configs = [ ":internal_config" ] + diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc index 3cbe07a081fe..63dd61d70ab1 100644 --- a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,21 +1,17 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2016-05-11 19:04:08 UTC -+++ v8/src/base/platform/platform-posix.cc -@@ -55,6 +55,14 @@ - #include <sys/prctl.h> // NOLINT, for prctl +--- v8/src/base/platform/platform-posix.cc.orig 2016-10-06 04:05:41.000000000 +0300 ++++ v8/src/base/platform/platform-posix.cc 2016-10-13 09:39:34.732843000 +0300 +@@ -27,6 +27,10 @@ + #include <sys/sysctl.h> // NOLINT, for sysctl #endif -+#if V8_OS_FREEBSD && !defined(__DragonFly__) -+#include <sys/thr.h> // for thr_self -+#endif -+ +#if V8_OS_NETBSD +#include <lwp.h> // for _lwp_self +#endif + - #if !defined(V8_OS_NACL) && !defined(_AIX) - #include <sys/syscall.h> - #endif -@@ -329,6 +337,12 @@ int OS::GetCurrentThreadId() { + #undef MAP_TYPE + + #if defined(ANDROID) && !defined(V8_ANDROID_LOG_STDOUT) +@@ -329,6 +333,12 @@ return static_cast<int>(syscall(__NR_gettid)); #elif V8_OS_ANDROID return static_cast<int>(gettid()); diff --git a/www/chromium/files/patch-v8_src_profiler_sampler.cc b/www/chromium/files/patch-v8_src_profiler_sampler.cc deleted file mode 100644 index cb948582f337..000000000000 --- a/www/chromium/files/patch-v8_src_profiler_sampler.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- v8/src/profiler/sampler.cc.orig 2016-08-04 11:28:06.738852000 -0400 -+++ v8/src/profiler/sampler.cc 2016-08-04 11:28:29.356607000 -0400 -@@ -210,7 +210,7 @@ - - // Returns hash value for hash map. - uint32_t ThreadHash(pthread_t thread_id) { --#if V8_OS_MACOSX -+#if defined(V8_OS_MACOSX) || defined(__OpenBSD__) || defined(__FreeBSD__) - return static_cast<uint32_t>(reinterpret_cast<intptr_t>(thread_id)); - #else - return static_cast<uint32_t>(thread_id); diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index 0214d81afb5d..00a6b3fa6848 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -1,11 +1,12 @@ bin/chrome man/man1/chrome.1.gz -%%DRIVER%%bin/chromedriver share/applications/chromium-browser.desktop %%DATADIR%%/chrome %%DATADIR%%/chrome-wrapper %%DATADIR%%/chrome_100_percent.pak -%%DATADIR%%/content_resources.pak +%%DATADIR%%/chrome_200_percent.pak +%%DATADIR%%/icudtl.dat +%%DATADIR%%/natives_blob.bin %%DATADIR%%/keyboard_resources.pak %%DATADIR%%/locales/am.pak %%DATADIR%%/locales/ar.pak @@ -22,6 +23,7 @@ share/applications/chromium-browser.desktop %%DATADIR%%/locales/es.pak %%DATADIR%%/locales/et.pak %%DATADIR%%/locales/fa.pak +%%DATADIR%%/locales/fake-bidi.pak %%DATADIR%%/locales/fi.pak %%DATADIR%%/locales/fil.pak %%DATADIR%%/locales/fr.pak @@ -61,9 +63,7 @@ share/applications/chromium-browser.desktop %%DATADIR%%/locales/zh-CN.pak %%DATADIR%%/locales/zh-TW.pak %%DATADIR%%/mksnapshot -%%DATADIR%%/pseudo_locales/fake-bidi.pak %%DATADIR%%/resources.pak -%%DATADIR%%/resources/extension/demo/library.js %%DATADIR%%/resources/inspector/Images/accelerometer-back.png %%DATADIR%%/resources/inspector/Images/accelerometer-bottom.png %%DATADIR%%/resources/inspector/Images/accelerometer-front.png @@ -121,16 +121,12 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/Images/resourcesTimeGraphIcon.png %%DATADIR%%/resources/inspector/Images/searchNext.png %%DATADIR%%/resources/inspector/Images/searchPrev.png -%%DATADIR%%/resources/inspector/Images/securityPropertyInfo.svg -%%DATADIR%%/resources/inspector/Images/securityPropertyInsecure.svg -%%DATADIR%%/resources/inspector/Images/securityPropertySecure.svg -%%DATADIR%%/resources/inspector/Images/securityPropertyUnknown.svg -%%DATADIR%%/resources/inspector/Images/securityPropertyWarning.svg -%%DATADIR%%/resources/inspector/Images/securityStateInsecure.svg -%%DATADIR%%/resources/inspector/Images/securityStateNeutral.svg -%%DATADIR%%/resources/inspector/Images/securityStateSecure.svg +%%DATADIR%%/resources/inspector/Images/securityIcons.png +%%DATADIR%%/resources/inspector/Images/securityIcons_2x.png %%DATADIR%%/resources/inspector/Images/settingsListRemove.png %%DATADIR%%/resources/inspector/Images/settingsListRemove_2x.png +%%DATADIR%%/resources/inspector/Images/smallIcons.png +%%DATADIR%%/resources/inspector/Images/smallIcons_2x.png %%DATADIR%%/resources/inspector/Images/speech.png %%DATADIR%%/resources/inspector/Images/toolbarButtonGlyphs.png %%DATADIR%%/resources/inspector/Images/toolbarButtonGlyphs_2x.png @@ -142,23 +138,22 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/InspectorBackendCommands.js %%DATADIR%%/resources/inspector/SupportedCSSProperties.js %%DATADIR%%/resources/inspector/Tests.js -%%DATADIR%%/resources/inspector/accessibility_module.js -%%DATADIR%%/resources/inspector/animation_module.js -%%DATADIR%%/resources/inspector/audits_module.js -%%DATADIR%%/resources/inspector/cm_modes_module.js -%%DATADIR%%/resources/inspector/components_lazy_module.js -%%DATADIR%%/resources/inspector/console_module.js -%%DATADIR%%/resources/inspector/devices_module.js +%%DATADIR%%/resources/inspector/accessibility/accessibility_module.js +%%DATADIR%%/resources/inspector/animation/animation_module.js +%%DATADIR%%/resources/inspector/audits/audits_module.js +%%DATADIR%%/resources/inspector/cm_modes/cm_modes_module.js +%%DATADIR%%/resources/inspector/components_lazy/components_lazy_module.js +%%DATADIR%%/resources/inspector/console/console_module.js +%%DATADIR%%/resources/inspector/devices/devices_module.js %%DATADIR%%/resources/inspector/devtools.js %%DATADIR%%/resources/inspector/devtools_extension_api.js -%%DATADIR%%/resources/inspector/diff_module.js -%%DATADIR%%/resources/inspector/elements_module.js -%%DATADIR%%/resources/inspector/emulated_devices_module.js -%%DATADIR%%/resources/inspector/es_tree_module.js +%%DATADIR%%/resources/inspector/diff/diff_module.js +%%DATADIR%%/resources/inspector/elements/elements_module.js %%DATADIR%%/resources/inspector/emulated_devices/Nexus5X-landscape.svg %%DATADIR%%/resources/inspector/emulated_devices/Nexus5X-portrait.svg %%DATADIR%%/resources/inspector/emulated_devices/Nexus6P-landscape.svg %%DATADIR%%/resources/inspector/emulated_devices/Nexus6P-portrait.svg +%%DATADIR%%/resources/inspector/emulated_devices/emulated_devices_module.js %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-default-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-default-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-keyboard-1x.png @@ -191,51 +186,33 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/emulated_devices/iPhone6-portrait.svg %%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-landscape.svg %%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg +%%DATADIR%%/resources/inspector/es_tree/es_tree_module.js %%DATADIR%%/resources/inspector/formatter_worker.js -%%DATADIR%%/resources/inspector/gonzales_module.js +%%DATADIR%%/resources/inspector/gonzales/gonzales_module.js %%DATADIR%%/resources/inspector/heap_snapshot_worker.js %%DATADIR%%/resources/inspector/inspector.html %%DATADIR%%/resources/inspector/inspector.js -%%DATADIR%%/resources/inspector/layers_module.js -%%DATADIR%%/resources/inspector/network_module.js -%%DATADIR%%/resources/inspector/profiler_module.js -%%DATADIR%%/resources/inspector/resources_module.js -%%DATADIR%%/resources/inspector/sass_module.js -%%DATADIR%%/resources/inspector/screencast_module.js -%%DATADIR%%/resources/inspector/security_module.js -%%DATADIR%%/resources/inspector/settings_module.js -%%DATADIR%%/resources/inspector/snippets_module.js -%%DATADIR%%/resources/inspector/source_frame_module.js -%%DATADIR%%/resources/inspector/sources_module.js +%%DATADIR%%/resources/inspector/layers/layers_module.js +%%DATADIR%%/resources/inspector/network/network_module.js +%%DATADIR%%/resources/inspector/profiler/profiler_module.js +%%DATADIR%%/resources/inspector/resources/resources_module.js +%%DATADIR%%/resources/inspector/sass/sass_module.js +%%DATADIR%%/resources/inspector/screencast/screencast_module.js +%%DATADIR%%/resources/inspector/security/security_module.js +%%DATADIR%%/resources/inspector/settings/settings_module.js +%%DATADIR%%/resources/inspector/snippets/snippets_module.js +%%DATADIR%%/resources/inspector/source_frame/source_frame_module.js +%%DATADIR%%/resources/inspector/sources/sources_module.js %%DATADIR%%/resources/inspector/temp_storage_shared_worker.js -%%DATADIR%%/resources/inspector/timeline_module.js +%%DATADIR%%/resources/inspector/timeline/timeline_module.js +%%DATADIR%%/resources/inspector/timeline_model/timeline_model_module.js %%DATADIR%%/resources/inspector/toolbox.html %%DATADIR%%/resources/inspector/toolbox.js -%%DATADIR%%/resources/inspector/ui_lazy_module.js +%%DATADIR%%/resources/inspector/ui_lazy/ui_lazy_module.js +%%DRIVER%%bin/chromedriver share/icons/hicolor/128x128/apps/chrome.png share/icons/hicolor/22x22/apps/chrome.png share/icons/hicolor/24x24/apps/chrome.png share/icons/hicolor/256x256/apps/chrome.png share/icons/hicolor/48x48/apps/chrome.png share/icons/hicolor/64x64/apps/chrome.png -@dir %%DATADIR%%/locales -@dir %%DATADIR%%/resources/extension/demo -@dir %%DATADIR%%/resources/extension -@dir %%DATADIR%%/resources/inspector/Images -@dir %%DATADIR%%/resources/inspector -@dir %%DATADIR%%/resources -@dir %%DATADIR%% -@dir share/icons/hicolor/128x128/apps -@dir share/icons/hicolor/128x128 -@dir share/icons/hicolor/22x22/apps -@dir share/icons/hicolor/22x22 -@dir share/icons/hicolor/24x24/apps -@dir share/icons/hicolor/24x24 -@dir share/icons/hicolor/256x256/apps -@dir share/icons/hicolor/256x256 -@dir share/icons/hicolor/48x48/apps -@dir share/icons/hicolor/48x48 -@dir share/icons/hicolor/64x64/apps -@dir share/icons/hicolor/64x64 -@dir share/icons/hicolor -@dir share/icons |