CVS commit: pkgsrc/www/firefox

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jul 17 08:08:56 UTC 2022

Modified Files:
        pkgsrc/www/firefox: Makefile distinfo mozilla-common.mk
Added Files:
        pkgsrc/www/firefox/patches:
            patch-third__party_libwebrtc_modules_video__capture_linux_device__info__linux.cc
Removed Files:
        pkgsrc/www/firefox/patches:
            patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc

Log Message:
firefox: remove unused gtk2 dependency

Clean up some pkglint while here.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.527 -r1.528 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.472 -r1.473 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.234 -r1.235 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r1.20 -r0 \
    pkgsrc/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/patches/patch-third__party_libwebrtc_modules_video__capture_linux_device__info__linux.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.527 pkgsrc/www/firefox/Makefile:1.528
--- pkgsrc/www/firefox/Makefile:1.527   Sat Jul  9 02:22:25 2022
+++ pkgsrc/www/firefox/Makefile Sun Jul 17 08:08:56 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.527 2022/07/09 02:22:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.528 2022/07/17 08:08:56 wiz Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            102.0
@@ -6,12 +6,13 @@ 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/}
 EXTRACT_SUFX=  .tar.xz
 
-NODEJSKIT=     nodejs-output-95.0.tgz
-DISTFILES=     ${DEFAULT_DISTFILES} ${NODEJSKIT}
+NODEJSKIT=             nodejs-output-95.0.tgz
+DISTFILES=             ${DEFAULT_DISTFILES} ${NODEJSKIT}
 SITES.${NODEJSKIT}=    ${MASTER_SITE_LOCAL}
 
 MAINTAINER=    ryoon%NetBSD.org@localhost

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.472 pkgsrc/www/firefox/distinfo:1.473
--- pkgsrc/www/firefox/distinfo:1.472   Sat Jul  9 02:22:25 2022
+++ pkgsrc/www/firefox/distinfo Sun Jul 17 08:08:56 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.472 2022/07/09 02:22:25 ryoon Exp $
+$NetBSD: distinfo,v 1.473 2022/07/17 08:08:56 wiz Exp $
 
 BLAKE2s (firefox-102.0.1.source.tar.xz) = 43e2f34c0e39d1a3d3d341e55d474a9e5551865ace57f9f0fd1d7eb16676ef64
 SHA512 (firefox-102.0.1.source.tar.xz) = a930d359fb81e473b963a93f6db5110871e9fd57f6d0f352513047d363d930dd4811e8dd786c2f6f3541c3871eb1c0169b718652d9ee076fd13a20f52af30417
