[arch-commits] Commit in opera-ffmpeg-codecs/trunk (2 files)

[Evangelos Foutras]

    Date: Friday, November 12, 2021 @ 22:00:02
  Author: foutrelis
Revision: 1044855

Fix build with gn from Chromium 96

Added:
  opera-ffmpeg-codecs/trunk/gn-visibility-webrtc.patch
Modified:
  opera-ffmpeg-codecs/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   11 ++++++----
 gn-visibility-webrtc.patch |   45 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-12 21:49:27 UTC (rev 1044854)
+++ PKGBUILD	2021-11-12 22:00:02 UTC (rev 1044855)
@@ -16,12 +16,15 @@
 options=('!strip')
 source=(
   "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz"
+  "gn-visibility-webrtc.patch"
 )
-sha512sums=('159c8d37e8cfb5bb0e55d3d1329295dab585164b84b8c514ea80f0f68ce0b491f4c40a186a2bc108baae2341cf320dee78c654c0a038d5aeb17b5a19c7f043d9')
+sha512sums=('159c8d37e8cfb5bb0e55d3d1329295dab585164b84b8c514ea80f0f68ce0b491f4c40a186a2bc108baae2341cf320dee78c654c0a038d5aeb17b5a19c7f043d9'
+            'a0d2b31b870a53af6c68ef1f66c6e6bdeb63ca4bf49120c389dfbd41f98818c387295b0b9330d5e446ebdb46e20a7eb69ab2007eb5c5efdeb16e83e7e01b2e3b')
 
-#prepare() {
-  #cd "$srcdir/chromium-$pkgver"
-#}
+prepare() {
+  cd "$srcdir/chromium-$pkgver"
+  patch -Np1 -i ../gn-visibility-webrtc.patch
+}
 
 build() {
   cd "$srcdir/chromium-$pkgver"

Added: gn-visibility-webrtc.patch
===================================================================
--- gn-visibility-webrtc.patch	                        (rev 0)
+++ gn-visibility-webrtc.patch	2021-11-12 22:00:02 UTC (rev 1044855)
@@ -0,0 +1,45 @@
+From 72c4d9fc95c336f61d7a8417b78f947a400ce792 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tomasz=20=C5=9Aniatowski?= <tsniatowski at vewd.com>
+Date: Tue, 14 Sep 2021 10:33:37 +0000
+Subject: [PATCH] Relax googletest gn config visibility for webrtc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+An upcoming gn roll will start enforcing config visibility on
+public_configs and all_dependent_configs. Normally, configs with
+limited visibility have corresponding helper targets that push the
+configs using public_configs and are propagated with public_deps.
+However, webrtc prefers to avoid public_deps, and pushes the gtest
+config using all_dependent_configs. This requires direct visibility,
+so tweak gtest BUILD.gn to make things work.
+
+Bug: gn:252, 1249254
+Change-Id: Ic7be22f7bf129255fb0ac51f437cd6dd3989e3a3
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3158065
+Commit-Queue: Tomasz Śniatowski <tsniatowski at vewd.com>
+Reviewed-by: Victor Costan <pwnall at chromium.org>
+Cr-Commit-Position: refs/heads/main@{#921126}
+---
+ third_party/googletest/BUILD.gn | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/third_party/googletest/BUILD.gn b/third_party/googletest/BUILD.gn
+index fe240ebe954b6..d2bde47d75eab 100644
+--- a/third_party/googletest/BUILD.gn
++++ b/third_party/googletest/BUILD.gn
+@@ -5,7 +5,13 @@
+ import("//build_overrides/build.gni")
+ 
+ config("gtest_config") {
+-  visibility = [ ":*" ]  # gmock also shares this config.
++  # webrtc wants to push this config without a public_dep chain
++  # TODO(crbug.com/1249254): figure out what to do with this
++  visibility = [
++    ":*",  # gmock also shares this config.
++    "//test:*",  # webrts standalone setup
++    "//third_party/webrtc/test:*",
++  ]
+ 
+   defines = [
+     # Chromium always links googletest statically, so no API qualifier is