svn commit: r327970 - in head/www: seamonkey seamonkey-i18n seamonkey/files
Florian Smeets
flo at FreeBSD.org
Mon Sep 23 10:49:57 UTC 2013
Author: flo
Date: Mon Sep 23 10:49:55 2013
New Revision: 327970
URL: http://svnweb.freebsd.org/changeset/ports/327970
Log:
Actually commit the update to 2.21, which should have been part of r327587.
Reported by: thierry
Added:
head/www/seamonkey/files/patch-bug876156 (contents, props changed)
head/www/seamonkey/files/patch-bug886181 (contents, props changed)
head/www/seamonkey/files/patch-bug889699 (contents, props changed)
head/www/seamonkey/files/patch-bug910875 (contents, props changed)
head/www/seamonkey/files/patch-bug916216 (contents, props changed)
head/www/seamonkey/files/patch-bug916589 (contents, props changed)
head/www/seamonkey/files/patch-no-videoio.h (contents, props changed)
Deleted:
head/www/seamonkey/files/patch-bug722975
head/www/seamonkey/files/patch-bug844818
head/www/seamonkey/files/patch-bug862759
head/www/seamonkey/files/patch-bug897300
head/www/seamonkey/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp
head/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h
Modified:
head/www/seamonkey-i18n/Makefile
head/www/seamonkey-i18n/distinfo
head/www/seamonkey/Makefile
head/www/seamonkey/distinfo
head/www/seamonkey/files/patch-bug783463
head/www/seamonkey/files/patch-bug803480
head/www/seamonkey/files/patch-bug807492
head/www/seamonkey/files/patch-bug893397
Modified: head/www/seamonkey-i18n/Makefile
==============================================================================
--- head/www/seamonkey-i18n/Makefile Mon Sep 23 10:41:01 2013 (r327969)
+++ head/www/seamonkey-i18n/Makefile Mon Sep 23 10:49:55 2013 (r327970)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= seamonkey-i18n
-PORTVERSION= 2.20
+PORTVERSION= 2.21
CATEGORIES= www
MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/langpack
PKGNAMEPREFIX=
Modified: head/www/seamonkey-i18n/distinfo
==============================================================================
--- head/www/seamonkey-i18n/distinfo Mon Sep 23 10:41:01 2013 (r327969)
+++ head/www/seamonkey-i18n/distinfo Mon Sep 23 10:49:55 2013 (r327970)
@@ -1,46 +1,46 @@
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.ca.langpack.xpi) = dcda87f448ba649460454c705affc3c8682b61acf674ec60524ecdf93c1c6494
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.ca.langpack.xpi) = 786234
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.cs.langpack.xpi) = 433efaae462b6661692f9dd2f35e2c1e90f8dfeefca02ef949d20a3111611697
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.cs.langpack.xpi) = 792681
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.de.langpack.xpi) = 8066849c5fa8ca4154fde88398471a598cdc793e22ae0ddd537c0897c66fce33
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.de.langpack.xpi) = 816125
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.en-GB.langpack.xpi) = 07631754db0f117ab0f4726179f632f2b004922e510a434452dbfe40c707e95f
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.en-GB.langpack.xpi) = 778706
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.en-US.langpack.xpi) = 8727a79f3ca7c468850275a20a9b56c9381658d01b69b6ccada7108bc88be3a8
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.en-US.langpack.xpi) = 779133
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.es-AR.langpack.xpi) = 814a12b160f4684de2b959c370900253c1f95006b02c4e81bcacb376d5623508
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.es-AR.langpack.xpi) = 832957
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.es-ES.langpack.xpi) = c526baf8c7a1e1cbd92b1162c91432757387b285c8c14a6afe2868e9c1db804f
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.es-ES.langpack.xpi) = 808970
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.fi.langpack.xpi) = 50736285028571543888147dd96602c396863e8a631ea3bd9edad10861d1b8f2
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.fi.langpack.xpi) = 781765
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.fr.langpack.xpi) = ed81f900ff6cddfb4d35dd2e47697643987f55837556a79df67481256a64c3ed
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.fr.langpack.xpi) = 790900
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.hu.langpack.xpi) = b57c83830504da0aff5a6bca57140f6098689621e9d60fe77202fcb9c0620de8
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.hu.langpack.xpi) = 824136
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.it.langpack.xpi) = 24d9846fbb6bd35dc5952f561efe217287728107ba0a8669dd166edb0a2b2f19
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.it.langpack.xpi) = 726883
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.ja-JP-mac.langpack.xpi) = 6716fc1d7274c55bbf58212cfd103e34505957c6fdc5d258fa531e2341b7ee92
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.ja-JP-mac.langpack.xpi) = 876109
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.ja.langpack.xpi) = 9a8154ebc3a547802da7b8c39375f834e85457cc5abd177fc8210f4701223039
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.ja.langpack.xpi) = 850888
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.lt.langpack.xpi) = 5cbeebc6c69ad6cd9720219dfa6a608c99e55ec01f05acf01e1b16bfae40b441
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.lt.langpack.xpi) = 823333
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.nb-NO.langpack.xpi) = 3ba560dd072544b6de6985e979add1fda74a4cae88d6d2a10bf322aba241f798
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.nb-NO.langpack.xpi) = 782759
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.nl.langpack.xpi) = 0faa1d06063e5f629b29bf2d43f241c3cf71f22ea7c7c329bd252f86849bfd58
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.nl.langpack.xpi) = 776794
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.pl.langpack.xpi) = ce8a980121bb9bb00c62594b90c9f8230cd35a79d3e5ac992c4dcc4117839482
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.pl.langpack.xpi) = 822501
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.pt-PT.langpack.xpi) = 489fdce1e57d24975e6576d4bc8e923345e771edde5e2d80795f6ff6b16a3280
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.pt-PT.langpack.xpi) = 817878
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.ru.langpack.xpi) = b713226abf662a8c04a275bfc86a6a8414284fd3851fbe4cc446bf30872cc478
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.ru.langpack.xpi) = 884270
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.sk.langpack.xpi) = 40d6413ec8b39ab623a32808a341c0bdd717d97dcd76a62bbb1cadc2cad4a085
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.sk.langpack.xpi) = 818446
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.sv-SE.langpack.xpi) = 9d1ca084ac20a9b1ff9e4c6e028e5e0a7222b84841fcea6e4e7cc7d6c62c3ee6
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.sv-SE.langpack.xpi) = 804382
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.tr.langpack.xpi) = f79ebcf49f9129944dba82ec57397812135b24d59e29f720c2402d46120d5e19
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.tr.langpack.xpi) = 846836
-SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.uk.langpack.xpi) = 4202c86c0427506e216491b63662f50429ffe351e80850780d9eea9c36eb823f
-SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.uk.langpack.xpi) = 847645
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.ca.langpack.xpi) = bae95e24ff166ba5b5ab0c602e68cbe385fbee8b5c39cb63ba2265c811a24d1e
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.ca.langpack.xpi) = 781711
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.cs.langpack.xpi) = 8683700573a9de966d31439b8c28de64e2482d036ef02e6e40b7c51387ff62cd
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.cs.langpack.xpi) = 805381
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.de.langpack.xpi) = 0ef353606469a84c5d84da9a90bdfa883710841fd38d06097389f9c21c5586f7
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.de.langpack.xpi) = 811333
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.en-GB.langpack.xpi) = f5ea6d3f0bbfb59936587f2cb7e125c89d86ba2dc2ac523dc4af40a4035c58bf
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.en-GB.langpack.xpi) = 776425
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.en-US.langpack.xpi) = 344fee1baf0d2073698ba98af158fe3626e395f116e3243c5fe871a11fac15c0
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.en-US.langpack.xpi) = 776311
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.es-AR.langpack.xpi) = a62c604838a950b12e0c86ddbf0ce200949c88205e1f333c26568cb054e33f6c
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.es-AR.langpack.xpi) = 831255
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.es-ES.langpack.xpi) = e5098a5e417a7017d0d6260e6c59ad6fb5b89764e09d735b03fda2b2d4eb8226
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.es-ES.langpack.xpi) = 806277
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.fi.langpack.xpi) = 53dde96957c2517f67ecb2ac4c243c52c3d8ed49fb7cc87381421aca73d23c0b
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.fi.langpack.xpi) = 776791
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.fr.langpack.xpi) = 1bd025bd416ecce86b9069c6100f7d363c6fee7f3848b93d19ea70ce6aedc01e
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.fr.langpack.xpi) = 786273
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.hu.langpack.xpi) = 30049dfa4c056a05426a5592e4c5dea4e6294d2b3e1ff70d06e680c4bf1a7cad
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.hu.langpack.xpi) = 819320
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.it.langpack.xpi) = 2c2050a5b75030306fe5bc1f4a52a9680f8c5d5ab5de8748cb937d8e527c5279
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.it.langpack.xpi) = 722101
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.ja-JP-mac.langpack.xpi) = 8fff37b7ff11023441fa611d065fb6aa0fa54e591e7159d9332178e6357f3514
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.ja-JP-mac.langpack.xpi) = 880967
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.ja.langpack.xpi) = 1ad52de9874fdfce02c055b32f663b7a674693f5d81ca92a7a1caa753696ec92
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.ja.langpack.xpi) = 855792
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.lt.langpack.xpi) = 6969a51384b6cdb9b65d4612a1952aa3086207666b9cd118d3d0869dff9e1f7a
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.lt.langpack.xpi) = 820605
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.nb-NO.langpack.xpi) = e39aa3989e85dbf4d30e1ab6fe040858fc52ee540197a29b7bab9ca5e6028ef8
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.nb-NO.langpack.xpi) = 795078
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.nl.langpack.xpi) = 4b59f589cf7556a22996af8624d7b5cd26578315f3f86f4f3fc3f95bda9fca49
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.nl.langpack.xpi) = 772164
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.pl.langpack.xpi) = 17104a91eefffa815fe3e16c9df18f4df4a2ea2277f4b21a543fe57a634c1801
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.pl.langpack.xpi) = 817582
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.pt-PT.langpack.xpi) = b2e7b932965848c4946dd93a06db6a3121fece716a4ce01433e80a8966cde3e8
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.pt-PT.langpack.xpi) = 808710
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.ru.langpack.xpi) = 563614150dd4e4e2c511c43759b45f33e590fe9940ba116f519e825ef1d72c95
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.ru.langpack.xpi) = 878652
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.sk.langpack.xpi) = 47e2b0c1cc71b2c9dd59d3497c37ddd57c88ab531742485d582c1fea24552f0a
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.sk.langpack.xpi) = 815370
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.sv-SE.langpack.xpi) = a925496466d67ba42a4e44bea5aa14ef187725b473bdae1c3cfdbc96ba86c3fc
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.sv-SE.langpack.xpi) = 799175
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.tr.langpack.xpi) = abd29ab2133fdf375b0cbb9ee24a6ab73af52b32289aeca4cb0d8cfbd9bb9206
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.tr.langpack.xpi) = 844534
+SHA256 (xpi/seamonkey-i18n-2.21/seamonkey-2.21.uk.langpack.xpi) = 1a8f1b69119e2df9f6ceb2d486e6eb689984798c3196e84e1be29da01dcd6179
+SIZE (xpi/seamonkey-i18n-2.21/seamonkey-2.21.uk.langpack.xpi) = 846252
Modified: head/www/seamonkey/Makefile
==============================================================================
--- head/www/seamonkey/Makefile Mon Sep 23 10:41:01 2013 (r327969)
+++ head/www/seamonkey/Makefile Mon Sep 23 10:49:55 2013 (r327970)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= seamonkey
-DISTVERSION= 2.20
-PORTREVISION= 1
+DISTVERSION= 2.21
CATEGORIES?= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source
DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
@@ -16,16 +15,17 @@ BUILD_DEPENDS= nspr>=4.10:${PORTSDIR}/de
nss>=3.15:${PORTSDIR}/security/nss \
sqlite3>=3.7.16.1:${PORTSDIR}/databases/sqlite3 \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
+ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
unzip:${PORTSDIR}/archivers/unzip
+LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l
EM_VERSION= 1.5.2
-L_VERSION= 2.5b1
+L_VERSION= 2.6b3
USE_AUTOTOOLS= autoconf213:env
USE_PYTHON_BUILD=-2.7
OBJDIR_BUILD= # in-tree build broken after bug 789837
USE_BZIP2= yes
-USES= gmake pkgconfig
USE_GECKO= gecko
WANT_GNOME= yes
USE_QT4= # empty
@@ -45,8 +45,8 @@ MOZ_PKGCONFIG_FILES=
NOT_FOR_ARCHS= ia64
-OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS WEBRTC
-OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS WEBRTC
+OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS
+OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL GSTREAMER LDAP LIGHTNING MAILNEWS
CHATZILLA_DESC?=Chatzilla IRC module
COMPOSER_DESC?= HTML Composer module
@@ -84,13 +84,14 @@ MOZ_OPTIONS+= --disable-ldap --disable-m
.if ! ${PORT_OPTIONS:MLDAP}
MOZ_OPTIONS+= --disable-ldap --enable-mailnews
.else
+# libprldap60.so: Undefined symbol "PR_GetCurrentThread"
. if ${ARCH} == i386
USE_GCC?= yes
. endif
MOZ_OPTIONS+= --enable-ldap --enable-mailnews
.endif
.if ${PORT_OPTIONS:MENIGMAIL}
-MASTER_SITES+= http://www.enigmail.net/download/source/:enigmail
+MASTER_SITES+= https://www.enigmail.net/download/source/:enigmail
DISTFILES+= ${EM_DISTFILE}:enigmail
RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg
EM_DISTNAME= enigmail-${EM_VERSION}
Modified: head/www/seamonkey/distinfo
==============================================================================
--- head/www/seamonkey/distinfo Mon Sep 23 10:41:01 2013 (r327969)
+++ head/www/seamonkey/distinfo Mon Sep 23 10:49:55 2013 (r327970)
@@ -1,4 +1,4 @@
-SHA256 (seamonkey-2.20.source.tar.bz2) = 17463fbbfe75a52317bbfb09e25dfce45539914f0559cdfe95f545408a8084fd
-SIZE (seamonkey-2.20.source.tar.bz2) = 139969292
+SHA256 (seamonkey-2.21.source.tar.bz2) = 1b15b1e6bc19477ff7dfc805dd3629566b0b5e94eca9638fe2f4b47c3a8d5ae9
+SIZE (seamonkey-2.21.source.tar.bz2) = 140654724
SHA256 (enigmail-1.5.2.tar.gz) = f20d6d1be1ab12dc2f1208d8f01227fd7e5c4dcf5d6f4bd0833a932b58973a26
SIZE (enigmail-1.5.2.tar.gz) = 1211395
Modified: head/www/seamonkey/files/patch-bug783463
==============================================================================
--- head/www/seamonkey/files/patch-bug783463 Mon Sep 23 10:41:01 2013 (r327969)
+++ head/www/seamonkey/files/patch-bug783463 Mon Sep 23 10:49:55 2013 (r327970)
@@ -1,14 +1,14 @@
---- mozilla/gfx/skia/Makefile.in~
-+++ mozilla/gfx/skia/Makefile.in
-@@ -339,10 +339,9 @@ CPPSRCS += \
- SkMMapStream.cpp \
- SkOSFile.cpp \
- $(NULL)
--ifeq (Linux,$(OS_TARGET))
-+ifneq (,$(or $(MOZ_X11),$(filter Linux,$(OS_TARGET))))
- CPPSRCS += \
- SkFontHost_linux.cpp \
-- SkFontHost_tables.cpp \
- SkTime_Unix.cpp \
- $(NULL)
- endif
+--- mozilla/gfx/skia/moz.build~
++++ mozilla/gfx/skia/moz.build
+@@ -188,10 +188,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
+ 'SkMMapStream.cpp',
+ 'SkOSFile.cpp',
+ ]
+- if CONFIG['OS_TARGET'] == 'Linux':
++ if CONFIG['MOZ_X11'] == 1 or CONFIG['OS_TARGET'] == 'Linux':
+ CPP_SOURCES += [
+ 'SkFontHost_linux.cpp',
+- 'SkFontHost_tables.cpp',
+ 'SkThread_pthread.cpp',
+ 'SkTime_Unix.cpp',
+ ]
Modified: head/www/seamonkey/files/patch-bug803480
==============================================================================
--- head/www/seamonkey/files/patch-bug803480 Mon Sep 23 10:41:01 2013 (r327969)
+++ head/www/seamonkey/files/patch-bug803480 Mon Sep 23 10:49:55 2013 (r327970)
@@ -75,15 +75,28 @@ index a0575dc..be327fd 100644
dnl
dnl option to disable cookies
diff --git netwerk/wifi/Makefile.in netwerk/wifi/Makefile.in
-index 39d7364..e8d276b 100644
+index 26dbd79..4cbf912 100644
--- mozilla/netwerk/wifi/Makefile.in
+++ mozilla/netwerk/wifi/Makefile.in
-@@ -41,7 +41,7 @@ CPPSRCS += nsWifiScannerSolaris.cpp
+@@ -20,7 +20,7 @@ ifeq ($(OS_ARCH),SunOS)
OS_INCLUDES += $(GLIB_CFLAGS)
endif
-ifdef MOZ_ENABLE_DBUS
+ifdef NECKO_WIFI_DBUS
- CPPSRCS += nsWifiScannerDBus.cpp
OS_INCLUDES += $(MOZ_DBUS_GLIB_CFLAGS)
endif
+
+diff --git netwerk/wifi/moz.build netwerk/wifi/moz.build
+index 5e70211..07b01de 100644
+--- mozilla/netwerk/wifi/moz.build
++++ mozilla/netwerk/wifi/moz.build
+@@ -43,7 +43,7 @@ elif CONFIG['OS_ARCH'] == 'SunOS':
+ 'nsWifiScannerSolaris.cpp',
+ ]
+
+-if CONFIG['MOZ_ENABLE_DBUS']:
++if CONFIG['NECKO_WIFI_DBUS']:
+ CPP_SOURCES += [
+ 'nsWifiScannerDBus.cpp',
+ ]
Modified: head/www/seamonkey/files/patch-bug807492
==============================================================================
--- head/www/seamonkey/files/patch-bug807492 Mon Sep 23 10:41:01 2013 (r327969)
+++ head/www/seamonkey/files/patch-bug807492 Mon Sep 23 10:49:55 2013 (r327970)
@@ -1,19 +1,4 @@
-diff --git config/system-headers config/system-headers
-index 9bd1efa..1095a01 100644
---- mozilla/config/system-headers
-+++ mozilla/config/system-headers
-@@ -1121,8 +1121,10 @@ gst/app/gstappsink.h
- gst/app/gstappsrc.h
- gst/video/video.h
- sys/msg.h
- sys/ipc.h
- sys/thr.h
- sys/user.h
- kvm.h
- spawn.h
-+err.h
-+xlocale.h
-diff --git configure.in configure.in
+JJdiff --git configure.in configure.in
index c167461..8346c11 100644
--- mozilla/configure.in
+++ mozilla/configure.in
@@ -36,21 +21,6 @@ index c167461..8346c11 100644
;;
esac
fi
-diff --git js/src/config/system-headers js/src/config/system-headers
-index 9bd1efa..1095a01 100644
---- mozilla/js/src/config/system-headers
-+++ mozilla/js/src/config/system-headers
-@@ -1121,8 +1121,10 @@ gst/app/gstappsink.h
- gst/app/gstappsrc.h
- gst/video/video.h
- sys/msg.h
- sys/ipc.h
- sys/thr.h
- sys/user.h
- kvm.h
- spawn.h
-+err.h
-+xlocale.h
diff --git media/mtransport/objs.mk media/mtransport/objs.mk
index f1fc85f..141e8ca 100644
--- mozilla/media/mtransport/objs.mk
@@ -581,1288 +551,6 @@ index a30e330..cfbd8a3 100644
ifeq ($(OS_TARGET),Darwin)
LIBS += \
-framework AudioToolbox \
-diff --git media/webrtc/trunk/webrtc/build/common.gypi media/webrtc/trunk/webrtc/build/common.gypi
-index 9ca9f7c..d5c4ab9 100644
---- mozilla/media/webrtc/trunk/webrtc/build/common.gypi
-+++ mozilla/media/webrtc/trunk/webrtc/build/common.gypi
-@@ -119,16 +119,21 @@
- # flood of chromium-style warnings. Investigate enabling them:
- # http://code.google.com/p/webrtc/issues/detail?id=163
- 'clang_use_chrome_plugins%': 0,
-
- # Switch between Android audio device OpenSL ES implementation
- # and Java Implementation
- 'enable_android_opensl%': 0,
- }],
-+ ['OS=="linux" or OS=="solaris" or os_bsd==1', {
-+ 'include_v4l2_video_capture%': 1,
-+ }, {
-+ 'include_v4l2_video_capture%': 0,
-+ }],
- ['OS=="ios"', {
- 'enable_video%': 0,
- 'enable_protobuf%': 0,
- 'build_libjpeg%': 0,
- 'build_libyuv%': 0,
- 'build_libvpx%': 0,
- 'include_tests%': 0,
- }],
-@@ -205,16 +210,28 @@
- 'defines': ['WEBRTC_ARCH_ARM_NEON',
- 'WEBRTC_BUILD_NEON_LIBS',
- 'WEBRTC_DETECT_ARM_NEON'],
- }],
- ],
- }],
- ],
- }],
-+ ['os_bsd==1', {
-+ 'defines': [
-+ 'WEBRTC_BSD',
-+ 'WEBRTC_THREAD_RR',
-+ ],
-+ }],
-+ ['OS=="dragonfly" or OS=="netbsd"', {
-+ 'defines': [
-+ # doesn't support pthread_condattr_setclock
-+ 'WEBRTC_CLOCK_TYPE_REALTIME',
-+ ],
-+ }],
- ['OS=="ios"', {
- 'defines': [
- 'WEBRTC_MAC',
- 'WEBRTC_IOS',
- 'WEBRTC_THREAD_RR',
- 'WEBRTC_CLOCK_TYPE_REALTIME',
- ],
- }],
-diff --git media/webrtc/trunk/webrtc/modules/audio_device/audio_device_utility.cc media/webrtc/trunk/webrtc/modules/audio_device/audio_device_utility.cc
-index 203f09a..0b0b70e 100644
---- mozilla/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_utility.cc
-+++ mozilla/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_utility.cc
-@@ -41,17 +41,17 @@ bool AudioDeviceUtility::StringCompare(
- const char* str1 , const char* str2,
- const WebRtc_UWord32 length)
- {
- return ((_strnicmp(str1, str2, length) == 0) ? true : false);
- }
-
- } // namespace webrtc
-
--#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
-
- // ============================================================================
- // Linux & Mac
- // ============================================================================
-
- #include <sys/time.h> // gettimeofday
- #include <time.h> // gettimeofday
- #include <string.h> // strncasecmp
-@@ -104,11 +104,11 @@ WebRtc_UWord32 AudioDeviceUtility::GetTimeInMS()
- bool AudioDeviceUtility::StringCompare(
- const char* str1 , const char* str2, const WebRtc_UWord32 length)
- {
- return (strncasecmp(str1, str2, length) == 0)?true: false;
- }
-
- } // namespace webrtc
-
--#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-+#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
-
-
-diff --git media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc
-index bdad224..39e1132 100644
---- mozilla/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc
-+++ mozilla/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc
-@@ -7,16 +7,17 @@
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
- #include "modules/rtp_rtcp/source/forward_error_correction.h"
-
- #include <algorithm>
- #include <cassert>
-+#include <cstdlib> // for abs()
- #include <cstring>
- #include <iterator>
-
- #include "modules/rtp_rtcp/source/forward_error_correction_internal.h"
- #include "modules/rtp_rtcp/source/rtp_utility.h"
- #include "system_wrappers/interface/trace.h"
-
- namespace webrtc {
-diff --git media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility.cc media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility.cc
-index 298d479..37b70c9 100644
---- mozilla/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility.cc
-+++ mozilla/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility.cc
-@@ -13,17 +13,17 @@
- #include <cassert>
- #include <cmath> // ceil
- #include <cstring> // memcpy
-
- #if defined(_WIN32)
- #include <Windows.h> // FILETIME
- #include <WinSock.h> // timeval
- #include <MMSystem.h> // timeGetTime
--#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC))
-+#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC))
- #include <sys/time.h> // gettimeofday
- #include <time.h>
- #endif
- #if (defined(_DEBUG) && defined(_WIN32) && (_MSC_VER >= 1400))
- #include <stdio.h>
- #endif
-
- #include "system_wrappers/interface/tick_util.h"
-@@ -151,17 +151,17 @@ void get_time(WindowsHelpTimer* help_timer, FILETIME& current_time) {
- virtual WebRtc_Word64 GetTimeInMS();
-
- virtual void CurrentNTP(WebRtc_UWord32& secs, WebRtc_UWord32& frac);
-
- private:
- WindowsHelpTimer* _helpTimer;
- };
-
--#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
-
- // A clock reading times from the POSIX API.
- class UnixSystemClock : public RtpRtcpClock {
- public:
- UnixSystemClock() {}
- virtual ~UnixSystemClock() {}
-
- virtual WebRtc_Word64 GetTimeInMS();
-@@ -209,17 +209,17 @@ void WindowsSystemClock::CurrentNTP(WebRtc_UWord32& secs,
- } else if (dtemp < -1) {
- dtemp += 1;
- secs--;
- }
- dtemp *= NTP_FRAC;
- frac = (WebRtc_UWord32)dtemp;
- }
-
--#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC))
-+#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC))
-
- WebRtc_Word64 UnixSystemClock::GetTimeInMS() {
- return TickTime::MillisecondTimestamp();
- }
-
- // Use the system time.
- void UnixSystemClock::CurrentNTP(WebRtc_UWord32& secs, WebRtc_UWord32& frac) {
- double dtemp;
-@@ -248,17 +248,17 @@ void UnixSystemClock::CurrentNTP(WebRtc_UWord32& secs, WebRtc_UWord32& frac) {
- // Note that this is a POD. Only PODs are allowed to have static storage
- // duration according to the Google Style guide.
- static WindowsHelpTimer global_help_timer = {0, 0, {{ 0, 0}, 0}, 0};
- #endif
-
- RtpRtcpClock* GetSystemClock() {
- #if defined(_WIN32)
- return new WindowsSystemClock(&global_help_timer);
--#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
- return new UnixSystemClock();
- #else
- return NULL;
- #endif
- }
-
- WebRtc_UWord32 GetCurrentRTP(RtpRtcpClock* clock, WebRtc_UWord32 freq) {
- const bool use_global_clock = (clock == NULL);
-@@ -325,17 +325,17 @@ WebRtc_UWord16 GetPayloadDataLength(const WebRtcRTPHeader* rtp_header,
- return static_cast<WebRtc_UWord16>(length);
- }
-
- #if defined(_WIN32)
- bool StringCompare(const char* str1, const char* str2,
- const WebRtc_UWord32 length) {
- return (_strnicmp(str1, str2, length) == 0) ? true : false;
- }
--#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
- bool StringCompare(const char* str1, const char* str2,
- const WebRtc_UWord32 length) {
- return (strncasecmp(str1, str2, length) == 0) ? true : false;
- }
- #endif
-
- #if !defined(WEBRTC_LITTLE_ENDIAN) && !defined(WEBRTC_BIG_ENDIAN)
- #error Either WEBRTC_LITTLE_ENDIAN or WEBRTC_BIG_ENDIAN must be defined
-diff --git media/webrtc/trunk/webrtc/modules/udp_transport/source/udp_transport_impl.cc media/webrtc/trunk/webrtc/modules/udp_transport/source/udp_transport_impl.cc
-index e50db5d..70ad8a8 100644
---- mozilla/media/webrtc/trunk/webrtc/modules/udp_transport/source/udp_transport_impl.cc
-+++ mozilla/media/webrtc/trunk/webrtc/modules/udp_transport/source/udp_transport_impl.cc
-@@ -13,60 +13,62 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <time.h>
-
- #if defined(_WIN32)
- #include <winsock2.h>
- #include <ws2tcpip.h>
--#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
- #include <arpa/inet.h>
- #include <ctype.h>
- #include <fcntl.h>
- #include <netdb.h>
-+#include <sys/socket.h>
- #include <net/if.h>
- #include <netinet/in.h>
- #include <stdlib.h>
- #include <sys/ioctl.h>
--#include <sys/socket.h>
- #include <sys/time.h>
- #include <unistd.h>
- #ifndef WEBRTC_IOS
- #include <net/if_arp.h>
- #endif
- #endif // defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-
- #if defined(WEBRTC_MAC)
--#include <ifaddrs.h>
- #include <machine/types.h>
- #endif
-+#if defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
-+#include <ifaddrs.h>
-+#endif
- #if defined(WEBRTC_LINUX)
- #include <linux/netlink.h>
- #include <linux/rtnetlink.h>
- #endif
-
- #include "common_types.h"
- #include "critical_section_wrapper.h"
- #include "rw_lock_wrapper.h"
- #include "trace.h"
- #include "typedefs.h"
- #include "udp_socket_manager_wrapper.h"
-
--#if defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-+#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
- #define GetLastError() errno
-
- #define IFRSIZE ((int)(size * sizeof (struct ifreq)))
-
- #define NLMSG_OK_NO_WARNING(nlh,len) \
- ((len) >= (int)sizeof(struct nlmsghdr) && \
- (int)(nlh)->nlmsg_len >= (int)sizeof(struct nlmsghdr) && \
- (int)(nlh)->nlmsg_len <= (len))
-
--#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-+#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
-
- namespace webrtc {
-
- class SocketFactory : public UdpTransportImpl::SocketFactoryInterface {
- public:
- UdpSocketWrapper* CreateSocket(const WebRtc_Word32 id,
- UdpSocketManager* mgr,
- CallbackObj obj,
-@@ -2366,17 +2368,17 @@ WebRtc_UWord32 UdpTransport::InetAddrIPV4(const char* ip)
- {
- return ::inet_addr(ip);
- }
-
- WebRtc_Word32 UdpTransport::InetPresentationToNumeric(WebRtc_Word32 af,
- const char* src,
- void* dst)
- {
--#if defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-+#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
- const WebRtc_Word32 result = inet_pton(af, src, dst);
- return result > 0 ? 0 : -1;
-
- #elif defined(_WIN32)
- SocketAddress temp;
- int length=sizeof(SocketAddress);
-
- if(af == AF_INET)
-@@ -2488,17 +2490,17 @@ WebRtc_Word32 UdpTransport::LocalHostAddressIPV6(char n_localIP[16])
- break;
- };
- }
- freeaddrinfo(result);
- WEBRTC_TRACE(kTraceWarning, kTraceTransport, -1,
- "getaddrinfo failed to find address");
- return -1;
-
--#elif defined(WEBRTC_MAC)
-+#elif defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
- struct ifaddrs* ptrIfAddrs = NULL;
- struct ifaddrs* ptrIfAddrsStart = NULL;
-
- getifaddrs(&ptrIfAddrsStart);
- ptrIfAddrs = ptrIfAddrsStart;
- while(ptrIfAddrs)
- {
- if(ptrIfAddrs->ifa_addr->sa_family == AF_INET6)
-@@ -2680,17 +2682,17 @@ WebRtc_Word32 UdpTransport::LocalHostAddress(WebRtc_UWord32& localIP)
- }
- else
- {
- WebRtc_Word32 error = WSAGetLastError();
- WEBRTC_TRACE(kTraceWarning, kTraceTransport, -1,
- "gethostbyname failed, error:%d", error);
- return -1;
- }
--#elif (defined(WEBRTC_MAC))
-+#elif (defined(WEBRTC_BSD) || defined(WEBRTC_MAC))
- char localname[255];
- if (gethostname(localname, 255) != -1)
- {
- hostent* localHost;
- localHost = gethostbyname(localname);
- if(localHost)
- {
- if(localHost->h_addrtype != AF_INET)
-@@ -2819,17 +2821,17 @@ WebRtc_Word32 UdpTransport::IPAddress(const SocketAddress& address,
- }
-
- source_port = address._sockaddr_in6.sin6_port;
- }
- // Convert port number to network byte order.
- sourcePort = htons(source_port);
- return 0;
-
-- #elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-+ #elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
- WebRtc_Word32 ipFamily = address._sockaddr_storage.sin_family;
- const void* ptrNumericIP = NULL;
-
- if(ipFamily == AF_INET)
- {
- ptrNumericIP = &(address._sockaddr_in.sin_addr);
- }
- else if(ipFamily == AF_INET6)
-diff --git media/webrtc/trunk/webrtc/modules/utility/source/rtp_dump_impl.cc media/webrtc/trunk/webrtc/modules/utility/source/rtp_dump_impl.cc
-index 69a52ec..7ac226c 100644
---- mozilla/media/webrtc/trunk/webrtc/modules/utility/source/rtp_dump_impl.cc
-+++ mozilla/media/webrtc/trunk/webrtc/modules/utility/source/rtp_dump_impl.cc
-@@ -14,17 +14,17 @@
- #include <stdio.h>
-
- #include "critical_section_wrapper.h"
- #include "trace.h"
-
- #if defined(_WIN32)
- #include <Windows.h>
- #include <mmsystem.h>
--#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
- #include <string.h>
- #include <sys/time.h>
- #include <time.h>
- #endif
-
- #if (defined(_DEBUG) && defined(_WIN32))
- #define DEBUG_PRINT(expr) OutputDebugString(##expr)
- #define DEBUG_PRINTP(expr, p) \
-@@ -233,17 +233,17 @@ bool RtpDumpImpl::RTCP(const WebRtc_UWord8* packet) const
- return is_rtcp;
- }
-
- // TODO (hellner): why is TickUtil not used here?
- inline WebRtc_UWord32 RtpDumpImpl::GetTimeInMS() const
- {
- #if defined(_WIN32)
- return timeGetTime();
--#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
- struct timeval tv;
- struct timezone tz;
- unsigned long val;
-
- gettimeofday(&tv, &tz);
- val = tv.tv_sec * 1000 + tv.tv_usec / 1000;
- return val;
- #else
-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 653ee16..8d6fd68 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
-@@ -14,17 +14,23 @@
- #include <unistd.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <stdio.h>
- #include <stdlib.h>
-
- //v4l includes
-+#if defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#include <sys/videoio.h>
-+#elif defined(__sun)
-+#include <sys/videodev2.h>
-+#else
- #include <linux/videodev2.h>
-+#endif
-
- #include "ref_count.h"
- #include "trace.h"
-
-
- namespace webrtc
- {
- namespace videocapturemodule
-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..424ea0a 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
-@@ -7,22 +7,30 @@
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
- #include <sys/ioctl.h>
- #include <unistd.h>
- #include <sys/stat.h>
- #include <fcntl.h>
--#include <linux/videodev2.h>
- #include <errno.h>
- #include <stdio.h>
- #include <sys/mman.h>
- #include <string.h>
-
-+//v4l includes
-+#if defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#include <sys/videoio.h>
-+#elif defined(__sun)
-+#include <sys/videodev2.h>
-+#else
-+#include <linux/videodev2.h>
-+#endif
-+
- #include <new>
-
- #include "ref_count.h"
- #include "trace.h"
- #include "thread_wrapper.h"
- #include "critical_section_wrapper.h"
- #include "video_capture_linux.h"
-
-diff --git media/webrtc/trunk/webrtc/modules/video_capture/device_info_impl.cc media/webrtc/trunk/webrtc/modules/video_capture/device_info_impl.cc
-index e3f7bb5..882cede 100644
---- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/device_info_impl.cc
-+++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/device_info_impl.cc
-@@ -49,17 +49,17 @@ WebRtc_Word32 DeviceInfoImpl::NumberOfCapabilities(
- if (!deviceUniqueIdUTF8)
- return -1;
-
- _apiLock.AcquireLockShared();
-
- if (_lastUsedDeviceNameLength == strlen((char*) deviceUniqueIdUTF8))
- {
- // Is it the same device that is asked for again.
--#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
- if(strncasecmp((char*)_lastUsedDeviceName,
- (char*) deviceUniqueIdUTF8,
- _lastUsedDeviceNameLength)==0)
- #else
- if (_strnicmp((char*) _lastUsedDeviceName,
- (char*) deviceUniqueIdUTF8,
- _lastUsedDeviceNameLength) == 0)
- #endif
-@@ -86,17 +86,17 @@ WebRtc_Word32 DeviceInfoImpl::GetCapability(const char* deviceUniqueIdUTF8,
- {
- WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideoCapture, _id,
- "deviceUniqueIdUTF8 parameter not set in call to GetCapability");
- return -1;
- }
- ReadLockScoped cs(_apiLock);
-
- if ((_lastUsedDeviceNameLength != strlen((char*) deviceUniqueIdUTF8))
--#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
- || (strncasecmp((char*)_lastUsedDeviceName,
- (char*) deviceUniqueIdUTF8,
- _lastUsedDeviceNameLength)!=0))
- #else
- || (_strnicmp((char*) _lastUsedDeviceName,
- (char*) deviceUniqueIdUTF8,
- _lastUsedDeviceNameLength) != 0))
- #endif
-@@ -150,17 +150,17 @@ WebRtc_Word32 DeviceInfoImpl::GetBestMatchedCapability(
- {
-
-
- if (!deviceUniqueIdUTF8)
- return -1;
-
- ReadLockScoped cs(_apiLock);
- if ((_lastUsedDeviceNameLength != strlen((char*) deviceUniqueIdUTF8))
--#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
- || (strncasecmp((char*)_lastUsedDeviceName,
- (char*) deviceUniqueIdUTF8,
- _lastUsedDeviceNameLength)!=0))
- #else
- || (_strnicmp((char*) _lastUsedDeviceName,
- (char*) deviceUniqueIdUTF8,
- _lastUsedDeviceNameLength) != 0))
- #endif
-diff --git media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
-index 0a9765e..8d4bbf4 100644
---- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
-+++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
-@@ -43,17 +43,17 @@
- 'conditions': [
- ['include_internal_video_capture==0', {
- 'sources': [
- 'external/device_info_external.cc',
- 'external/video_capture_external.cc',
- ],
- }, { # include_internal_video_capture == 1
- 'conditions': [
-- ['OS=="linux"', {
-+ ['include_v4l2_video_capture==1', {
- 'include_dirs': [
- 'linux',
- ],
- 'sources': [
- 'linux/device_info_linux.cc',
- 'linux/device_info_linux.h',
- 'linux/video_capture_linux.cc',
- 'linux/video_capture_linux.h',
-@@ -152,31 +152,35 @@
- 'include_dirs': [
- 'include',
- ],
- 'sources': [
- 'test/video_capture_unittest.cc',
- 'test/video_capture_main_mac.mm',
- ],
- 'conditions': [
-- ['OS=="mac" or OS=="linux"', {
-+ ['OS!="win" and OS!="android"', {
- 'cflags': [
- '-Wno-write-strings',
- ],
- 'ldflags': [
- '-lpthread -lm',
- ],
- }],
-- ['OS=="linux"', {
-+ ['include_v4l2_video_capture==1', {
- 'libraries': [
-- '-lrt',
- '-lXext',
- '-lX11',
- ],
- }],
-+ ['OS=="linux"', {
-+ 'libraries': [
-+ '-lrt',
-+ ],
-+ }],
- ['OS=="mac"', {
- 'dependencies': [
- # Link with a special main for mac so we can use the webcam.
- '<(webrtc_root)/test/test.gyp:test_support_main_threaded_mac',
- ],
- 'xcode_settings': {
- # TODO(andrew): CoreAudio and AudioToolbox shouldn't be needed.
- 'OTHER_LDFLAGS': [
-diff --git media/webrtc/trunk/webrtc/system_wrappers/interface/asm_defines.h media/webrtc/trunk/webrtc/system_wrappers/interface/asm_defines.h
-index 0cd85d0..45591be 100644
---- mozilla/media/webrtc/trunk/webrtc/system_wrappers/interface/asm_defines.h
-+++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/interface/asm_defines.h
-@@ -6,17 +6,17 @@
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
- #ifndef WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ASM_DEFINES_H_
- #define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ASM_DEFINES_H_
-
--#if defined(__linux__) && defined(__ELF__)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(__ELF__)
- .section .note.GNU-stack,"",%progbits
- #endif
-
- // Define the macros used in ARM assembly code, so that for Mac or iOS builds
- // we add leading underscores for the function names.
- #ifdef __APPLE__
- .macro GLOBAL_FUNCTION name
- .global _\name
-diff --git media/webrtc/trunk/webrtc/system_wrappers/interface/tick_util.h media/webrtc/trunk/webrtc/system_wrappers/interface/tick_util.h
-index 0cd85d0..45591be 100644
---- mozilla/media/webrtc/trunk/webrtc/system_wrappers/interface/tick_util.h
-+++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/interface/tick_util.h
-@@ -189,17 +189,17 @@ inline WebRtc_Word64 TickTime::QueryOsForTicks() {
- // 0x0fffffff ~3.1 days, the code will not take that long to execute
- // so it must have been a wrap around.
- if (old > 0xf0000000 && now < 0x0fffffff) {
- num_wrap_time_get_time++;
- }
- }
- result.ticks_ = now + (num_wrap_time_get_time << 32);
- #endif
--#elif defined(WEBRTC_LINUX)
-+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
- struct timespec ts;
- // TODO(wu): Remove CLOCK_REALTIME implementation.
- #ifdef WEBRTC_CLOCK_TYPE_REALTIME
- clock_gettime(CLOCK_REALTIME, &ts);
- #else
- clock_gettime(CLOCK_MONOTONIC, &ts);
- #endif
- result.ticks_ = 1000000000LL * static_cast<WebRtc_Word64>(ts.tv_sec) +
-@@ -236,34 +236,34 @@ inline WebRtc_Word64 TickTime::MillisecondTimestamp() {
- #if _WIN32
- #ifdef USE_QUERY_PERFORMANCE_COUNTER
- LARGE_INTEGER qpfreq;
- QueryPerformanceFrequency(&qpfreq);
- return (ticks * 1000) / qpfreq.QuadPart;
- #else
- return ticks;
- #endif
--#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
- return ticks / 1000000LL;
- #else
- return ticks / 1000LL;
- #endif
- }
-
- inline WebRtc_Word64 TickTime::MicrosecondTimestamp() {
- WebRtc_Word64 ticks = TickTime::Now().Ticks();
- #if _WIN32
- #ifdef USE_QUERY_PERFORMANCE_COUNTER
- LARGE_INTEGER qpfreq;
- QueryPerformanceFrequency(&qpfreq);
- return (ticks * 1000) / (qpfreq.QuadPart / 1000);
- #else
- return ticks * 1000LL;
- #endif
--#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
- return ticks / 1000LL;
- #else
- return ticks;
- #endif
- }
-
- inline WebRtc_Word64 TickTime::Ticks() const {
- return ticks_;
-@@ -273,33 +273,33 @@ inline WebRtc_Word64 TickTime::MillisecondsToTicks(const WebRtc_Word64 ms) {
- #if _WIN32
- #ifdef USE_QUERY_PERFORMANCE_COUNTER
- LARGE_INTEGER qpfreq;
- QueryPerformanceFrequency(&qpfreq);
- return (qpfreq.QuadPart * ms) / 1000;
- #else
- return ms;
- #endif
--#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
- return ms * 1000000LL;
- #else
- return ms * 1000LL;
- #endif
- }
-
- inline WebRtc_Word64 TickTime::TicksToMilliseconds(const WebRtc_Word64 ticks) {
- #if _WIN32
- #ifdef USE_QUERY_PERFORMANCE_COUNTER
- LARGE_INTEGER qpfreq;
- QueryPerformanceFrequency(&qpfreq);
- return (ticks * 1000) / qpfreq.QuadPart;
- #else
- return ticks;
- #endif
--#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
- return ticks / 1000000LL;
- #else
- return ticks / 1000LL;
- #endif
- }
-
- inline TickTime& TickTime::operator+=(const WebRtc_Word64& ticks) {
- ticks_ += ticks;
-@@ -318,17 +318,17 @@ inline WebRtc_Word64 TickInterval::Milliseconds() const {
- #ifdef USE_QUERY_PERFORMANCE_COUNTER
- LARGE_INTEGER qpfreq;
- QueryPerformanceFrequency(&qpfreq);
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list