diff options
| -rw-r--r-- | .SRCINFO | 20 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 26 | ||||
| -rw-r--r-- | chromium-widevine-r3.patch | 22 |
4 files changed, 53 insertions, 16 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sat Sep 22 22:15:11 UTC 2018 +# Wed Nov 7 22:36:12 UTC 2018 pkgbase = chromium-dev pkgdesc = The open-source project behind Google Chrome (Dev Channel) - pkgver = 71.0.3554.4 + pkgver = 72.0.3595.2 pkgrel = 1 url = http://www.chromium.org install = chromium-dev.install @@ -45,26 +45,30 @@ pkgbase = chromium-dev 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 - source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-71.0.3554.4.tar.xz + source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-72.0.3595.2.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-compiler-r4.patch + source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-compiler-r7.patch source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-webrtc-r0.patch source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-ffmpeg-ebp-r1.patch + source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-harfbuzz-r0.patch source = chromium-ffmpeg-clang.patch source = chromium-intel-vaapi_r18.diff.base64::https://chromium-review.googlesource.com/changes/532294/revisions/18/patch?download - source = chromium-widevine-r2.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-widevine-r2.patch?h=packages/chromium + source = chromium_fix_snapselectionstrategy_missing_include.base64::https://chromium-review.googlesource.com/changes/1304418/revisions/2/patch?download + source = chromium-widevine-r3.patch source = chromium-skia-harmony.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-skia-harmony.patch?h=packages/chromium source = fix_mixup_between_DIP_pixel_coordinates.diff.base64::https://chromium-review.googlesource.com/changes/1083692/revisions/3/patch?download - sha256sums = cf3ad33c0fe4125dd539997e2f3631576205d847db0d5b2e80d9ebdf43aee570 + sha256sums = 61a692d8841d838d9c348397b2f3770cc6dfb02f6d9d1466048148aa0d4e0cf9 sha256sums = SKIP sha256sums = dd2b5c4191e468972b5ea8ddb4fa2e2fa3c2c94c79fc06645d0efc0e63ce7ee1 - sha256sums = c8225c0c14288c21f5cc448afc0f67fc4563517c39a8680af9e659f5b2d8f418 + sha256sums = 7fa727b29032577c70f5655b10a440599c12e53d6f52713e661defc1002cfa3a sha256sums = bcb2f4588cf5dcf75cde855c7431e94fdcc34bdd68b876a90f65ab9938594562 sha256sums = 1bc5df96750e825a3ef01958df9497d4fbdeb3f25681a3a034e0d4a04b9c3479 + sha256sums = 1b370d49c43e88acfe7c0b1f9517047e927f3407bd80b4a48bba32c001f80136 sha256sums = 16741344288d200fadf74546855e00aa204122e744b4811a36155efd5537bd95 sha256sums = 957d777c67756074c8e028d08c1e88e738f881b3a8569e60c5bdd1da6737e305 - sha256sums = 02c69bb3954087db599def7f5b6d65cf8f7cf2ed81dfbdaa4bb7b51863b4df15 + sha256sums = 486aa853cf7701aabc91c6b4c46adc50898eede3fc9c439b53515be6dd94758d + sha256sums = 6e6576a11d0511fed7251160e3028fc2405983ff4cf60823e7e49db9e28a748b sha256sums = feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3 sha256sums = d3330d7f7fa256e99488a6c9edce793c9fc1054e3766a66fde74ed2bd8ed496f diff --git a/.gitignore b/.gitignore index d066d168dd57..d3ae687ae8c9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ !chromium-dev.install !chromium-dev.svg !chromium-ffmpeg-clang.patch +!chromium-widevine-r3.patch @@ -16,7 +16,7 @@ _use_wayland=0 # Build Wayland NOTE: extremely experimental and don't ## -- Package and components information -- ## ############################################## pkgname=chromium-dev -pkgver=71.0.3554.4 +pkgver=72.0.3595.2 pkgrel=1 pkgdesc="The open-source project behind Google Chrome (Dev Channel)" arch=('x86_64') @@ -81,14 +81,16 @@ source=( #"https://gsdview.appspot.com/chromium-browser-official/chromium-${pkgv 'git+https://github.com/foutrelis/chromium-launcher.git' 'chromium-dev.svg' # Patch form Gentoo - 'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-compiler-r4.patch' + 'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-compiler-r7.patch' 'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-webrtc-r0.patch' 'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-ffmpeg-ebp-r1.patch' + 'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-harfbuzz-r0.patch' # Misc Patches 'chromium-ffmpeg-clang.patch' 'chromium-intel-vaapi_r18.diff.base64::https://chromium-review.googlesource.com/changes/532294/revisions/18/patch?download' # Patch from crbug (chromium bugtracker) or Arch chromium package - 'chromium-widevine-r2.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-widevine-r2.patch?h=packages/chromium' + 'chromium_fix_snapselectionstrategy_missing_include.base64::https://chromium-review.googlesource.com/changes/1304418/revisions/2/patch?download' + 'chromium-widevine-r3.patch' 'chromium-skia-harmony.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-skia-harmony.patch?h=packages/chromium' 'fix_mixup_between_DIP_pixel_coordinates.diff.base64::https://chromium-review.googlesource.com/changes/1083692/revisions/3/patch?download' ) @@ -97,14 +99,16 @@ sha256sums=( #"$(curl -sL https://gsdview.appspot.com/chromium-browser-official/ 'SKIP' 'dd2b5c4191e468972b5ea8ddb4fa2e2fa3c2c94c79fc06645d0efc0e63ce7ee1' # Patch form Gentoo - 'c8225c0c14288c21f5cc448afc0f67fc4563517c39a8680af9e659f5b2d8f418' + '7fa727b29032577c70f5655b10a440599c12e53d6f52713e661defc1002cfa3a' 'bcb2f4588cf5dcf75cde855c7431e94fdcc34bdd68b876a90f65ab9938594562' '1bc5df96750e825a3ef01958df9497d4fbdeb3f25681a3a034e0d4a04b9c3479' + '1b370d49c43e88acfe7c0b1f9517047e927f3407bd80b4a48bba32c001f80136' # Misc Patches '16741344288d200fadf74546855e00aa204122e744b4811a36155efd5537bd95' '957d777c67756074c8e028d08c1e88e738f881b3a8569e60c5bdd1da6737e305' # Patch from crbug (chromium bugtracker) or Arch chromium package - '02c69bb3954087db599def7f5b6d65cf8f7cf2ed81dfbdaa4bb7b51863b4df15' + '486aa853cf7701aabc91c6b4c46adc50898eede3fc9c439b53515be6dd94758d' + '6e6576a11d0511fed7251160e3028fc2405983ff4cf60823e7e49db9e28a748b' 'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3' 'd3330d7f7fa256e99488a6c9edce793c9fc1054e3766a66fde74ed2bd8ed496f' ) @@ -181,6 +185,7 @@ _keeplibs=( 'third_party/catapult/tracing/third_party/pako' 'third_party/ced' 'third_party/cld_3' + 'third_party/closure_compiler' 'third_party/crashpad' 'third_party/crashpad/crashpad/third_party/zlib' 'third_party/crc32c' @@ -201,6 +206,7 @@ _keeplibs=( 'third_party/iccjpeg' 'third_party/inspector_protocol' 'third_party/jinja2' + 'third_party/jsoncpp' 'third_party/jstemplate' 'third_party/khronos' 'third_party/leveldatabase' @@ -438,9 +444,10 @@ prepare() { msg2 "Patching the sources" # Patch sources from Gentoo. - patch -p1 -i "${srcdir}/chromium-compiler-r4.patch" + patch -p1 -i "${srcdir}/chromium-compiler-r7.patch" patch -p1 -i "${srcdir}/chromium-webrtc-r0.patch" patch -p1 -i "${srcdir}/chromium-ffmpeg-ebp-r1.patch" + patch -p1 -i "${srcdir}/chromium-harfbuzz-r0.patch" # Misc patches @@ -473,11 +480,14 @@ prepare() { # Patch from crbug (chromium bugtracker) or Arch chromium package + # https://crbug.com/819294 + base64 -d "${srcdir}/chromium_fix_snapselectionstrategy_missing_include.base64" | patch -p1 -i - + # https://crbug.com/skia/6663#c10 patch -p4 -i "${srcdir}/chromium-skia-harmony.patch" # https://crbug.com/473866 - patch -p1 -i "${srcdir}/chromium-widevine-r2.patch" + patch -p1 -i "${srcdir}/chromium-widevine-r3.patch" # Setup nodejs dependency. mkdir -p third_party/node/linux/node-linux-x64/bin/ @@ -533,7 +543,7 @@ build() { # Build all. # Work around broken deps - LC_ALL=C ninja -C out/Release gen/ui/accessibility/ax_enums.mojom.h + LC_ALL=C ninja -C out/Release gen/ui/accessibility/ax_enums.mojom{,-shared}.h LC_ALL=C ninja -C out/Release -v chrome chrome_sandbox chromedriver #widevinecdmadapter } diff --git a/chromium-widevine-r3.patch b/chromium-widevine-r3.patch new file mode 100644 index 000000000000..3c411ada2a37 --- /dev/null +++ b/chromium-widevine-r3.patch @@ -0,0 +1,22 @@ +From 5818fdbef3d399fe1bfbb56f81e59184e1a8e467 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppymaster@gmail.com> +Date: Sun, 14 Oct 2018 20:04:03 -0400 +Subject: [PATCH] Define WIDEVINE_CDM_VERSION_STRING + +--- + third_party/widevine/cdm/widevine_cdm_version.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/third_party/widevine/cdm/widevine_cdm_version.h b/third_party/widevine/cdm/widevine_cdm_version.h +index dd6efed02646..eaa017197e61 100644 +--- a/third_party/widevine/cdm/widevine_cdm_version.h ++++ b/third_party/widevine/cdm/widevine_cdm_version.h +@@ -11,5 +11,6 @@ + // If the Widevine CDM is available define the following: + // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available + // as a string, e.g., "1.0.123.456"). ++#define WIDEVINE_CDM_VERSION_STRING "unknown" + + #endif // WIDEVINE_CDM_VERSION_H_ +-- +2.19.1
\ No newline at end of file |