From nobody Fri Jan 19 22:38:19 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 4TGvf36cBGz57ZJM; Fri, 19 Jan 2024 22:38:19 +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 4TGvf362wwz4Gs6; Fri, 19 Jan 2024 22:38:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705703899; 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=gt8G/O/xFuxGJoOnl28/fRkHl0jl2s08xtnhr0lAo0k=; b=BPkEyu7pK6fpQgLsM935BtJ2jr1xT7O5wfhr0dsSUPJfAXQL/ftFxtx3fBb9sMK4bu4La/ SyrNMB88rBB3/wzknzTnptm+43cHYKyh7bi0XjeZaFibO69O/CBiL9OzvBFgigzBV18Rzp seCnFKvdORb0O0tCSuhXfYki9ohOXDeTQrp0MIIkNMhGvr5J/usfqFgD8QtG68HqeiFGkp unqxfUTEgXUU+IyuJ/covSx6LPqwxvLrVoLAShv+e404c785bhOa9aFfB041axM/jPL1ye 2NawrwzF66DbVgAqoMqfdK5gYpj2BVkqHjl8RzhfA6YT9tQRCYFXQOHiKL04pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705703899; 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=gt8G/O/xFuxGJoOnl28/fRkHl0jl2s08xtnhr0lAo0k=; b=vpCTjZy4O86IldmbbfwxXVY3anTjHEQY89pqr6kzSIn2C7NlZEFNKu5IQw5+/jm4Qp2s+F 7p1z3jTa2CTweHD+5F+Ryheo4MMD/VseBOfYtYw6feKZ1IbDKvsfZYWYhhHpC7EVFiu2QP dFiY62neHc23K9iRM9GktIN0d5h9VlVZWwjABHF7+DKhXmPocV+4EV1cHb28KHl0lrCVZc w1WmAkY6UWMi+pDdh5iRcLX6Vrymm3TfBi0OhCE7DMFHgMmFDur03R74bv4hmobNO1yUQs Uk5g7CafdHfiJYZS+uMxuV93KbFhpLNoGnTCYdIPz6zRPid99oJnMMq5yjWLzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705703899; a=rsa-sha256; cv=none; b=dSHVShrg36CDeA9qtJbACQ4xckktgG01/+w0BMOkraBIb2uckTz8DpJxMGkm/JUsqHwmz4 Uot+Z244HlCiRfQoWpEiqAQELurjuuGrXkogZPcFZ2OEY4X7gYQBdhR3h3WpkW58ITW8hn kt0EKqJJagrLNE5fv2d5JZeoSdiv8a1U10Z74qHiOz5NulUczrX1ysW+FGEAC897qzVVPH PhIjbNPth7sT9xGICCVBweLrMpgGRJIINxo2xsmSfAQ0pGXA9vtKqGrSx52RNReStOMNHm QTTvrIwxTOe59wZlhY0upfXsmwGebdRtKSd5TPhdZKp5lCWuf/TUpnhY+sF+Tg== 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 4TGvf355Mrz18Sb; Fri, 19 Jan 2024 22:38:19 +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 40JMcJVX035447; Fri, 19 Jan 2024 22:38:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40JMcJCG035444; Fri, 19 Jan 2024 22:38:19 GMT (envelope-from git) Date: Fri, 19 Jan 2024 22:38:19 GMT Message-Id: <202401192238.40JMcJCG035444@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 53a70f124869 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 53a70f124869afd195d8eb34e20142e55eaa72cb Auto-Submitted: auto-generated The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=53a70f124869afd195d8eb34e20142e55eaa72cb commit 53a70f124869afd195d8eb34e20142e55eaa72cb Author: Christoph Moench-Tegeder AuthorDate: 2024-01-19 22:36:34 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2024-01-19 22:36:34 +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@ --- 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);