[gentoo-commits] repo/gentoo:master commit in: www-client/chromium/, www-client/chromium/files/

[Stephan Hartmann]

commit:     0f568bf655f5348dbacf740c70c37d6ce351f0c1
Author:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 26 15:45:28 2021 +0000
Commit:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Sat Jun 26 15:45:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f568bf6

www-client/chromium: dev channel bump to 93.0.4549.3

Bug: https://bugs.gentoo.org/796527
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>

 www-client/chromium/Manifest                       |  4 ++--
 ...0.4542.2.ebuild => chromium-93.0.4549.3.ebuild} |  6 ++----
 .../chromium/files/chromium-93-system-ffmpeg.patch | 25 ++++++++++++++++++++++
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 785fce8c630..2ae63cd042f 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -4,7 +4,7 @@ DIST chromium-91.0.4472.106.tar.xz 950214296 BLAKE2B 1c68c3d6ccb593b4516482ba8f1
 DIST chromium-91.0.4472.114.tar.xz 950268264 BLAKE2B e811ec3550434a5f5dcff3f5a0c07d2a951b0479ae8ef7de0dc82c60d63bb19a04ed065b2f8f12b0ba4786244fd0fdba9a38e1f0ae076a9be2fc50bc293453b5 SHA512 7a04d966e8c8b75b5fe063730cbc4734cc9a5a38a50a573193243301930719cef26e2b741f2f893350bb717261302e5d00b0b3264a3fdb8f80a5460223eac5de
 DIST chromium-92-patchset-6.tar.xz 3764 BLAKE2B a7149940b1371e4bd295e6038b87cc13f4edf8d8ed286d9d8d0e63144c2546de39564fc203a4b2e185267e46398efd0414c1f695ee31c78d33a6cd8d7b434016 SHA512 2f104901271d42762ea27f7c8a017307bde7348ec6b84d0c85875a07bf3783ba43bdb886fb3c6376753b6a14102b495a28bdc7adc611992440d2c1345aea035b
 DIST chromium-92.0.4515.59.tar.xz 957613080 BLAKE2B b6d4009e9c0cb90d3c16bac95d383a243c0e0660a521110bb188c1091aa97d84de85f5766e2a1ed908f78637ea786778030a0ae430ddfa8a4505feb5e9385fd4 SHA512 d7dbc569751cb4b3b3fd97429cfda5577d8468ba201914775b27562911010719c84ea2380b11f07c7b5965cd8444676200ae190f06a19e35586a0980d085968b
-DIST chromium-93-patchset-3.tar.xz 4848 BLAKE2B eb46541d283f8c17967ad45ac36838f9f46f20883eb13260c5804aaf805736283a7890e5f76ab7c1dccfd218bbf55cfbb04378c116c4e390a575c91511308aa7 SHA512 be61f3c907899121e08394647c276f638201e6c1a2d682fac0e559117866e3c1c40fd6283159725504d699b6ad6ef773e980e0e98487aafb80f1c458a3b55959
-DIST chromium-93.0.4542.2.tar.xz 988397092 BLAKE2B 9491aff480ca5200b0ebfa0ddb2082cffe7f86475241d99c320a4c415e36df81696d14323219e8d2a62ae0cc18bdbc03a8f5dff57b95acf25316b842b9c1c648 SHA512 28e00b6e343e74a6abb0d9c60017e37c6ec5e577ac292232cf7d6f13176edc1663f2c4fd5a18a5436b76055d9ac7ec2b4c477dbe59a9a963bd62d447aaf8c56c
+DIST chromium-93-patchset-4.tar.xz 4452 BLAKE2B a697175dceb03ae19175860c29f93b7f58bb212ba4932822c5c85dd8230a50b0cfefd3968ebb872d0b62fb4371b065fc51192f657c7f0fd5667bb3531344abed SHA512 836cbb1580f3559fc55e110b61120282cd2384da028d244fab5b9bdba475f3162e952bc45b7a827019ca0ebf92127dc0a89ba32c5718bded349c8ba25eecd207
+DIST chromium-93.0.4549.3.tar.xz 989184368 BLAKE2B e0b690797ac99587b3a4385e09d4c9fed51fb75321269b239d931f39ca839ec82d474a5bba90f22e558562a5c395c9680c781fef4f35ead9de9e063a7c900357 SHA512 5e27d524163bddc168d6344d09bc02aed50cba487e8d8310f421cb9a4f2103f5cf1ed036dc9adf572eb950401e74755eb7561fc51f9ed28ac5f92fda3eb210aa
 DIST highway-0.12.1.tar.gz 1480579 BLAKE2B 2889f96e33ae4411b14dae2229d86b0581f2044f50d6bb829a83417f0d67f0c9a8c03d552d09a985231ea11e88497fa405efcb85d158b5734b477bec5764a1eb SHA512 d14aeffc80739a5993177fb190ac03998d495004e9c54126c0e0b174c28be52a3f3fe581d8a08db67c34bd00045223d1850e7b384a2e7fe37a8150d7908004cb
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf

diff --git a/www-client/chromium/chromium-93.0.4542.2.ebuild b/www-client/chromium/chromium-93.0.4549.3.ebuild
similarity index 99%
rename from www-client/chromium/chromium-93.0.4542.2.ebuild
rename to www-client/chromium/chromium-93.0.4549.3.ebuild
index c99ac3f994e..2895f1aa216 100644
--- a/www-client/chromium/chromium-93.0.4542.2.ebuild
+++ b/www-client/chromium/chromium-93.0.4549.3.ebuild
@@ -13,7 +13,7 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
-PATCHSET="3"
+PATCHSET="4"
 PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
 	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
@@ -234,6 +234,7 @@ src_prepare() {
 		"${WORKDIR}/patches"
 		"${FILESDIR}/chromium-92-EnumTable-crash.patch"
 		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
+		"${FILESDIR}/chromium-93-system-ffmpeg.patch"
 		"${FILESDIR}/chromium-shim_headers.patch"
 	)
 
@@ -262,9 +263,6 @@ src_prepare() {
 		ln -s "${WORKDIR}/highway-0.12.1" third_party/highway/src || die
 	fi
 
-	# lastchange.py requires initialized git repository
-	git init -q || die
-
 	local keeplibs=(
 		base/third_party/cityhash
 		base/third_party/double_conversion

diff --git a/www-client/chromium/files/chromium-93-system-ffmpeg.patch b/www-client/chromium/files/chromium-93-system-ffmpeg.patch
new file mode 100644
index 00000000000..7ed5331c527
--- /dev/null
+++ b/www-client/chromium/files/chromium-93-system-ffmpeg.patch
@@ -0,0 +1,25 @@
+From 04d56bcb5a59c4a36b9bb9ac57a84090033761ce Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@××××××××××.com>
+Date: Sat, 19 Jun 2021 13:08:48 +0000
+Subject: [PATCH] unbundle: add libavcodec/format.h shim headers
+
+Header is included in ffmpeg_demuxer.
+---
+ build/linux/unbundle/ffmpeg.gn | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/build/linux/unbundle/ffmpeg.gn b/build/linux/unbundle/ffmpeg.gn
+index 978298a..16e2074 100644
+--- a/build/linux/unbundle/ffmpeg.gn
++++ b/build/linux/unbundle/ffmpeg.gn
+@@ -23,6 +23,7 @@ shim_headers("ffmpeg_shim") {
+   root_path = "."
+   headers = [
+     "libavcodec/avcodec.h",
++    "libavcodec/packet.h",
+     "libavformat/avformat.h",
+     "libavutil/imgutils.h",
+   ]
+-- 
+2.31.1
+