@@ -29,12 +29,12 @@ SHA1 (patch-media_libcubeb_src_cubeb__ja
 SHA1 (patch-media_libcubeb_src_moz.build) = e027285ea24f2626b1328d4c6e9a31ed55445f99
 SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc
 SHA1 (patch-media_libtheora_lib_info.c) = f6dbf536d73859a1ff78304c2e9f6a6f74dac01f
-SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 2e951d7d91934751608e99628fc144632d8a3b5c
 SHA1 (patch-modules_fdlibm_src_math__private.h) = 6ae3b0077b4a8c6088c35769fa1972cfc44ea9c1
 SHA1 (patch-mozglue_misc_Uptime.cpp) = daefe25ef1ebc8e4d3735017b9e8ac68c4710a00
 SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 13e512c7ee9fa1e14ba415d62fa853e5fbfc91c0
 SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = a7cd867916524770609d1c307a65b315b88456f4
 SHA1 (patch-third__party_js_cfworker_build.sh) = 46cdf97b99cf01080f290ae8d9a33b5f869fc3e4
+SHA1 (patch-third__party_libwebrtc_modules_video__capture_linux_device__info__linux.cc) = 2e951d7d91934751608e99628fc144632d8a3b5c
 SHA1 (patch-third__party_libwebrtc_system__wrappers_source_cpu__features__linux.cc) = b90e22b50879f7adcc1da3a993f52c0701b720f8
 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = bd7b2a0f2407c3ab95515b2f143c41c3ca6fb0c4
 SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 2303b753066298305ccae80d72765dbc4da5e0dc

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.234 pkgsrc/www/firefox/mozilla-common.mk:1.235
--- pkgsrc/www/firefox/mozilla-common.mk:1.234  Tue Jul  5 01:18:01 2022
+++ pkgsrc/www/firefox/mozilla-common.mk        Sun Jul 17 08:08:56 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.234 2022/07/05 01:18:01 gutteridge Exp $
+# $NetBSD: mozilla-common.mk,v 1.235 2022/07/17 08:08:56 wiz Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -51,7 +51,7 @@ CONFIGURE_ARGS+=      --host=${MACHINE_GNU_PL
 CONFIGURE_ENV+=                BINDGEN_CFLAGS="-isystem${PREFIX}/include/nspr \
                        -isystem${X11BASE}/include/pixman-1"
 
-test:
+do-test:
        cd ${WRKSRC}/${OBJDIR}/dist/bin &&      \
             ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey
 
@@ -167,7 +167,7 @@ CONFIGURE_SCRIPT=   ${WRKSRC}/configure
 PLIST_VARS+=   ffvpx
 
 .if ${MACHINE_ARCH} == "aarch64" || \
-    !empty(MACHINE_ARCH:M*arm*) || \
+    ${MACHINE_ARCH:M*arm*} || \
     ${MACHINE_ARCH} == "i386" || \
     ${MACHINE_ARCH} == "x86_64"
 PLIST.ffvpx=   yes     # see media/ffvpx/ffvpxcommon.mozbuild
@@ -223,7 +223,6 @@ RUST_REQ=   1.59.0
 .include "../../x11/libXtst/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2
 .include "../../x11/pixman/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 PLIST_VARS+=           wayland
 .if ${PKG_BUILD_OPTIONS.gtk3:Mwayland}

Added files:

Index: pkgsrc/www/firefox/patches/patch-third__party_libwebrtc_modules_video__capture_linux_device__info__linux.cc
diff -u /dev/null pkgsrc/www/firefox/patches/patch-third__party_libwebrtc_modules_video__capture_linux_device__info__linux.cc:1.1
--- /dev/null   Sun Jul 17 08:08:56 2022
+++ pkgsrc/www/firefox/patches/patch-third__party_libwebrtc_modules_video__capture_linux_device__info__linux.cc Sun Jul 17 08:08:56 2022
@@ -0,0 +1,63 @@
+$NetBSD: patch-third__party_libwebrtc_modules_video__capture_linux_device__info__linux.cc,v 1.1 2022/07/17 08:08:56 wiz Exp $
+
+* Fix buiuld under NetBSD.
+  NetBSD's sys/videoio.h does not have v4l2_capability.device_caps
+  and video capture does not work for me anyway.
+
+--- third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc.orig        2021-05-20 21:30:20.000000000 +0000
++++ third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc
+@@ -207,10 +207,12 @@ uint32_t DeviceInfoLinux::NumberOfDevice
+     sprintf(device, "/dev/video%d", n);
+     if ((fd = open(device, O_RDONLY)) != -1) {
+       // query device capabilities and make sure this is a video capture device
++#if !defined(__NetBSD__)
+       if (ioctl(fd, VIDIOC_QUERYCAP, &cap) < 0 || !IsVideoCaptureDevice(&cap)) {
+         close(fd);
+         continue;
+       }
++#endif
+ 
+       close(fd);
+       count++;
+@@ -241,10 +243,12 @@ int32_t DeviceInfoLinux::GetDeviceName(u
+     sprintf(device, "/dev/video%d", device_index);
+     if ((fd = open(device, O_RDONLY)) != -1) {
+       // query device capabilities and make sure this is a video capture device
++#if !defined(__NetBSD__)
+       if (ioctl(fd, VIDIOC_QUERYCAP, &cap) < 0 || !IsVideoCaptureDevice(&cap)) {
+         close(fd);
+         continue;
+       }
++#endif
+       if (count == deviceNumber) {
+         // Found the device
+         found = true;
+@@ -328,10 +332,12 @@ int32_t DeviceInfoLinux::CreateCapabilit
+     struct v4l2_capability cap;
+     if (ioctl(fd, VIDIOC_QUERYCAP, &cap) == 0) {
+       // skip devices without video capture capability
++#if !defined(__NetBSD__)
+       if (!IsVideoCaptureDevice(&cap)) {
+         close(fd);
+         continue;
+       }
++#endif
+ 
+       if (cap.bus_info[0] != 0) {
+         if (strncmp((const char*)cap.bus_info, (const char*)deviceUniqueIdUTF8,
+@@ -384,6 +390,7 @@ bool DeviceInfoLinux::IsDeviceNameMatche
+   return false;
+ }
+ 
++#ifndef __NetBSD__
+ bool DeviceInfoLinux::IsVideoCaptureDevice(struct v4l2_capability* cap)
+ {
+   if (cap->capabilities & V4L2_CAP_DEVICE_CAPS) {
+@@ -392,6 +399,7 @@ bool DeviceInfoLinux::IsVideoCaptureDevi
+     return cap->capabilities & V4L2_CAP_VIDEO_CAPTURE;
+   }
+ }
++#endif
+ 
+ int32_t DeviceInfoLinux::FillCapabilities(int fd) {
+   // set image format