Switch to the firefox-52 branch and remove a patch that seems to have been merged (very differently) upstream.

[Martin Husemann <martin%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Martin Husemann <martin%NetBSD.org@localhost>
Pushed By:	martin
Date:		Fri Nov 11 16:57:31 2016 +0100
Changeset:	1ac5edc4508100c7674b314bfec8cca32a63b505

Modified Files:
	firefox-hg/Makefile
	firefox-hg/distinfo
Removed Files:
	firefox-hg/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc

Log Message:
Switch to the firefox-52 branch and remove a patch that seems to have
been merged (very differently) upstream.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1ac5edc4508100c7674b314bfec8cca32a63b505

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

diffstat:
 firefox-hg/Makefile                                |  2 +-
 firefox-hg/distinfo                                |  1 -
 ...les_video__capture_linux_device__info__linux.cc | 41 ----------------------
 3 files changed, 1 insertion(+), 43 deletions(-)

diffs:
diff --git a/firefox-hg/Makefile b/firefox-hg/Makefile
index 28e1255..374c1ec 100644
--- a/firefox-hg/Makefile
+++ b/firefox-hg/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.9 2015/08/17 07:30:47 thomasklausner Exp $
 
-MOZ_BRANCH=	50.0a1
+MOZ_BRANCH=	52.0a1
 
 .include "Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/firefox-hg/distinfo b/firefox-hg/distinfo
index c29cf3e..e4118f7 100644
--- a/firefox-hg/distinfo
+++ b/firefox-hg/distinfo
@@ -8,7 +8,6 @@ SHA1 (patch-ao) = fd708563f119823f5634ecd57e5a2089682040e0
 SHA1 (patch-build_gyp.mozbuild) = b811edb2f76fdd241edff0b4945977c810a987b8
 SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = 2be8b355ef1de83371e6b3a15216b1eaf4ae58cf
 SHA1 (patch-media_libyuv_source_mjpeg__decoder.cc) = 13656013a84a8c2be2df24d3e7c425b374587ec9
-SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 37c5750a2994d338de2c3e729be0360ad1da9b95
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = ba581d0edc7cfa4a43e6f0dc8a75a914fef18ea9
 SHA1 (patch-modules_libpref_init_all.js) = 73dbe0c7001f9bfadb6ff7b50c340f7d135cb42a
 SHA1 (patch-netwerk_srtp_src_crypto_hash_hmac.c) = 7c41842734db27e7d98bbeb8a5dcc29d8878f370
diff --git a/firefox-hg/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc b/firefox-hg/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
deleted file mode 100644
index a54f838..0000000
--- a/firefox-hg/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc,v 1.1 2014/09/29 10:46:25 thomasklausner Exp $
-
-Support for Video for Linux on NetBSD.
-https://bugzilla.mozilla.org/show_bug.cgi?id=826985
-
---- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.orig	2014-05-29 23:31:23.000000000 +0000
-+++ media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
-@@ -25,10 +25,21 @@
- #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"
- 
-+#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
- {
-@@ -136,6 +147,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));