- Update to 2.25

Submitted by:	Jan Beich
Security:	http://www.vuxml.org/freebsd/610de647-af8d-11e3-a25b-b4b52fce4ce8.html
This commit is contained in:
Beat Gaetzi 2014-03-20 10:15:01 +00:00
parent a13d44a2df
commit 1616441cd1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=348676
26 changed files with 3088 additions and 447 deletions

View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= seamonkey PORTNAME= seamonkey
DISTVERSION= 2.24 DISTVERSION= 2.25
CATEGORIES= www mail news editors irc ipv6 CATEGORIES= www mail news editors irc ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US

View file

@ -76,7 +76,7 @@ post-patch:
@${DO_NADA} >>${PREFS_FILE} @${DO_NADA} >>${PREFS_FILE}
. if (${DISTVERSION:R:R} < 28 && ${PORTNAME} != "seamonkey") || \ . if (${DISTVERSION:R:R} < 28 && ${PORTNAME} != "seamonkey") || \
(${PORTNAME} == "seamonkey" && ${DISTVERSION:C/[0-9]*\.//:C/b.*//} < 25) (${PORTNAME} == "seamonkey" && ${DISTVERSION:C/[0-9]*\.//:C/[ab].*//} < 25)
# dummy resident-unique for make about:memory's "measure" # dummy resident-unique for make about:memory's "measure"
@${REINPLACE_CMD} -i '' \ @${REINPLACE_CMD} -i '' \
's,/proc/self/smaps\(.Private\),////////dev/null\1,' \ 's,/proc/self/smaps\(.Private\),////////dev/null\1,' \

View file

@ -1,2 +1,6 @@
SHA256 (seamonkey-2.24.tar.bz2) = ed4ad37ff9c5d0d36f66bf25b272698e6d5bcf828cfac694d15467d4a4014ce5 SHA256 (seamonkey-2.25.tar.bz2) = 67892c00243b9a4f2964ac61c9661e2d954ce33bc27fb10588f650922d5e3c62
SIZE (seamonkey-2.24.tar.bz2) = 29803592 SIZE (seamonkey-2.25.tar.bz2) = 30377947
SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99
SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908
SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b
SIZE (gtk2-2.18.3-19.fc12.i686.rpm) = 3198708

View file

@ -2,8 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= seamonkey-i18n PORTNAME= seamonkey-i18n
PORTVERSION= 2.24 PORTVERSION= 2.25
PORTREVISION= 1
CATEGORIES= www mail news editors irc CATEGORIES= www mail news editors irc
MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/langpack MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/langpack
PKGNAMEPREFIX= PKGNAMEPREFIX=

View file

@ -1,54 +1,54 @@
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.be.langpack.xpi) = 73048f93f2bc1de227d78f4baacced8ed481d0effc1d7b3b1073464dcdb7d872 SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.be.langpack.xpi) = 89685620ee38c099b3621de2ef1e79b63ea2f8c2c73d333c1afb79068e971d14
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.be.langpack.xpi) = 814307 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.be.langpack.xpi) = 817911
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.ca.langpack.xpi) = 40bb6f6ac6e3e2739777eb9b219c88e232e2b20437ec15ff93344cabd6f61047 SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.ca.langpack.xpi) = ea59f8370f00ca40358ecdf489658316ffd44f58c75a3a2b0d4823b0b0a65a5e
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.ca.langpack.xpi) = 811480 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.ca.langpack.xpi) = 815229
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.cs.langpack.xpi) = 5605ff0b35abd28c7e84b87d2a30434803f74263e53b8b1350a9836fafea71f7 SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.cs.langpack.xpi) = 9e1ed7d0540634f4dfa96e71219c9b5ef13389b498185f8160ddc732402f8329
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.cs.langpack.xpi) = 809460 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.cs.langpack.xpi) = 813471
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.de.langpack.xpi) = 842fdef4a36a9f5f9ba99e51e4bd99e0890eb279ec151f1a6527c90d123a1997 SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.de.langpack.xpi) = 38634d0c30f1c81a2b86d85542038dcc78efe82a9423718fd5feae15749a9764
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.de.langpack.xpi) = 816146 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.de.langpack.xpi) = 821039
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.en-GB.langpack.xpi) = 8da55c64db56bdb9356c51d21a4a09a4530541a38e946543496c60bdc60ef1d3 SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.en-GB.langpack.xpi) = ab5e441d1b2b474b2724fa67afc1ae77433efdeb3d8f2292b27376b08f433c61
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.en-GB.langpack.xpi) = 781088 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.en-GB.langpack.xpi) = 784862
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.en-US.langpack.xpi) = 3fae3e80f0b046ee88133c949705264e7b002ec00b2ada403c5d811a77ae87d1 SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.en-US.langpack.xpi) = 7fd81253636a639c33665c0276f88748cb80fe084eff12a9ae7535c2fb5daed3
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.en-US.langpack.xpi) = 782073 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.en-US.langpack.xpi) = 785842
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.es-AR.langpack.xpi) = 28de7925df64046ce11476a5fc463e6d166bcf1f895ead8d96c563c636075052 SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.es-AR.langpack.xpi) = bea734c6766993aa99b0c2bc78370e732680d00de7ca1dd65a02a2a92383794d
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.es-AR.langpack.xpi) = 838204 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.es-AR.langpack.xpi) = 836043
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.es-ES.langpack.xpi) = 88d260366fb1c841c46f464510b45e4fe76b636faa02ee649e8143dba8143434 SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.es-ES.langpack.xpi) = e1f52133ff623e90dcb9cd9988abd9c5e6e31d8679c6ee2ccd723f52028bae33
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.es-ES.langpack.xpi) = 811306 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.es-ES.langpack.xpi) = 813327
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.fi.langpack.xpi) = 209e64e3e4132d05beb124f3642e57cd5a341d73e417644725c2a8060cd56a90 SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.fi.langpack.xpi) = caaaf807a1bf85408c2a9dcbab74e6ee2e9a794114a9d72a86f218ad1b2d4a5b
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.fi.langpack.xpi) = 780302 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.fi.langpack.xpi) = 783351
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.fr.langpack.xpi) = db23d07a62d4f0a7f5a42f2fd1d33a0704ba484c4801e9d218469deadb122106 SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.fr.langpack.xpi) = 3983ba2cf14165d78724dd97e4652833c7f4197c8fa2218eb48c575c8359249f
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.fr.langpack.xpi) = 790321 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.fr.langpack.xpi) = 794139
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.gl.langpack.xpi) = 9bc816dda158a5840dfe666e63c7045a73c12021ad1b19ff57ad8b8435124789 SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.gl.langpack.xpi) = b48fe273f37bf4a76b6d607377e390d64053019df7213c59b0aa35bce6a6e533
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.gl.langpack.xpi) = 789063 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.gl.langpack.xpi) = 792993
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.hu.langpack.xpi) = 44099a7e28c99e40483bcec2d1e33e9fe46c493f6dd5b2f95ad83d3b164e81ce SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.hu.langpack.xpi) = 3818cf807f912dcf089d992520debf7deda24346f083172ab50fad1ef3b6b197
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.hu.langpack.xpi) = 823607 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.hu.langpack.xpi) = 827480
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.it.langpack.xpi) = c4225ca1648957624fb801000404166072277730ce5b3aab3cf815a787c64acc SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.it.langpack.xpi) = 1b1b28a69f18af2cf089860722c8a85e8a8b53087adf7bdb881b7fce14a571dd
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.it.langpack.xpi) = 725388 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.it.langpack.xpi) = 727323
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.ja-JP-mac.langpack.xpi) = 8a273e9d1070c8467ddf19290f5fc4a9382f67cc30b498e2523b48f8756965da SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.ja-JP-mac.langpack.xpi) = ce6ee62d188107055a7bfaff2a47b375ae06a4e11898d22c4af3636b653487f2
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.ja-JP-mac.langpack.xpi) = 887433 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.ja-JP-mac.langpack.xpi) = 891817
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.ja.langpack.xpi) = 246c15ce3c6f2245b518b08a88390879a5b0e329467f4d108f13e526c7d9201d SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.ja.langpack.xpi) = 66916fd154ef6e33f2c6d3a53fe0dd46d1fd03542241361a18cd589ee7683483
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.ja.langpack.xpi) = 862158 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.ja.langpack.xpi) = 866418
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.lt.langpack.xpi) = d92d7755ccb9a27e2c473eb36c76f3735633d6671dd681d3613ab0e0ea4987d2 SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.lt.langpack.xpi) = 043edbbe70608661eb33be1c372f5a4132d2f37e56d570bd6a953495cf99002c
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.lt.langpack.xpi) = 827034 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.lt.langpack.xpi) = 830877
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.nb-NO.langpack.xpi) = 083be6b731ff4c0e97c1385d66719765e1e09992015686acec6057ecdd2f8837 SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.nb-NO.langpack.xpi) = 0773a90b97b3b24f28dea4c637a95c1cf0b4a0aa4b7957232dec7d2de23775e6
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.nb-NO.langpack.xpi) = 802295 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.nb-NO.langpack.xpi) = 806695
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.nl.langpack.xpi) = f58c6c559b678fc978d7822b67b11cdc0d54d055bb5a6c6059d2bf8e6ebc5d54 SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.nl.langpack.xpi) = e6b91de4deb292b61ad18e593338f912a5d5749b045bc2698b7e38e394d148ee
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.nl.langpack.xpi) = 776386 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.nl.langpack.xpi) = 780751
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.pl.langpack.xpi) = e5406c7cdf55841544806445e3f9f86532bed9e09d3da3077363d4e6cebe9fce SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.pl.langpack.xpi) = 420d34f2475fbfe0f5c80ba3e9d526e02b9fb605e2edc8cfe0011d1e4afd93b2
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.pl.langpack.xpi) = 852730 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.pl.langpack.xpi) = 855085
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.pt-PT.langpack.xpi) = 66dfe3c112c1c6c071b6a0086531f101579d1c92a0d909bbcfee48aedb647969 SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.pt-PT.langpack.xpi) = 54c80b0243f946249bf53f84b424ef0102cc4cbd0b4fa7861ba77b7977880ff6
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.pt-PT.langpack.xpi) = 812004 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.pt-PT.langpack.xpi) = 816434
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.ru.langpack.xpi) = d6679b379995552a0ad7b096daa94dffb10d9392a3f8936592deedef4859791b SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.ru.langpack.xpi) = 1f03d4fe581603c64e619562af0aa747e9e73a5be179d99b9b6d5d568ca995dd
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.ru.langpack.xpi) = 882614 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.ru.langpack.xpi) = 884848
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.sk.langpack.xpi) = 4976e86f4faa81cc7ca5ca73305f827d0347a0e2990377fc00c505ce468cb777 SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.sk.langpack.xpi) = 841c06545a7b5f57842674d9f59849e0840dda51d4d5029c1d1dade100df66cb
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.sk.langpack.xpi) = 836795 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.sk.langpack.xpi) = 840780
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.sv-SE.langpack.xpi) = a1cd1c18dcbeb56ca35e4d14c3c2f63e682ce3f51179901c640277cbd0ecb33a SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.sv-SE.langpack.xpi) = 1455d1aff8f321d40a1e724d8771db39eee93e74deaf8733fa5a01badc3affd8
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.sv-SE.langpack.xpi) = 804953 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.sv-SE.langpack.xpi) = 809391
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.tr.langpack.xpi) = 59f170597e514ca92fab8f7139a5ece6f99d1410e2f52ca4b8452ba687c9b007 SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.tr.langpack.xpi) = 3c3c54f359b08a508ce014b1edb99db4ed0455237f423051a25e746a775f1dd1
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.tr.langpack.xpi) = 850114 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.tr.langpack.xpi) = 789890
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.uk.langpack.xpi) = 62972d16d400379183758c09373b4ace1e579a2afa2195f6b31026d50033aea9 SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.uk.langpack.xpi) = b64369e2191eaa97fbb11a8e3e343cef42f3156ffccb75d97ed48a71158ea29f
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.uk.langpack.xpi) = 852876 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.uk.langpack.xpi) = 852254
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.zh-CN.langpack.xpi) = 54d7957ffbc32b34ab6490d1abce26af07e949c265bedc887c15d8a5608f4914 SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.zh-CN.langpack.xpi) = 2e00de1f63e08914d954af80b6bd19552a268f566ca16de587ea673df4d6217c
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.zh-CN.langpack.xpi) = 813619 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.zh-CN.langpack.xpi) = 817701
SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.zh-TW.langpack.xpi) = 90f6ec47141d5ea1aa6809c2ae2ba6c5a8c17e86b0647e5f627c19c0d490fe6c SHA256 (xpi/seamonkey-i18n-2.25/seamonkey-2.25.zh-TW.langpack.xpi) = fc24d601697ee73d6cebb6bc06cc8b22e192716b343138834788d4ff7c9a1863
SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.zh-TW.langpack.xpi) = 837900 SIZE (xpi/seamonkey-i18n-2.25/seamonkey-2.25.zh-TW.langpack.xpi) = 842075

