Date: Fri, 19 Jan 2024 22:39:23 GMT From: Christoph Moench-Tegeder <cmt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 0138c4f51f30 - 2024Q1 - www/firefox: try to fix camera/video usage Message-ID: <202401192239.40JMdNq4035847@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q1 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=0138c4f51f300c16c02518b6e8e067891159d706 commit 0138c4f51f300c16c02518b6e8e067891159d706 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> AuthorDate: 2024-01-19 22:36:34 +0000 Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org> 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<VideoCaptureModule> 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401192239.40JMdNq4035847>