diff options
author | Danny Rawlins <monster.romster@gmail.com> | 2017-06-17 21:16:20 +1000 |
---|---|---|
committer | Danny Rawlins <monster.romster@gmail.com> | 2017-06-17 21:16:43 +1000 |
commit | fc01c52a7aecb68d538b4acc0dcd9d2b9cd576ed (patch) | |
tree | 937c105dbfa4f62a55c2e7986c3106c85952ed63 /chromium | |
parent | 8e9f4f59bf5254b65af6881e834cec583d15961c (diff) | |
download | opt-fc01c52a7aecb68d538b4acc0dcd9d2b9cd576ed.tar.gz opt-fc01c52a7aecb68d538b4acc0dcd9d2b9cd576ed.tar.xz |
[notify] chromium: 56.0.2924.28 -> 59.0.3071.104 new dependency nodejs
Diffstat (limited to 'chromium')
-rw-r--r-- | chromium/.footprint | 67 | ||||
-rw-r--r-- | chromium/.md5sum | 4 | ||||
-rw-r--r-- | chromium/.signature | 10 | ||||
-rw-r--r-- | chromium/0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch | 118 | ||||
-rw-r--r-- | chromium/0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch | 35 | ||||
-rw-r--r-- | chromium/Pkgfile | 25 |
6 files changed, 230 insertions, 29 deletions
diff --git a/chromium/.footprint b/chromium/.footprint index e14abcbd2..fde892e1e 100644 --- a/chromium/.footprint +++ b/chromium/.footprint @@ -7,6 +7,7 @@ drwxr-xr-x root/root usr/lib/chromium/ -rw-r--r-- root/root usr/lib/chromium/chrome_100_percent.pak -rw-r--r-- root/root usr/lib/chromium/chrome_200_percent.pak -rwxr-xr-x root/root usr/lib/chromium/chromium +-rw-r--r-- root/root usr/lib/chromium/headless_lib.pak -rw-r--r-- root/root usr/lib/chromium/icudtl.dat -rw-r--r-- root/root usr/lib/chromium/keyboard_resources.pak drwxr-xr-x root/root usr/lib/chromium/locales/ @@ -25,7 +26,10 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/accelerometer-left.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/accelerometer-right.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/accelerometer-top.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/applicationCache.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/audits_logo.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/audits_logo_2x.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/audits_logo_bw.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/audits_logo_bw_2x.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpoint.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointConditional.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointConditional_2x.png @@ -39,19 +43,16 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/chromeSelect.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/chromeSelect_2x.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/deleteIcon.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/domain.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/errorWave.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/errorWave_2x.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/fileSystem.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/forward.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/frame.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/ic_info_black_18dp.svg -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/ic_warning_black_18dp.svg +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/largeIcons.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/largeIcons_2x.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/mediumIcons.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/mediumIcons_2x.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/navigationControls.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/navigationControls_2x.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneAddButtons.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneFilterButtons.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneRefreshButtons.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/popoverArrows.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/profileGroupIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/profileIcon.png @@ -66,8 +67,6 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceCSSIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceDocumentIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceDocumentIconSmall.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceGlyphs.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceGlyphs_2x.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceJSIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourcePlainIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourcePlainIconSmall.png @@ -76,18 +75,15 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/searchPrev.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/securityIcons.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/securityIcons_2x.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/settingsListRemove.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/settingsListRemove_2x.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/smallIcons.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/smallIcons_2x.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/speech.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/toolbarButtonGlyphs.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/toolbarButtonGlyphs_2x.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/toolbarItemSelected.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/toolbarResizerHorizontal.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/toolbarResizerVertical.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/touchCursor.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/touchCursor_2x.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/treeoutlineTriangles.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/treeoutlineTriangles_2x.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/whatsnew.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/InspectorBackendCommands.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/SupportedCSSProperties.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Tests.js @@ -99,12 +95,25 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/audits/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/audits/audits_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/audits2/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/audits2/audits2_module.js +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/audits2_worker.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/audits2_worker/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/audits2_worker/audits2_worker_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/changes/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/changes/changes_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/cm/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/cm/cm_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/cm_modes/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/cm_modes/cm_modes_module.js -drwxr-xr-x root/root usr/lib/chromium/resources/inspector/components_lazy/ --rw-r--r-- root/root usr/lib/chromium/resources/inspector/components_lazy/components_lazy_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/color_picker/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/color_picker/color_picker_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/console/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/console/console_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/cookie_table/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/cookie_table/cookie_table_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/coverage/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/coverage/coverage_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/data_grid/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/data_grid/data_grid_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/devices/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/devices/devices_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/devtools_compatibility.js @@ -151,10 +160,16 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/emulated_devices/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/iPhone6-portrait.svg -rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/iPhone6Plus-landscape.svg -rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/event_listeners/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/event_listeners/event_listeners_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/formatter_worker.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/gonzales/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/gonzales/gonzales_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/heap_snapshot_model/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/heap_snapshot_model/heap_snapshot_model_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/heap_snapshot_worker.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/inline_editor/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/inline_editor/inline_editor_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/inspector.html -rw-r--r-- root/root usr/lib/chromium/resources/inspector/inspector.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/layer_viewer/ @@ -163,8 +178,18 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/layers/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/layers/layers_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/network/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/network/network_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/network_group_lookup/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/network_group_lookup/network_group_lookup_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/object_ui/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/object_ui/object_ui_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/perf_ui/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/perf_ui/perf_ui_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/product_registry/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/product_registry/product_registry_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/profiler/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/profiler/profiler_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/quick_open/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/quick_open/quick_open_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/resources/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/resources/resources_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/sass/ @@ -191,9 +216,11 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/timeline_model/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/timeline_model/timeline_model_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/toolbox.html -rw-r--r-- root/root usr/lib/chromium/resources/inspector/toolbox.js -drwxr-xr-x root/root usr/lib/chromium/resources/inspector/ui_lazy/ --rw-r--r-- root/root usr/lib/chromium/resources/inspector/ui_lazy/ui_lazy_module.js +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/unit_test_runner.html +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/unit_test_runner.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/utility_shared_worker.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/workspace_diff/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/workspace_diff/workspace_diff_module.js -rw-r--r-- root/root usr/lib/chromium/snapshot_blob.bin -rw-r--r-- root/root usr/lib/chromium/views_mus_resources.pak drwxr-xr-x root/root usr/share/ diff --git a/chromium/.md5sum b/chromium/.md5sum index b36f51569..77a1e1968 100644 --- a/chromium/.md5sum +++ b/chromium/.md5sum @@ -1,4 +1,6 @@ -fe9558308c03b56d06074a7fe5c2269a chromium-56.0.2924.28.tar.xz +7ad48853453a431b689c1ff97378840a 0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch +de9345fb5cd756ed43c4ea7b9223e5ee 0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch +4a315c89d6fc567b5982316767a8faef chromium-59.0.3071.104.tar.xz b527005e021b14869a669e42c46b661d chromium.desktop 64968626706b07721983ac59fb3babbf chromium.sh 3354997dd0bfde3443499133a6e16a85 last-commit-position.patch diff --git a/chromium/.signature b/chromium/.signature index 6d1710101..7e682fbc2 100644 --- a/chromium/.signature +++ b/chromium/.signature @@ -1,8 +1,10 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/WTb6sHK7IS0hXVWN4+scHio/zWvkG39mLdwnZRshMoJhseCzHU+cRVyximAR1WEqqL0mM1xMnShhPXrj2DG7g8= -SHA256 (Pkgfile) = 54d113f2bf8e16f75f0bcc57702b6d3bb8b08f10d481c6cefc90b88974dec73f -SHA256 (.footprint) = a6f23dd938646bcab0cde20bab53a8ee34ae3f4e7224c3cb438b714a61d8d990 -SHA256 (chromium-56.0.2924.28.tar.xz) = 11041cbcaed253d9ce71ace30d24dbd7785c4b3fe952a6d5e943ca592048b802 +RWSE3ohX2g5d/Sd/u8JKRTy2kh/SZe9qwNZZZLelRdTKezwqc5Fr9jx8sDuuKQUdgWMr30fOsDSHf3qnN1xY+WqumBj5dJjwfg8= +SHA256 (Pkgfile) = 319d1323b951c220d006280272b9e8a0625e87195db91ab8a9c5cb338502aecd +SHA256 (.footprint) = ecc99206edaf6df789ab643b4e401d05dd4c35a733789bb6a7b21ff6c40664b9 +SHA256 (chromium-59.0.3071.104.tar.xz) = a949fa166cdcdbd8419fbdb4583804613d9845130f0c851e4c647d79a4c300d0 SHA256 (last-commit-position.patch) = d3dc397956a26ec045e76c25c57a1fac5fc0acff94306b2a670daee7ba15709e SHA256 (chromium.sh) = 7b182d0ae1e9ef841f8cd0b403a304babd548bf60b5e3808b2144bebdbb7c154 SHA256 (chromium.desktop) = caf015652ac7ce9403a5cb6c7bec3dc597222b20c5842059ee15674e2c9209cc +SHA256 (0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch) = 9c081c84a4f85dbef82a9edf34cf0b1e8377c563874fd9c1b4efddf1476748f9 +SHA256 (0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch) = 42eb6ada30d5d507f2bda2d2caece37e397e7086bc0d430db776fad143562fb6 diff --git a/chromium/0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch b/chromium/0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch new file mode 100644 index 000000000..8a1bf2b20 --- /dev/null +++ b/chromium/0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch @@ -0,0 +1,118 @@ +From 27bab2297187099229a1e4304d8feb866c8da55a Mon Sep 17 00:00:00 2001 +From: "dongseong.hwang" <dongseong.hwang@intel.com> +Date: Tue, 18 Apr 2017 16:44:55 -0700 +Subject: [PATCH] ClientNativePixmapFactoryDmabuf uses ioctl, instead of + drmIoctl. + +DMA_BUF_SYNC ioctl is not drmIoctl, because it uses dma-buf fd, instead of drm +device fd. + +In addition, remove LOCAL_ prefix to fix build failure >= kernel 4.6 + +Actually, ChromeOS doesn't need this local DMA_BUF_SYNC definition as all +verion of kernel for cros has dma-buf.h header. +https://chromium-review.googlesource.com/c/459544/ +However, there is not any way to distinguish real ChromeOS build and +current_os="chromeos" build, so remain the local definition to ChromeOS as +well. + +BUG=584248 +R=reveman@chromium.org + +Review-Url: https://codereview.chromium.org/2805503003 +Cr-Commit-Position: refs/heads/master@{#465425} +--- + ui/gfx/linux/client_native_pixmap_dmabuf.cc | 49 +++++++++++++---------------- + 1 file changed, 21 insertions(+), 28 deletions(-) + +diff --git a/ui/gfx/linux/client_native_pixmap_dmabuf.cc b/ui/gfx/linux/client_native_pixmap_dmabuf.cc +index d656c338f0a6..1bb441dc25ce 100644 +--- a/ui/gfx/linux/client_native_pixmap_dmabuf.cc ++++ b/ui/gfx/linux/client_native_pixmap_dmabuf.cc +@@ -7,36 +7,35 @@ + #include <fcntl.h> + #include <linux/version.h> + #include <stddef.h> ++#include <sys/ioctl.h> + #include <sys/mman.h> + #include <xf86drm.h> + + #include "base/debug/crash_logging.h" + #include "base/memory/ptr_util.h" ++#include "base/posix/eintr_wrapper.h" + #include "base/process/memory.h" + #include "base/process/process_metrics.h" + #include "base/strings/stringprintf.h" + #include "base/trace_event/trace_event.h" + +-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) ++#include <linux/dma-buf.h> ++#else + #include <linux/types.h> + +-struct local_dma_buf_sync { ++struct dma_buf_sync { + __u64 flags; + }; + +-#define LOCAL_DMA_BUF_SYNC_READ (1 << 0) +-#define LOCAL_DMA_BUF_SYNC_WRITE (2 << 0) +-#define LOCAL_DMA_BUF_SYNC_RW \ +- (LOCAL_DMA_BUF_SYNC_READ | LOCAL_DMA_BUF_SYNC_WRITE) +-#define LOCAL_DMA_BUF_SYNC_START (0 << 2) +-#define LOCAL_DMA_BUF_SYNC_END (1 << 2) ++#define DMA_BUF_SYNC_READ (1 << 0) ++#define DMA_BUF_SYNC_WRITE (2 << 0) ++#define DMA_BUF_SYNC_RW (DMA_BUF_SYNC_READ | DMA_BUF_SYNC_WRITE) ++#define DMA_BUF_SYNC_START (0 << 2) ++#define DMA_BUF_SYNC_END (1 << 2) + +-#define LOCAL_DMA_BUF_BASE 'b' +-#define LOCAL_DMA_BUF_IOCTL_SYNC \ +- _IOW(LOCAL_DMA_BUF_BASE, 0, struct local_dma_buf_sync) +- +-#else +-#include <linux/dma-buf.h> ++#define DMA_BUF_BASE 'b' ++#define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync) + #endif + + namespace gfx { +@@ -44,25 +43,19 @@ namespace gfx { + namespace { + + void PrimeSyncStart(int dmabuf_fd) { +- struct local_dma_buf_sync sync_start = {0}; ++ struct dma_buf_sync sync_start = {0}; + +- sync_start.flags = LOCAL_DMA_BUF_SYNC_START | LOCAL_DMA_BUF_SYNC_RW; +-#if DCHECK_IS_ON() +- int rv = +-#endif +- drmIoctl(dmabuf_fd, LOCAL_DMA_BUF_IOCTL_SYNC, &sync_start); +- DPLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_START"; ++ sync_start.flags = DMA_BUF_SYNC_START | DMA_BUF_SYNC_RW; ++ int rv = HANDLE_EINTR(ioctl(dmabuf_fd, DMA_BUF_IOCTL_SYNC, &sync_start)); ++ PLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_START"; + } + + void PrimeSyncEnd(int dmabuf_fd) { +- struct local_dma_buf_sync sync_end = {0}; ++ struct dma_buf_sync sync_end = {0}; + +- sync_end.flags = LOCAL_DMA_BUF_SYNC_END | LOCAL_DMA_BUF_SYNC_RW; +-#if DCHECK_IS_ON() +- int rv = +-#endif +- drmIoctl(dmabuf_fd, LOCAL_DMA_BUF_IOCTL_SYNC, &sync_end); +- DPLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_END"; ++ sync_end.flags = DMA_BUF_SYNC_END | DMA_BUF_SYNC_RW; ++ int rv = HANDLE_EINTR(ioctl(dmabuf_fd, DMA_BUF_IOCTL_SYNC, &sync_end)); ++ PLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_END"; + } + + } // namespace +-- +2.13.0 + diff --git a/chromium/0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch b/chromium/0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch new file mode 100644 index 000000000..345770000 --- /dev/null +++ b/chromium/0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch @@ -0,0 +1,35 @@ +From 63901da067e069e298595618e01c4758c7896ff5 Mon Sep 17 00:00:00 2001 +From: thomasanderson <thomasanderson@google.com> +Date: Fri, 28 Apr 2017 11:56:12 -0700 +Subject: [PATCH] Fix kernel version condition for including dma-buf.h + +Kernel 4.11 merges the commit that added linux/dma-buf.h +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ef96152e6a36e0510387cb174178b7982c1ae879 + +This CL increases the required kernel to include this file to 4.11. + +BUG=707604 +R=danakj@chromium.org + +Review-Url: https://codereview.chromium.org/2851803002 +Cr-Commit-Position: refs/heads/master@{#468078} +--- + ui/gfx/linux/client_native_pixmap_dmabuf.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ui/gfx/linux/client_native_pixmap_dmabuf.cc b/ui/gfx/linux/client_native_pixmap_dmabuf.cc +index 31ff4f4395b6..4927daf3a61d 100644 +--- a/ui/gfx/linux/client_native_pixmap_dmabuf.cc ++++ b/ui/gfx/linux/client_native_pixmap_dmabuf.cc +@@ -19,7 +19,7 @@ + #include "base/strings/stringprintf.h" + #include "base/trace_event/trace_event.h" + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) + #include <linux/dma-buf.h> + #else + #include <linux/types.h> +-- +2.13.0 + diff --git a/chromium/Pkgfile b/chromium/Pkgfile index f1eb98e2e..6965a428b 100644 --- a/chromium/Pkgfile +++ b/chromium/Pkgfile @@ -2,13 +2,15 @@ # URL: http://chromium.org/ # Maintainer: Jose V Beneyto, sepen at crux dot nu # Packager: Tadeusz Sosnierz, tadzikes gmail com -# Depends on: dbus-glib gperf gtk gtk3 libevent libexif libgcrypt ninja nss pciutils speech-dispatcher xorg-libxscrnsaver xorg-libxt yasm +# Depends on: dbus-glib gperf gtk gtk3 libevent libexif libgcrypt ninja nodejs nss pciutils speech-dispatcher xorg-libxscrnsaver xorg-libxt yasm name=chromium -version=56.0.2924.28 +version=59.0.3071.104 release=1 source=(http://commondatastorage.googleapis.com/$name-browser-official/$name-$version.tar.xz \ - last-commit-position.patch $name.sh $name.desktop) + last-commit-position.patch $name.sh $name.desktop + 0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch + 0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch) build() { cd $name-$version @@ -19,6 +21,17 @@ build() { # we don't use git sources patch -p1 -i $SRC/last-commit-position.patch + # https://bugs.chromium.org/p/chromium/issues/detail?id=707604 + patch -p1 -i $SRC/0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch + patch -p1 -i $SRC/0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch + + mkdir -p third_party/node/linux/node-linux-x64/bin + ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/ + + # Fix a build issue with GCC-6 + sed 's/^config("compiler") {/&\ncflags_cc = [ "-fno-delete-null-pointer-checks" ]/' \ + -i build/config/linux/BUILD.gn + _gn_args=( 'blink_gc_plugin=false' 'clang_use_chrome_plugins=false' @@ -48,7 +61,11 @@ build() { python2 tools/gn/bootstrap/bootstrap.py --gn-gen-args="${_gn_args[*]}" out/Release/gn gen out/Release --args="${_gn_args[*]}" --script-executable=/usr/bin/python2 - ninja -C out/Release chrome chrome_sandbox + # Ninja, by default, sets the number of jobs to the number of availalble threads + local JOBS=$(awk 'BEGIN{RS="-j|--jobs="} NR==2 {print $1}' <<< $MAKEFLAGS) + test -n "$JOBS" && export JOBS="-j $JOBS" + + ninja $JOBS -C out/Release chrome chrome_sandbox install -m 0755 -D out/Release/chrome $PKG/usr/lib/$name/$name install -m 4755 -o root -g root -D out/Release/chrome_sandbox $PKG/usr/lib/$name/chrome-sandbox |