svn commit: r448987 - in branches/2017Q3/www/chromium: . files
Carlos J. Puga Medina
cpm at FreeBSD.org
Wed Aug 30 15:24:19 UTC 2017
Author: cpm
Date: Wed Aug 30 15:24:15 2017
New Revision: 448987
URL: https://svnweb.freebsd.org/changeset/ports/448987
Log:
MFH: r448637
www/chromium: update to 60.0.3112.101
- Update LICENSE
- Drop USE_GNOME=gtk20 dependency because chromium uses gtk3
- Use freetype2 bundled to avoid more issues related to the freetype library
- Fix typo in the comment of pre-configure section
- Update comment in SNDIO section
Changelog: https://chromium.googlesource.com/chromium/src/+log/59.0.3071.115..60.0.3112.101?pretty=fuller&n=10000
Security: https://vuxml.freebsd.org/freebsd/7d138476-7710-11e7-88a1-e8e0b747a45a.html
Approved by: ports-secteam (delphij)
Added:
branches/2017Q3/www/chromium/files/patch-base_debug_stack__trace.h
- copied unchanged from r448637, head/www/chromium/files/patch-base_debug_stack__trace.h
branches/2017Q3/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc
- copied unchanged from r448637, head/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc
branches/2017Q3/www/chromium/files/patch-base_process_internal__linux.cc
- copied unchanged from r448637, head/www/chromium/files/patch-base_process_internal__linux.cc
branches/2017Q3/www/chromium/files/patch-base_task_scheduler_delayed_task_manager.cc
- copied unchanged from r448637, head/www/chromium/files/patch-base_task_scheduler_delayed_task_manager.cc
branches/2017Q3/www/chromium/files/patch-base_test_test__file__util__linux.cc
- copied unchanged from r448637, head/www/chromium/files/patch-base_test_test__file__util__linux.cc
branches/2017Q3/www/chromium/files/patch-base_trace__event_malloc_dump_provider.cc
- copied unchanged from r448637, head/www/chromium/files/patch-base_trace__event_malloc_dump_provider.cc
branches/2017Q3/www/chromium/files/patch-chrome_app_mash_embedded_services.cc
- copied unchanged from r448637, head/www/chromium/files/patch-chrome_app_mash_embedded_services.cc
branches/2017Q3/www/chromium/files/patch-chrome_browser_devtools_devtools_eye_dropper.cc
- copied unchanged from r448637, head/www/chromium/files/patch-chrome_browser_devtools_devtools_eye_dropper.cc
branches/2017Q3/www/chromium/files/patch-chrome_browser_ui_views_profiles_avatar_button.cc
- copied unchanged from r448637, head/www/chromium/files/patch-chrome_browser_ui_views_profiles_avatar_button.cc
branches/2017Q3/www/chromium/files/patch-components_autofill_strings.grdp
- copied unchanged from r448637, head/www/chromium/files/patch-components_autofill_strings.grdp
branches/2017Q3/www/chromium/files/patch-components_new_or_sad_tab_strings.grdp
- copied unchanged from r448637, head/www/chromium/files/patch-components_new_or_sad_tab_strings.grdp
branches/2017Q3/www/chromium/files/patch-content_browser_gpu_gpu__feature__checker__impl.cc
- copied unchanged from r448637, head/www/chromium/files/patch-content_browser_gpu_gpu__feature__checker__impl.cc
branches/2017Q3/www/chromium/files/patch-content_browser_memory_swap_metrics_observer_linux.cc
- copied unchanged from r448637, head/www/chromium/files/patch-content_browser_memory_swap_metrics_observer_linux.cc
branches/2017Q3/www/chromium/files/patch-content_browser_renderer__host_media_in_process_video_capture_device_launcher.cc
- copied unchanged from r448637, head/www/chromium/files/patch-content_browser_renderer__host_media_in_process_video_capture_device_launcher.cc
branches/2017Q3/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
- copied unchanged from r448637, head/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
branches/2017Q3/www/chromium/files/patch-gpu_ipc_client_gpu_memory_buffer_impl.cc
- copied unchanged from r448637, head/www/chromium/files/patch-gpu_ipc_client_gpu_memory_buffer_impl.cc
branches/2017Q3/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.cc
- copied unchanged from r448637, head/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.cc
branches/2017Q3/www/chromium/files/patch-gpu_ipc_service_gpu__memory_buffer_factory.cc
- copied unchanged from r448637, head/www/chromium/files/patch-gpu_ipc_service_gpu__memory_buffer_factory.cc
branches/2017Q3/www/chromium/files/patch-ipc_ipc__channel_common.cc
- copied unchanged from r448637, head/www/chromium/files/patch-ipc_ipc__channel_common.cc
branches/2017Q3/www/chromium/files/patch-ipc_ipc__channel_mojo.cc
- copied unchanged from r448637, head/www/chromium/files/patch-ipc_ipc__channel_mojo.cc
branches/2017Q3/www/chromium/files/patch-remoting_base_chromoting_event.cc
- copied unchanged from r448637, head/www/chromium/files/patch-remoting_base_chromoting_event.cc
branches/2017Q3/www/chromium/files/patch-remoting_client_display_sys_opengl.h
- copied unchanged from r448637, head/www/chromium/files/patch-remoting_client_display_sys_opengl.h
branches/2017Q3/www/chromium/files/patch-remoting_host_it2me_it2me_native_messaging_host_main.cc
- copied unchanged from r448637, head/www/chromium/files/patch-remoting_host_it2me_it2me_native_messaging_host_main.cc
branches/2017Q3/www/chromium/files/patch-remoting_host_me2me_desktop_environment.cc
- copied unchanged from r448637, head/www/chromium/files/patch-remoting_host_me2me_desktop_environment.cc
branches/2017Q3/www/chromium/files/patch-remoting_host_remoting_me2me_host.cc
- copied unchanged from r448637, head/www/chromium/files/patch-remoting_host_remoting_me2me_host.cc
branches/2017Q3/www/chromium/files/patch-remoting_host_setup_me2me_native_messaging_host_main.cc
- copied unchanged from r448637, head/www/chromium/files/patch-remoting_host_setup_me2me_native_messaging_host_main.cc
branches/2017Q3/www/chromium/files/patch-remoting_webapp_base_js_platform.js
- copied unchanged from r448637, head/www/chromium/files/patch-remoting_webapp_base_js_platform.js
branches/2017Q3/www/chromium/files/patch-sandbox_BUILD.gn
- copied unchanged from r448637, head/www/chromium/files/patch-sandbox_BUILD.gn
branches/2017Q3/www/chromium/files/patch-sandbox_linux_BUILD.gn
- copied unchanged from r448637, head/www/chromium/files/patch-sandbox_linux_BUILD.gn
branches/2017Q3/www/chromium/files/patch-services_device_battery_BUILD.gn
- copied unchanged from r448637, head/www/chromium/files/patch-services_device_battery_BUILD.gn
branches/2017Q3/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
- copied unchanged from r448637, head/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
branches/2017Q3/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_gl_renderergl_utils.cpp
- copied unchanged from r448637, head/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_gl_renderergl_utils.cpp
branches/2017Q3/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile_stdio.cpp
- copied unchanged from r448637, head/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile_stdio.cpp
branches/2017Q3/www/chromium/files/patch-third__party_vulkan-validation-layers_src_loader_vk_loader_platform.h
- copied unchanged from r448637, head/www/chromium/files/patch-third__party_vulkan-validation-layers_src_loader_vk_loader_platform.h
branches/2017Q3/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.cc
- copied unchanged from r448637, head/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.cc
branches/2017Q3/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.h
- copied unchanged from r448637, head/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.h
branches/2017Q3/www/chromium/files/patch-ui_gfx_ipc_gfx_param_traits_macros.h
- copied unchanged from r448637, head/www/chromium/files/patch-ui_gfx_ipc_gfx_param_traits_macros.h
branches/2017Q3/www/chromium/files/patch-ui_gfx_linux_client_native_pixmap_dmabuf.cc
- copied unchanged from r448637, head/www/chromium/files/patch-ui_gfx_linux_client_native_pixmap_dmabuf.cc
branches/2017Q3/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.cc
- copied unchanged from r448637, head/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.cc
branches/2017Q3/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.h
- copied unchanged from r448637, head/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.h
branches/2017Q3/www/chromium/files/patch-ui_gfx_native_pixmap_handle.cc
- copied unchanged from r448637, head/www/chromium/files/patch-ui_gfx_native_pixmap_handle.cc
branches/2017Q3/www/chromium/files/patch-ui_gfx_native_pixmap_handle.h
- copied unchanged from r448637, head/www/chromium/files/patch-ui_gfx_native_pixmap_handle.h
Deleted:
branches/2017Q3/www/chromium/files/patch-build__overrides_pdfium.gni
branches/2017Q3/www/chromium/files/patch-build_config_freetype_BUILD.gn
branches/2017Q3/www/chromium/files/patch-chrome_app_mash_mash__runner.cc
branches/2017Q3/www/chromium/files/patch-chrome_browser_resources_vulcanize.gni
branches/2017Q3/www/chromium/files/patch-chrome_browser_ui_libgtkui_gtk_ui.cc
branches/2017Q3/www/chromium/files/patch-chrome_chrome__paks.gni
branches/2017Q3/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc
branches/2017Q3/www/chromium/files/patch-device_battery_BUILD.gn
branches/2017Q3/www/chromium/files/patch-mash_package_mash__packaged__service.cc
branches/2017Q3/www/chromium/files/patch-media_ffmpeg_ffmpeg__common.h
branches/2017Q3/www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc
branches/2017Q3/www/chromium/files/patch-remoting_host_BUILD.gn
branches/2017Q3/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
branches/2017Q3/www/chromium/files/patch-services_service__manager_standalone_context.cc
branches/2017Q3/www/chromium/files/patch-testing_gtest_src_gtest.cc
branches/2017Q3/www/chromium/files/patch-third__party_angle_gni_angle.gni
branches/2017Q3/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn
branches/2017Q3/www/chromium/files/patch-third__party_libxml_BUILD.gn
branches/2017Q3/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost_FreeType_common.cpp
Modified:
branches/2017Q3/www/chromium/Makefile
branches/2017Q3/www/chromium/distinfo
branches/2017Q3/www/chromium/files/audio_manager_openbsd.cc
branches/2017Q3/www/chromium/files/audio_manager_openbsd.h
branches/2017Q3/www/chromium/files/patch-BUILD.gn
branches/2017Q3/www/chromium/files/patch-base_BUILD.gn
branches/2017Q3/www/chromium/files/patch-base_debug_stack__trace__posix.cc
branches/2017Q3/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h
branches/2017Q3/www/chromium/files/patch-base_files_file__util.h
branches/2017Q3/www/chromium/files/patch-base_native__library__posix.cc
branches/2017Q3/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc
branches/2017Q3/www/chromium/files/patch-base_process_memory.h
branches/2017Q3/www/chromium/files/patch-base_process_process__metrics.h
branches/2017Q3/www/chromium/files/patch-base_process_process__posix.cc
branches/2017Q3/www/chromium/files/patch-base_sys__info__posix.cc
branches/2017Q3/www/chromium/files/patch-base_third__party_libevent_BUILD.gn
branches/2017Q3/www/chromium/files/patch-base_threading_platform__thread__linux.cc
branches/2017Q3/www/chromium/files/patch-base_trace__event_trace__log.cc
branches/2017Q3/www/chromium/files/patch-build_config_BUILD.gn
branches/2017Q3/www/chromium/files/patch-build_config_BUILDCONFIG.gn
branches/2017Q3/www/chromium/files/patch-build_config_allocator.gni
branches/2017Q3/www/chromium/files/patch-build_config_compiler_BUILD.gn
branches/2017Q3/www/chromium/files/patch-chrome_app_chrome__main.cc
branches/2017Q3/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
branches/2017Q3/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
branches/2017Q3/www/chromium/files/patch-chrome_common_chrome__switches.cc
branches/2017Q3/www/chromium/files/patch-chrome_common_chrome__switches.h
branches/2017Q3/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
branches/2017Q3/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.cc
branches/2017Q3/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
branches/2017Q3/www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc
branches/2017Q3/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc
branches/2017Q3/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
branches/2017Q3/www/chromium/files/patch-content_browser_utility__process__host__impl.cc
branches/2017Q3/www/chromium/files/patch-device_usb_usb__device__impl.cc
branches/2017Q3/www/chromium/files/patch-gpu_ipc_client_BUILD.gn
branches/2017Q3/www/chromium/files/patch-gpu_ipc_service_BUILD.gn
branches/2017Q3/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
branches/2017Q3/www/chromium/files/patch-net_dns_address__sorter__posix.cc
branches/2017Q3/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc
branches/2017Q3/www/chromium/files/patch-net_proxy_proxy__service.cc
branches/2017Q3/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
branches/2017Q3/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
branches/2017Q3/www/chromium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc
branches/2017Q3/www/chromium/files/patch-remoting_host_host__details.cc
branches/2017Q3/www/chromium/files/patch-skia_BUILD.gn
branches/2017Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_Assertions.cpp
branches/2017Q3/www/chromium/files/patch-third__party_node_node.py
branches/2017Q3/www/chromium/files/patch-third__party_widevine_cdm_BUILD.gn
branches/2017Q3/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py
branches/2017Q3/www/chromium/files/patch-ui_base_BUILD.gn
branches/2017Q3/www/chromium/files/patch-ui_gfx_font__render__params.h
branches/2017Q3/www/chromium/files/patch-ui_gl_BUILD.gn
branches/2017Q3/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
branches/2017Q3/www/chromium/pkg-plist
Directory Properties:
branches/2017Q3/ (props changed)
Modified: branches/2017Q3/www/chromium/Makefile
==============================================================================
--- branches/2017Q3/www/chromium/Makefile Wed Aug 30 15:12:44 2017 (r448986)
+++ branches/2017Q3/www/chromium/Makefile Wed Aug 30 15:24:15 2017 (r448987)
@@ -2,18 +2,15 @@
# $FreeBSD$
PORTNAME= chromium
-PORTVERSION= 59.0.3071.115
-PORTREVISION= 2
+PORTVERSION= 60.0.3112.101
CATEGORIES= www
-MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/:source1 \
- LOCAL/cpm:source2
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:source1 \
- ${PORTNAME}-freetype2${EXTRACT_SUFX}:source2
+MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= chromium at FreeBSD.org
COMMENT= Google web browser based on WebKit
-LICENSE= BSD3CLAUSE LGPL21 MPL
+LICENSE= BSD3CLAUSE LGPL21 MPL11
LICENSE_COMB= multi
BUILD_DEPENDS= gperf:devel/gperf \
@@ -48,7 +45,6 @@ LIB_DEPENDS= libspeechd.so:accessibility/speech-dispat
libwebp.so:graphics/webp \
libavcodec.so:multimedia/ffmpeg \
libcups.so:print/cups \
- libfreetype.so:print/freetype2 \
libharfbuzz.so:print/harfbuzz \
libharfbuzz-icu.so:print/harfbuzz-icu \
libgcrypt.so:security/libgcrypt \
@@ -71,7 +67,7 @@ USE_LDCONFIG= ${DATADIR}
USE_PERL5= build
USE_XORG= scrnsaverproto x11 xcb xcomposite xcursor xext xdamage xfixes xi \
xproto xrandr xrender xscrnsaver xtst
-USE_GNOME= atk dconf glib20 gtk20 gtk30 libxml2 libxslt
+USE_GNOME= atk dconf glib20 gtk30 libxml2 libxslt
MAKE_ARGS= -C out/${BUILDTYPE}
SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper
ALL_TARGET= chrome
@@ -88,7 +84,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang
# 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_media_router=true \
enable_nacl=false \
enable_one_click_signin=true \
enable_remoting=false \
@@ -98,9 +93,9 @@ GN_ARGS+= clang_use_chrome_plugins=false \
toolkit_views=true \
treat_warnings_as_errors=false \
use_allocator="none" \
+ use_allocator_shim=false \
use_aura=true \
use_cups=true \
- use_experimental_allocator_shim=false \
use_gtk3=true \
use_lld=true \
use_sysroot=false \
@@ -169,8 +164,7 @@ PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false
# With SNDIO=on we exclude audio_manager_linux from the build (see
# media/audio/BUILD.gn) and use audio_manager_openbsd which does not
-# support falling back to ALSA. In theory it supports falling back to
-# PulseAudio, but this is untested.
+# support falling back to ALSA or PulseAudio.
SNDIO_PREVENTS= ALSA PULSEAUDIO
SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
SNDIO_VARS= GN_ARGS+=use_sndio=true
@@ -178,7 +172,7 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false
.include "Makefile.tests"
TEST_ALL_TARGET= ${TEST_TARGETS}
-TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}:source1
+TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}
.include <bsd.port.options.mk>
@@ -198,9 +192,6 @@ pre-everything::
@${ECHO_MSG} "and ${WANTSPACE}."
@${ECHO_MSG}
-post-extract:
- @${MV} ${WRKDIR}/freetype2 ${WRKSRC}/third_party/freetype/src
-
post-patch-SNDIO-on:
@${MKDIR} ${WRKSRC}/media/audio/sndio ${WRKSRC}/media/audio/openbsd
@${CP} ${FILESDIR}/sndio_output.* ${WRKSRC}/media/audio/sndio
@@ -209,7 +200,7 @@ post-patch-SNDIO-on:
pre-configure:
# We used to remove bundled libraries to be sure that chromium uses
- # system libraries and not shippen ones.
+ # system libraries and not shipped ones.
# cd ${WRKSRC} && ${PYTHON_CMD} \
#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
cd ${WRKSRC} && ${PYTHON_CMD} \
@@ -225,8 +216,8 @@ do-configure:
gen --args='${GN_ARGS}' out/${BUILDTYPE}
# Setup nodejs dependency
- @${MKDIR} ${WRKSRC}/third_party/node/linux/node-linux-x64/bin
- ${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/linux/node-linux-x64/bin/node
+ @${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin
+ ${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin/node
do-test-TEST-on:
.for t in ${TEST_TARGETS}
Modified: branches/2017Q3/www/chromium/distinfo
==============================================================================
--- branches/2017Q3/www/chromium/distinfo Wed Aug 30 15:12:44 2017 (r448986)
+++ branches/2017Q3/www/chromium/distinfo Wed Aug 30 15:24:15 2017 (r448987)
@@ -1,7 +1,5 @@
-TIMESTAMP = 1498576960
-SHA256 (chromium-59.0.3071.115.tar.xz) = 37cbc9955ae3b25cd4e9851a82ea97a0035021cc90658902938ad1c20f263170
-SIZE (chromium-59.0.3071.115.tar.xz) = 530808448
-SHA256 (chromium-freetype2.tar.xz) = 5bcb3d3da82905b2077ae0dcca52b99a25344c7e8dbdcd52691d69ab269356e3
-SIZE (chromium-freetype2.tar.xz) = 22847212
-SHA256 (chromium-59.0.3071.115-testdata.tar.xz) = a66e7b4a8f6002fe64b2b5609deb6eff2a0da442cb68e22ce404023021f20852
-SIZE (chromium-59.0.3071.115-testdata.tar.xz) = 124229320
+TIMESTAMP = 1502990445
+SHA256 (chromium-60.0.3112.101.tar.xz) = 0bfb6318af1c3cf82e8ac872e3da34cd3c013aadaab446d5097228101cec065e
+SIZE (chromium-60.0.3112.101.tar.xz) = 537528240
+SHA256 (chromium-60.0.3112.101-testdata.tar.xz) = c22a3aa43af83b6ab3e97bbf9e44b4b00c6d7a9b50d3a528cfd8726b845f1f7e
+SIZE (chromium-60.0.3112.101-testdata.tar.xz) = 124655656
Modified: branches/2017Q3/www/chromium/files/audio_manager_openbsd.cc
==============================================================================
--- branches/2017Q3/www/chromium/files/audio_manager_openbsd.cc Wed Aug 30 15:12:44 2017 (r448986)
+++ branches/2017Q3/www/chromium/files/audio_manager_openbsd.cc Wed Aug 30 15:24:15 2017 (r448987)
@@ -3,14 +3,12 @@
// found in the LICENSE file.
#include "base/metrics/histogram_macros.h"
+#include "base/memory/ptr_util.h"
#include "media/audio/openbsd/audio_manager_openbsd.h"
#include "media/audio/audio_device_description.h"
#include "media/audio/audio_output_dispatcher.h"
-#if defined(USE_PULSEAUDIO)
-#include "media/audio/pulse/audio_manager_pulse.h"
-#endif
#if defined(USE_SNDIO)
#include "media/audio/sndio/sndio_input.h"
#include "media/audio/sndio/sndio_output.h"
@@ -82,12 +80,9 @@ AudioParameters AudioManagerOpenBSD::GetInputStreamPar
kDefaultSampleRate, 16, buffer_size);
}
-AudioManagerOpenBSD::AudioManagerOpenBSD(
- scoped_refptr<base::SingleThreadTaskRunner> task_runner,
- scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
- AudioLogFactory* audio_log_factory)
- : AudioManagerBase(std::move(task_runner),
- std::move(worker_task_runner),
+AudioManagerOpenBSD::AudioManagerOpenBSD(std::unique_ptr<AudioThread> audio_thread,
+ AudioLogFactory* audio_log_factory)
+ : AudioManagerBase(std::move(audio_thread),
audio_log_factory) {
DLOG(WARNING) << "AudioManagerOpenBSD";
SetMaxOutputStreamsAllowed(kMaxOutputStreams);
@@ -170,34 +165,17 @@ AudioOutputStream* AudioManagerOpenBSD::MakeOutputStre
}
#endif
-ScopedAudioManagerPtr CreateAudioManager(
- scoped_refptr<base::SingleThreadTaskRunner> task_runner,
- scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
+std::unique_ptr<media::AudioManager> CreateAudioManager(
+ std::unique_ptr<AudioThread> audio_thread,
AudioLogFactory* audio_log_factory) {
DLOG(WARNING) << "CreateAudioManager";
-#if defined(USE_PULSEAUDIO)
- // Do not move task runners when creating AudioManagerPulse.
- // If the creation fails, we need to use the task runners to create other
- // AudioManager implementations.
- std::unique_ptr<AudioManagerPulse, AudioManagerDeleter> manager(
- new AudioManagerPulse(task_runner, worker_task_runner,
- audio_log_factory));
- if (manager->Init()) {
- UMA_HISTOGRAM_ENUMERATION("Media.OpenBSDAudioIO", kPulse, kAudioIOMax + 1);
- return std::move(manager);
- }
- DVLOG(1) << "PulseAudio is not available on the OS";
-#endif
-
#if defined(USE_SNDIO)
UMA_HISTOGRAM_ENUMERATION("Media.OpenBSDAudioIO", kSndio, kAudioIOMax + 1);
- return ScopedAudioManagerPtr(
- new AudioManagerOpenBSD(std::move(task_runner),
- std::move(worker_task_runner),audio_log_factory));
+ return base::MakeUnique<AudioManagerOpenBSD>(std::move(audio_thread),
+ audio_log_factory);
#else
- return ScopedAudioManagerPtr(
- new FakeAudioManager(std::move(task_runner),
- std::move(worker_task_runner), audio_log_factory));
+ return base::MakeUnique<FakeAudioManager>(std::move(audio_thread),
+ audio_log_factory);
#endif
}
Modified: branches/2017Q3/www/chromium/files/audio_manager_openbsd.h
==============================================================================
--- branches/2017Q3/www/chromium/files/audio_manager_openbsd.h Wed Aug 30 15:12:44 2017 (r448986)
+++ branches/2017Q3/www/chromium/files/audio_manager_openbsd.h Wed Aug 30 15:24:15 2017 (r448987)
@@ -17,10 +17,9 @@ namespace media {
class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase {
public:
- AudioManagerOpenBSD(
- scoped_refptr<base::SingleThreadTaskRunner> task_runner,
- scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
- AudioLogFactory* audio_log_factory);
+ AudioManagerOpenBSD(std::unique_ptr<AudioThread> audio_thread,
+ AudioLogFactory* audio_log_factory);
+ ~AudioManagerOpenBSD() override;
// Implementation of AudioManager.
bool HasAudioOutputDevices() override;
@@ -50,8 +49,6 @@ class MEDIA_EXPORT AudioManagerOpenBSD : public AudioM
const LogCallback& log_callback) override;
protected:
- ~AudioManagerOpenBSD() override;
-
AudioParameters GetPreferredOutputStreamParameters(
const std::string& output_device_id,
const AudioParameters& input_params) override;
Modified: branches/2017Q3/www/chromium/files/patch-BUILD.gn
==============================================================================
--- branches/2017Q3/www/chromium/files/patch-BUILD.gn Wed Aug 30 15:12:44 2017 (r448986)
+++ branches/2017Q3/www/chromium/files/patch-BUILD.gn Wed Aug 30 15:24:15 2017 (r448987)
@@ -1,42 +1,33 @@
---- BUILD.gn.orig 2017-06-05 19:03:00 UTC
-+++ BUILD.gn
-@@ -95,7 +95,7 @@ group("gn_all") {
+--- BUILD.gn.orig 2017-07-25 21:04:48.000000000 +0200
++++ BUILD.gn 2017-07-29 00:52:25.378843000 +0200
+@@ -92,7 +92,7 @@
]
}
-- if (!is_ios && !is_android && !is_chromecast) {
-+ if (!is_ios && !is_android && !is_bsd && !is_chromecast) {
+- if (!is_ios && !is_android && !is_chromecast && !is_fuchsia) {
++ if (!is_ios && !is_android && !is_bsd && !is_chromecast && !is_fuchsia) {
deps += [
"//chrome",
"//chrome/test:browser_tests",
-@@ -153,7 +153,7 @@ group("gn_all") {
+@@ -151,7 +151,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.
+- if (!is_ios && !is_fuchsia) {
++ if (!is_ios && !is_bsd && !is_fuchsia) {
deps += [
-@@ -199,7 +199,7 @@ group("gn_all") {
- "//ui/touch_selection:ui_touch_selection_unittests",
- "//url/ipc:url_ipc_unittests",
+ "//cc:cc_unittests",
+ "//chrome/test:telemetry_perf_unittests",
+@@ -363,7 +363,7 @@
]
-- } else {
-+ } else if (!is_bsd) {
- deps += [ "//ios:all" ]
}
-@@ -359,7 +359,7 @@ group("gn_all") {
- ]
- }
-
- if (is_linux) {
+ if (is_linux || is_bsd) {
# The following are definitely linux-only.
deps += [
"//chrome:manpage",
-@@ -382,9 +382,16 @@ group("gn_all") {
+@@ -386,9 +386,16 @@
# TODO(dpranke): add the linux_dump_symbols flag?
deps += [ "//chrome:linux_symbols" ]
}
@@ -54,7 +45,7 @@
deps += [
"//base:base_i18n_perftests",
"//base:base_perftests",
-@@ -455,7 +462,7 @@ group("gn_all") {
+@@ -459,7 +466,7 @@
if (enable_nacl) {
deps += [ "//components/nacl/loader:nacl_loader_unittests" ]
@@ -63,16 +54,16 @@
# TODO(dpranke): Figure out what platforms should actually have this.
deps += [ "//components/nacl/loader:nacl_helper" ]
-@@ -557,7 +564,7 @@ group("gn_all") {
+@@ -557,7 +564,7 @@
deps +=
[ "//chrome/installer/mini_installer:next_version_mini_installer" ]
}
-- } else if (!is_android && !is_ios) {
-+ } else if (!is_android && !is_ios && !is_bsd) {
+- } else if (!is_android && !is_ios && !is_fuchsia) {
++ } else if (!is_android && !is_ios && !is_bsd && !is_fuchsia) {
deps += [ "//breakpad:symupload($host_toolchain)" ]
}
-@@ -595,7 +602,7 @@ group("gn_all") {
+@@ -588,7 +595,7 @@
deps += [ "//components/proximity_auth:proximity_auth_unittests" ]
}
@@ -81,7 +72,7 @@
deps += [
"//mash:all",
"//media/mojo/services:media_service_unittests",
-@@ -620,7 +627,7 @@ group("gn_all") {
+@@ -606,7 +613,7 @@
}
}
@@ -90,7 +81,7 @@
# TODO(GYP): Figure out if any of these should be in gn_all
# and figure out how cross-platform they are
deps += [
-@@ -659,7 +666,7 @@ group("gn_all") {
+@@ -644,7 +651,7 @@
}
if (target_cpu == "x86" || target_cpu == "x64") {
@@ -99,7 +90,7 @@
deps += [ "//chrome/test:load_library_perf_tests" ]
}
deps += [
-@@ -667,7 +674,7 @@ group("gn_all") {
+@@ -652,13 +659,13 @@
"//third_party/libjpeg_turbo:simd_asm",
]
}
@@ -108,8 +99,6 @@
deps += [ "//v8:v8_shell" ]
}
}
-@@ -677,7 +684,7 @@ group("gn_all") {
- }
if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) ||
- (use_libfuzzer && is_mac)) {
@@ -117,25 +106,25 @@
deps += [
"//testing/libfuzzer/fuzzers",
"//testing/libfuzzer/tests:libfuzzer_tests",
-@@ -828,7 +835,7 @@ if (is_chromeos) {
+@@ -677,7 +684,7 @@
+ deps += [ "//native_client_sdk/src:nacl_core_sdk" ]
+ }
- 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 = [
-@@ -854,7 +861,7 @@ group("gn_visibility") {
+- if (is_linux && use_ozone) {
++ if ((is_linux || is_bsd ) && use_ozone) {
+ deps += [
+ "//headless",
+ "//headless:headless_tests",
+@@ -811,7 +818,7 @@
}
}
--if (!is_ios) {
-+if (!is_ios || !is_bsd) {
+-if (!is_ios && !is_fuchsia) {
++if (!is_ios && !is_bsd && !is_fuchsia) {
# This group includes all of the targets needed to build and test Blink,
# including running the layout tests (see below).
group("blink_tests") {
-@@ -921,7 +928,7 @@ if (!is_ios) {
+@@ -879,7 +886,7 @@
data_deps += [ "//content/shell:content_shell_crash_service" ]
}
@@ -144,7 +133,7 @@
data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ]
}
-@@ -929,7 +936,7 @@ if (!is_ios) {
+@@ -887,7 +894,7 @@
data_deps += [ "//breakpad:dump_syms($host_toolchain)" ]
}
@@ -153,16 +142,16 @@
data_deps += [ "//breakpad:dump_syms($host_toolchain)" ]
}
-@@ -979,7 +986,7 @@ group("chromium_swarm_tests") {
+@@ -941,7 +948,7 @@
group("chromium_builder_perf") {
testonly = true
-- if (!is_ios && !is_android && !is_chromecast) {
-+ if (!is_ios && !is_android && !is_chromecast && !is_bsd) {
+- if (!is_ios && !is_android && !is_chromecast && !is_fuchsia) {
++ if (!is_ios && !is_android && !is_bsd && !is_chromecast && !is_fuchsia) {
data_deps = [
"//cc:cc_perftests",
"//chrome/test:load_library_perf_tests",
-@@ -1009,7 +1016,7 @@ group("chromium_builder_perf") {
+@@ -975,7 +982,7 @@
"//chrome/installer/mini_installer:mini_installer",
"//chrome/test:angle_perftests",
]
Modified: branches/2017Q3/www/chromium/files/patch-base_BUILD.gn
==============================================================================
--- branches/2017Q3/www/chromium/files/patch-base_BUILD.gn Wed Aug 30 15:12:44 2017 (r448986)
+++ branches/2017Q3/www/chromium/files/patch-base_BUILD.gn Wed Aug 30 15:24:15 2017 (r448987)
@@ -1,6 +1,6 @@
---- base/BUILD.gn.orig 2017-06-05 21:03:00.000000000 +0200
-+++ base/BUILD.gn 2017-06-13 19:23:34.211227000 +0200
-@@ -1098,7 +1098,7 @@
+--- base/BUILD.gn.orig 2017-07-25 21:04:48.000000000 +0200
++++ base/BUILD.gn 2017-08-02 22:12:25.442369000 +0200
+@@ -1106,7 +1106,7 @@
"base_paths_win.h",
]
@@ -9,17 +9,25 @@
sources += [ "base_paths_posix.cc" ]
}
}
-@@ -1157,6 +1157,9 @@
+@@ -1142,7 +1142,7 @@
+ # Needed for <atomic> if using newer C++ library than sysroot, except if
+ # building inside the cros_sdk environment - use host_toolchain as a
+ # more robust check for this.
+- if (!use_sysroot && (is_android || (is_linux && !is_chromecast)) &&
++ if (!use_sysroot && (is_android || (is_linux && !is_chromecast) && !is_clang) &&
+ host_toolchain != "//build/toolchain/cros:host") {
+ libs = [ "atomic" ]
+ }
+@@ -1168,7 +1168,7 @@
+ "allocator/allocator_shim_override_glibc_weak_symbols.h",
+ ]
deps += [ "//base/allocator:tcmalloc" ]
- } else if (is_linux && use_allocator == "none") {
+- } else if (is_linux && use_allocator == "none") {
++ } else if (is_linux && !is_bsd && use_allocator == "none") {
sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
-+ } else if (is_bsd && use_allocator == "none") {
-+ # TODO move the code to "allocator_shim_default_dispatch_to_glibc.cc"
-+ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
} else if (is_android && use_allocator == "none") {
sources += [
- "allocator/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc",
-@@ -1172,6 +1175,33 @@
+@@ -1185,6 +1185,31 @@
}
}
@@ -32,8 +40,6 @@
+ "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",
+ ]
+ sources += [
+ "files/file_path_watcher_stub.cc",
@@ -53,7 +59,7 @@
# Allow more direct string conversions on platforms with native utf8
# strings
if (is_mac || is_ios || is_chromeos || is_chromecast) {
-@@ -1469,7 +1499,7 @@
+@@ -1520,7 +1545,7 @@
}
# Linux.
@@ -62,7 +68,7 @@
if (is_asan || is_lsan || is_msan || is_tsan) {
# For llvm-sanitizer.
data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ]
-@@ -1494,7 +1524,7 @@
+@@ -1545,7 +1570,7 @@
"//base/third_party/xdg_user_dirs",
]
} else {
@@ -71,7 +77,7 @@
sources -= [
"nix/mime_util_xdg.cc",
"nix/mime_util_xdg.h",
-@@ -2325,6 +2355,12 @@
+@@ -2392,6 +2417,12 @@
"trace_event/trace_event_android_unittest.cc",
]
set_sources_assignment_filter(sources_assignment_filter)
Copied: branches/2017Q3/www/chromium/files/patch-base_debug_stack__trace.h (from r448637, head/www/chromium/files/patch-base_debug_stack__trace.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2017Q3/www/chromium/files/patch-base_debug_stack__trace.h Wed Aug 30 15:24:15 2017 (r448987, copy of r448637, head/www/chromium/files/patch-base_debug_stack__trace.h)
@@ -0,0 +1,10 @@
+--- base/debug/stack_trace.h.orig 2017-08-02 19:09:58.400190000 +0200
++++ base/debug/stack_trace.h 2017-08-02 19:10:33.950334000 +0200
+@@ -16,6 +16,7 @@
+ #include "build/build_config.h"
+
+ #if defined(OS_POSIX)
++#include <sys/stdint.h>
+ #include <unistd.h>
+ #endif
+
Modified: branches/2017Q3/www/chromium/files/patch-base_debug_stack__trace__posix.cc
==============================================================================
--- branches/2017Q3/www/chromium/files/patch-base_debug_stack__trace__posix.cc Wed Aug 30 15:12:44 2017 (r448986)
+++ branches/2017Q3/www/chromium/files/patch-base_debug_stack__trace__posix.cc Wed Aug 30 15:24:15 2017 (r448987)
@@ -1,5 +1,5 @@
---- base/debug/stack_trace_posix.cc.orig 2017-04-19 19:06:28 UTC
-+++ base/debug/stack_trace_posix.cc
+--- base/debug/stack_trace_posix.cc.orig 2017-07-25 21:04:48.000000000 +0200
++++ base/debug/stack_trace_posix.cc 2017-08-02 18:45:42.071358000 +0200
@@ -34,7 +34,7 @@
#include <AvailabilityMacros.h>
#endif
@@ -9,18 +9,19 @@
#include "base/debug/proc_maps_linux.h"
#endif
-@@ -575,6 +575,10 @@ class SandboxSymbolizeHelper {
+@@ -574,6 +574,11 @@
// for the modules that are loaded in the current process.
// Returns true on success.
bool CacheMemoryRegions() {
-+#if defined(OS_FREEBSD)
++#if defined(OS_BSD)
+ // TODO (rene) avoid link error, implement something?
++ NOTIMPLEMENTED();
+ return false;
+#else
// Reads /proc/self/maps.
std::string contents;
if (!ReadProcMaps(&contents)) {
-@@ -590,6 +594,7 @@ class SandboxSymbolizeHelper {
+@@ -589,6 +594,7 @@
is_initialized_ = true;
return true;
@@ -28,3 +29,12 @@
}
// Opens all object files and caches their file descriptors.
+@@ -721,7 +727,7 @@
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if !defined(__UCLIBC__) && !defined(_AIX) && !defined(OS_BSD)
+ count = std::min(arraysize(trace_), count);
+
+ // Though the backtrace API man page does not list any possible negative
Modified: branches/2017Q3/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h
==============================================================================
--- branches/2017Q3/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h Wed Aug 30 15:12:44 2017 (r448986)
+++ branches/2017Q3/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h Wed Aug 30 15:24:15 2017 (r448987)
@@ -1,4 +1,4 @@
---- base/files/file_path_watcher_kqueue.h.orig 2017-04-19 19:06:28 UTC
+--- base/files/file_path_watcher_kqueue.h.orig 2017-06-05 19:03:00 UTC
+++ base/files/file_path_watcher_kqueue.h
@@ -5,6 +5,10 @@
#ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
Modified: branches/2017Q3/www/chromium/files/patch-base_files_file__util.h
==============================================================================
--- branches/2017Q3/www/chromium/files/patch-base_files_file__util.h Wed Aug 30 15:12:44 2017 (r448986)
+++ branches/2017Q3/www/chromium/files/patch-base_files_file__util.h Wed Aug 30 15:24:15 2017 (r448987)
@@ -1,11 +1,11 @@
---- base/files/file_util.h.orig 2017-06-05 19:03:00 UTC
-+++ base/files/file_util.h
-@@ -406,7 +406,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas
+--- base/files/file_util.h.orig 2017-07-25 21:04:48.000000000 +0200
++++ base/files/file_util.h 2017-07-29 00:57:11.269678000 +0200
+@@ -406,7 +406,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)
+-#if defined(OS_LINUX) || defined(OS_AIX)
++#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
// Broad categories of file systems as returned by statfs() on Linux.
enum FileSystemType {
FILE_SYSTEM_UNKNOWN, // statfs failed.
Copied: branches/2017Q3/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc (from r448637, head/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2017Q3/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc Wed Aug 30 15:24:15 2017 (r448987, copy of r448637, head/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc)
@@ -0,0 +1,11 @@
+--- base/files/memory_mapped_file_posix.cc.orig 2017-08-02 18:42:44.932652000 +0200
++++ base/files/memory_mapped_file_posix.cc 2017-08-02 18:42:59.362655000 +0200
+@@ -114,7 +114,7 @@
+
+ #if defined(OS_ANDROID) && __ANDROID_API__ < 21
+ do_manual_extension = true;
+-#elif !defined(OS_MACOSX)
++#elif !defined(OS_MACOSX) && !defined(OS_BSD)
+ if (posix_fallocate(file_.GetPlatformFile(), region.offset,
+ region.size) != 0) {
+ DPLOG(ERROR) << "posix_fallocate " << file_.GetPlatformFile();
Modified: branches/2017Q3/www/chromium/files/patch-base_native__library__posix.cc
==============================================================================
--- branches/2017Q3/www/chromium/files/patch-base_native__library__posix.cc Wed Aug 30 15:12:44 2017 (r448986)
+++ branches/2017Q3/www/chromium/files/patch-base_native__library__posix.cc Wed Aug 30 15:24:15 2017 (r448987)
@@ -1,11 +1,11 @@
---- base/native_library_posix.cc.orig 2017-06-05 19:03:00 UTC
-+++ base/native_library_posix.cc
-@@ -35,7 +35,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP
+--- base/native_library_posix.cc.orig 2017-07-25 21:04:48.000000000 +0200
++++ base/native_library_posix.cc 2017-08-02 21:02:05.991380000 +0200
+@@ -30,7 +30,7 @@
+ // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892,
+ // and http://crbug.com/40794.
+ int flags = RTLD_LAZY;
+-#if defined(OS_ANDROID) || !defined(RTLD_DEEPBIND)
++#if defined(OS_ANDROID) || !defined(RTLD_DEEPBIND) || defined(OS_BSD)
+ // Certain platforms don't define RTLD_DEEPBIND. Android dlopen() requires
// further investigation, as it might vary across 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
Modified: branches/2017Q3/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc
==============================================================================
--- branches/2017Q3/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc Wed Aug 30 15:12:44 2017 (r448986)
+++ branches/2017Q3/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc Wed Aug 30 15:24:15 2017 (r448987)
@@ -1,45 +1,49 @@
---- base/posix/unix_domain_socket_linux.cc.orig 2017-06-05 19:03:00 UTC
-+++ base/posix/unix_domain_socket_linux.cc
-@@ -23,6 +23,15 @@
+--- base/posix/unix_domain_socket_linux.cc.orig 2017-08-03 00:05:03.000000000 +0200
++++ base/posix/unix_domain_socket_linux.cc 2017-08-10 00:44:31.627900000 +0200
+@@ -5,7 +5,10 @@
+ #include "base/posix/unix_domain_socket_linux.h"
- namespace base {
+ #include <errno.h>
++#include <sys/types.h>
++#include <sys/param.h>
+ #include <sys/socket.h>
++#include <sys/ucred.h>
+ #include <unistd.h>
-+#if defined(OS_BSD)
-+// Port over Linux ucred structure
-+struct ucred {
-+ pid_t pid; // process ID of the sending process
-+ uid_t uid; // user ID of the sending process
-+ gid_t gid; // group ID of the sending process
-+};
-+#endif
-+
+ #include <vector>
+@@ -25,6 +28,14 @@
+
const size_t UnixDomainSocket::kMaxFileDescriptors = 16;
- #if !defined(OS_NACL_NONSFI)
-@@ -37,8 +46,14 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) {
-
- // static
- bool UnixDomainSocket::EnableReceiveProcessId(int fd) {
-+#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;
++#ifndef SCM_CREDENTIALS
++# define SCM_CREDENTIALS 0X9001
+#endif
- }
- #endif // !defined(OS_NACL_NONSFI)
-
-@@ -144,7 +159,11 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
- // The PNaCl toolchain for Non-SFI binary build does not support
++
++#ifndef SO_PASSCRED
++# define SO_PASSCRED 0x9002
++#endif
++
+ #if !defined(OS_NACL_NONSFI)
+ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) {
+ int raw_socks[2];
+@@ -114,7 +125,7 @@
+ CMSG_SPACE(sizeof(int) * kMaxFileDescriptors)
+ #if !defined(OS_NACL_NONSFI)
+ // The PNaCl toolchain for Non-SFI binary build does not support ucred.
+- + CMSG_SPACE(sizeof(struct ucred))
++ + CMSG_SPACE(sizeof(struct sockcred))
+ #endif
+ ;
+ char control_buffer[kControlBufferSize];
+@@ -145,9 +156,9 @@
// SCM_CREDENTIALS.
if (cmsg->cmsg_level == SOL_SOCKET &&
-+#if defined(OS_BSD)
-+ 1) { // XXX(rene) carpet getting full ...
-+#else
cmsg->cmsg_type == SCM_CREDENTIALS) {
-+#endif
- DCHECK_EQ(payload_len, sizeof(struct ucred));
+- DCHECK_EQ(payload_len, sizeof(struct ucred));
++ DCHECK_EQ(payload_len, sizeof(struct sockcred));
DCHECK_EQ(pid, -1);
- pid = reinterpret_cast<struct ucred*>(CMSG_DATA(cmsg))->pid;
+- pid = reinterpret_cast<struct ucred*>(CMSG_DATA(cmsg))->pid;
++ pid = getpid();
+ }
+ #endif
+ }
Copied: branches/2017Q3/www/chromium/files/patch-base_process_internal__linux.cc (from r448637, head/www/chromium/files/patch-base_process_internal__linux.cc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2017Q3/www/chromium/files/patch-base_process_internal__linux.cc Wed Aug 30 15:24:15 2017 (r448987, copy of r448637, head/www/chromium/files/patch-base_process_internal__linux.cc)
@@ -0,0 +1,16 @@
+--- base/process/internal_linux.cc.orig 2017-08-10 00:00:17.842158000 +0200
++++ base/process/internal_linux.cc 2017-08-10 00:02:37.838081000 +0200
+@@ -60,10 +60,13 @@
+ // Synchronously reading files in /proc is safe.
+ ThreadRestrictions::ScopedAllowIO allow_io;
+
++#if !defined(OS_BSD)
+ if (!ReadFileToString(file, buffer)) {
+ DLOG(WARNING) << "Failed to read " << file.MaybeAsASCII();
+ return false;
+ }
++#endif
++
+ return !buffer->empty();
+ }
+
Modified: branches/2017Q3/www/chromium/files/patch-base_process_memory.h
==============================================================================
--- branches/2017Q3/www/chromium/files/patch-base_process_memory.h Wed Aug 30 15:12:44 2017 (r448986)
+++ branches/2017Q3/www/chromium/files/patch-base_process_memory.h Wed Aug 30 15:24:15 2017 (r448987)
@@ -1,11 +1,11 @@
---- base/process/memory.h.orig 2017-06-05 19:03:00 UTC
-+++ base/process/memory.h
-@@ -32,7 +32,7 @@ BASE_EXPORT void EnableTerminationOnOutOfMemory();
+--- base/process/memory.h.orig 2017-07-25 21:04:48.000000000 +0200
++++ base/process/memory.h 2017-07-29 01:01:15.601297000 +0200
+@@ -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)
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD)
BASE_EXPORT extern size_t g_oom_size;
// The maximum allowed value for the OOM score.
Modified: branches/2017Q3/www/chromium/files/patch-base_process_process__metrics.h
==============================================================================
--- branches/2017Q3/www/chromium/files/patch-base_process_process__metrics.h Wed Aug 30 15:12:44 2017 (r448986)
+++ branches/2017Q3/www/chromium/files/patch-base_process_process__metrics.h Wed Aug 30 15:24:15 2017 (r448987)
@@ -1,5 +1,5 @@
---- base/process/process_metrics.h.orig 2017-06-05 19:03:00 UTC
-+++ base/process/process_metrics.h
+--- base/process/process_metrics.h.orig 2017-07-25 21:04:48.000000000 +0200
++++ base/process/process_metrics.h 2017-08-01 22:08:56.153263000 +0200
@@ -22,6 +22,12 @@
#include "base/values.h"
#include "build/build_config.h"
@@ -13,48 +13,46 @@
#if defined(OS_MACOSX)
#include <mach/mach.h>
#include "base/process/port_provider_mac.h"
-@@ -205,7 +211,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -215,7 +221,7 @@
// otherwise.
bool GetIOCounters(IoCounters* io_counters) const;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_AIX)
++#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
// Returns the number of file descriptors currently open by the process, or
// -1 on error.
int GetOpenFdCount() const;
-@@ -213,7 +219,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -223,12 +229,12 @@
// Returns the soft limit of file descriptors that can be opened by the
// process, or -1 on error.
int GetOpenFdSoftLimit() const;
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_AIX)
++#endif // defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ // Bytes of swap as reported by /proc/[pid]/status.
+ uint64_t GetVmSwapBytes() const;
+-#endif // defined(OS_LINUX) || defined(OS_ANDROID)
++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+
private:
#if !defined(OS_MACOSX) || defined(OS_IOS)
-@@ -289,7 +295,7 @@ BASE_EXPORT void SetFdLimit(unsigned int max_descripto
+@@ -304,7 +310,7 @@
#endif // defined(OS_POSIX)
#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
-- defined(OS_ANDROID)
-+ defined(OS_ANDROID) || defined(OS_BSD)
+- defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA)
++ defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) || defined(OS_BSD)
// Data about system-wide memory consumption. Values are in KB. Available on
// Windows, Mac, Linux, Android and Chrome OS.
//
-@@ -383,13 +389,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
- // CPU-related ticks. Returns -1 on parse error.
- // Exposed for testing.
- BASE_EXPORT int ParseProcStatCPU(const std::string& input);
-+#endif
+@@ -352,7 +358,7 @@
+ #endif
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD)
- // Get the number of threads of |process| as available in /proc/<pid>/stat.
- // This should be used with care as no synchronization with running threads is
- // done. This is mostly useful to guarantee being single-threaded.
- // Returns 0 on failure.
- BASE_EXPORT int GetNumberOfThreads(ProcessHandle process);
-+#endif
-
-+#if defined(OS_LINUX) || defined(OS_ANDROID)
- // /proc/self/exe refers to the current executable.
- BASE_EXPORT extern const char kProcSelfExe[];
-
+ #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \
+- defined(OS_FUCHSIA)
++ defined(OS_FUCHSIA) || defined(OS_BSD)
+ int buffers = 0;
+ int cached = 0;
+ int active_anon = 0;
Modified: branches/2017Q3/www/chromium/files/patch-base_process_process__posix.cc
==============================================================================
--- branches/2017Q3/www/chromium/files/patch-base_process_process__posix.cc Wed Aug 30 15:12:44 2017 (r448986)
+++ branches/2017Q3/www/chromium/files/patch-base_process_process__posix.cc Wed Aug 30 15:24:15 2017 (r448987)
@@ -1,6 +1,6 @@
---- base/process/process_posix.cc.orig 2017-06-15 21:03:00.000000000 +0200
-+++ base/process/process_posix.cc 2017-06-19 15:25:27.760111000 +0200
-@@ -21,8 +21,18 @@
+--- base/process/process_posix.cc.orig 2017-07-25 21:04:48.000000000 +0200
++++ base/process/process_posix.cc 2017-08-02 19:38:18.657740000 +0200
+@@ -22,8 +22,18 @@
#include <sys/event.h>
#endif
@@ -19,9 +19,9 @@
#if !defined(OS_NACL_NONSFI)
bool WaitpidWithTimeout(base::ProcessHandle handle,
-@@ -184,13 +194,13 @@
- base::ProcessHandle parent_pid = base::GetParentProcessId(handle);
+@@ -186,13 +196,13 @@
base::ProcessHandle our_pid = base::GetCurrentProcessHandle();
+
if (parent_pid != our_pid) {
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(OS_BSD)
@@ -36,26 +36,26 @@
}
int status;
-@@ -256,12 +266,16 @@
+@@ -258,12 +268,16 @@
return Process(handle);
}
--#if !defined(OS_LINUX) && !defined(OS_MACOSX)
-+#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD)
+-#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX)
++#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX) && !defined(OS_BSD)
// static
bool Process::CanBackgroundProcesses() {
return false;
}
--#endif // !defined(OS_LINUX) && !defined(OS_MACOSX)
+-#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX)
+#elif defined(OS_FREEBSD)
+bool Process::CanBackgroundProcesses() {
+ return true;
+}
-+#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD)
++#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX) && !defined(OS_BSD)
// static
void Process::TerminateCurrentProcessImmediately(int exit_code) {
-@@ -369,15 +383,31 @@
+@@ -371,15 +385,31 @@
bool Process::IsProcessBackgrounded() const {
// See SetProcessBackgrounded().
DCHECK(IsValid());
@@ -85,5 +85,5 @@
+ return result == 0;
+#endif // !defined(OS_FREEBSD)
}
- #endif // !defined(OS_LINUX) && !defined(OS_MACOSX)
+ #endif // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX)
Modified: branches/2017Q3/www/chromium/files/patch-base_sys__info__posix.cc
==============================================================================
--- branches/2017Q3/www/chromium/files/patch-base_sys__info__posix.cc Wed Aug 30 15:12:44 2017 (r448986)
+++ branches/2017Q3/www/chromium/files/patch-base_sys__info__posix.cc Wed Aug 30 15:24:15 2017 (r448987)
@@ -1,20 +1,20 @@
---- base/sys_info_posix.cc.orig 2017-06-05 19:03:00 UTC
-+++ base/sys_info_posix.cc
+--- base/sys_info_posix.cc.orig 2017-07-25 21:04:48.000000000 +0200
++++ base/sys_info_posix.cc 2017-08-02 21:19:06.172695000 +0200
@@ -35,7 +35,7 @@
namespace {
--#if !defined(OS_OPENBSD)
-+#if !defined(OS_BSD)
+-#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA)
++#if !defined(OS_BSD) && !defined(OS_FUCHSIA)
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.
-@@ -128,7 +128,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
+@@ -128,7 +128,7 @@
namespace base {
--#if !defined(OS_OPENBSD)
-+#if !defined(OS_BSD)
+-#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA)
++#if !defined(OS_BSD) && !defined(OS_FUCHSIA)
int SysInfo::NumberOfProcessors() {
return g_lazy_number_of_processors.Get().value();
}
Copied: branches/2017Q3/www/chromium/files/patch-base_task_scheduler_delayed_task_manager.cc (from r448637, head/www/chromium/files/patch-base_task_scheduler_delayed_task_manager.cc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2017Q3/www/chromium/files/patch-base_task_scheduler_delayed_task_manager.cc Wed Aug 30 15:24:15 2017 (r448987, copy of r448637, head/www/chromium/files/patch-base_task_scheduler_delayed_task_manager.cc)
@@ -0,0 +1,12 @@
+--- base/task_scheduler/delayed_task_manager.cc.orig 2017-08-10 23:52:26.912451000 +0200
++++ base/task_scheduler/delayed_task_manager.cc 2017-08-11 00:22:09.125479000 +0200
+@@ -70,9 +70,6 @@
+ if (started_.IsSet()) {
+ AddDelayedTaskNow(std::move(task), delay,
+ std::move(post_task_now_callback));
+- } else {
+- tasks_added_before_start_.push_back(
+- {std::move(task), std::move(post_task_now_callback)});
+ }
+ }
+ }
Copied: branches/2017Q3/www/chromium/files/patch-base_test_test__file__util__linux.cc (from r448637, head/www/chromium/files/patch-base_test_test__file__util__linux.cc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2017Q3/www/chromium/files/patch-base_test_test__file__util__linux.cc Wed Aug 30 15:24:15 2017 (r448987, copy of r448637, head/www/chromium/files/patch-base_test_test__file__util__linux.cc)
@@ -0,0 +1,13 @@
+--- base/test/test_file_util_linux.cc.orig 2017-08-10 16:14:03.505570000 +0200
++++ base/test/test_file_util_linux.cc 2017-08-10 16:14:43.299690000 +0200
+@@ -20,8 +20,10 @@
+ return false;
+ if (fdatasync(fd.get()) != 0)
+ return false;
++#if !defined(OS_BSD)
+ if (posix_fadvise(fd.get(), 0, 0, POSIX_FADV_DONTNEED) != 0)
+ return false;
++#endif
+ return true;
+ }
+
Modified: branches/2017Q3/www/chromium/files/patch-base_third__party_libevent_BUILD.gn
==============================================================================
--- branches/2017Q3/www/chromium/files/patch-base_third__party_libevent_BUILD.gn Wed Aug 30 15:12:44 2017 (r448986)
+++ branches/2017Q3/www/chromium/files/patch-base_third__party_libevent_BUILD.gn Wed Aug 30 15:24:15 2017 (r448987)
@@ -1,11 +1,15 @@
---- base/third_party/libevent/BUILD.gn.orig 2017-04-19 19:06:28 UTC
-+++ base/third_party/libevent/BUILD.gn
-@@ -50,6 +50,9 @@ static_library("libevent") {
+--- base/third_party/libevent/BUILD.gn.orig 2017-08-03 00:05:03.000000000 +0200
++++ base/third_party/libevent/BUILD.gn 2017-08-03 14:47:35.196280000 +0200
+@@ -50,6 +50,13 @@
"linux/event-config.h",
]
include_dirs = [ "linux" ]
+ } else if (is_bsd) {
-+ sources += [ "kqueue.c" ]
++ sources += [
++ "kqueue.c",
++ "freebsd/config.h",
++ "freebsd/event-config.h",
++ ]
+ include_dirs = [ "freebsd" ]
} else if (is_android) {
sources += [
Modified: branches/2017Q3/www/chromium/files/patch-base_threading_platform__thread__linux.cc
==============================================================================
--- branches/2017Q3/www/chromium/files/patch-base_threading_platform__thread__linux.cc Wed Aug 30 15:12:44 2017 (r448986)
+++ branches/2017Q3/www/chromium/files/patch-base_threading_platform__thread__linux.cc Wed Aug 30 15:24:15 2017 (r448987)
@@ -1,8 +1,8 @@
---- base/threading/platform_thread_linux.cc.orig 2017-06-05 19:03:01 UTC
-+++ base/threading/platform_thread_linux.cc
+--- base/threading/platform_thread_linux.cc.orig 2017-07-25 21:04:48.000000000 +0200
++++ base/threading/platform_thread_linux.cc 2017-08-01 22:36:09.953380000 +0200
@@ -19,7 +19,9 @@
- #if !defined(OS_NACL)
+ #if !defined(OS_NACL) && !defined(OS_AIX)
#include <pthread.h>
+#if !defined(OS_BSD)
#include <sys/prctl.h>
@@ -10,21 +10,12 @@
#include <sys/resource.h>
#include <sys/time.h>
#include <sys/types.h>
-@@ -130,7 +132,7 @@ void PlatformThread::SetName(const std::string& name)
+@@ -130,7 +132,7 @@
ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
tracked_objects::ThreadData::InitializeThreadContext(name);
--#if !defined(OS_NACL)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list