summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsL1pKn072017-09-06 19:10:42 +0200
committersL1pKn072017-09-06 19:11:16 +0200
commit572752918812d45d356c19cda0e59d885612b2d9 (patch)
tree30cc1fa2711b69a5012d3a12473549ad88dda2e2
parentfa0fce834385c9353e1efdc8782bd911ff341511 (diff)
downloadaur-572752918812d45d356c19cda0e59d885612b2d9.tar.gz
Update to 62.0.3198.0
- Now vaapi patch for everyone! (see the install/upgrade note)
-rw-r--r--.SRCINFO35
-rw-r--r--.gitignore4
-rw-r--r--PKGBUILD542
-rw-r--r--chromium-blink-gcc7-r2.patch (renamed from chromium-blink-gcc7-r1.patch)0
-rw-r--r--chromium-dev.install22
-rw-r--r--chromium-intel-vaapi_r2.patch (renamed from vaapi_patch-r3.patch)14
6 files changed, 320 insertions, 297 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7b6c223ed436..b9719f5df692 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sat Aug 26 05:47:19 UTC 2017
+# Wed Sep 6 17:09:41 UTC 2017
pkgbase = chromium-dev
pkgdesc = The open-source project behind Google Chrome (Dev Channel)
- pkgver = 62.0.3192.0
+ pkgver = 62.0.3198.0
pkgrel = 1
url = http://www.chromium.org
install = chromium-dev.install
@@ -39,34 +39,41 @@ pkgbase = chromium-dev
optdepends = pepper-flash: PPAPI Flash Player
optdepends = chromium-widevine-dev: Widevine plugin (eg: Netflix) (Dev Channel)
optdepends = kdialog: Needed for file dialogs in KF5
- optdepends = kwalletmanager: Needed for storing passwords in KWallet5, needs add "--password-store=kwallet5" into $HOME/config/chromium-dev.conf
+ optdepends = kwalletmanager: Needed for storing passwords in KWallet5
optdepends = ttf-font: For some typography
optdepends = libappindicator-gtk3: Needed for show systray icon in the panel on GTK3 Desktop based
+ optdepends = libva-vdpau-driver-chromium: HW video acceleration for NVIDIA users
+ optdepends = libva-mesa-driver: HW video acceleration for Nouveau, R600 and RadeonSI users
+ optdepends = libva-intel-driver: HW video acceleration for Intel G45 and HD users
options = !strip
- source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-62.0.3192.0.tar.xz
+ source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-62.0.3198.0.tar.xz
source = git+https://github.com/foutrelis/chromium-launcher.git
source = chromium-dev.svg
source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-FORTIFY_SOURCE-r2.patch
- source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-gn-bootstrap-r16.patch
+ source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-gn-bootstrap-r17.patch
source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-gcc5-r2.patch
- source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-system-icu-r2.patch
source = minizip.patch
- source = vaapi_patch-r3.patch::https://sl1pkn07.wtf/paste/view/raw/918a2c94
- source = https://raw.githubusercontent.com/OSSystems/meta-browser/master/recipes-browser/chromium/files/0002-replace-struct-ucontext-with-ucontext_t.patch
+ source = chromium-intel-vaapi_r2.patch
+ source = https://raw.githubusercontent.com/sjnewbury/gentoo-playground/master/www-client/chromium/files/chromium-intel-vaapi-fix.patch
+ source = https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/master/debian/patches/specify-max-resolution.patch
+ source = breakpad-use-ucontext_t.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/breakpad-use-ucontext_t.patch?h=packages/chromium
+ source = chromium-gcc-r1.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-gcc-r1.patch?h=packages/chromium
+ source = chromium-blink-gcc7-r2.patch
source = chromium-widevine-r1.patch
- source = chromium-blink-gcc7-r1.patch
- sha256sums = 437cc2045ebbb755ec929d403f7f51afe58ea3916aee609937b903772a7c7919
+ sha256sums = 6e7c33bfe357554cd9400d55bfc280338a7a9474bb0a53b6c81ea84688637970
sha256sums = SKIP
sha256sums = dd2b5c4191e468972b5ea8ddb4fa2e2fa3c2c94c79fc06645d0efc0e63ce7ee1
sha256sums = fa3f703d599051135c5be24b81dfcb23190bb282db73121337ac76bc9638e8a5
- sha256sums = 0dc153c76900a1a4ab3a33af767aad22b833c657a9acec8f8fbf0be2ed57b993
+ sha256sums = d81319f168dad0e411c8e810f73daa2f56ff579578771bd9c9bb1aa2d7c09a8b
sha256sums = d44b90fc7313afaa6d6f77cde72c0e9a5e4a1cc792216cbca2ed45c39658c472
- sha256sums = 9128edb5a29ba1a5ad21be4a7b83eb07965b172425064c12c4abcc431deea2b4
sha256sums = 95ba939b9372e533ecbcc9ca034f3e9fc6621d3bddabb57c4d092ea69fa6c840
- sha256sums = a67a1c086ed54047b568fda7b62070e6cfb04e087820729b7553e972fcfe9ba8
+ sha256sums = 1c18149f776b38349060491fd626122e66638affa07111f3fc2f4974b4124e99
+ sha256sums = a688de2b3a7183ebf9eb25108b0d28a8c6228cc71c8e3519062a51224f5b3488
+ sha256sums = 69958012fa3af965ce15a5d108e912e18acdb7c577ed6b53ec179624dfc4d1e3
sha256sums = 6e9a345f810d36068ee74ebba4708c70ab30421dad3571b6be5e9db635078ea8
- sha256sums = 0d537830944814fe0854f834b5dc41dc5fc2428f77b2ad61d4a5e76b0fe99880
+ sha256sums = 11cffe305dd49027c91638261463871e9ecb0ecc6ecc02bfa37b203c5960ab58
sha256sums = fab4c65e2802e709a32d059784182be5a89bc3ca862a7e27810714ea7b86f868
+ sha256sums = 0d537830944814fe0854f834b5dc41dc5fc2428f77b2ad61d4a5e76b0fe99880
pkgname = chromium-dev
diff --git a/.gitignore b/.gitignore
index 9021d728e092..e32428b49668 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,5 @@
!chromium-dev.svg
!chromium-widevine-r1.patch
!minizip.patch
-!vaapi_patch-r3.patch
-!chromium-blink-gcc7-r1.patch
+!chromium-intel-vaapi_r2.patch
+!chromium-blink-gcc7-r2.patch
diff --git a/PKGBUILD b/PKGBUILD
index 04113e3fac26..7f9e006bc105 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Nagisa <simonas@kazlauskas.me>
# Contributor: Misc <andreas.reis@gmail.com>
# Contributor: Jeagoss <jgoliver@jeago.com>
-# Contributor: Saikrishna Arcot <saiarcot895@gmail.com> and Steven Newbury <steve@snewbury.org.uk> (Authors of VAAPI patch)
+# Contributor: Saikrishna Arcot <saiarcot895@gmail.com> and Steven Newbury <steve@snewbury.org.uk> (First Authors of VAAPI patch)
#########################
## -- Build options -- ##
@@ -17,7 +17,7 @@ _debug_mode=0 # Build in debug mode.
## -- Package and components information -- ##
##############################################
pkgname=chromium-dev
-pkgver=62.0.3192.0
+pkgver=62.0.3198.0
pkgrel=1
pkgdesc="The open-source project behind Google Chrome (Dev Channel)"
arch=('i686' 'x86_64')
@@ -42,7 +42,8 @@ depends=(
'gtk3'
'openh264'
)
-makedepends=('libexif'
+makedepends=(
+ 'libexif'
'gperf'
'ninja'
'python2-beautifulsoup4'
@@ -62,7 +63,7 @@ optdepends=(
'chromium-widevine-dev: Widevine plugin (eg: Netflix) (Dev Channel)'
#
'kdialog: Needed for file dialogs in KF5'
- 'kwalletmanager: Needed for storing passwords in KWallet5, needs add "--password-store=kwallet5" into $HOME/config/chromium-dev.conf'
+ 'kwalletmanager: Needed for storing passwords in KWallet5'
#
'ttf-font: For some typography'
#
@@ -74,33 +75,37 @@ source=( #"https://gsdview.appspot.com/chromium-browser-official/chromium-${pkgv
'chromium-dev.svg'
# Patch form Gentoo
'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-FORTIFY_SOURCE-r2.patch'
- 'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-gn-bootstrap-r16.patch'
+ 'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-gn-bootstrap-r17.patch'
'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-gcc5-r2.patch'
- 'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-system-icu-r2.patch'
# Misc Patches
'minizip.patch'
- 'vaapi_patch-r3.patch::https://sl1pkn07.wtf/paste/view/raw/918a2c94' #'vaapi_patch-r3.base64::https://chromium-review.googlesource.com/changes/532294/revisions/53b93dfe87fd10cced5d2a2a63072dfc7a2af6e4/patch?download'
- 'https://raw.githubusercontent.com/OSSystems/meta-browser/master/recipes-browser/chromium/files/0002-replace-struct-ucontext-with-ucontext_t.patch' # from https://github.com/OSSystems/meta-browser/tree/master/recipes-browser/chromium
+ 'chromium-intel-vaapi_r2.patch' # Orig: https://chromium-review.googlesource.com/changes/532294/revisions/53b93dfe87fd10cced5d2a2a63072dfc7a2af6e4/patch?download
+ 'https://raw.githubusercontent.com/sjnewbury/gentoo-playground/master/www-client/chromium/files/chromium-intel-vaapi-fix.patch'
+ 'https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/master/debian/patches/specify-max-resolution.patch'
# Patch from crbug (chromium bugtracker) or Arch chromium package
+ 'breakpad-use-ucontext_t.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/breakpad-use-ucontext_t.patch?h=packages/chromium'
+ 'chromium-gcc-r1.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-gcc-r1.patch?h=packages/chromium'
+ 'chromium-blink-gcc7-r2.patch' # https://bugs.chromium.org/p/chromium/issues/detail?id=614289
'chromium-widevine-r1.patch'
- 'chromium-blink-gcc7-r1.patch' #::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-blink-gcc7.patch?h=packages/chromium' # https://bugs.chromium.org/p/chromium/issues/detail?id=614289
)
-sha256sums=( #"$(curl -sL https://gsdview.appspot.com/chromium-browser-official/chromium-55.0.2873.0.tar.xz.hashes | grep sha256 | cut -d ' ' -f3)"
+sha256sums=( #"$(curl -sL https://gsdview.appspot.com/chromium-browser-official/chromium-${pkgver}.tar.xz.hashes | grep sha256 | cut -d ' ' -f3)"
"$(curl -sL https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${pkgver}.tar.xz.hashes | grep sha256 | cut -d ' ' -f3)"
'SKIP'
'dd2b5c4191e468972b5ea8ddb4fa2e2fa3c2c94c79fc06645d0efc0e63ce7ee1'
# Patch form Gentoo
'fa3f703d599051135c5be24b81dfcb23190bb282db73121337ac76bc9638e8a5'
- '0dc153c76900a1a4ab3a33af767aad22b833c657a9acec8f8fbf0be2ed57b993'
+ 'd81319f168dad0e411c8e810f73daa2f56ff579578771bd9c9bb1aa2d7c09a8b'
'd44b90fc7313afaa6d6f77cde72c0e9a5e4a1cc792216cbca2ed45c39658c472'
- '9128edb5a29ba1a5ad21be4a7b83eb07965b172425064c12c4abcc431deea2b4'
# Misc Patches
'95ba939b9372e533ecbcc9ca034f3e9fc6621d3bddabb57c4d092ea69fa6c840'
- 'a67a1c086ed54047b568fda7b62070e6cfb04e087820729b7553e972fcfe9ba8' #'4696ff0eb1b33e97958f4eb677e2f5d88bf72b3d454a2c8f0dadb5abbe1ae439'
+ '1c18149f776b38349060491fd626122e66638affa07111f3fc2f4974b4124e99'
+ 'a688de2b3a7183ebf9eb25108b0d28a8c6228cc71c8e3519062a51224f5b3488'
+ '69958012fa3af965ce15a5d108e912e18acdb7c577ed6b53ec179624dfc4d1e3'
+ # Patch from crbug (chromium bugtracker) or Arch chromium package
'6e9a345f810d36068ee74ebba4708c70ab30421dad3571b6be5e9db635078ea8'
- # Patch from crbug (chromium bugtracker)
- '0d537830944814fe0854f834b5dc41dc5fc2428f77b2ad61d4a5e76b0fe99880'
+ '11cffe305dd49027c91638261463871e9ecb0ecc6ecc02bfa37b203c5960ab58'
'fab4c65e2802e709a32d059784182be5a89bc3ca862a7e27810714ea7b86f868'
+ '0d537830944814fe0854f834b5dc41dc5fc2428f77b2ad61d4a5e76b0fe99880'
)
options=('!strip')
install=chromium-dev.install
@@ -126,12 +131,14 @@ _google_default_client_id="413772536636.apps.googleusercontent.com"
_google_default_client_secret="0ZChLK6AxeA3Isu96MkwqDR4"
# Build NaCL?. disabled if detect 32bit system
+# VULKAN!! (seems only build with 64 bits) # https://crbug.com/582558 NOTE: disabled by default
if [ "${CARCH}" = "i686" ]; then
_build_nacl=0
_nacl="false"
elif [ "${CARCH}" = "x86_64" ]; then
_build_nacl=1
_nacl="true"
+ #_vulkan=1
makedepends+=('ncurses5-compat-libs')
fi
@@ -149,215 +156,204 @@ fi
# List of third-party components needed for build chromium. The rest is remove by remove_bundled_libraries srcipt in prepare().
_keeplibs=(
- '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/mozilla_security_manager'
- 'courgette/third_party'
- 'native_client/src/third_party/dlmalloc'
- 'native_client_sdk/src/libraries/third_party/newlib-extras'
- 'net/third_party/mozilla_security_manager'
- 'net/third_party/nss'
- 'third_party/WebKit'
- 'third_party/analytics'
- 'third_party/angle'
- 'third_party/angle/src/common/third_party/base'
- 'third_party/angle/src/common/third_party/murmurhash'
- 'third_party/angle/src/third_party/compiler'
- 'third_party/angle/src/third_party/libXNVCtrl'
- 'third_party/angle/src/third_party/trace_event'
- 'third_party/boringssl'
- 'third_party/brotli'
- 'third_party/cacheinvalidation'
- 'third_party/catapult'
- 'third_party/catapult/third_party/polymer'
- 'third_party/catapult/third_party/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/d3'
- 'third_party/catapult/tracing/third_party/gl-matrix'
- 'third_party/catapult/tracing/third_party/jszip'
- 'third_party/catapult/tracing/third_party/mannwhitneyu'
- 'third_party/catapult/tracing/third_party/oboe'
- 'third_party/ced'
- 'third_party/cld_2'
- 'third_party/cld_3'
- 'third_party/cros_system_api'
- 'third_party/devscripts'
- 'third_party/dom_distiller_js'
- 'third_party/fips181'
- 'third_party/flatbuffers'
- 'third_party/flot'
- 'third_party/freetype'
- '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/googletest'
- 'third_party/hunspell'
- 'third_party/iccjpeg'
- 'third_party/inspector_protocol'
- 'third_party/jinja2'
- 'third_party/jstemplate'
- 'third_party/khronos'
- 'third_party/leveldatabase'
- 'third_party/libXNVCtrl'
- 'third_party/libaddressinput'
- 'third_party/libjingle'
- 'third_party/libphonenumber'
- 'third_party/libsecret'
- 'third_party/libsrtp'
- 'third_party/libudev'
- 'third_party/libvpx'
- 'third_party/libvpx/source/libvpx/third_party/x86inc'
- 'third_party/libwebm'
- 'third_party/libxml'
- '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/node'
- 'third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2'
- 'third_party/openmax_dl'
- 'third_party/ots'
- 'third_party/pdfium'
- 'third_party/pdfium/third_party/agg23'
- 'third_party/pdfium/third_party/base'
- 'third_party/pdfium/third_party/build'
- 'third_party/pdfium/third_party/bigint'
- 'third_party/pdfium/third_party/freetype'
- 'third_party/pdfium/third_party/lcms'
- 'third_party/pdfium/third_party/libopenjpeg20'
- 'third_party/pdfium/third_party/libpng16'
- 'third_party/pdfium/third_party/libtiff'
- 'third_party/ply'
- 'third_party/polymer'
- 'third_party/protobuf'
- 'third_party/protobuf/third_party/six'
- 'third_party/qcms'
- 'third_party/sfntly'
- 'third_party/skia'
- 'third_party/skia/third_party/gif'
- 'third_party/skia/third_party/vulkan'
- 'third_party/smhasher'
- 'third_party/spirv-headers'
- 'third_party/spirv-tools-angle'
- 'third_party/sqlite'
- 'third_party/swiftshader'
- 'third_party/swiftshader/third_party/llvm-subzero'
- 'third_party/swiftshader/third_party/subzero'
- 'third_party/tcmalloc'
- 'third_party/usrsctp'
- 'third_party/web-animations-js'
- 'third_party/webdriver'
- 'third_party/webrtc'
- 'third_party/widevine'
- 'third_party/woff2'
- 'third_party/zlib/google'
- 'url/third_party/mozilla'
- 'v8/src/third_party/valgrind'
- 'v8/third_party/inspector_protocol'
-
- # gyp -> gn leftovers
- 'base/third_party/libevent'
- 'third_party/adobe'
- 'third_party/speech-dispatcher'
- 'third_party/usb_ids'
- 'third_party/xdg-utils'
- 'third_party/yasm/run_yasm.py'
-
- # VULKAN!!
- 'third_party/SPIRV-Tools'
- 'third_party/angle/src/third_party/compiler'
- 'third_party/glslang-angle'
- 'third_party/glslang'
- 'third_party/shaderc'
- 'third_party/vulkan-validation-layers'
- 'third_party/vulkan'
-)
+ '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/mozilla_security_manager'
+ 'courgette/third_party'
+ 'native_client/src/third_party/dlmalloc'
+ 'native_client_sdk/src/libraries/third_party/newlib-extras'
+ 'net/third_party/mozilla_security_manager'
+ 'net/third_party/nss'
+ 'third_party/WebKit'
+ 'third_party/analytics'
+ 'third_party/angle'
+ 'third_party/angle/src/common/third_party/base'
+ 'third_party/angle/src/common/third_party/murmurhash'
+ 'third_party/angle/src/third_party/compiler'
+ 'third_party/angle/src/third_party/libXNVCtrl'
+ 'third_party/angle/src/third_party/trace_event'
+ 'third_party/boringssl'
+ 'third_party/brotli'
+ 'third_party/cacheinvalidation'
+ 'third_party/catapult'
+ 'third_party/catapult/third_party/polymer'
+ 'third_party/catapult/third_party/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/d3'
+ 'third_party/catapult/tracing/third_party/gl-matrix'
+ 'third_party/catapult/tracing/third_party/jszip'
+ 'third_party/catapult/tracing/third_party/mannwhitneyu'
+ 'third_party/catapult/tracing/third_party/oboe'
+ 'third_party/ced'
+ 'third_party/cld_2'
+ 'third_party/cld_3'
+ 'third_party/cros_system_api'
+ 'third_party/devscripts'
+ 'third_party/dom_distiller_js'
+ 'third_party/fips181'
+ 'third_party/flatbuffers'
+ 'third_party/flot'
+ 'third_party/freetype'
+ 'third_party/glslang-angle'
+ '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/googletest'
+ 'third_party/hunspell'
+ 'third_party/iccjpeg'
+ 'third_party/inspector_protocol'
+ 'third_party/jinja2'
+ 'third_party/jstemplate'
+ 'third_party/khronos'
+ 'third_party/leveldatabase'
+ 'third_party/libXNVCtrl'
+ 'third_party/libaddressinput'
+ 'third_party/libjingle'
+ 'third_party/libphonenumber'
+ 'third_party/libsecret'
+ 'third_party/libsrtp'
+ 'third_party/libudev'
+ 'third_party/libvpx'
+ 'third_party/libvpx/source/libvpx/third_party/x86inc'
+ 'third_party/libwebm'
+ 'third_party/libxml'
+ '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/node'
+ 'third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2'
+ 'third_party/openmax_dl'
+ 'third_party/ots'
+ 'third_party/pdfium'
+ 'third_party/pdfium/third_party/agg23'
+ 'third_party/pdfium/third_party/base'
+ 'third_party/pdfium/third_party/build'
+ 'third_party/pdfium/third_party/bigint'
+ 'third_party/pdfium/third_party/freetype'
+ 'third_party/pdfium/third_party/lcms'
+ 'third_party/pdfium/third_party/libopenjpeg20'
+ 'third_party/pdfium/third_party/libpng16'
+ 'third_party/pdfium/third_party/libtiff'
+ 'third_party/ply'
+ 'third_party/polymer'
+ 'third_party/protobuf'
+ 'third_party/protobuf/third_party/six'
+ 'third_party/qcms'
+ 'third_party/sfntly'
+ 'third_party/skia'
+ 'third_party/skia/third_party/gif'
+ 'third_party/skia/third_party/vulkan'
+ 'third_party/smhasher'
+ 'third_party/spirv-headers'
+ 'third_party/spirv-tools-angle'
+ 'third_party/sqlite'
+ 'third_party/swiftshader'
+ 'third_party/swiftshader/third_party/llvm-subzero'
+ 'third_party/swiftshader/third_party/subzero'
+ 'third_party/tcmalloc'
+ 'third_party/usrsctp'
+ 'third_party/vulkan-validation-layers'
+ 'third_party/vulkan'
+ 'third_party/web-animations-js'
+ 'third_party/webdriver'
+ 'third_party/webrtc'
+ 'third_party/widevine'
+ 'third_party/woff2'
+ 'third_party/zlib/google'
+ 'url/third_party/mozilla'
+ 'v8/src/third_party/valgrind'
+ 'v8/third_party/inspector_protocol'
+
+ # gyp -> gn leftovers
+ 'base/third_party/libevent'
+ 'third_party/adobe'
+ 'third_party/speech-dispatcher'
+ 'third_party/usb_ids'
+ 'third_party/xdg-utils'
+ 'third_party/yasm/run_yasm.py'
+ )
# Set build flags.
_flags=(
- 'is_debug=false'
- 'enable_widevine=true'
- 'enable_hangout_services_extension=false'
- "ffmpeg_branding=\"ChromeOS\""
- 'proprietary_codecs=true'
- "google_api_key=\"${_google_api_key}\""
- "google_default_client_id=\"${_google_default_client_id}\""
- "google_default_client_secret=\"${_google_default_client_secret}\""
- 'fieldtrial_testing_like_official_build=false'
- "remove_webcore_debug_symbols=${_strip}"
- 'use_gtk3=true'
- 'use_gconf=false'
- "use_gio=false"
- "use_gnome_keyring=${_gnome_keyring}"
- 'link_pulseaudio=true'
- 'use_sysroot=false'
- 'use_gold=false'
- 'linux_use_bundled_binutils=false'
- 'fatal_linker_warnings=false'
- 'treat_warnings_as_errors=false'
- "enable_nacl=${_nacl}"
- "enable_nacl_nonsfi=${_nacl}"
- 'use_custom_libcxx=false'
- # VULKAN!! disable at the moment (fail build)
- #'enable_vulkan=true'
-)
+ 'is_debug=false'
+ 'enable_widevine=true'
+ 'enable_hangout_services_extension=false'
+ "ffmpeg_branding=\"ChromeOS\""
+ 'proprietary_codecs=true'
+ "google_api_key=\"${_google_api_key}\""
+ "google_default_client_id=\"${_google_default_client_id}\""
+ "google_default_client_secret=\"${_google_default_client_secret}\""
+ 'fieldtrial_testing_like_official_build=false'
+ "remove_webcore_debug_symbols=${_strip}"
+ 'use_gtk3=true'
+ 'use_gconf=false'
+ "use_gio=false"
+ "use_gnome_keyring=${_gnome_keyring}"
+ 'link_pulseaudio=true'
+ 'use_sysroot=false'
+ 'use_gold=false'
+ 'linux_use_bundled_binutils=false'
+ 'fatal_linker_warnings=false'
+ 'treat_warnings_as_errors=false'
+ "enable_nacl=${_nacl}"
+ "enable_nacl_nonsfi=${_nacl}"
+ 'use_custom_libcxx=false'
+ )
+
+if [ "$_vulkan" = "1" ]; then
+ _flags+=('enable_vulkan=true')
+ _keeplibs+=(
+ 'third_party/SPIRV-Tools'
+ 'third_party/glslang'
+ 'third_party/shaderc'
+ )
+fi
# Enable VAAPI, see https://chromium-review.googlesource.com/532294
-# NOTE : The detector is Experimental, Can kill you kitty/doggy/waifu/husbando
-# NOTE 2: vfio-pci is for avoid systems with KVM VGA passtrought enabled
-# NOTE 3: Nvidia (bloob drivers) seems have problem with this patch. disable it
-_enable_vaapi=0
-_vga_drivers="$(lspci -vk | grep -A10 VGA | grep 'Kernel driver in use' | cut -d ' ' -f5)"
-for _driver in ${_vga_drivers}; do
- if [ "${_driver}" != "vfio-pci" ] && [ "${_driver}" != "nvidia" ]; then
- _enable_vaapi=1
- _flags+=('use_vaapi=true')
- optdepends+=(
-# 'libva-vdpau-driver-chromium: HW video acceleration for NVIDIA users'
- 'libva-mesa-driver: HW video acceleration for Nouveau, R600 and RadeonSI users'
- 'libva-intel-driver: HW video acceleration for Intel G45 and HD users'
- )
- depends+=('libva')
- break
- fi
-done
+_flags+=('use_vaapi=true')
+optdepends+=(
+ 'libva-vdpau-driver-chromium: HW video acceleration for NVIDIA users'
+ 'libva-mesa-driver: HW video acceleration for Nouveau, R600 and RadeonSI users'
+ 'libva-intel-driver: HW video acceleration for Intel G45 and HD users'
+ )
# Set the bundled/external components.
# TODO: need ported to GN as GYP doing before. see status page: https://crbug.com/551343
_use_system=(
- 'ffmpeg'
- 'flac'
-# 'freetype' # https://bugs.chromium.org/p/pdfium/issues/detail?id=733
- 'harfbuzz-ng'
-# 'icu' # https://crbug.com/678661
- 'libdrm'
-# 'libevent' # Get segfaults and other problems https://bugs.gentoo.org/593458
- 'libjpeg'
- 'libpng'
-# 'libsrtp' # https://bugs.gentoo.org/459932
-# 'libvpx' # Needs update
- 'libwebp'
-# 'libxml' # https://bugs.gentoo.org/616818
- 'libxslt'
- 'openh264'
- 'opus'
- 're2'
- 'snappy'
- 'yasm'
- 'zlib'
-)
+ 'ffmpeg'
+ 'flac'
+# 'freetype' # https://bugs.chromium.org/p/pdfium/issues/detail?id=733
+ 'harfbuzz-ng'
+# 'icu' # https://crbug.com/678661
+ 'libdrm'
+# 'libevent' # Get segfaults and other problems https://bugs.gentoo.org/593458
+ 'libjpeg'
+ 'libpng'
+# 'libsrtp' # https://bugs.gentoo.org/459932
+# 'libvpx' # Needs update
+ 'libwebp'
+# 'libxml' # https://bugs.gentoo.org/616818
+ 'libxslt'
+ 'openh264'
+ 'opus'
+ 're2'
+ 'snappy'
+ 'yasm'
+ 'zlib'
+ )
# Conditionals.
if [ "${_debug_mode}" = "1" ]; then
@@ -377,9 +373,9 @@ fi
prepare() {
# Use custom toolchain.
_flags+=(
- "custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
- "host_toolchain=\"//build/toolchain/linux/unbundle:default\""
- )
+ "custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+ "host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+ )
# Set Python2 path.
mkdir -p python-path
@@ -398,26 +394,31 @@ prepare() {
msg2 "Patching the sources"
# Patch sources from Gentoo.
patch -p1 -i "${srcdir}/chromium-FORTIFY_SOURCE-r2.patch"
- patch -p1 -i "${srcdir}/chromium-gn-bootstrap-r16.patch"
+ patch -p1 -i "${srcdir}/chromium-gn-bootstrap-r17.patch"
patch -p1 -i "${srcdir}/chromium-gcc5-r2.patch"
- patch -p1 -i "${srcdir}/chromium-system-icu-r2.patch"
# Misc Patches:
- patch -p1 -i "${srcdir}/chromium-blink-gcc7-r1.patch"
- patch -p1 -i "${srcdir}/0002-replace-struct-ucontext-with-ucontext_t.patch"
-
- # VULKAN!!!
- sed 's|base/||' -i cc/output/vulkan_renderer.h
+ patch -p1 -i "${srcdir}/minizip.patch"
# Apply VAAPI patch
- if [ "${_enable_vaapi}" = "1" ]; then
- msg2 "Enable VAAPI"
- patch -p1 -i "${srcdir}/vaapi_patch-r3.patch" # base64 -d "${srcdir}/vaapi_patch-r3.base64" | patch -p1 -i -
+ patch -p1 -i "${srcdir}/chromium-intel-vaapi_r2.patch" # base64 -d "${srcdir}/chromium-intel-vaapi.base64" | patch -p1 -i -
+ patch -p1 -i "${srcdir}/chromium-intel-vaapi-fix.patch"
+ patch -p1 -i "${srcdir}/specify-max-resolution.patch"
+ sed 's|chromium-browser|chromium-dev|' -i media/gpu/vaapi_wrapper.h
+
+ if [ "${_vulkan}" = "1" ]; then
+ export VULKAN_SDK="/usr"
+ sed 's|base/||' -i cc/output/vulkan_renderer.h
+ sed 's|/x86_64-linux-gnu||' -i gpu/vulkan/BUILD.gn
fi
- patch -p1 -i "${srcdir}/minizip.patch"
+ # Patch from crbug (chromium bugtracker) or Arch chromium package
+ # Fix build with glibc 2.26
+ patch -p1 -i "${srcdir}/breakpad-use-ucontext_t.patch"
+
+ patch -p1 -i "${srcdir}/chromium-gcc-r1.patch"
+ patch -p1 -i "${srcdir}/chromium-blink-gcc7-r2.patch"
- # Patch from crbug (chromium bugtracker).
# https://crbug.com/473866
patch -p0 -i "${srcdir}/chromium-widevine-r1.patch"
sed 's|@WIDEVINE_VERSION@|The Cake Is a Lie|g' -i "third_party/widevine/cdm/stub/widevine_cdm_version.h"
@@ -438,9 +439,6 @@ prepare() {
popd &> /dev/null
done
- # Make it possible to remove third_party/adobe.
- echo > "${srcdir}/flapper_version.h"
-
# Remove most bundled libraries. Some are still needed.
msg2 "Removing unnecessary components to save space."
python2 build/linux/unbundle/remove_bundled_libraries.py ${_keeplibs[@]} --do-remove
@@ -477,9 +475,9 @@ prepare() {
_set_gcc() {
_compiler=GCC
_flags+=(
- 'is_clang=false'
- 'clang_use_chrome_plugins=false'
- )
+ 'is_clang=false'
+ 'clang_use_chrome_plugins=false'
+ )
_c_compiler="gcc"
_cpp_compiler="g++"
CFLAGS+=" -fno-delete-null-pointer-checks"
@@ -495,8 +493,8 @@ prepare() {
elif [ "${CARCH}" = 'x86_64' ]; then
_compiler=Clang
_flags+=(
- 'is_clang=true'
- 'clang_use_chrome_plugins=true'
+ 'is_clang=true'
+ 'clang_use_chrome_plugins=true'
)
_clang_path="${srcdir}/chromium-${pkgver}/third_party/llvm-build/Release+Asserts/bin"
_c_compiler="${_clang_path}/clang"
@@ -558,38 +556,38 @@ package() {
# Install libs.
_libs=(
- 'libclearkeycdm.so'
- 'libEGL.so'
- 'libGLESv2.so'
- 'libVkLayer_core_validation.so'
- 'libVkLayer_object_tracker.so'
- 'libVkLayer_parameter_validation.so'
- 'libVkLayer_swapchain.so'
- 'libVkLayer_threading.so'
- 'libVkLayer_unique_objects.so'
- 'libwidevinecdmadapter.so'
- )
+ 'libclearkeycdm.so'
+ 'libEGL.so'
+ 'libGLESv2.so'
+ 'libVkLayer_core_validation.so'
+ 'libVkLayer_object_tracker.so'
+ 'libVkLayer_parameter_validation.so'
+ 'libVkLayer_swapchain.so'
+ 'libVkLayer_threading.so'
+ 'libVkLayer_unique_objects.so'
+ 'libwidevinecdmadapter.so'
+ 'swiftshader/libEGL.so'
+ 'swiftshader/libGLESv2.so'
+ #
+ 'natives_blob.bin'
+ 'snapshot_blob.bin'
+ )
for i in "${_libs[@]}"; do
install -Dm755 "${i}" "${pkgdir}/usr/lib/chromium-dev/${i}"
done
- install -Dm644 natives_blob.bin "${pkgdir}/usr/lib/chromium-dev/natives_blob.bin"
- install -Dm644 snapshot_blob.bin "${pkgdir}/usr/lib/chromium-dev/snapshot_blob.bin"
- install -Dm755 swiftshader/libEGL.so "${pkgdir}/usr/lib/chromium-dev/swiftshader/libEGL.so"
- install -Dm755 swiftshader/libGLESv2.so "${pkgdir}/usr/lib/chromium-dev/swiftshader/libGLESv2.so"
-
# Install Resources.
_resources=(
- 'chrome_100_percent.pak'
- 'chrome_200_percent.pak'
- 'headless_lib.pak'
- 'keyboard_resources.pak'
- 'mus_app_resources_100.pak'
- 'mus_app_resources_200.pak'
- 'mus_app_resources_strings.pak'
- 'resources.pak'
- 'views_mus_resources.pak'
- )
+ 'chrome_100_percent.pak'
+ 'chrome_200_percent.pak'
+ 'headless_lib.pak'
+ 'keyboard_resources.pak'
+ 'mus_app_resources_100.pak'
+ 'mus_app_resources_200.pak'
+ 'mus_app_resources_strings.pak'
+ 'resources.pak'
+ 'views_mus_resources.pak'
+ )
for i in "${_resources[@]}"; do
install -Dm644 "${i}" "${pkgdir}/usr/lib/chromium-dev/${i}"
done
@@ -610,11 +608,16 @@ package() {
# Install NaCL stuff if is detected.
if [ "${_build_nacl}" = "1" ]; then
- install -Dm755 nacl_helper "${pkgdir}/usr/lib/chromium-dev/nacl_helper"
- install -Dm755 nacl_helper_bootstrap "${pkgdir}/usr/lib/chromium-dev/nacl_helper_bootstrap"
- install -Dm755 nacl_helper_nonsfi "${pkgdir}/usr/lib/chromium-dev/nacl_helper_nonsfi"
- install -Dm755 nacl_irt_x86_64.nexe "${pkgdir}/usr/lib/chromium-dev/nacl_irt_x86_64.nexe"
- install -Dm644 icudtl.dat "${pkgdir}/usr/lib/chromium-dev/icudtl.dat"
+ _nacl_libs=(
+ 'nacl_helper'
+ 'nacl_helper_bootstrap'
+ 'nacl_helper_nonsfi'
+ 'nacl_irt_x86_64.nexe'
+ 'icudtl.dat'
+ )
+ for i in "${_nacl_libs[@]}"; do
+ install -Dm755 "${i}" "${pkgdir}/usr/lib/chromium-dev/${i}"
+ done
fi
popd &> /dev/null
@@ -634,6 +637,7 @@ package() {
fi
strip $STRIP_BINARIES "${pkgdir}/usr/lib/chromium-dev/"{chromium-dev,chrome-sandbox,chromedriver}
strip $STRIP_SHARED "${pkgdir}/usr/lib/chromium-dev/"lib*.so
+ strip $STRIP_SHARED "${pkgdir}/usr/lib/chromium-dev/swiftshader/"lib*.so
fi
# Try to fix libpng errors. (second attemp)
diff --git a/chromium-blink-gcc7-r1.patch b/chromium-blink-gcc7-r2.patch
index 4791a449dd01..4791a449dd01 100644
--- a/chromium-blink-gcc7-r1.patch
+++ b/chromium-blink-gcc7-r2.patch
diff --git a/chromium-dev.install b/chromium-dev.install
index 678d71b9813d..8ee4a9b5694c 100644
--- a/chromium-dev.install
+++ b/chromium-dev.install
@@ -7,15 +7,27 @@ green="${bold}$(tput setaf 2)"
_instructions() {
printf "${yellow}==>${all_off} ${bold}ATENTION:${all_off}
${green}==>${all_off} ${bold}This Chromium package no longer supports custom flags passed via the
- '/etc/chromium/default' file (or any other files under /etc/chromium/).${all_off}
-
+ '/etc/chromium/default' file (or any other files under '/etc/chromium/').
${blue}->${all_off} The new '${bold}/usr/bin/chromium-dev${all_off}' launcher script will automatically detect
Pepper Flash (if installed) and pass the correct flags to Chromium.'
-
${blue}->${all_off} If you need to pass extra command-line arguments to Chromium, you
- can put them in a '${bold}chromium-dev-flags.conf${all_off}' file under '${bold}\x24HOME/.config/${all_off}
+ can put them in the '${bold}chromium-dev-flags.conf${all_off}' file under '${bold}\x24HOME/.config/'${all_off}
(or ${bold}\x24XDG_CONFIG_HOME${all_off}). Arguments are split on whitespace and shell
- quoting rules apply but no further parsing is performed.\n"
+ quoting rules apply but no further parsing is performed.
+${green}==>${all_off} ${bold}If you use Kwallet5 from Plasma/Kf5:${all_off}
+ ${blue}->${all_off} You needs add '${bold}\"--password-store=kwallet5\"${all_off}' into '${bold}chromium-dev-flags.conf${all_off}' file
+ under '${bold}\x24HOME/.config/${all_off}' (or ${bold}\x24XDG_CONFIG_HOME${all_off}).
+${green}==>${all_off} ${bold}If you GPU can decode videos with resolution more than 1920x1088:${all_off}
+ ${blue}->${all_off} You can change this value (hardcoded in the code) setting it into the '${bold}va_fallback_resolution${all_off}' file
+ under '${bold}/etc/chromium-dev/${all_off}' with this content (must be integers numbers):
+ '${bold}Width Height+8${all_off}'
+ in the first line, in that order (notice this need have ${bold}two spaces${all_off} between two integers). For example:
+ '${bold}4032 4088${all_off}'.
+ You can know this values running '${bold}vdpauinfo${all_off}' command.
+ ${blue}->${all_off} For more info, visit:
+ '${bold}https://github.com/saiarcot895/chromium-ubuntu-build/issues/13${all_off}'
+ or
+ '${bold}https://github.com/saiarcot895/chromium-ubuntu-build/pull/16${all_off}'.\n"
}
post_install() {
diff --git a/vaapi_patch-r3.patch b/chromium-intel-vaapi_r2.patch
index ef6d673ed51a..7a22198afe42 100644
--- a/vaapi_patch-r3.patch
+++ b/chromium-intel-vaapi_r2.patch
@@ -436,7 +436,7 @@ index 3d815a2..2c96048 100644
private:
diff --git a/content/common/sandbox_linux/bpf_gpu_policy_linux.cc b/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
-index fe2f298..507f481 100644
+index fe2f298a..507f481 100644
--- a/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
+++ b/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
@@ -56,22 +56,6 @@
@@ -808,8 +808,8 @@ index 3a65c75..dd2d957 100644
}
# TODO(watk): Run this on bots. http://crbug.com/461437
--if (is_win || is_android || is_chromeos) {
-+if (is_win || is_android || is_chromeos || is_desktop_linux) {
+-if (is_win || is_android || use_v4l2_codec || use_vaapi) {
++if (is_win || is_android || use_v4l2_codec || use_vaapi || is_desktop_linux) {
test("video_decode_accelerator_unittest") {
sources = [
"video_accelerator_unittest_helpers.h",
@@ -817,8 +817,8 @@ index 3a65c75..dd2d957 100644
}
}
--if (is_chromeos || is_mac || is_win) {
-+if (is_chromeos || is_mac || is_win || is_desktop_linux) {
+-if (use_v4l2_codec || use_vaapi || is_mac || is_win) {
++if (use_v4l2_codec || use_vaapi || is_mac || is_win || is_desktop_linux) {
test("video_encode_accelerator_unittest") {
deps = [
"//base",
@@ -826,8 +826,8 @@ index 3a65c75..dd2d957 100644
}
}
--if (is_chromeos) {
-+if (is_chromeos || is_desktop_linux) {
+-if (use_v4l2_codec || use_vaapi) {
++if (use_v4l2_codec || use_vaapi || is_desktop_linux) {
test("jpeg_decode_accelerator_unittest") {
deps = [
"//base",