CVS commit: pkgsrc/www/firefox

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sat Mar 30 11:48:34 UTC 2024

Modified Files:
        pkgsrc/www/firefox: Makefile distinfo
Added Files:
        pkgsrc/www/firefox/patches:
            patch-third__party_libwebrtc_modules_video__capture_video__capture__factory.cc

Log Message:
firefox: restore webcam support,  bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.591 -r1.592 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.524 -r1.525 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/patches/patch-third__party_libwebrtc_modules_video__capture_video__capture__factory.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.591 pkgsrc/www/firefox/Makefile:1.592
--- pkgsrc/www/firefox/Makefile:1.591   Sun Mar 10 12:16:39 2024
+++ pkgsrc/www/firefox/Makefile Sat Mar 30 11:48:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.591 2024/03/10 12:16:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.592 2024/03/30 11:48:34 maya Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            123.0
@@ -6,6 +6,7 @@ MOZ_BRANCH_MINOR=       .1
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.524 pkgsrc/www/firefox/distinfo:1.525
--- pkgsrc/www/firefox/distinfo:1.524   Sun Mar 10 12:16:39 2024
+++ pkgsrc/www/firefox/distinfo Sat Mar 30 11:48:34 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.524 2024/03/10 12:16:39 ryoon Exp $
+$NetBSD: distinfo,v 1.525 2024/03/30 11:48:34 maya Exp $
 
 BLAKE2s (firefox-123.0.1.source.tar.xz) = d242b65c21b81833e912cda955aed4512f438850f493aa727c8383116043ae59
 SHA512 (firefox-123.0.1.source.tar.xz) = e9af61c1ca800edd16ab7a0d24c9a36bbb34813ed0a11ff62389aa38fa83deba394bca5d95cdaad55ad29ffa3c0e5d3dd15ac1099f7fa3649f4b6c835b7498c2
@@ -35,6 +35,7 @@ SHA1 (patch-third__party_libwebrtc_modul
 SHA1 (patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc) = 455be625b5de2f6f1f4b2dbb6c8cb33ca16c2583
 SHA1 (patch-third__party_libwebrtc_modules_video__capture_linux_device__info__v4l2.cc) = 4cb0e1c88dc83370024ed1aac7f75445b9f98df8
 SHA1 (patch-third__party_libwebrtc_modules_video__capture_linux_video__capture__v4l2.cc) = 8111952a107eb2cd665525ddd0e27c79eee3c1cd
+SHA1 (patch-third__party_libwebrtc_modules_video__capture_video__capture__factory.cc) = 442a18a947bed338225e00967e8cd23f61378c8a
 SHA1 (patch-third__party_libwebrtc_system__wrappers_source_cpu__features__linux.cc) = b90e22b50879f7adcc1da3a993f52c0701b720f8
 SHA1 (patch-third__party_sqlite3_src_moz.build) = b26856a4b87aa12211575d9982f62dc899474b52
 SHA1 (patch-third__party_wasm2c_src_prebuilt_wasm2c__source__includes.cc) = 99d0db944f0c2d0c623460991efd423d9127c988

Added files:

Index: pkgsrc/www/firefox/patches/patch-third__party_libwebrtc_modules_video__capture_video__capture__factory.cc
diff -u /dev/null pkgsrc/www/firefox/patches/patch-third__party_libwebrtc_modules_video__capture_video__capture__factory.cc:1.1
--- /dev/null   Sat Mar 30 11:48:34 2024
+++ pkgsrc/www/firefox/patches/patch-third__party_libwebrtc_modules_video__capture_video__capture__factory.cc   Sat Mar 30 11:48:34 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-third__party_libwebrtc_modules_video__capture_video__capture__factory.cc,v 1.1 2024/03/30 11:48:34 maya Exp $
+
+Restore webcam support on BSDs
+
+--- third_party/libwebrtc/modules/video_capture/video_capture_factory.cc.orig  2024-03-30 04:34:50.675628454 +0000
++++ third_party/libwebrtc/modules/video_capture/video_capture_factory.cc
+@@ -24,7 +24,7 @@ rtc::scoped_refptr<VideoCaptureModule> V
+     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* VideoCap
+     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);