CVS commit: pkgsrc/www/firefox

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Aug 11 14:00:03 UTC 2023

Modified Files:
        pkgsrc/www/firefox: PLIST distinfo mozilla-common.mk
Added Files:
        pkgsrc/www/firefox/patches: patch-widget_gtk_v4l2test_v4l2test.cpp

Log Message:
firefox: fix PLIST issue on aarch64


To generate a diff of this commit:
cvs rdiff -u -r1.183 -r1.184 pkgsrc/www/firefox/PLIST
cvs rdiff -u -r1.502 -r1.503 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.259 -r1.260 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/patches/patch-widget_gtk_v4l2test_v4l2test.cpp

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/PLIST
diff -u pkgsrc/www/firefox/PLIST:1.183 pkgsrc/www/firefox/PLIST:1.184
--- pkgsrc/www/firefox/PLIST:1.183      Sat Jun 24 16:03:58 2023
+++ pkgsrc/www/firefox/PLIST    Fri Aug 11 14:00:03 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.183 2023/06/24 16:03:58 abs Exp $
+@comment $NetBSD: PLIST,v 1.184 2023/08/11 14:00:03 tnn Exp $
 bin/firefox
 lib/firefox/application.ini
 lib/firefox/browser/chrome/icons/default/default128.png
@@ -33,6 +33,7 @@ lib/firefox/pingsender
 lib/firefox/platform.ini
 lib/firefox/plugin-container
 lib/firefox/removed-files
+${PLIST.v4l2_decode}lib/firefox/v4l2test
 ${PLIST.wayland}lib/firefox/vaapitest
 share/applications/firefox.desktop
 share/icons/hicolor/128x128/apps/firefox.png

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.502 pkgsrc/www/firefox/distinfo:1.503
--- pkgsrc/www/firefox/distinfo:1.502   Thu Aug  3 22:02:33 2023
+++ pkgsrc/www/firefox/distinfo Fri Aug 11 14:00:03 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.502 2023/08/03 22:02:33 ryoon Exp $
+$NetBSD: distinfo,v 1.503 2023/08/11 14:00:03 tnn Exp $
 
 BLAKE2s (firefox-116.0.source.tar.xz) = 4c4470859eb0d87391a31c9a004d3309d218b2b385768369b1078d2c9e515498
 SHA512 (firefox-116.0.source.tar.xz) = 4370c65a99bf8796524aca11ea8e99fa4f875176a5805ad49f35ae149080eb54be42e7eae84627e87e17b88b262649e48f3b30b317170ac7c208960200d1005d
@@ -40,5 +40,6 @@ SHA1 (patch-toolkit_modules_subprocess_s
 SHA1 (patch-toolkit_moz.configure) = c183f8b1566ffed0df17bf856f693b3a288affeb
 SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 706635b76a7b525794aba95e95544f09e18bb662
 SHA1 (patch-toolkit_xre_glxtest.cpp) = adcd5b05fcbd7b41c01a2aa66f3e8f05ed230444
+SHA1 (patch-widget_gtk_v4l2test_v4l2test.cpp) = a9ed8692a703d3b31bdbc8d0582a60540922a1dd
 SHA1 (patch-xpcom_base_nscore.h) = 1ac4d34d3c9e80bc1ac966c6c84cb320bc0fa1ec
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 81d43a046fcef6bf6717d52485686ba8e8738254

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.259 pkgsrc/www/firefox/mozilla-common.mk:1.260
--- pkgsrc/www/firefox/mozilla-common.mk:1.259  Thu Aug  3 22:02:33 2023
+++ pkgsrc/www/firefox/mozilla-common.mk        Fri Aug 11 14:00:03 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.259 2023/08/03 22:02:33 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.260 2023/08/11 14:00:03 tnn Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -192,7 +192,14 @@ OBJDIR=                    ../build
 CONFIGURE_DIRS=                ${OBJDIR}
 CONFIGURE_SCRIPT=      ${WRKSRC}/configure
 
-PLIST_VARS+=   ffvpx
+PLIST_VARS+=   v4l2_decode ffvpx
+
+PLIST_VARS+=   v4l2_decode
+.if ${MACHINE_ARCH} == "aarch64" || \
+    ${MACHINE_ARCH:M*arm*} || \
+    ${MACHINE_ARCH:Mriscv64}
+PLIST.v4l2_decode=     yes     # see toolkit/moz.configure
+.endif
 
 .if ${MACHINE_ARCH} == "aarch64" || \
     ${MACHINE_ARCH:M*arm*} || \

Added files:

Index: pkgsrc/www/firefox/patches/patch-widget_gtk_v4l2test_v4l2test.cpp
diff -u /dev/null pkgsrc/www/firefox/patches/patch-widget_gtk_v4l2test_v4l2test.cpp:1.1
--- /dev/null   Fri Aug 11 14:00:03 2023
+++ pkgsrc/www/firefox/patches/patch-widget_gtk_v4l2test_v4l2test.cpp   Fri Aug 11 14:00:03 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-widget_gtk_v4l2test_v4l2test.cpp,v 1.1 2023/08/11 14:00:03 tnn Exp $
+
+Add NetBSD support.
+
+--- widget/gtk/v4l2test/v4l2test.cpp.orig      2023-07-27 18:36:17.000000000 +0000
++++ widget/gtk/v4l2test/v4l2test.cpp
+@@ -9,7 +9,11 @@
+ #include <cstdlib>
+ #include <errno.h>
+ #include <fcntl.h>
++#if defined(__NetBSD__)
++#include <sys/videoio.h>
++#else
+ #include <linux/videodev2.h>
++#endif
+ #include <sys/ioctl.h>
+ #include <unistd.h>
+ #include <string.h>