summaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-bug826985
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2013-06-26 11:01:34 +0000
committerFlorian Smeets <flo@FreeBSD.org>2013-06-26 11:01:34 +0000
commitd24ed7a7b663f5e7f243706e0f25e7b044c02f28 (patch)
tree95f37f9850e84f6918dba03cead478194c444dc5 /www/firefox/files/patch-bug826985
parent- Update to 3.98-1.1 (diff)
- update firefox to 22.0
- update firefox-esr, thunderbird and libxul to 17.0.7 - update nspr to 4.10 - OSS support was removed upstream, only ALSA and PulseAudio are supported from now on. Security: b3fcb387-de4b-11e2-b1c6-0025905a4771 In collaboration with: Jan Beich <jbeich@tormail.org>
Diffstat (limited to 'www/firefox/files/patch-bug826985')
-rw-r--r--www/firefox/files/patch-bug8269858
1 files changed, 4 insertions, 4 deletions
diff --git a/www/firefox/files/patch-bug826985 b/www/firefox/files/patch-bug826985
index d15ab05562d1..217655c0b81a 100644
--- a/www/firefox/files/patch-bug826985
+++ b/www/firefox/files/patch-bug826985
@@ -16,16 +16,16 @@ diff --git configure.in configure.in
index 55e4cd1..76567b3 100644
--- configure.in
+++ configure.in
-@@ -5250,6 +5250,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -5294,6 +5294,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 OpenSLES is only available in Android 2.3 and later; we'll change this
- dnl hard dependency to a dynamic load with graceful runtime failure before
- dnl we make --enable-webrtc on by default in Android (bug 815905)
+ if test "$MOZ_WIDGET_TOOLKIT" != "gonk"; then
+ dnl OpenSLES is only available in Android 2.3 and later; we'll change this
+ dnl hard dependency to a dynamic load with graceful runtime failure before
@@ -8981,6 +8984,10 @@ elif test "${OS_TARGET}" = "Android"; then
fi
fi