www/firefox: update to 60.0

- Add U2F support, required by Web Authentication [1]
- Drop libv4l support to reduce maintenance

Changes:	https://www.mozilla.org/firefox/60.0/releasenotes/
PR:		226476
Tested by:	tobik, jrm, D. Ebdrup, lwhsu
Submitted by:	Greg V [1]
Security:	5aefc41e-d304-4ec8-8c82-824f84f08244
MFH:		2018Q2
Differential Revision:	https://reviews.freebsd.org/D15186

1 files changed, 0 insertions, 171 deletions

diff --git a/www/firefox/files/patch-bug826985 b/www/firefox/files/patch-bug826985
deleted file mode 100644
index 69a51707c051..000000000000
--- a/www/firefox/files/patch-bug826985
+++ /dev/null
@@ -1,171 +0,0 @@
-commit 8024d93
-Author: Henrik Gulbrandsen <henrik@gulbra.net>
-Date:   Fri Jan 4 13:49:22 2013 +0100
-
-    Bug 826985 - Support more video formats for WebRTC via libv4l2 on Linux.
----
- config/system-headers                                   |  1 +
- old-configure.in                                        |  7 +++++++
- media/webrtc/signaling/test/Makefile.in                 |  1 +
- .../modules/video_capture/linux/device_info_linux.cc    | 17 +++++++++++++++++
- .../modules/video_capture/linux/video_capture_linux.cc  | 16 +++++++++++++++-
- .../webrtc/modules/video_capture/video_capture.gypi     | 11 +++++++++++
- toolkit/library/Makefile.in                             |  1 +
- 6 files changed, 52 insertions(+), 1 deletion(-)
-
-diff --git config/system-headers.mozbuild config/system-headers.mozbuild
-index e02d381a12e9..7620b4d00623 100644
---- config/system-headers.mozbuild
-+++ config/system-headers.mozbuild
-@@ -428,6 +428,7 @@ system_headers = [
-     'libgnomeui/gnome-icon-theme.h',
-     'libgnomeui/gnome-ui-init.h',
-     'libutil.h',
-+    'libv4l2.h',
-     'limits.h',
-     'link.h',
-     'linux/ioprio.h',
-diff --git old-configure.in configure.in
-index 55e4cd1..76567b3 100644
---- old-configure.in
-+++ old-configure.in
-@@ -2558,6 +2558,9 @@ if test -n "$MOZ_WEBRTC"; then
-     if test -n "$MOZ_X11"; then
-       MOZ_WEBRTC_X11_LIBS="-lXext -lXdamage -lXfixes -lXcomposite"
-     fi
-+
-+    dnl with libv4l2 we can support more cameras
-+    PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)
- else
-     MOZ_SYNTH_PICO=
- fi
-diff --git build/gyp.mozbuild build/gyp.mozbuild
-index b483cd1..f1dd1f0 100644
---- build/gyp.mozbuild
-+++ build/gyp.mozbuild
-@@ -11,6 +11,7 @@ gyp_vars = {
-     'have_ethtool_cmd_speed_hi': 1 if CONFIG['MOZ_WEBRTC_HAVE_ETHTOOL_SPEED_HI'] else 0,
-     'include_alsa_audio': 1 if CONFIG['MOZ_ALSA'] else 0,
-     'include_pulse_audio': 1 if CONFIG['MOZ_PULSEAUDIO'] else 0,
-+    'use_libv4l2': 1 if CONFIG['MOZ_LIBV4L2_LIBS'] else 0,
-     # basic stuff for everything
-     'include_internal_video_render': 0,
-     'clang_use_chrome_plugins': 0,
-diff --git media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
-index 239a292..bab496c 100644
---- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
-+++ media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
-@@ -25,6 +25,9 @@
- #else
- #include <linux/videodev2.h>
- #endif
-+#ifdef HAVE_LIBV4L2
-+#include <libv4l2.h>
-+#endif
- 
- #include "webrtc/system_wrappers/interface/ref_count.h"
- #include "webrtc/system_wrappers/interface/trace.h"
-@@ -34,6 +37,15 @@
- #define BUF_LEN     ( 1024 * ( EVENT_SIZE + 16 ) )
- #endif
- 
-+#ifdef HAVE_LIBV4L2
-+#define open	v4l2_open
-+#define close	v4l2_close
-+#define dup	v4l2_dup
-+#define ioctl	v4l2_ioctl
-+#define mmap	v4l2_mmap
-+#define munmap	v4l2_munmap
-+#endif
-+
- namespace webrtc
- {
- namespace videocapturemodule
-@@ -274,6 +286,11 @@ int32_t DeviceInfoLinux::GetDeviceName(
-     memset(deviceNameUTF8, 0, deviceNameLength);
-     memcpy(cameraName, cap.card, sizeof(cap.card));
- 
-+    if (cameraName[0] == '\0')
-+    {
-+        sprintf(cameraName, "Camera at /dev/video%d", deviceNumber);
-+    }
-+
-     if (deviceNameLength >= strlen(cameraName))
-     {
-         memcpy(deviceNameUTF8, cameraName, strlen(cameraName));
-diff --git media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
-index 12df1b3..e9863ba 100644
---- media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
-+++ media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
-@@ -25,6 +25,9 @@
- #else
- #include <linux/videodev2.h>
- #endif
-+#ifdef HAVE_LIBV4L2
-+#include <libv4l2.h>
-+#endif
- 
- #include <new>
- 
-@@ -32,6 +35,15 @@
- #include "webrtc/modules/video_capture/linux/video_capture_linux.h"
- #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
- #include "webrtc/system_wrappers/include/trace.h"
-+
-+#ifdef HAVE_LIBV4L2
-+#define open	v4l2_open
-+#define close	v4l2_close
-+#define dup	v4l2_dup
-+#define ioctl	v4l2_ioctl
-+#define mmap	v4l2_mmap
-+#define munmap	v4l2_munmap
-+#endif
- 
- namespace webrtc {
- namespace videocapturemodule {
-diff --git media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
-index d46b5aa..e452223 100644
---- media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
-+++ media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
-@@ -7,6 +7,9 @@
- # be found in the AUTHORS file in the root of the source tree.
- 
- {
-+  'variables': {
-+     'use_libv4l2%': 0,
-+  },
-   'targets': [
-     {
-       'target_name': 'video_capture_module',
-@@ -76,6 +76,19 @@
-                 'linux/video_capture_linux.cc',
-                 'linux/video_capture_linux.h',
-               ],
-+              'conditions': [
-+                ['use_libv4l2==1', {
-+                  'defines': [
-+                    'HAVE_LIBV4L2',
-+                  ],
-+                  'cflags_mozilla': [
-+                    '$(MOZ_LIBV4L2_CFLAGS)',
-+                  ],
-+                  'libraries': [
-+                    '-lv4l2',
-+                  ],
-+                }],
-+              ],
-             }],
-             ['OS=="mac"', {
-               'sources': [
-diff --git toolkit/library/moz.build toolkit/library/moz.build
-index 9c16ffa..1db3794 100644
---- toolkit/library/moz.build
-+++ toolkit/library/moz.build
-@@ -163,6 +163,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF
-     ]
- 
- OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
-+OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS']
- OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
- OS_LIBS += CONFIG['MOZ_APP_EXTRA_LIBS']
-