summaryrefslogtreecommitdiff
path: root/mail/thunderbird/files/patch-bug826985
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2018-07-18 23:44:21 +0000
committerJan Beich <jbeich@FreeBSD.org>2018-07-18 23:44:21 +0000
commite344179e4710fcd9e8b27f21ad966399c6676062 (patch)
tree25470098899348b52b879360dae665e7d4b833ee /mail/thunderbird/files/patch-bug826985
parent- missed a '+" (diff)
mail/thunderbird: drop patches in preparation for update
$ svn commit Sending Mk/Uses/gecko.mk Sending mail/thunderbird/Makefile Sending mail/thunderbird/distinfo Sending mail/thunderbird/files/patch-addon-search Replacing mail/thunderbird/files/patch-bug1021761 Adding mail/thunderbird/files/patch-bug1144632 Deleting mail/thunderbird/files/patch-bug1186967 [...] Transmitting file data ..........done Committing transaction... svn: E165001: Commit failed (details follow): svn: E165001: Commit blocked by pre-commit hook (exit code 1) with output: Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-bug702179" == Additional errors may compound and may not be accurate == Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-bug1021761" Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-bug1288587" Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-bug847568" Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-env-api-keys" [...] Pointy hat to: portmgr (multi-steps are error prone)
Diffstat (limited to 'mail/thunderbird/files/patch-bug826985')
-rw-r--r--mail/thunderbird/files/patch-bug826985183
1 files changed, 0 insertions, 183 deletions
diff --git a/mail/thunderbird/files/patch-bug826985 b/mail/thunderbird/files/patch-bug826985
deleted file mode 100644
index 2453978e69e0..000000000000
--- a/mail/thunderbird/files/patch-bug826985
+++ /dev/null
@@ -1,183 +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 config/system-headers
-index 55e4cd1..76567b3 100644
---- mozilla/config/system-headers
-+++ mozilla/config/system-headers
-@@ -624,6 +624,7 @@ libgnome/libgnome.h
- libgnomeui/gnome-icon-lookup.h
- libgnomeui/gnome-icon-theme.h
- libgnomeui/gnome-ui-init.h
-+libv4l2.h
- limits.h
- link.h
- #ifdef ANDROID
-diff --git old-configure.in configure.in
-index 55e4cd1..76567b3 100644
---- mozilla/old-configure.in
-+++ mozilla/old-configure.in
-@@ -5309,6 +5309,9 @@ if test -n "$MOZ_WEBRTC"; then
- MOZ_VP8_ENCODER=1
- MOZ_VP8_ERROR_CONCEALMENT=1
-
-+ dnl with libv4l2 we can support more cameras
-+ PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)
-+
- dnl enable once Signaling lands
- MOZ_WEBRTC_SIGNALING=1
- AC_DEFINE(MOZ_WEBRTC_SIGNALING)
-diff --git build/gyp.mozbuild build/gyp.mozbuild
-index b483cd1..f1dd1f0 100644
---- mozilla/build/gyp.mozbuild
-+++ mozilla/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/signaling/test/common.build media/webrtc/signaling/test/common.build
-index b483cd1..f1dd1f0 100644
---- mozilla/media/webrtc/signaling/test/common.build
-+++ mozilla/media/webrtc/signaling/test/common.build
-@@ -99,6 +99,7 @@ if CONFIG['JS_SHARED_LIBRARY']:
-
- USE_LIBS += ['mozglue']
-
-+OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS']
- OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
- OS_LIBS += CONFIG['REALTIME_LIBS']
-
-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
---- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
-+++ mozilla/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
---- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
-+++ mozilla/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>
-
-@@ -26,6 +31,15 @@
- #include "critical_section_wrapper.h"
- #include "video_capture_linux.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
---- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
-+++ mozilla/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',
-@@ -75,6 +78,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',
-+ ],
-+ }],
-+ ],
- }], # linux
- ['OS=="mac"', {
- 'sources': [
-diff --git toolkit/library/moz.build toolkit/library/moz.build
-index 9c16ffa..1db3794 100644
---- mozilla/toolkit/library/moz.build
-+++ mozilla/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']
-