From nobody Fri Jan 19 22:39:23 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TGvgH3f3Mz57ZVV; Fri, 19 Jan 2024 22:39:23 +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 4TGvgH2sgqz4GyC; Fri, 19 Jan 2024 22:39:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705703963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Md19DD7zC2fGJqEYJM/DYwAlrqC0Rz2l1wCibRaOVsk=; b=Fhx6SbWa2dgfhpRidio1M/eoTXn1SfqyqzW/wsYzPfDG5uQ3PrhmSW3s+o/yLfYiTt9T0N +wWhtgjhymncp7/UM7RgmOC6Azimb6SVzjNXTm8JmeiPBheBUnWxHPx337hj+6G0fFrGyk A7WDsVrsE+aZVr4UHq9SHb3INh04sIF2Ca1ra+NZx5wuECkt/pLcicerUJEv5Y+RLTvMux dL6/iu2hcFfQBhw1iPJkv7VyOFjW9JQ1WgbBqhpxJAuT2GloqKT9FOqobvywu0vVCXzlTF M5qM+vfxJ1qcvR6cfQl8KWViWWhPckvRAUOt8kBBleKaeoUf4yhPFpy1kY5nig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705703963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Md19DD7zC2fGJqEYJM/DYwAlrqC0Rz2l1wCibRaOVsk=; b=y2Eo9HCKcpxvnMFL/oqiUe7rLxjorTQG8nIX8I4nuOXB8+cRVnLaj4tM9iSwvs0G2N0qPw +RzbPasTd7Dt3aTUvsTzhz9dFwxoMPosWz/rf7LFC//HJd4H8orPBjXo26139yA+qaBIjU wGe24lM6sUeS7h5hKJ265kCTVuREvabP5ZorG5ZoQ3YlyB+kgv9OxXuQ2u1cpSdtuEa0Hq iGSo4XO7r+zDzs0cIaZizB4MutZEucGGE1HtRa4Iy0gnHOje6NtJ7fIsyxrEJzGZf6UN+e bIRkjMGMsHaeuTre/Li8Y6cUCmUGiqEw+MrWnqNQHIu47Av2dMOklgi1LO5cww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705703963; a=rsa-sha256; cv=none; b=pJ7iHL9Ji2yEGL5acLppXfcTMN9usNZt4DRySMemHtxSN6ngWDaCUnQ0gxN8DHV2y+f4wi XGG4ca4ZovA9gVkTUdxnmJ9dlj+e1a5sRvsXV9Jc9+TBVGJtUM/O9DmbZQ2pw/IsThzDOj 4f9PcjILAA8L1mzYxgbJ+Y0bQ+PF0xf3fVS/5PljxaRfykYSutfvyRdrZTPachAbN98+RQ x9tUOd4EL1m4yb6mmoZtJRITtNcIQ68nDckBCdp9xJpF1L3DyPNj/txpXoBfGpENjEDAOG YTpgbNABWAq7rQSlSJ0ahXEi/CA0YAdltYkIgP0rJK1rcb77hachQsZemPJGnA== 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 4TGvgH1wWwz18t3; Fri, 19 Jan 2024 22:39:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40JMdN2d035850; Fri, 19 Jan 2024 22:39:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40JMdNq4035847; Fri, 19 Jan 2024 22:39:23 GMT (envelope-from git) Date: Fri, 19 Jan 2024 22:39:23 GMT Message-Id: <202401192239.40JMdNq4035847@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 0138c4f51f30 - 2024Q1 - www/firefox: try to fix camera/video usage List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 0138c4f51f300c16c02518b6e8e067891159d706 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=0138c4f51f300c16c02518b6e8e067891159d706 commit 0138c4f51f300c16c02518b6e8e067891159d706 Author: Christoph Moench-Tegeder AuthorDate: 2024-01-19 22:36:34 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2024-01-19 22:39:15 +0000 www/firefox: try to fix camera/video usage This functionality should work on FreeBSD, too (not only "pure Linux" as the comments stated). Reported by: jsm@ (cherry picked from commit 53a70f124869afd195d8eb34e20142e55eaa72cb) --- www/firefox/Makefile | 2 +- ...dules_video__capture_video__capture__factory.cc | 26 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 8a62cce9c12c..33f74e7aaad7 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,7 +1,7 @@ PORTNAME= firefox DISTVERSION= 122.0 PORTEPOCH= 2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www wayland MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}${DISTVERSIONSUFFIX}-candidates/build2/source diff --git a/www/firefox/files/patch-third__party_libwebrtc_modules_video__capture_video__capture__factory.cc b/www/firefox/files/patch-third__party_libwebrtc_modules_video__capture_video__capture__factory.cc new file mode 100644 index 000000000000..b57030bdb636 --- /dev/null +++ b/www/firefox/files/patch-third__party_libwebrtc_modules_video__capture_video__capture__factory.cc @@ -0,0 +1,26 @@ +commit 324c4811690dd288a7bbd1378d129dc5e9d6f16b + + video capture also is implented with WEBRTC_BSD (at least on FreeBSD) + +diff --git third_party/libwebrtc/modules/video_capture/video_capture_factory.cc third_party/libwebrtc/modules/video_capture/video_capture_factory.cc +index e085ac2df8a0..2790fbbe1cba 100644 +--- third_party/libwebrtc/modules/video_capture/video_capture_factory.cc ++++ third_party/libwebrtc/modules/video_capture/video_capture_factory.cc +@@ -24,7 +24,7 @@ rtc::scoped_refptr VideoCaptureFactory::Create( + const char* deviceUniqueIdUTF8) { + // This is only implemented on pure Linux and WEBRTC_LINUX is defined for + // Android as well +-#if !defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) ++#if (!defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)) || defined(WEBRTC_ANDROID) + return nullptr; + #else + return videocapturemodule::VideoCaptureImpl::Create(options, +@@ -40,7 +40,7 @@ VideoCaptureModule::DeviceInfo* VideoCaptureFactory::CreateDeviceInfo( + VideoCaptureOptions* options) { + // This is only implemented on pure Linux and WEBRTC_LINUX is defined for + // Android as well +-#if !defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) ++#if (!defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)) || defined(WEBRTC_ANDROID) + return nullptr; + #else + return videocapturemodule::VideoCaptureImpl::CreateDeviceInfo(options);