From owner-dev-commits-ports-all@freebsd.org Sun May 16 10:31:05 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F148863CFCD; Sun, 16 May 2021 10:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FjdpK6KXmz3FV2; Sun, 16 May 2021 10:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C1CDC1730C; Sun, 16 May 2021 10:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14GAV5sV076612; Sun, 16 May 2021 10:31:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14GAV5Gg076611; Sun, 16 May 2021 10:31:05 GMT (envelope-from git) Date: Sun, 16 May 2021 10:31:05 GMT Message-Id: <202105161031.14GAV5Gg076611@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 74647995deae - main - www/chromium: attempt to make it work with Microsoft Teams MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74647995deae7050b6f9a3bf3b3a3ef8ff25ad63 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 May 2021 10:31:06 -0000 The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=74647995deae7050b6f9a3bf3b3a3ef8ff25ad63 commit 74647995deae7050b6f9a3bf3b3a3ef8ff25ad63 Author: Rene Ladan AuthorDate: 2021-05-15 18:56:06 +0000 Commit: Rene Ladan CommitDate: 2021-05-16 10:29:58 +0000 www/chromium: attempt to make it work with Microsoft Teams - add dependency virtual_oss so the microphone works [1] - skip assertion in h264_decoder, we will force it to initialize later [2] PR: 246214 [1] PR: 255484 [2] MFH: 2021Q2 --- www/chromium/Makefile | 4 +++- ...ideo__coding_codecs_h264_h264__decoder__impl.cc | 22 ++++++++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 5a5b33075650..d623cdc57569 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,6 +2,7 @@ PORTNAME= chromium PORTVERSION= 90.0.4430.212 +PORTREVISION= 1 CATEGORIES= www java MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/rene/chromium/:fonts @@ -63,7 +64,8 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libxshmfence.so:x11/libxshmfence RUN_DEPENDS= xdg-open:devel/xdg-utils \ - noto-basic>0:x11-fonts/noto-basic + noto-basic>0:x11-fonts/noto-basic \ + virtual_oss>0:audio/virtual_oss USES= bison compiler:c++17-lang cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \ ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz xorg diff --git a/www/chromium/files/patch-third__party_webrtc_modules_video__coding_codecs_h264_h264__decoder__impl.cc b/www/chromium/files/patch-third__party_webrtc_modules_video__coding_codecs_h264_h264__decoder__impl.cc index 83f4afc9a103..4d6ee5c9c3ca 100644 --- a/www/chromium/files/patch-third__party_webrtc_modules_video__coding_codecs_h264_h264__decoder__impl.cc +++ b/www/chromium/files/patch-third__party_webrtc_modules_video__coding_codecs_h264_h264__decoder__impl.cc @@ -1,12 +1,22 @@ ---- third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc.orig 2021-04-30 09:00:21.722978000 +0000 -+++ third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc 2021-04-30 09:00:54.473978000 +0000 -@@ -202,6 +202,9 @@ +--- third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc.orig 2021-05-10 18:48:00 UTC ++++ third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc +@@ -77,7 +77,8 @@ int H264DecoderImpl::AVGetBuffer2(AVCodecContext* cont + int height = av_frame->height; + // See |lowres|, if used the decoder scales the image by 1/2^(lowres). This + // has implications on which resolutions are valid, but we don't use it. +- RTC_CHECK_EQ(context->lowres, 0); ++ // PR255687: disabled to prevent crash with Microsoft Teams ++ // RTC_CHECK_EQ(context->lowres, 0); + // Adjust the |width| and |height| to values acceptable by the decoder. + // Without this, FFmpeg may overflow the buffer. If modified, |width| and/or + // |height| are larger than the actual image and the image has to be cropped +@@ -201,6 +202,9 @@ int32_t H264DecoderImpl::InitDecode(const VideoCodec* + // |get_buffer2| is called with the context, there |opaque| can be used to get // a pointer |this|. av_context_->opaque = this; - ++ + // Initializing |lowres| + av_context_->lowres = 0; -+ + AVCodec* codec = avcodec_find_decoder(av_context_->codec_id); if (!codec) { - // This is an indication that FFmpeg has not been initialized or it has not