View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= seamonkey PORTNAME= seamonkey
DISTVERSION= 2.24 DISTVERSION= 2.25
CATEGORIES?= www mail news editors irc ipv6 CATEGORIES?= www mail news editors irc ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/
@ -12,18 +12,23 @@ EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
MAINTAINER= gecko@FreeBSD.org MAINTAINER= gecko@FreeBSD.org
COMMENT= The open source, standards compliant web browser COMMENT= The open source, standards compliant web browser
BUILD_DEPENDS= nspr>=4.10.2:${PORTSDIR}/devel/nspr \ BUILD_DEPENDS= nspr>=4.10.3:${PORTSDIR}/devel/nspr \
nss>=3.15.4:${PORTSDIR}/security/nss \ nss>=3.15.4:${PORTSDIR}/security/nss \
sqlite3>=3.8.0.2:${PORTSDIR}/databases/sqlite3 \ harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \
libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \
opus>=1.1:${PORTSDIR}/audio/opus \
libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
sqlite3>=3.8.1:${PORTSDIR}/databases/sqlite3 \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
zip:${PORTSDIR}/archivers/zip \
unzip:${PORTSDIR}/archivers/unzip unzip:${PORTSDIR}/archivers/unzip
# cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \ # cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \
LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l
EM_VERSION= 1.6.1_pre20140112 EM_VERSION= 1.6.1_pre20140112
L_VERSION= 2.9b1 L_VERSION= 3.0b1
SSP_UNSAFE= yes SSP_UNSAFE= yes
USE_AUTOTOOLS= autoconf213:env USE_AUTOTOOLS= autoconf213:env
@ -78,6 +83,23 @@ MOZSRC:= ${WRKSRC}/mozilla
XPI_LIBDIR= ${PREFIX}/lib/xpi XPI_LIBDIR= ${PREFIX}/lib/xpi
# avoid clang 3.2/3.3 crash in js/src/jsgc.cpp on refillFreeList<(js::AllowGC)1>
# http://svnweb.freebsd.org/changeset/base/255804
.if ${CHOSEN_COMPILER_TYPE} == clang && ${ARCH} == i386 && ${OSVERSION} < 1000056
. if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
BROKEN= Cannot build with OPTIMIZED_CFLAGS option due to \
a ${CHOSEN_COMPILER_TYPE} bug: unset the option or \
use FAVORITE_COMPILER=gcc in Makefile.local/make.conf
# apply workaround only for -O2 or greater
. elif ${CXXFLAGS:M-O*} && ! ${CXXFLAGS:M-O[01]}
. if ${MACHINE_CPU:Msse2}
CXXFLAGS+= -msse2
. else
CXXFLAGS+= -O1
. endif
. endif
.endif
.if ${PORT_OPTIONS:MALSA} .if ${PORT_OPTIONS:MALSA}
BUILD_DEPENDS+= alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib BUILD_DEPENDS+= alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
.endif .endif

View file

@ -1,4 +1,4 @@
SHA256 (seamonkey-2.24.source.tar.bz2) = 63855265b4754dd056af8d611b50219577a592466cdf1d3865028d86ed680474 SHA256 (seamonkey-2.25.source.tar.bz2) = d99c19338737d75016561340c4bfa0087e13d055971579135eb205ae975c022a
SIZE (seamonkey-2.24.source.tar.bz2) = 149845514 SIZE (seamonkey-2.25.source.tar.bz2) = 155695615
SHA256 (enigmail-1.6.1_pre20140112.tar.xz) = 2d89a9186c3ccfc9397c933c6f63c0518224fea0096d7a292dba3765de088149 SHA256 (enigmail-1.6.1_pre20140112.tar.xz) = 2d89a9186c3ccfc9397c933c6f63c0518224fea0096d7a292dba3765de088149
SIZE (enigmail-1.6.1_pre20140112.tar.xz) = 916028 SIZE (enigmail-1.6.1_pre20140112.tar.xz) = 916028

View file

@ -41,3 +41,13 @@ index 91285cd..cf4a233 100755
if ($targetOs eq "SunOS") { if ($targetOs eq "SunOS") {
$targetComp = "sunc"; $targetComp = "sunc";
} }
@@ -107,6 +109,9 @@ elsif ($srcComp =~ /cc/) {
elsif ($targetOs eq "AIX") {
$targetComp = "ibmc";
}
+ else {
+ $targetComp = "gcc3";
+ }
}
else {
$targetComp = $srcComp;

File diff suppressed because it is too large Load diff

View file

@ -1,68 +0,0 @@
diff --git configure.in configure.in
index 2084be9..eb6eeb2 100644
--- mozilla/configure.in
+++ mozilla/configure.in
@@ -3369,14 +3369,19 @@ fi
AC_CACHE_CHECK(
[for res_ninit()],
ac_cv_func_res_ninit,
- [AC_TRY_LINK([
+ [AC_TRY_RUN([
#ifdef linux
#define _BSD_SOURCE 1
#endif
+ #include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/nameser.h>
#include <resolv.h>
- ],
- [int foo = res_ninit(&_res);],
+ int main(int argc, char **argv){
+ int foo = res_ninit(&_res);
+ }],
[ac_cv_func_res_ninit=yes],
+ [ac_cv_func_res_ninit=no],
[ac_cv_func_res_ninit=no])
])
diff --git extensions/auth/nsAuthGSSAPI.cpp extensions/auth/nsAuthGSSAPI.cpp
index e828beb..6444246 100644
--- mozilla/extensions/auth/nsAuthGSSAPI.cpp
+++ mozilla/extensions/auth/nsAuthGSSAPI.cpp
@@ -39,6 +39,9 @@ typedef KLStatus (*KLCacheHasValidTickets_type)(
#endif
#if defined(HAVE_RES_NINIT)
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
#include <resolv.h>
#endif
diff --git js/src/configure.in js/src/configure.in
index e25f569..b9722f9 100644
--- mozilla/js/src/configure.in
+++ mozilla/js/src/configure.in
@@ -2797,14 +2797,19 @@ fi
AC_CACHE_CHECK(
[for res_ninit()],
ac_cv_func_res_ninit,
- [AC_TRY_LINK([
+ [AC_TRY_RUN([
#ifdef linux
#define _BSD_SOURCE 1
#endif
+ #include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/nameser.h>
#include <resolv.h>
- ],
- [int foo = res_ninit(&_res);],
+ int main(int argc, char **argv){
+ int foo = res_ninit(&_res);
+ }],
[ac_cv_func_res_ninit=yes],
+ [ac_cv_func_res_ninit=no],
[ac_cv_func_res_ninit=no])
])

View file

@ -42,9 +42,9 @@ index b483cd1..f1dd1f0 100644
--- mozilla/media/webrtc/signaling/test/Makefile.in --- mozilla/media/webrtc/signaling/test/Makefile.in
+++ mozilla/media/webrtc/signaling/test/Makefile.in +++ mozilla/media/webrtc/signaling/test/Makefile.in
@@ -17,6 +17,7 @@ LIBS = \ @@ -17,6 +17,7 @@ LIBS = \
$(NSPR_LIBS) \
$(NSS_LIBS) \ $(NSS_LIBS) \
$(REALTIME_LIBS) \ $(REALTIME_LIBS) \
$(MOZ_JS_LIBS) \
+ $(MOZ_LIBV4L2_LIBS) \ + $(MOZ_LIBV4L2_LIBS) \
$(DEPTH)/xpcom/glue/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ $(DEPTH)/xpcom/glue/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
$(DEPTH)/media/mtransport/standalone/$(LIB_PREFIX)mtransport_s.$(LIB_SUFFIX) \ $(DEPTH)/media/mtransport/standalone/$(LIB_PREFIX)mtransport_s.$(LIB_SUFFIX) \
@ -53,7 +53,7 @@ diff --git media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_lin
index 239a292..bab496c 100644 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
+++ 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
@@ -26,11 +26,23 @@ @@ -25,10 +25,21 @@
#else #else
#include <linux/videodev2.h> #include <linux/videodev2.h>
#endif #endif
@ -61,9 +61,8 @@ index 239a292..bab496c 100644
+#include <libv4l2.h> +#include <libv4l2.h>
+#endif +#endif
#include "ref_count.h" #include "webrtc/system_wrappers/interface/ref_count.h"
#include "trace.h" #include "webrtc/system_wrappers/interface/trace.h"
+#ifdef HAVE_LIBV4L2 +#ifdef HAVE_LIBV4L2
+#define open v4l2_open +#define open v4l2_open
@ -73,10 +72,9 @@ index 239a292..bab496c 100644
+#define mmap v4l2_mmap +#define mmap v4l2_mmap
+#define munmap v4l2_munmap +#define munmap v4l2_munmap
+#endif +#endif
+
namespace webrtc namespace webrtc
{ {
namespace videocapturemodule
@@ -130,6 +142,11 @@ WebRtc_Word32 DeviceInfoLinux::GetDeviceName( @@ -130,6 +142,11 @@ WebRtc_Word32 DeviceInfoLinux::GetDeviceName(
memset(deviceNameUTF8, 0, deviceNameLength); memset(deviceNameUTF8, 0, deviceNameLength);
memcpy(cameraName, cap.card, sizeof(cap.card)); memcpy(cameraName, cap.card, sizeof(cap.card));
@ -154,11 +152,11 @@ diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
index 9c16ffa..1db3794 100644 index 9c16ffa..1db3794 100644
--- mozilla/toolkit/library/Makefile.in --- mozilla/toolkit/library/Makefile.in
+++ mozilla/toolkit/library/Makefile.in +++ mozilla/toolkit/library/Makefile.in
@@ -405,6 +405,7 @@ endif @@ -121,6 +121,7 @@ endif
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib) EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib)
ifdef MOZ_WEBRTC ifdef MOZ_WEBRTC
+EXTRA_DSO_LDOPTS += $(MOZ_LIBV4L2_LIBS) +EXTRA_DSO_LDOPTS += $(MOZ_LIBV4L2_LIBS)
ifdef MOZ_PEERCONNECTION ifdef MOZ_WEBRTC_SIGNALING
COMPONENT_LIBS += peerconnection SHARED_LIBRARY_LIBS += \
endif $(DEPTH)/media/webrtc/signaling/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \

View file

@ -0,0 +1,188 @@
# Allow building against system-wide graphite2/harfbuzz.
diff --git config/Makefile.in config/Makefile.in
index 14bfc0d..5383399 100644
--- mozilla/config/Makefile.in
+++ mozilla/config/Makefile.in
@@ -77,6 +77,8 @@ export:: $(export-preqs)
-DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \
-DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \
-DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
+ -DMOZ_NATIVE_GRAPHITE2=$(MOZ_NATIVE_GRAPHITE2) \
+ -DMOZ_NATIVE_HARFBUZZ=$(MOZ_NATIVE_HARFBUZZ) \
$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
$(INSTALL) system_wrappers $(DIST)
diff --git config/system-headers config/system-headers
index 126391e..b711fc3 100644
--- mozilla/config/system-headers
+++ mozilla/config/system-headers
@@ -1144,3 +1144,11 @@ unicode/utypes.h
#endif
libutil.h
unwind.h
+#if MOZ_NATIVE_GRAPHITE2==1
+graphite2/Font.h
+graphite2/Segment.h
+#endif
+#if MOZ_NATIVE_HARFBUZZ==1
+harfbuzz/hb-ot.h
+harfbuzz/hb.h
+#endif
diff --git configure.in configure.in
index bbc7b40..1747206 100644
--- mozilla/configure.in
+++ mozilla/configure.in
@@ -7848,6 +7848,34 @@ if test "$USE_FC_FREETYPE"; then
fi
dnl ========================================================
+dnl Check for graphite2 and harfbuzz
+dnl ========================================================
+
+MOZ_ARG_WITH_BOOL(system-harfbuzz,
+[ --with-system-harfbuzz Use system harfbuzz (located with pkgconfig)],
+MOZ_NATIVE_HARFBUZZ=1,
+MOZ_NATIVE_HARFBUZZ= )
+
+if test -n "$MOZ_NATIVE_HARFBUZZ"; then
+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.25)
+fi
+AC_SUBST(MOZ_NATIVE_HARFBUZZ)
+AC_SUBST(MOZ_HARFBUZZ_CFLAGS)
+AC_SUBST(MOZ_HARFBUZZ_LIBS)
+
+MOZ_ARG_WITH_BOOL(system-graphite2,
+[ --with-system-graphite2 Use system graphite2 (located with pkgconfig)],
+MOZ_NATIVE_GRAPHITE2=1,
+MOZ_NATIVE_GRAPHITE2= )
+
+if test -n "$MOZ_NATIVE_GRAPHITE2"; then
+ PKG_CHECK_MODULES(MOZ_GRAPHITE2, graphite2 >= 1.2.4)
+fi
+AC_SUBST(MOZ_NATIVE_GRAPHITE2)
+AC_SUBST(MOZ_GRAPHITE2_CFLAGS)
+AC_SUBST(MOZ_GRAPHITE2_LIBS)
+
+dnl ========================================================
dnl Check for pixman and cairo
dnl ========================================================
diff --git content/base/src/Makefile.in content/base/src/Makefile.in
index a618096..596901a 100644
--- mozilla/content/base/src/Makefile.in
+++ mozilla/content/base/src/Makefile.in
@@ -5,6 +5,10 @@
include $(topsrcdir)/config/rules.mk
+ifdef MOZ_NATIVE_HARFBUZZ
+nsContentUtils.$(OBJ_SUFFIX): CXXFLAGS+=$(MOZ_HARFBUZZ_CFLAGS)
+endif
+
# gcc requires -msse2 for this file since it uses SSE2 intrinsics. (See bug
# 585538 comment 12.)
ifneq (,$(INTEL_ARCHITECTURE))
diff --git gfx/moz.build gfx/moz.build
index 519aa46..6929751 100644
--- mozilla/gfx/moz.build
+++ mozilla/gfx/moz.build
@@ -7,6 +7,12 @@
if CONFIG['MOZ_TREE_CAIRO']:
DIRS += ['cairo']
+if not CONFIG['MOZ_NATIVE_GRAPHITE2']:
+ DIRS += ['graphite2/src' ]
+
+if not CONFIG['MOZ_NATIVE_HARFBUZZ']:
+ DIRS += ['harfbuzz/src']
+
DIRS += [
'2d',
'ycbcr',
@@ -15,8 +21,6 @@ DIRS += [
'qcms',
'gl',
'layers',
- 'graphite2/src',
- 'harfbuzz/src',
'ots/src',
'thebes',
'ipc',
diff --git gfx/skia/Makefile.in gfx/skia/Makefile.in
index 07a77a3..067f7bd 100644
--- mozilla/gfx/skia/Makefile.in
+++ mozilla/gfx/skia/Makefile.in
@@ -15,6 +15,10 @@ ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
OS_CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PANGO_CFLAGS) $(CAIRO_FT_CFLAGS)
endif
+ifdef MOZ_NATIVE_HARFBUZZ
+OS_CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS)
+endif
+
include $(topsrcdir)/config/rules.mk
ifneq (,$(INTEL_ARCHITECTURE))
diff --git gfx/thebes/Makefile.in gfx/thebes/Makefile.in
index e9f6b6c..0df2d8d 100644
--- mozilla/gfx/thebes/Makefile.in
+++ mozilla/gfx/thebes/Makefile.in
@@ -13,6 +13,14 @@ DEFINES := $(filter-out -DUNICODE,$(DEFINES))
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
CFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
+ifdef MOZ_NATIVE_GRAPHITE2
+CXXFLAGS += $(MOZ_GRAPHITE2_CFLAGS)
+endif
+
+ifdef MOZ_NATIVE_HARFBUZZ
+CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS)
+endif
+
ifeq ($(MOZ_WIDGET_TOOLKIT),android)
CXXFLAGS += $(CAIRO_FT_CFLAGS)
endif
diff --git intl/unicharutil/util/Makefile.in intl/unicharutil/util/Makefile.in
index f6b9f7c..11c44f4 100644
--- mozilla/intl/unicharutil/util/Makefile.in
+++ mozilla/intl/unicharutil/util/Makefile.in
@@ -21,3 +21,7 @@ ifdef _MSC_VER
OS_COMPILE_CXXFLAGS += -Zl
OS_COMPILE_CFLAGS += -Zl
endif
+
+ifdef MOZ_NATIVE_HARFBUZZ
+nsUnicodePropertyData.$(OBJ_SUFFIX): CXXFLAGS+=$(MOZ_HARFBUZZ_CFLAGS)
+endif
diff --git netwerk/dns/Makefile.in netwerk/dns/Makefile.in
index 1cacbd7..a8cd156 100644
--- mozilla/netwerk/dns/Makefile.in
+++ mozilla/netwerk/dns/Makefile.in
@@ -9,3 +9,7 @@ include $(topsrcdir)/config/rules.mk
# for effective TLD data.
etld_data.inc: $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat
$(PYTHON) $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat > etld_data.inc
+
+ifdef MOZ_NATIVE_HARFBUZZ
+nsIDNService.$(OBJ_SUFFIX): CXXFLAGS+=$(MOZ_HARFBUZZ_CFLAGS)
+endif
diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
index 007f272..27f488e 100644
--- mozilla/toolkit/library/Makefile.in
+++ mozilla/toolkit/library/Makefile.in
@@ -103,6 +103,14 @@ ifndef MOZ_TREE_PIXMAN
EXTRA_DSO_LDOPTS += $(MOZ_PIXMAN_LIBS)
endif
+ifdef MOZ_NATIVE_GRAPHITE2
+EXTRA_DSO_LDOPTS += $(MOZ_GRAPHITE2_LIBS)
+endif
+
+ifdef MOZ_NATIVE_HARFBUZZ
+EXTRA_DSO_LDOPTS += $(MOZ_HARFBUZZ_LIBS)
+endif
+
ifdef MOZ_DMD
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,dmd,$(DIST)/lib)
endif

View file

@ -2,7 +2,7 @@ diff --git configure.in configure.in
index 549ad06..2878d9f 100644 index 549ad06..2878d9f 100644
--- mozilla/configure.in --- mozilla/configure.in
+++ mozilla/configure.in +++ mozilla/configure.in
@@ -8491,7 +8491,7 @@ case "$OS_TARGET" in @@ -8091,7 +8091,7 @@ case "$OS_TARGET" in
NECKO_WIFI=1 NECKO_WIFI=1
fi fi
;; ;;
@ -15,23 +15,23 @@ diff --git netwerk/wifi/moz.build netwerk/wifi/moz.build
index 07b01de..11706af 100644 index 07b01de..11706af 100644
--- mozilla/netwerk/wifi/moz.build --- mozilla/netwerk/wifi/moz.build
+++ mozilla/netwerk/wifi/moz.build +++ mozilla/netwerk/wifi/moz.build
@@ -34,6 +34,10 @@ if CONFIG['OS_ARCH'] == 'Darwin': @@ -35,6 +35,10 @@ if CONFIG['OS_ARCH'] == 'Darwin':
CMMSRCS += [ UNIFIED_SOURCES += [
'osx_corewlan.mm', 'osx_corewlan.mm',
] ]
+elif CONFIG['OS_ARCH'] == 'FreeBSD': +elif CONFIG['OS_ARCH'] == 'FreeBSD':
+ SOURCES += [ + UNIFIED_SOURCES += [
+ 'nsWifiScannerFreeBSD.cpp', + 'nsWifiScannerFreeBSD.cpp',
+ ] + ]
elif CONFIG['OS_ARCH'] == 'WINNT': elif CONFIG['OS_ARCH'] == 'WINNT':
CPP_SOURCES += [ UNIFIED_SOURCES += [
'nsWifiScannerWin.cpp', 'nsWifiScannerWin.cpp',
diff --git netwerk/wifi/nsWifiScannerFreeBSD.cpp netwerk/wifi/nsWifiScannerFreeBSD.cpp diff --git netwerk/wifi/nsWifiScannerFreeBSD.cpp netwerk/wifi/nsWifiScannerFreeBSD.cpp
new file mode 100644 new file mode 100644
index 0000000..80d4cb6 index 0000000..80d4cb6
--- /dev/null --- /dev/null
+++ mozilla/netwerk/wifi/nsWifiScannerFreeBSD.cpp +++ mozilla/netwerk/wifi/nsWifiScannerFreeBSD.cpp
@@ -0,0 +1,172 @@ @@ -0,0 +1,167 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public +/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this + * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@ -60,43 +60,39 @@ index 0000000..80d4cb6
+static nsresult +static nsresult
+FreeBSDGetAccessPointData(nsCOMArray<nsWifiAccessPoint> &accessPoints) +FreeBSDGetAccessPointData(nsCOMArray<nsWifiAccessPoint> &accessPoints)
+{ +{
+ bool res = false;
+ char *dupn = NULL;
+ struct ifaddrs *ifal, *ifa;
+ unsigned len;
+
+ // get list of interfaces + // get list of interfaces
+ if (getifaddrs(&ifal) < 0) + struct ifaddrs *ifal;
+ if (getifaddrs(&ifal) < 0) {
+ return NS_ERROR_FAILURE; + return NS_ERROR_FAILURE;
+ }
+ +
+ accessPoints.Clear(); + accessPoints.Clear();
+ +
+ // loop through the interfaces + // loop through the interfaces
+ nsresult rv = NS_ERROR_FAILURE;
+ struct ifaddrs *ifa;
+ for (ifa = ifal; ifa; ifa = ifa->ifa_next) { + for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
+ int s; + // limit to one interface per address
+ struct ifreq ifr; + if (ifa->ifa_addr->sa_family != AF_LINK) {
+ struct ifmediareq ifmr;
+ struct ieee80211req i802r;
+ char iscanbuf[32*1024], *vsr;
+
+ memset(&ifr, 0, sizeof(ifr));
+
+ // list can contain duplicates, so ignore those
+ if (dupn != NULL && strcmp(dupn, ifa->ifa_name) == 0)
+ continue; + continue;
+ dupn = ifa->ifa_name; + }
+ +
+ // store interface name in socket structure + // store interface name in socket structure
+ struct ifreq ifr;
+ memset(&ifr, 0, sizeof(ifr));
+ strncpy(ifr.ifr_name, ifa->ifa_name, sizeof(ifr.ifr_name)); + strncpy(ifr.ifr_name, ifa->ifa_name, sizeof(ifr.ifr_name));
+ ifr.ifr_addr.sa_family = AF_LOCAL; + ifr.ifr_addr.sa_family = AF_LOCAL;
+ +
+ // open socket to interface + // open socket to interface
+ if ((s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0)) < 0) + int s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0);
+ if (s < 0) {
+ continue; + continue;
+ }
+ +
+ // clear interface media structure + // clear interface media structure
+ (void) memset(&ifmr, 0, sizeof(ifmr)); + struct ifmediareq ifmr;
+ (void) strncpy(ifmr.ifm_name, ifa->ifa_name, sizeof(ifmr.ifm_name)); + memset(&ifmr, 0, sizeof(ifmr));
+ strncpy(ifmr.ifm_name, ifa->ifa_name, sizeof(ifmr.ifm_name));
+ +
+ // get interface media information + // get interface media information
+ if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) { + if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
@ -111,8 +107,10 @@ index 0000000..80d4cb6
+ } + }
+ +
+ // perform WiFi scan + // perform WiFi scan
+ (void) memset(&i802r, 0, sizeof(i802r)); + struct ieee80211req i802r;
+ (void) strncpy(i802r.i_name, ifa->ifa_name, sizeof(i802r.i_name)); + char iscanbuf[32*1024];
+ memset(&i802r, 0, sizeof(i802r));
+ strncpy(i802r.i_name, ifa->ifa_name, sizeof(i802r.i_name));
+ i802r.i_type = IEEE80211_IOC_SCAN_RESULTS; + i802r.i_type = IEEE80211_IOC_SCAN_RESULTS;
+ i802r.i_data = iscanbuf; + i802r.i_data = iscanbuf;
+ i802r.i_len = sizeof(iscanbuf); + i802r.i_len = sizeof(iscanbuf);
@ -125,36 +123,33 @@ index 0000000..80d4cb6
+ close(s); + close(s);
+ +
+ // loop through WiFi networks and build geoloc-lookup structure + // loop through WiFi networks and build geoloc-lookup structure
+ vsr = (char *) i802r.i_data; + char *vsr = (char *) i802r.i_data;
+ len = i802r.i_len; + unsigned len = i802r.i_len;
+ while (len >= sizeof(struct ieee80211req_scan_result)) { + while (len >= sizeof(struct ieee80211req_scan_result)) {
+ struct ieee80211req_scan_result *isr; + struct ieee80211req_scan_result *isr =
+ char *id; + (struct ieee80211req_scan_result *) vsr;
+ int idlen;
+ char ssid[IEEE80211_NWID_LEN+1];
+ nsWifiAccessPoint *ap;
+
+ isr = (struct ieee80211req_scan_result *) vsr;
+ +
+ // determine size of this entry + // determine size of this entry
+ char *id;
+ int idlen;
+ if (isr->isr_meshid_len) { + if (isr->isr_meshid_len) {
+ id = vsr + isr->isr_ie_off + isr->isr_ssid_len; + id = vsr + isr->isr_ie_off + isr->isr_ssid_len;
+ idlen = isr->isr_meshid_len; + idlen = isr->isr_meshid_len;
+ } + } else {
+ else {
+ id = vsr + isr->isr_ie_off; + id = vsr + isr->isr_ie_off;
+ idlen = isr->isr_ssid_len; + idlen = isr->isr_ssid_len;
+ } + }
+ +
+ // copy network data + // copy network data
+ char ssid[IEEE80211_NWID_LEN+1];
+ strncpy(ssid, id, idlen); + strncpy(ssid, id, idlen);
+ ssid[idlen] = '\0'; + ssid[idlen] = '\0';
+ ap = new nsWifiAccessPoint(); + nsWifiAccessPoint *ap = new nsWifiAccessPoint();
+ ap->setSSID(ssid, strlen(ssid)); + ap->setSSID(ssid, strlen(ssid));
+ ap->setMac(isr->isr_bssid); + ap->setMac(isr->isr_bssid);
+ ap->setSignal(isr->isr_rssi); + ap->setSignal(isr->isr_rssi);
+ accessPoints.AppendObject(ap); + accessPoints.AppendObject(ap);
+ res = true; + rv = NS_OK;
+ +
+ // log the data + // log the data
+ LOG(( "FreeBSD access point: " + LOG(( "FreeBSD access point: "
@ -172,7 +167,7 @@ index 0000000..80d4cb6
+ +
+ freeifaddrs(ifal); + freeifaddrs(ifal);
+ +
+ return res ? NS_OK : NS_ERROR_FAILURE; + return rv;
+} +}
+ +
+nsresult +nsresult

View file

@ -1,160 +0,0 @@
diff --git config/system-headers config/system-headers
index 432cba6..18a9627 100644
--- mozilla/config/system-headers
+++ mozilla/config/system-headers
@@ -1131,3 +1131,4 @@ unicode/unum.h
unicode/ustring.h
unicode/utypes.h
#endif
+libutil.h
diff --git js/src/config/system-headers js/src/config/system-headers
index 432cba6..18a9627 100644
--- mozilla/js/src/config/system-headers
+++ mozilla/js/src/config/system-headers
@@ -1131,3 +1131,4 @@ unicode/unum.h
unicode/ustring.h
unicode/utypes.h
#endif
+libutil.h
diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
index 9975621..b4b037d 100644
--- mozilla/toolkit/library/Makefile.in
+++ mozilla/toolkit/library/Makefile.in
@@ -289,6 +289,10 @@ OS_LIBS += $(call EXPAND_LIBNAME,kvm)
EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols
endif
+ifeq ($(OS_ARCH),FreeBSD)
+OS_LIBS += $(call EXPAND_LIBNAME,util)
+endif
+
ifeq ($(OS_ARCH),WINNT)
OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 version winspool comdlg32 imm32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg iphlpapi uxtheme setupapi secur32 sensorsapi portabledeviceguids windowscodecs wininet wbemuuid)
ifdef ACCESSIBILITY
diff --git xpcom/base/nsMemoryReporterManager.cpp xpcom/base/nsMemoryReporterManager.cpp
index b8147c8..0ffb34e 100644
--- mozilla/xpcom/base/nsMemoryReporterManager.cpp
+++ mozilla/xpcom/base/nsMemoryReporterManager.cpp
@@ -204,6 +204,61 @@ ResidentFastDistinguishedAmount(int64_t* aN)
return ResidentDistinguishedAmount(aN);
}
+#ifdef __FreeBSD__
+#include <libutil.h>
+#include <algorithm>
+
+static nsresult
+GetKinfoVmentrySelf(int64_t* prss, uint64_t* maxreg)
+{
+ int cnt;
+ struct kinfo_vmentry *vmmap, *kve;
+ if ((vmmap = kinfo_getvmmap(getpid(), &cnt)) == NULL)
+ return NS_ERROR_FAILURE;
+
+ if (prss)
+ *prss = 0;
+ if (maxreg)
+ *maxreg = 0;
+
+ for (int i = 0; i < cnt; i++) {
+ kve = &vmmap[i];
+ if (prss)
+ *prss += kve->kve_private_resident;
+ if (maxreg)
+ *maxreg = std::max(*maxreg,
+ kve->kve_end - kve->kve_start);
+ }
+
+ free(vmmap);
+ return NS_OK;
+}
+
+#define HAVE_PRIVATE_REPORTER
+static nsresult
+PrivateDistinguishedAmount(int64_t* aN)
+{
+ int64_t priv;
+ nsresult rv = GetKinfoVmentrySelf(&priv, NULL);
+ if (NS_SUCCEEDED(rv))
+ *aN = priv * getpagesize();
+
+ return NS_OK;
+}
+
+#define HAVE_VSIZE_MAX_CONTIGUOUS_REPORTER 1
+static nsresult
+VsizeMaxContiguousDistinguishedAmount(int64_t* aN)
+{
+ uint64_t biggestRegion;
+ nsresult rv = GetKinfoVmentrySelf(NULL, &biggestRegion);
+ if (NS_SUCCEEDED(rv))
+ *aN = biggestRegion;
+
+ return NS_OK;
+}
+#endif // FreeBSD
+
#elif defined(SOLARIS)
#include <procfs.h>
@@ -416,6 +470,25 @@ VsizeMaxContiguousDistinguishedAmount(int64_t* aN)
return NS_OK;
}
+#define HAVE_PRIVATE_REPORTER
+static nsresult
+PrivateDistinguishedAmount(int64_t* aN)
+{
+ PROCESS_MEMORY_COUNTERS_EX pmcex;
+ pmcex.cb = sizeof(PROCESS_MEMORY_COUNTERS_EX);
+
+ if (!GetProcessMemoryInfo(
+ GetCurrentProcess(),
+ (PPROCESS_MEMORY_COUNTERS) &pmcex, sizeof(pmcex))) {
+ return NS_ERROR_FAILURE;
+ }
+
+ *aN = pmcex.PrivateUsage;
+ return NS_OK;
+}
+#endif // XP_<PLATFORM>
+
+#ifdef HAVE_VSIZE_MAX_CONTIGUOUS_REPORTER
class VsizeMaxContiguousReporter MOZ_FINAL : public MemoryUniReporter
{
public:
@@ -429,8 +502,9 @@ public:
return VsizeMaxContiguousDistinguishedAmount(aAmount);
}
};
+#endif
-#define HAVE_PRIVATE_REPORTER
+#ifdef HAVE_PRIVATE_REPORTER
class PrivateReporter MOZ_FINAL : public MemoryUniReporter
{
public:
@@ -443,21 +517,10 @@ public:
NS_IMETHOD GetAmount(int64_t* aAmount)
{
- PROCESS_MEMORY_COUNTERS_EX pmcex;
- pmcex.cb = sizeof(PROCESS_MEMORY_COUNTERS_EX);
-
- if (!GetProcessMemoryInfo(
- GetCurrentProcess(),
- (PPROCESS_MEMORY_COUNTERS) &pmcex, sizeof(pmcex))) {
- return NS_ERROR_FAILURE;
- }
-
- *aAmount = pmcex.PrivateUsage;
- return NS_OK;
+ return PrivateDistinguishedAmount(aAmount);
}
};
-
-#endif // XP_<PLATFORM>
+#endif
#ifdef HAVE_VSIZE_AND_RESIDENT_REPORTERS
class VsizeReporter MOZ_FINAL : public MemoryUniReporter

View file

@ -1,62 +0,0 @@
diff --git xpcom/base/nsMemoryInfoDumper.cpp xpcom/base/nsMemoryInfoDumper.cpp
index 0b2f78c..d857374 100644
--- mozilla/xpcom/base/nsMemoryInfoDumper.cpp
+++ mozilla/xpcom/base/nsMemoryInfoDumper.cpp
@@ -6,7 +6,7 @@
#include "mozilla/nsMemoryInfoDumper.h"
-#ifdef XP_LINUX
+#if defined(XP_LINUX) || defined(__FreeBSD__)
#include "mozilla/Preferences.h"
#endif
#include "mozilla/unused.h"
@@ -31,7 +31,7 @@
#include <unistd.h>
#endif
-#ifdef XP_LINUX
+#if defined(XP_LINUX) || defined(__FreeBSD__)
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -110,7 +110,7 @@ private:
} // anonymous namespace
-#ifdef XP_LINUX // {
+#if defined(XP_LINUX) || defined(__FreeBSD__) // {
namespace {
/*
@@ -552,7 +552,7 @@ nsMemoryInfoDumper::~nsMemoryInfoDumper()
/* static */ void
nsMemoryInfoDumper::Initialize()
{
-#ifdef XP_LINUX
+#if defined(XP_LINUX) || defined(__FreeBSD__)
SignalPipeWatcher::Create();
FifoWatcher::MaybeCreate();
#endif
diff --git xpcom/base/nsMemoryReporterManager.cpp xpcom/base/nsMemoryReporterManager.cpp
index 1252e27..6f22093 100644
--- mozilla/xpcom/base/nsMemoryReporterManager.cpp
+++ mozilla/xpcom/base/nsMemoryReporterManager.cpp
@@ -17,7 +17,7 @@
#include "nsPIDOMWindow.h"
#include "nsIObserverService.h"
#include "nsIGlobalObject.h"
-#if defined(XP_LINUX)
+#if defined(XP_LINUX) || defined(__FreeBSD__)
#include "nsMemoryInfoDumper.h"
#endif
#include "mozilla/Attributes.h"
@@ -898,7 +898,7 @@ nsMemoryReporterManager::Init()
RegisterStrongReporter(new mozilla::dmd::DMDReporter());
#endif
-#if defined(XP_LINUX)
+#if defined(XP_LINUX) || defined(__FreeBSD__)
nsMemoryInfoDumper::Initialize();
#endif

View file

@ -0,0 +1,266 @@
commit d099acd
Author: Trevor Saunders <trev.saunders@gmail.com>
Date: Fri Jan 17 15:08:00 2014 -0800
Bug 961264 - Remove obsolete checks for gcc visibility stuff.
---
configure.in | 115 +++-------------------------------------------------
js/src/configure.in | 111 ++------------------------------------------------
2 files changed, 8 insertions(+), 218 deletions(-)
diff --git configure.in configure.in
index dfb8193..33d71b3 100644
--- mozilla/configure.in
+++ mozilla/configure.in
@@ -2507,118 +2507,15 @@ MOZ_CXX11
AC_LANG_C
-dnl Check for .hidden assembler directive and visibility attribute.
-dnl Borrowed from glibc configure.in
+dnl Setup default hidden visibility and wrapped system headers.
dnl ===============================================================
if test "$GNU_CC"; then
- AC_CACHE_CHECK(for visibility(hidden) attribute,
- ac_cv_visibility_hidden,
- [cat > conftest.c <<EOF
- int foo __attribute__ ((visibility ("hidden"))) = 1;
-EOF
- ac_cv_visibility_hidden=no
- if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
- if egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then
- ac_cv_visibility_hidden=yes
- fi
- fi
- rm -f conftest.[cs]
- ])
- if test "$ac_cv_visibility_hidden" = "yes"; then
- AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
-
- AC_CACHE_CHECK(for visibility(default) attribute,
- ac_cv_visibility_default,
- [cat > conftest.c <<EOF
- int foo __attribute__ ((visibility ("default"))) = 1;
-EOF
- ac_cv_visibility_default=no
- if ${CC-cc} -fvisibility=hidden -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
- if ! egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then
- ac_cv_visibility_default=yes
- fi
- fi
- rm -f conftest.[cs]
- ])
- if test "$ac_cv_visibility_default" = "yes"; then
- AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE)
-
- AC_CACHE_CHECK(for visibility pragma support,
- ac_cv_visibility_pragma,
- [cat > conftest.c <<EOF
-#pragma GCC visibility push(hidden)
- int foo_hidden = 1;
-#pragma GCC visibility push(default)
- int foo_default = 1;
-EOF
- ac_cv_visibility_pragma=no
- if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
- if egrep '\.(hidden|private_extern).*foo_hidden' conftest.s >/dev/null; then
- if ! egrep '\.(hidden|private_extern).*foo_default' conftest.s > /dev/null; then
- ac_cv_visibility_pragma=yes
- fi
- fi
- fi
- rm -f conftest.[cs]
- ])
- if test "$ac_cv_visibility_pragma" = "yes"; then
- AC_CACHE_CHECK(For gcc visibility bug with class-level attributes (GCC bug 26905),
- ac_cv_have_visibility_class_bug,
- [cat > conftest.c <<EOF
-#pragma GCC visibility push(hidden)
-struct __attribute__ ((visibility ("default"))) TestStruct {
- static void Init();
-};
-__attribute__ ((visibility ("default"))) void TestFunc() {
- TestStruct::Init();
-}
-EOF
- ac_cv_have_visibility_class_bug=no
- if ! ${CXX-g++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
- ac_cv_have_visibility_class_bug=yes
- else
- if test `egrep -c '@PLT|\\$stub' conftest.S` = 0; then
- ac_cv_have_visibility_class_bug=yes
- fi
- fi
- rm -rf conftest.{c,S}
- ])
-
- AC_CACHE_CHECK(For x86_64 gcc visibility bug with builtins (GCC bug 20297),
- ac_cv_have_visibility_builtin_bug,
- [cat > conftest.c <<EOF
-#pragma GCC visibility push(hidden)
-#pragma GCC visibility push(default)
-#include <string.h>
-#pragma GCC visibility pop
-
-__attribute__ ((visibility ("default"))) void Func() {
- char c[[100]];
- memset(c, 0, sizeof(c));
-}
-EOF
- ac_cv_have_visibility_builtin_bug=no
- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
- ac_cv_have_visibility_builtin_bug=yes
- else
- if test `grep -c "@PLT" conftest.S` = 0; then
- ac_cv_visibility_builtin_bug=yes
- fi
- fi
- rm -f conftest.{c,S}
- ])
- if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
- "$ac_cv_have_visibility_class_bug" = "no"; then
- VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
- WRAP_SYSTEM_INCLUDES=1
- STL_FLAGS='-I$(DIST)/stl_wrappers'
- WRAP_STL_INCLUDES=1
- else
- VISIBILITY_FLAGS='-fvisibility=hidden'
- fi # have visibility pragma bug
- fi # have visibility pragma
- fi # have visibility(default) attribute
- fi # have visibility(hidden) attribute
+ AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
+ AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE)
+ VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
+ WRAP_SYSTEM_INCLUDES=1
+ STL_FLAGS='-I$(DIST)/stl_wrappers'
+ WRAP_STL_INCLUDES=1
fi # GNU_CC
# visibility hidden flag for Sun Studio on Solaris
diff --git js/src/configure.in js/src/configure.in
index bddd46d..d4b522e 100644
--- mozilla/js/src/configure.in
+++ mozilla/js/src/configure.in
@@ -2348,116 +2348,13 @@ fi
AC_LANG_C
-dnl Check for .hidden assembler directive and visibility attribute.
-dnl Borrowed from glibc configure.in
+dnl Setup default hidden visibility and wrapped system headers.
dnl ===============================================================
if test "$GNU_CC"; then
- AC_CACHE_CHECK(for visibility(hidden) attribute,
- ac_cv_visibility_hidden,
- [cat > conftest.c <<EOF
- int foo __attribute__ ((visibility ("hidden"))) = 1;
-EOF
- ac_cv_visibility_hidden=no
- if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
- if egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then
- ac_cv_visibility_hidden=yes
- fi
- fi
- rm -f conftest.[cs]
- ])
- if test "$ac_cv_visibility_hidden" = "yes"; then
- AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
-
- AC_CACHE_CHECK(for visibility(default) attribute,
- ac_cv_visibility_default,
- [cat > conftest.c <<EOF
- int foo __attribute__ ((visibility ("default"))) = 1;
-EOF
- ac_cv_visibility_default=no
- if ${CC-cc} -fvisibility=hidden -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
- if ! egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then
- ac_cv_visibility_default=yes
- fi
- fi
- rm -f conftest.[cs]
- ])
- if test "$ac_cv_visibility_default" = "yes"; then
- AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE)
-
- AC_CACHE_CHECK(for visibility pragma support,
- ac_cv_visibility_pragma,
- [cat > conftest.c <<EOF
-#pragma GCC visibility push(hidden)
- int foo_hidden = 1;
-#pragma GCC visibility push(default)
- int foo_default = 1;
-EOF
- ac_cv_visibility_pragma=no
- if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
- if egrep '\.(hidden|private_extern).*foo_hidden' conftest.s >/dev/null; then
- if ! egrep '\.(hidden|private_extern).*foo_default' conftest.s > /dev/null; then
- ac_cv_visibility_pragma=yes
- fi
- fi
- fi
- rm -f conftest.[cs]
- ])
- if test "$ac_cv_visibility_pragma" = "yes"; then
- AC_CACHE_CHECK(For gcc visibility bug with class-level attributes (GCC bug 26905),
- ac_cv_have_visibility_class_bug,
- [cat > conftest.c <<EOF
-#pragma GCC visibility push(hidden)
-struct __attribute__ ((visibility ("default"))) TestStruct {
- static void Init();
-};
-__attribute__ ((visibility ("default"))) void TestFunc() {
- TestStruct::Init();
-}
-EOF
- ac_cv_have_visibility_class_bug=no
- if ! ${CXX-g++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
- ac_cv_have_visibility_class_bug=yes
- else
- if test `egrep -c '@PLT|\\$stub' conftest.S` = 0; then
- ac_cv_have_visibility_class_bug=yes
- fi
- fi
- rm -rf conftest.{c,S}
- ])
-
- AC_CACHE_CHECK(For x86_64 gcc visibility bug with builtins (GCC bug 20297),
- ac_cv_have_visibility_builtin_bug,
- [cat > conftest.c <<EOF
-#pragma GCC visibility push(hidden)
-#pragma GCC visibility push(default)
-#include <string.h>
-#pragma GCC visibility pop
-
-__attribute__ ((visibility ("default"))) void Func() {
- char c[[100]];
- memset(c, 0, sizeof(c));
-}
-EOF
- ac_cv_have_visibility_builtin_bug=no
- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
- ac_cv_have_visibility_builtin_bug=yes
- else
- if test `grep -c "@PLT" conftest.S` = 0; then
- ac_cv_visibility_builtin_bug=yes
- fi
- fi
- rm -f conftest.{c,S}
- ])
- if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
- "$ac_cv_have_visibility_class_bug" = "no"; then
- VISIBILITY_FLAGS='-I$(DIST)/system_wrappers_js -include $(topsrcdir)/config/gcc_hidden.h'
- WRAP_SYSTEM_INCLUDES=1
- else
- VISIBILITY_FLAGS='-fvisibility=hidden'
- fi # have visibility pragma bug
- fi # have visibility pragma
- fi # have visibility(default) attribute
- fi # have visibility(hidden) attribute
+ AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
+ AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE)
+ VISIBILITY_FLAGS='-I$(DIST)/system_wrappers_js -include $(topsrcdir)/config/gcc_hidden.h'
+ WRAP_SYSTEM_INCLUDES=1
fi # GNU_CC
# visibility hidden flag for Sun Studio on Solaris

View file

@ -0,0 +1,48 @@
diff --git config/system-headers config/system-headers
index 8803150..ae38d68 100644
--- mozilla/config/system-headers
+++ mozilla/config/system-headers
@@ -1145,3 +1145,4 @@ unicode/ustring.h
unicode/utypes.h
#endif
libutil.h
+unwind.h
diff --git configure.in configure.in
index f452a5e..a1ebbcc 100644
--- mozilla/configure.in
+++ mozilla/configure.in
@@ -7455,7 +7455,10 @@ dnl ========================================================
dnl = Support for gcc stack unwinding (from gcc 3.3)
dnl ========================================================
if test -z "$SKIP_LIBRARY_CHECKS"; then
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
MOZ_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
+ AC_LANG_RESTORE
fi
dnl ========================================================
diff --git config/system-headers config/system-headers
index 8803150..ae38d68 100644
--- mozilla/js/src/config/system-headers
+++ mozilla/js/src/config/system-headers
@@ -1145,3 +1145,4 @@ unicode/ustring.h
unicode/utypes.h
#endif
libutil.h
+unwind.h
diff --git configure.in configure.in
index f452a5e..a1ebbcc 100644
--- mozilla/js/src/configure.in
+++ mozilla/js/src/configure.in
@@ -7455,7 +7455,10 @@ dnl ========================================================
dnl = Support for gcc stack unwinding (from gcc 3.3)
dnl ========================================================
if test -z "$SKIP_LIBRARY_CHECKS"; then
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
MOZ_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
+ AC_LANG_RESTORE
fi
dnl ========================================================

View file

@ -0,0 +1,18 @@
diff --git config/system-headers config/system-headers
index 8803150..ae38d68 100644
--- mozilla/config/system-headers
+++ mozilla/config/system-headers
@@ -1144,3 +1144,4 @@ unicode/utypes.h
#endif
libutil.h
unwind.h
+cairo-qt.h
diff --git config/system-headers config/system-headers
index 8803150..ae38d68 100644
--- mozilla/js/src/config/system-headers
+++ mozilla/js/src/config/system-headers
@@ -1144,3 +1144,4 @@ unicode/utypes.h
#endif
libutil.h
unwind.h
+cairo-qt.h

View file

@ -0,0 +1,38 @@
commit 2506904
Author: Alessandro Decina <alessandro.d@gmail.com>
Date: Wed Feb 19 11:30:09 2014 -0500
Bug 973744 - Remove matroska seek hack in the gstreamer media backend. r=edwin
---
content/media/gstreamer/GStreamerReader.cpp | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git content/media/gstreamer/GStreamerReader.cpp content/media/gstreamer/GStreamerReader.cpp
index e21ffdd..82dadeb 100644
--- mozilla/content/media/gstreamer/GStreamerReader.cpp
+++ mozilla/content/media/gstreamer/GStreamerReader.cpp
@@ -381,24 +381,6 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
/* we couldn't get this to play */
return ret;
- /* FIXME: workaround for a bug in matroskademux. This seek makes matroskademux
- * parse the index */
- LOG(PR_LOG_DEBUG, "doing matroskademux seek hack");
- if (gst_element_seek_simple(mPlayBin, GST_FORMAT_TIME,
- GST_SEEK_FLAG_FLUSH, 0)) {
- /* after a seek we need to wait again for ASYNC_DONE */
- message = gst_bus_timed_pop_filtered(mBus, 5 * GST_SECOND,
- (GstMessageType)(GST_MESSAGE_ASYNC_DONE | GST_MESSAGE_ERROR));
- LOG(PR_LOG_DEBUG, "matroskademux seek hack done");
- if (GST_MESSAGE_TYPE(message) != GST_MESSAGE_ASYNC_DONE) {
- gst_element_set_state(mPlayBin, GST_STATE_NULL);
- gst_message_unref(message);
- return NS_ERROR_FAILURE;
- }
- } else {
- LOG(PR_LOG_DEBUG, "matroskademux seek hack failed (non fatal)");
- }
-
/* report the duration */
gint64 duration;

View file

@ -0,0 +1,63 @@
diff --git configure.in configure.in
index 0d9236a..0447104 100644
--- mozilla/configure.in
+++ mozilla/configure.in
@@ -8670,6 +8670,20 @@ fi
AC_SUBST(MOZ_EM_DEBUG)
if test -n "$COMPILE_ENVIRONMENT"; then
+AC_MSG_CHECKING([for posix_fadvise])
+AC_TRY_LINK([#define _XOPEN_SOURCE 600
+ #include <fcntl.h>],
+ [posix_fadvise(0, 0, 0, 0);],
+ [ac_cv___posix_fadvise=true],
+ [ac_cv___posix_fadvise=false])
+
+if test "$ac_cv___posix_fadvise" = true ; then
+ AC_DEFINE(HAVE_POSIX_FADVISE)
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
+
AC_MSG_CHECKING([for posix_fallocate])
AC_TRY_LINK([#define _XOPEN_SOURCE 600
#include <fcntl.h>],
diff --git js/src/configure.in js/src/configure.in
index da9767c..352ba14 100644
--- mozilla/js/src/configure.in
+++ mozilla/js/src/configure.in
@@ -4025,6 +4025,20 @@ AC_SUBST(CXX_VERSION)
AC_SUBST(MSMANIFEST_TOOL)
AC_SUBST(MOZ_LINKER)
+AC_MSG_CHECKING([for posix_fadvise])
+AC_TRY_LINK([#define _XOPEN_SOURCE 600
+ #include <fcntl.h>],
+ [posix_fadvise(0, 0, 0, 0);],
+ [ac_cv___posix_fadvise=true],
+ [ac_cv___posix_fadvise=false])
+
+if test "$ac_cv___posix_fadvise" = true ; then
+ AC_DEFINE(HAVE_POSIX_FADVISE)
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
+
AC_MSG_CHECKING([for posix_fallocate])
AC_TRY_LINK([#define _XOPEN_SOURCE 600
#include <fcntl.h>],
diff --git xpcom/io/nsLocalFileUnix.cpp xpcom/io/nsLocalFileUnix.cpp
index bacf06c..0e46e4a 100644
--- mozilla/xpcom/io/nsLocalFileUnix.cpp
+++ mozilla/xpcom/io/nsLocalFileUnix.cpp
@@ -382,7 +382,7 @@ nsLocalFile::OpenNSPRFileDesc(int32_t flags, int32_t mode, PRFileDesc **_retval)
PR_Delete(mPath.get());
}
-#if defined(LINUX) && !defined(ANDROID)
+#if defined(HAVE_POSIX_FADVISE)
if (flags & OS_READAHEAD) {
posix_fadvise(PR_FileDesc2NativeHandle(*_retval), 0, 0,
POSIX_FADV_SEQUENTIAL);

View file

@ -0,0 +1,27 @@
diff --git xpcom/base/nsStackWalk.cpp xpcom/base/nsStackWalk.cpp
index bb0e15b..7641267 100644
--- mozilla/xpcom/base/nsStackWalk.cpp
+++ mozilla/xpcom/base/nsStackWalk.cpp
@@ -23,6 +23,12 @@ struct CriticalAddress {
};
static CriticalAddress gCriticalAddress;
+// for _Unwind_Backtrace from libcxxrt or libunwind
+// cxxabi.h from libcxxrt implicitly includes unwind.h first
+#if defined(HAVE__UNWIND_BACKTRACE) && !defined(_GNU_SOURCE)
+#define _GNU_SOURCE
+#endif
+
#if defined(HAVE_DLOPEN) || defined(XP_MACOSX)
#include <dlfcn.h>
#endif
@@ -1222,9 +1228,6 @@ NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames,
#elif defined(HAVE__UNWIND_BACKTRACE)
// libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
#include <unwind.h>
struct unwind_info {

View file

@ -1,38 +0,0 @@
--- mozilla/configure.in~
+++ mozilla/configure.in
@@ -2855,6 +2855,7 @@ EOF
#pragma GCC visibility push(hidden)
#pragma GCC visibility push(default)
#include <string.h>
+#include <iterator>
#pragma GCC visibility pop
__attribute__ ((visibility ("default"))) void Func() {
@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() {
}
EOF
ac_cv_have_visibility_builtin_bug=no
- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
+ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
ac_cv_have_visibility_builtin_bug=yes
else
if test `grep -c "@PLT" conftest.S` = 0; then
--- mozilla/js/src/configure.in~
+++ mozilla/js/src/configure.in
@@ -2855,6 +2855,7 @@ EOF
#pragma GCC visibility push(hidden)
#pragma GCC visibility push(default)
#include <string.h>
+#include <iterator>
#pragma GCC visibility pop
__attribute__ ((visibility ("default"))) void Func() {
@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() {
}
EOF
ac_cv_have_visibility_builtin_bug=no
- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
+ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
ac_cv_have_visibility_builtin_bug=yes
else
if test `grep -c "@PLT" conftest.S` = 0; then

View file

@ -0,0 +1,13 @@
# http://llvm.org/bugs/show_bug.cgi?id=19007
--- mozilla/xpcom/base/nscore.h~
+++ mozilla/xpcom/base/nscore.h
@@ -110,7 +110,7 @@
* NS_HIDDEN_(int) NS_FASTCALL func2(char *foo);
*/
-#if defined(__i386__) && defined(__GNUC__) && !defined(XP_OS2)
+#if defined(__i386__) && defined(__GNUC__) && !defined(XP_OS2) && !(defined(__clang__) && __clang_major__ == 3 && __clang_minor__ == 4 && __clang_patchlevel__ == 0)
#define NS_FASTCALL __attribute__ ((regparm (3), stdcall))
#define NS_CONSTRUCTOR_FASTCALL __attribute__ ((regparm (3), stdcall))
#elif defined(XP_WIN) && !defined(_WIN64)

View file

@ -0,0 +1,11 @@
--- mozilla/js/src/Makefile.in~
+++ mozilla/js/src/Makefile.in
@@ -373,7 +373,7 @@ endif
ifdef MOZ_SHARED_ICU
EXTRA_DSO_LDOPTS += $(MOZ_ICU_LIBS)
else
-SHARED_LIBRARY_LIBS += $(MOZ_ICU_LIBS)
+SHARED_LIBRARY_LIBS += $(filter-out -L% -l%,$(MOZ_ICU_LIBS))
endif
# Prevent floating point errors caused by VC++ optimizations

View file

@ -0,0 +1,10 @@
--- mozilla/memory/jemalloc/Makefile.in~
+++ mozilla/memory/jemalloc/Makefile.in
@@ -12,3 +12,7 @@ include $(topsrcdir)/config/rules.mk
ifdef GNU_CC
CFLAGS += -std=gnu99
endif
+
+# XXX startup crash workaround for gcc47 on amd64
+jemalloc.$(OBJ_SUFFIX): OS_CFLAGS := $(filter-out -O3 -Ofast,$(OS_CFLAGS))
+jemalloc.$(OBJ_SUFFIX): MOZ_OPTIMIZE_FLAGS=

View file

@ -0,0 +1,263 @@
# Allow building against system-wide ogg/vorbis/opus.
diff --git config/Makefile.in config/Makefile.in
index 5383399..4393ae8 100644
--- mozilla/config/Makefile.in
+++ mozilla/config/Makefile.in
@@ -79,6 +79,9 @@ export:: $(export-preqs)
-DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
-DMOZ_NATIVE_GRAPHITE2=$(MOZ_NATIVE_GRAPHITE2) \
-DMOZ_NATIVE_HARFBUZZ=$(MOZ_NATIVE_HARFBUZZ) \
+ -DMOZ_NATIVE_OGG=$(MOZ_NATIVE_OGG) \
+ -DMOZ_NATIVE_VORBIS=$(MOZ_NATIVE_VORBIS) \
+ -DMOZ_NATIVE_OPUS=$(MOZ_NATIVE_OPUS) \
$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
$(INSTALL) system_wrappers $(DIST)
diff --git config/external/moz.build config/external/moz.build
index c22a36c..740402e 100644
--- mozilla/config/external/moz.build
+++ mozilla/config/external/moz.build
@@ -15,13 +15,13 @@ if CONFIG['MOZ_UPDATER']:
if not CONFIG['MOZ_NATIVE_BZ2']:
external_dirs += ['modules/libbz2']
-if CONFIG['MOZ_VORBIS']:
+if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_NATIVE_VORBIS']:
external_dirs += ['media/libvorbis']
if CONFIG['MOZ_TREMOR']:
external_dirs += ['media/libtremor']
-if CONFIG['MOZ_OPUS']:
+if CONFIG['MOZ_OPUS'] and not CONFIG['MOZ_NATIVE_OPUS']:
external_dirs += ['media/libopus']
if CONFIG['MOZ_WEBM']:
@@ -34,7 +34,9 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ_NATIVE_LIBVPX']:
external_dirs += ['media/libvpx']
if CONFIG['MOZ_OGG']:
- external_dirs += ['media/libogg', 'media/libtheora']
+ if not CONFIG['MOZ_NATIVE_OGG']:
+ external_dirs += ['media/libogg']
+ external_dirs += ['media/libtheora']
if not CONFIG['MOZ_NATIVE_PNG']:
external_dirs += ['media/libpng']
diff --git config/system-headers config/system-headers
index b711fc3..fd3c14f 100644
--- mozilla/config/system-headers
+++ mozilla/config/system-headers
@@ -1153,3 +1153,17 @@ graphite2/Segment.h
harfbuzz/hb-ot.h
harfbuzz/hb.h
#endif
+#if MOZ_NATIVE_OGG==1
+ogg/ogg.h
+ogg/os_types.h
+#endif
+#if MOZ_NATIVE_VORBIS==1
+vorbis/codec.h
+vorbis/vorbisenc.h
+#endif
+#if MOZ_NATIVE_OPUS==1
+opus.h
+opus_multistream.h
+opus/opus.h
+opus/opus_multistream.h
+#endif
diff --git configure.in configure.in
index df49287..05e97ff 100644
--- mozilla/configure.in
+++ mozilla/configure.in
@@ -5130,6 +5130,40 @@ if test "${ac_cv_c_attribute_aligned}" != "0"; then
fi
dnl ========================================================
+dnl Check for libogg
+dnl ========================================================
+
+MOZ_ARG_WITH_BOOL(system-ogg,
+[ --with-system-ogg Use system libogg (located with pkgconfig)],
+MOZ_NATIVE_OGG=1,
+MOZ_NATIVE_OGG= )
+
+if test -n "$MOZ_NATIVE_OGG"; then
+ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1)
+fi
+
+AC_SUBST(MOZ_NATIVE_OGG)
+AC_SUBST(MOZ_OGG_CFLAGS)
+AC_SUBST(MOZ_OGG_LIBS)
+
+dnl ========================================================
+dnl Check for libvorbis
+dnl ========================================================
+
+MOZ_ARG_WITH_BOOL(system-vorbis,
+[ --with-system-vorbis Use system libvorbis (located with pkgconfig)],
+MOZ_NATIVE_VORBIS=1,
+MOZ_NATIVE_VORBIS= )
+
+if test -n "$MOZ_NATIVE_VORBIS"; then
+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.4)
+fi
+
+AC_SUBST(MOZ_NATIVE_VORBIS)
+AC_SUBST(MOZ_VORBIS_CFLAGS)
+AC_SUBST(MOZ_VORBIS_LIBS)
+
+dnl ========================================================
dnl = Disable Opus audio codec support
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(opus,
@@ -5138,6 +5172,25 @@ MOZ_ARG_DISABLE_BOOL(opus,
MOZ_OPUS=1)
dnl ========================================================
+dnl Check for libopus
+dnl ========================================================
+
+MOZ_ARG_WITH_BOOL(system-opus,
+[ --with-system-opus Use system libopus (located with pkgconfig)],
+MOZ_NATIVE_OPUS=1,
+MOZ_NATIVE_OPUS= )
+
+if test -n "$MOZ_NATIVE_OPUS"; then
+ PKG_CHECK_MODULES(MOZ_OPUS, opus >= 1.1)
+else
+ MOZ_OPUS_CFLAGS='-I$(topsrcdir)/media/libopus/include'
+fi
+
+AC_SUBST(MOZ_NATIVE_OPUS)
+AC_SUBST(MOZ_OPUS_CFLAGS)
+AC_SUBST(MOZ_OPUS_LIBS)
+
+dnl ========================================================
dnl = Disable VP8 decoder support
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(webm,
diff --git content/media/Makefile.in content/media/Makefile.in
index 68f360e..76f2d57 100644
--- mozilla/content/media/Makefile.in
+++ mozilla/content/media/Makefile.in
@@ -7,4 +7,16 @@ include $(topsrcdir)/config/rules.mk
CFLAGS += $(GSTREAMER_CFLAGS)
CXXFLAGS += $(GSTREAMER_CFLAGS)
+ifdef MOZ_NATIVE_OGG
+CXXFLAGS += $(MOZ_OGG_CFLAGS)
+endif
+
+ifdef MOZ_NATIVE_VORBIS
+CXXFLAGS += $(MOZ_VORBIS_CFLAGS)
+endif
+
+ifdef MOZ_NATIVE_OPUS
+CXXFLAGS += $(MOZ_OPUS_CFLAGS)
+endif
+
AudioNodeEngineNEON.$(OBJ_SUFFIX): CXXFLAGS += -mfpu=neon
diff --git media/libtheora/Makefile.in media/libtheora/Makefile.in
new file mode 100644
index 0000000..1f02dc0
--- /dev/null
+++ mozilla/media/libtheora/Makefile.in
@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+include $(topsrcdir)/config/rules.mk
+
+ifdef MOZ_NATIVE_OGG
+CFLAGS += $(MOZ_OGG_CFLAGS)
+endif
diff --git media/libtremor/Makefile.in media/libtremor/Makefile.in
new file mode 100644
index 0000000..1f02dc0
--- /dev/null
+++ mozilla/media/libtremor/Makefile.in
@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+include $(topsrcdir)/config/rules.mk
+
+ifdef MOZ_NATIVE_OGG
+CFLAGS += $(MOZ_OGG_CFLAGS)
+endif
diff --git media/libvorbis/Makefile.in media/libvorbis/Makefile.in
new file mode 100644
index 0000000..1f02dc0
--- /dev/null
+++ mozilla/media/libvorbis/Makefile.in
@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+include $(topsrcdir)/config/rules.mk
+
+ifdef MOZ_NATIVE_OGG
+CFLAGS += $(MOZ_OGG_CFLAGS)
+endif
diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in
index c5e82c4..91ef86a 100644
--- mozilla/media/webrtc/signaling/test/Makefile.in
+++ mozilla/media/webrtc/signaling/test/Makefile.in
@@ -48,6 +48,12 @@ LIBS += \
$(NULL)
endif
+ifdef MOZ_NATIVE_OPUS
+LIBS += \
+ $(MOZ_OPUS_LIBS) \
+ $(NULL)
+endif
+
ifdef MOZ_NATIVE_LIBVPX
LIBS += \
$(MOZ_LIBVPX_LIBS) \
diff --git media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi
index 00e77e7..55f48ab 100644
--- mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi
+++ mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi
@@ -14,9 +14,9 @@
'conditions': [
['build_with_mozilla==1', {
# Mozilla provides its own build of the opus library.
- 'include_dirs': [
- '$(DIST)/include/opus',
- ]
+ 'cflags_mozilla': [
+ '$(MOZ_OPUS_CFLAGS)',
+ ],
}, {
'dependencies': [
'<(DEPTH)/third_party/opus/opus.gyp:opus'
diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
index 27f488e..cd27084 100644
--- mozilla/toolkit/library/Makefile.in
+++ mozilla/toolkit/library/Makefile.in
@@ -91,6 +91,18 @@ ifdef MOZ_NATIVE_HUNSPELL
EXTRA_DSO_LDOPTS += $(MOZ_HUNSPELL_LIBS)
endif
+ifdef MOZ_NATIVE_OGG
+EXTRA_DSO_LDOPTS += $(MOZ_OGG_LIBS)
+endif
+
+ifdef MOZ_NATIVE_VORBIS
+EXTRA_DSO_LDOPTS += $(MOZ_VORBIS_LIBS)
+endif
+
+ifdef MOZ_NATIVE_OPUS
+EXTRA_DSO_LDOPTS += $(MOZ_OPUS_LIBS)
+endif
+
ifdef MOZ_NATIVE_LIBEVENT
EXTRA_DSO_LDOPTS += $(MOZ_LIBEVENT_LIBS)
endif