Attachment #182443 for bug #218912




.elif ${gecko_ARGS:Mfirefox}

_GECKO_DEFAULT_VERSION=	52
_GECKO_VERSIONS=		52 54
_GECKO_TYPE=	firefox

# Dependence lines for different Firefox versions
52_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox-esr
54_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox

.if exists(${LOCALBASE}/bin/firefox)
_GECKO_INSTALLED_VER!=	${LOCALBASE}/bin/firefox --version 2>/dev/null




MOZ_OPTIONS+=	--disable-gconf
.endif

.if ${MOZILLA_VER:R:R} < 55
. if ${PORT_OPTIONS:MGNOMEUI}
BUILD_DEPENDS+=	${libgnomeui_DETECT}:${libgnomeui_LIB_DEPENDS:C/.*://}
USE_GNOME+=		libgnomeui:build
MOZ_OPTIONS+=	--enable-gnomeui
. else
MOZ_OPTIONS+=	--disable-gnomeui
. endif
.endif

.if ${PORT_OPTIONS:MLIBPROXY}

.endif

.if ${PORT_OPTIONS:MRUST}
BUILD_DEPENDS+=	rust>=1.15.1:${RUST_PORT}
. if ${MOZILLA_VER:R:R} >= 51
BUILD_DEPENDS+=	cargo>=0.16.0:devel/cargo
. endif

Lines 2-8 Link Here

(-)b/www/firefox-i18n/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= firefox-i18n	4	PORTNAME= firefox-i18n
5	PORTVERSION= 53.0.2	5	PORTVERSION= 54.0b2
6	CATEGORIES= www	6	CATEGORIES= www
7	MASTER_SITES= MOZILLA/${PORTNAME:S\|-i18n\|\|}/releases/${DISTVERSION}/linux-i686/xpi \	7	MASTER_SITES= MOZILLA/${PORTNAME:S\|-i18n\|\|}/releases/${DISTVERSION}/linux-i686/xpi \
8	MOZILLA/${PORTNAME:S\|-i18n\|\|}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi	8	MOZILLA/${PORTNAME:S\|-i18n\|\|}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi
Lines 15-21 COMMENT= Localized interface for Firefox Link Here
15		15
16	EXTRACT_DEPENDS= zip:archivers/zip	16	EXTRACT_DEPENDS= zip:archivers/zip
17		17
18	USES= zip:infozip gecko:firefox,53,build	18	USES= zip:infozip gecko:firefox,54,build
19	USE_XPI= firefox	19	USE_XPI= firefox
20		20
21	NO_ARCH= yes	21	NO_ARCH= yes




TIMESTAMP = 1494295533
SHA256 (xpi/firefox-i18n-54.0b2/ach.xpi) = 6b50af6b457608c625b5a99c0f467e9e13827e84387223682c251847ef12ec03
SIZE (xpi/firefox-i18n-54.0b2/ach.xpi) = 432350
SHA256 (xpi/firefox-i18n-54.0b2/af.xpi) = 2e030e8d993a72fc2b922bd71749564706d5bbc4f5edd1d5cb0a2e2d341dd397
SIZE (xpi/firefox-i18n-54.0b2/af.xpi) = 441829
SHA256 (xpi/firefox-i18n-54.0b2/an.xpi) = 3b049eabcf49f57742f574c792b0f15a2f0fe7af8d7700074555741eba4b40bd
SIZE (xpi/firefox-i18n-54.0b2/an.xpi) = 450799
SHA256 (xpi/firefox-i18n-54.0b2/ar.xpi) = 0df14612d4a6fe4e6da247b8529b45ab856d3a6d6bf284dac9654af2b4c91909
SIZE (xpi/firefox-i18n-54.0b2/ar.xpi) = 479118
SHA256 (xpi/firefox-i18n-54.0b2/as.xpi) = 67a780398046cfb66c7b10d8aa3e42a7b8eef5d8eedb2f7d890ab1a748049708
SIZE (xpi/firefox-i18n-54.0b2/as.xpi) = 491255
SHA256 (xpi/firefox-i18n-54.0b2/ast.xpi) = 0b0cab248642b295d3ec4fdb5206c4b4ab3ec1d8aa9cec573f230bd6fa75a816
SIZE (xpi/firefox-i18n-54.0b2/ast.xpi) = 445436
SHA256 (xpi/firefox-i18n-54.0b2/az.xpi) = 59ead0e267f43af93c7caa1148947224dc4206d42a37f80156ff47adae994261
SIZE (xpi/firefox-i18n-54.0b2/az.xpi) = 459503
SHA256 (xpi/firefox-i18n-54.0b2/bg.xpi) = 5ca6477997bd96165af804a2a8bcd6c01c8bfb5c9f98354e1602f49a922cf65b
SIZE (xpi/firefox-i18n-54.0b2/bg.xpi) = 492607
SHA256 (xpi/firefox-i18n-54.0b2/bn-BD.xpi) = 9f52c102c056489b2187f9d781a645f2c1d205b812a3ca6afdad56130c211c7f
SIZE (xpi/firefox-i18n-54.0b2/bn-BD.xpi) = 516501
SHA256 (xpi/firefox-i18n-54.0b2/bn-IN.xpi) = f913e5d79388285ae6a7e7f59b81855135336c50c37e3dd90cbd101057017600
SIZE (xpi/firefox-i18n-54.0b2/bn-IN.xpi) = 513552
SHA256 (xpi/firefox-i18n-54.0b2/br.xpi) = 0bb79e4c792cd3bba0804064f91963389daba26a486cbf3fe84045ee6701ec07
SIZE (xpi/firefox-i18n-54.0b2/br.xpi) = 440067
SHA256 (xpi/firefox-i18n-54.0b2/bs.xpi) = e4c803a77b70c0077c3f0fb467a601b5ff143a37ac8303dd97005b7aa3007864
SIZE (xpi/firefox-i18n-54.0b2/bs.xpi) = 446633
SHA256 (xpi/firefox-i18n-54.0b2/ca.xpi) = 18483d647252cb2d6c9be0a2ec460de22cdecaa492b02d4a1ef3e5f9ded2aa59
SIZE (xpi/firefox-i18n-54.0b2/ca.xpi) = 448941
SHA256 (xpi/firefox-i18n-54.0b2/cs.xpi) = 5335967e578088e691d59a6f0540380075dab79e611c53fd67e2938da432f25a
SIZE (xpi/firefox-i18n-54.0b2/cs.xpi) = 449411
SHA256 (xpi/firefox-i18n-54.0b2/cy.xpi) = 0822da739fc2ce0bf267dcafc8af2841432e62793e4c66ca79d0d937c4e5780e
SIZE (xpi/firefox-i18n-54.0b2/cy.xpi) = 441503
SHA256 (xpi/firefox-i18n-54.0b2/da.xpi) = 823dfd42463c4b31a6a5b1cfdcb79bfda8e80ade999cd9d481d09e48b97190c6
SIZE (xpi/firefox-i18n-54.0b2/da.xpi) = 428973
SHA256 (xpi/firefox-i18n-54.0b2/de.xpi) = 81a6ac063827b7c3eb99a26b491e26c5e6898edf51e2d836d60e14a69a2d150d
SIZE (xpi/firefox-i18n-54.0b2/de.xpi) = 447784
SHA256 (xpi/firefox-i18n-54.0b2/dsb.xpi) = 72e03e9bcefc173af4df02bfc99f22df99e7b3829cbc1d07de1b3d98e8092b35
SIZE (xpi/firefox-i18n-54.0b2/dsb.xpi) = 464374
SHA256 (xpi/firefox-i18n-54.0b2/el.xpi) = e8815fb6cae7632d70ae00cd28293a96f9d875f4f2e4e6c1491751037f293437
SIZE (xpi/firefox-i18n-54.0b2/el.xpi) = 523412
SHA256 (xpi/firefox-i18n-54.0b2/en-GB.xpi) = 258bec58ec28b75eb3db7c9b9cc68af21497eb49603994ace4aaa105840c84fd
SIZE (xpi/firefox-i18n-54.0b2/en-GB.xpi) = 424829
SHA256 (xpi/firefox-i18n-54.0b2/en-US.xpi) = e8d3d164d433d755f7619c8413d1f53041f2f23d5819c8043362408b26245398
SIZE (xpi/firefox-i18n-54.0b2/en-US.xpi) = 430736
SHA256 (xpi/firefox-i18n-54.0b2/en-ZA.xpi) = 0fe0b4fc2bb38f15bfff36e44bbb2c62715daaa6b242f3914581512684fddeb7
SIZE (xpi/firefox-i18n-54.0b2/en-ZA.xpi) = 417992
SHA256 (xpi/firefox-i18n-54.0b2/eo.xpi) = 541501fc0829fcf8147ee269224928b52e6cf4e8f1b362a4177d63f906db902e
SIZE (xpi/firefox-i18n-54.0b2/eo.xpi) = 442322
SHA256 (xpi/firefox-i18n-54.0b2/es-AR.xpi) = 61ff3ce7467b5222e110107c4119e9f752645ad0b31c6b614487bb5c533a0311
SIZE (xpi/firefox-i18n-54.0b2/es-AR.xpi) = 450766
SHA256 (xpi/firefox-i18n-54.0b2/es-CL.xpi) = a806fc6176247cda5a54ef853c9637775f9a1c2e29a87dd1b55742a71f852b33
SIZE (xpi/firefox-i18n-54.0b2/es-CL.xpi) = 450475
SHA256 (xpi/firefox-i18n-54.0b2/es-ES.xpi) = 8604ba37430f71b800a67361ce53b2325d7d71cefd0167170db35c4f2e02ce59
SIZE (xpi/firefox-i18n-54.0b2/es-ES.xpi) = 347587
SHA256 (xpi/firefox-i18n-54.0b2/es-MX.xpi) = 2173f50a3dea92c658a7e60ae76fbab81335e2bd843a835bd31db2e6162d75f1
SIZE (xpi/firefox-i18n-54.0b2/es-MX.xpi) = 453324
SHA256 (xpi/firefox-i18n-54.0b2/et.xpi) = 1ded0ac4ec18c88b8c9425a9f00f02112514c0474c442d445fd210dae019bc77
SIZE (xpi/firefox-i18n-54.0b2/et.xpi) = 428863
SHA256 (xpi/firefox-i18n-54.0b2/eu.xpi) = 624fc7dfe57168f616153f03f34348786f82efe5dcb0a510d4e42c93560bede7
SIZE (xpi/firefox-i18n-54.0b2/eu.xpi) = 443202
SHA256 (xpi/firefox-i18n-54.0b2/fa.xpi) = a745c9cdf381f18097755226fd7fff59840c6498fd8601d8850f7b22d36ddddb
SIZE (xpi/firefox-i18n-54.0b2/fa.xpi) = 496781
SHA256 (xpi/firefox-i18n-54.0b2/ff.xpi) = f68a9e23a8e2a02ff493ebd0bd9698b17ff5a5a3850bc8f21bf6fe2d6c6f22cf
SIZE (xpi/firefox-i18n-54.0b2/ff.xpi) = 446668
SHA256 (xpi/firefox-i18n-54.0b2/fi.xpi) = b99cc77e76dcbf9a25fa68c622648aa9e2db64b610c83012d8695f13e55d23a9
SIZE (xpi/firefox-i18n-54.0b2/fi.xpi) = 434620
SHA256 (xpi/firefox-i18n-54.0b2/fr.xpi) = 85436c3886b9b89e601ddf39329af76275a0010fb6acc723574a239154cd3f07
SIZE (xpi/firefox-i18n-54.0b2/fr.xpi) = 457534
SHA256 (xpi/firefox-i18n-54.0b2/fy-NL.xpi) = 1896b79fd6ac6bfa4beca5f56d88292375231836d1d031a4146b126f464403ea
SIZE (xpi/firefox-i18n-54.0b2/fy-NL.xpi) = 449819
SHA256 (xpi/firefox-i18n-54.0b2/ga-IE.xpi) = c276e493fd8a6a77bb9f6a0542763ded93ceff0f74dfdc7329f2c86105d30e6c
SIZE (xpi/firefox-i18n-54.0b2/ga-IE.xpi) = 463129
SHA256 (xpi/firefox-i18n-54.0b2/gd.xpi) = 4da4ab8fc415524ea83e99f63edc5546c0027e8b3dca1615905e69521c358a38
SIZE (xpi/firefox-i18n-54.0b2/gd.xpi) = 452061
SHA256 (xpi/firefox-i18n-54.0b2/gl.xpi) = 3a6bbcc4ac4e7b6a16031a64a8b8518fa18c7932d90bbbedfa79beecc32ece96
SIZE (xpi/firefox-i18n-54.0b2/gl.xpi) = 449150
SHA256 (xpi/firefox-i18n-54.0b2/gn.xpi) = b750ecda7bef4e14213d8e04281e080748cf48ec6e26e81457de9451aabd1454
SIZE (xpi/firefox-i18n-54.0b2/gn.xpi) = 461571
SHA256 (xpi/firefox-i18n-54.0b2/gu-IN.xpi) = 922ab30d6f1cb0747d1cd18ec526014e6f1761d5667f5d16eed834ac214149f4
SIZE (xpi/firefox-i18n-54.0b2/gu-IN.xpi) = 493667
SHA256 (xpi/firefox-i18n-54.0b2/he.xpi) = 11d021e790ab97612caa09afd29586fff8d680f8c4267920180f4a2b888e34a2
SIZE (xpi/firefox-i18n-54.0b2/he.xpi) = 460047
SHA256 (xpi/firefox-i18n-54.0b2/hi-IN.xpi) = af30c610f0e1300a2deeb47438e303b1714fd554f7859693d0a55109915d66d9
SIZE (xpi/firefox-i18n-54.0b2/hi-IN.xpi) = 511787
SHA256 (xpi/firefox-i18n-54.0b2/hr.xpi) = f4f7ffc50536c254a274e593eefb63fa5d26601968efc4f53d71179c6c95180c
SIZE (xpi/firefox-i18n-54.0b2/hr.xpi) = 453109
SHA256 (xpi/firefox-i18n-54.0b2/hsb.xpi) = ba0e3f0d2d40c45d2b481dfd2680a2fc312e6eb981058c85e696690f90f52d4d
SIZE (xpi/firefox-i18n-54.0b2/hsb.xpi) = 462170
SHA256 (xpi/firefox-i18n-54.0b2/hu.xpi) = 486d533bddbc6dd76a435fbe4efcb092218ec13ccc62aaaf2577b118d008bff8
SIZE (xpi/firefox-i18n-54.0b2/hu.xpi) = 456925
SHA256 (xpi/firefox-i18n-54.0b2/hy-AM.xpi) = d0b02e04e824c1110f3bc1c16854e0d65632fbc1683ff149def5cb3878e35dca
SIZE (xpi/firefox-i18n-54.0b2/hy-AM.xpi) = 500717
SHA256 (xpi/firefox-i18n-54.0b2/id.xpi) = e4533c814f961d10f807c9e575989e1116bba1369731fc8f46c00fd5cc9d966a
SIZE (xpi/firefox-i18n-54.0b2/id.xpi) = 430280
SHA256 (xpi/firefox-i18n-54.0b2/is.xpi) = da4be8811abad593f3f8bf06f922ccdc0873a59ed6f63fbfc5d541272e211b89
SIZE (xpi/firefox-i18n-54.0b2/is.xpi) = 447329
SHA256 (xpi/firefox-i18n-54.0b2/it.xpi) = 7dbbe76bfea715179c118ed0d3547596454d45e9ee0b001d876893db807b68b8
SIZE (xpi/firefox-i18n-54.0b2/it.xpi) = 341968
SHA256 (xpi/firefox-i18n-54.0b2/ja.xpi) = d0ce0ca453f180cdf7edabf18e3268f3117c70018fd2d06f870b60eee8d5c2cf
SIZE (xpi/firefox-i18n-54.0b2/ja.xpi) = 493027
SHA256 (xpi/firefox-i18n-54.0b2/kk.xpi) = 29bbb10188bac81daf7d73c82da3d4c653fd4b8ae384527b18bbda3fed07eca3
SIZE (xpi/firefox-i18n-54.0b2/kk.xpi) = 499340
SHA256 (xpi/firefox-i18n-54.0b2/km.xpi) = 36101d95663960644b096602ee3db596b0f1e59ead95e9a5bf64be3accad8bdb
SIZE (xpi/firefox-i18n-54.0b2/km.xpi) = 524728
SHA256 (xpi/firefox-i18n-54.0b2/kn.xpi) = 59c340fdedbf240a5e46e07144a11ce01cb0bd83d4cd7fa0c611e2f2bcbd465e
SIZE (xpi/firefox-i18n-54.0b2/kn.xpi) = 524035
SHA256 (xpi/firefox-i18n-54.0b2/ko.xpi) = 9e67ce2142de5d82e959dff3e812efff88ec34f1b691d07fa0312a50173de95d
SIZE (xpi/firefox-i18n-54.0b2/ko.xpi) = 468651
SHA256 (xpi/firefox-i18n-54.0b2/lij.xpi) = c739536b93b9f8a6b97f958531d19907752d77619d84232e03bf9b14bb543995
SIZE (xpi/firefox-i18n-54.0b2/lij.xpi) = 435428
SHA256 (xpi/firefox-i18n-54.0b2/lt.xpi) = 8a42c0b05b37d3554ae70478a84a16b8e78ee3aa6eb26a1b6fd4cbaba0e9c1bb
SIZE (xpi/firefox-i18n-54.0b2/lt.xpi) = 457033
SHA256 (xpi/firefox-i18n-54.0b2/lv.xpi) = e2067c4beced017ce7559bf0bb610d5cc3e2fc0e2d654223e93224fe09f26c49
SIZE (xpi/firefox-i18n-54.0b2/lv.xpi) = 453376
SHA256 (xpi/firefox-i18n-54.0b2/mai.xpi) = de5a34ad598a77c50be8f51529ec384f163ab388d6c14919a1928bf00dc4a8ea
SIZE (xpi/firefox-i18n-54.0b2/mai.xpi) = 504301
SHA256 (xpi/firefox-i18n-54.0b2/mk.xpi) = bd05f2c417b776651c5aa58f610d532a7b1402c9ab30fdde3126e3bd7b38ccc9
SIZE (xpi/firefox-i18n-54.0b2/mk.xpi) = 499954
SHA256 (xpi/firefox-i18n-54.0b2/ml.xpi) = 89e1127cfd43e994b39505b901e5dc696acbe744cd55f30ebfbd832530ae4d59
SIZE (xpi/firefox-i18n-54.0b2/ml.xpi) = 520665
SHA256 (xpi/firefox-i18n-54.0b2/mr.xpi) = 94d69be50f1c958102715dcc93ed12f2e9e8b8dd9431c9f675949b9208a0ae45
SIZE (xpi/firefox-i18n-54.0b2/mr.xpi) = 507881
SHA256 (xpi/firefox-i18n-54.0b2/ms.xpi) = d0a9ebeb04a68cbf250cfc02aca420e1398d09709dcc2ec2030b90ccaaeee314
SIZE (xpi/firefox-i18n-54.0b2/ms.xpi) = 440726
SHA256 (xpi/firefox-i18n-54.0b2/nb-NO.xpi) = d87de6098aa2e6a6589a4892009e321702cdf3ab78f1d098b8c8cc4002b8b250
SIZE (xpi/firefox-i18n-54.0b2/nb-NO.xpi) = 439031
SHA256 (xpi/firefox-i18n-54.0b2/nl.xpi) = d81a6ffa69b3735e9d2d7009a5272917566960842ef6bfd3d1ddfa79ef486954
SIZE (xpi/firefox-i18n-54.0b2/nl.xpi) = 436859
SHA256 (xpi/firefox-i18n-54.0b2/nn-NO.xpi) = 4e514e8d606b0af61e383830fb4cd01026c54670886c4292222280be15628afe
SIZE (xpi/firefox-i18n-54.0b2/nn-NO.xpi) = 433328
SHA256 (xpi/firefox-i18n-54.0b2/or.xpi) = 1dd68ac544f06277082413f6673ec34e4e2472991b6ee3c0ee2e6eb2136da45f
SIZE (xpi/firefox-i18n-54.0b2/or.xpi) = 501207
SHA256 (xpi/firefox-i18n-54.0b2/pa-IN.xpi) = 02fd50b2c13337bbda22d54d9284418ddbb015107194a0ceef1983686de8f76c
SIZE (xpi/firefox-i18n-54.0b2/pa-IN.xpi) = 480863
SHA256 (xpi/firefox-i18n-54.0b2/pl.xpi) = a883b9cee7408f109fc1c4f7067081b83d483c341c972d1ba458635e64e68402
SIZE (xpi/firefox-i18n-54.0b2/pl.xpi) = 354948
SHA256 (xpi/firefox-i18n-54.0b2/pt-BR.xpi) = 0fa8dc3ed0ebd891e877782b04b9b256b9074612095feed6002b21d6beb27f21
SIZE (xpi/firefox-i18n-54.0b2/pt-BR.xpi) = 442706
SHA256 (xpi/firefox-i18n-54.0b2/pt-PT.xpi) = e330926df408aa8641f75736a9badef3e7e4e6e2aba7b2ea94b614aafdb563ae
SIZE (xpi/firefox-i18n-54.0b2/pt-PT.xpi) = 441597
SHA256 (xpi/firefox-i18n-54.0b2/rm.xpi) = 02b3d8b7c7a955ebc031515048fa973901551e503b469404c9424188f7d7ffb1
SIZE (xpi/firefox-i18n-54.0b2/rm.xpi) = 439746
SHA256 (xpi/firefox-i18n-54.0b2/ro.xpi) = e4369e1952a7960a95b2c081c8103006b1d0cf6bf03caa42a457b5ef3300ab50
SIZE (xpi/firefox-i18n-54.0b2/ro.xpi) = 454821
SHA256 (xpi/firefox-i18n-54.0b2/ru.xpi) = a2d465ba99ba544cefd517c3c2725453501e04d993fe0c6554c04d5e1a2e52c6
SIZE (xpi/firefox-i18n-54.0b2/ru.xpi) = 506893
SHA256 (xpi/firefox-i18n-54.0b2/si.xpi) = 3f59729bae26437926a1db83d3cb711f5e5a7dc0b77bcb8ded6741cbaa400e35
SIZE (xpi/firefox-i18n-54.0b2/si.xpi) = 496182
SHA256 (xpi/firefox-i18n-54.0b2/sk.xpi) = 9b59cc6c64d376c99f599ba39094ac2c9d0cbd7460e8a22b27d6a0840337e3a4
SIZE (xpi/firefox-i18n-54.0b2/sk.xpi) = 460857
SHA256 (xpi/firefox-i18n-54.0b2/sl.xpi) = 04454bfb17d444bb5bee5075e67c63bbaa021293bfdb73ef6c34b41ddd16ddc6
SIZE (xpi/firefox-i18n-54.0b2/sl.xpi) = 438368
SHA256 (xpi/firefox-i18n-54.0b2/son.xpi) = e3eb6d18f50936eb502aa115f93b23769e7490b34fea9d7a95263a2700a52d99
SIZE (xpi/firefox-i18n-54.0b2/son.xpi) = 439833
SHA256 (xpi/firefox-i18n-54.0b2/sq.xpi) = 8e2472bdb82639b71fd57fa8f9beec91fb5d3542b086f24ff53155d12c66abe7
SIZE (xpi/firefox-i18n-54.0b2/sq.xpi) = 453422
SHA256 (xpi/firefox-i18n-54.0b2/sr.xpi) = c89f53af42e87fdb87cc5f3651fe4bd33c98ed2306102ed91961e2901793771e
SIZE (xpi/firefox-i18n-54.0b2/sr.xpi) = 467995
SHA256 (xpi/firefox-i18n-54.0b2/sv-SE.xpi) = 8ea1cbf75b2a2dd31fbaabda7af29a911a70d0565c82058f38d677e43bf07e73
SIZE (xpi/firefox-i18n-54.0b2/sv-SE.xpi) = 445794
SHA256 (xpi/firefox-i18n-54.0b2/ta.xpi) = 6f9c38e64e388bc9d20e29ca63d3ff9b67b3d6a896bc0d647a50ec90295f3413
SIZE (xpi/firefox-i18n-54.0b2/ta.xpi) = 500477
SHA256 (xpi/firefox-i18n-54.0b2/te.xpi) = b7b8b3b74d150c3d676a2f527f77c3c80c2f4ecdf255e280ed2db3a748e6abe3
SIZE (xpi/firefox-i18n-54.0b2/te.xpi) = 520473
SHA256 (xpi/firefox-i18n-54.0b2/th.xpi) = baf97ade535c20e08c5a804a2a08441b07e6237b35970e9471490a8c74fb32d0
SIZE (xpi/firefox-i18n-54.0b2/th.xpi) = 494085
SHA256 (xpi/firefox-i18n-54.0b2/tr.xpi) = e25bdd9f0e2fccffd28cfeb4df596a41f762c20933593dfe3ff5b044af703e81
SIZE (xpi/firefox-i18n-54.0b2/tr.xpi) = 445852
SHA256 (xpi/firefox-i18n-54.0b2/uk.xpi) = b0259c08112f7a846d9fef89f1fc44130e7ce1760efaf4a0ec6e657c08351fac
SIZE (xpi/firefox-i18n-54.0b2/uk.xpi) = 497430
SHA256 (xpi/firefox-i18n-54.0b2/uz.xpi) = 4b99ed2093fa73aa086bae96f4b04b34a8ea5f73aeb25ec21a1c316d97085224
SIZE (xpi/firefox-i18n-54.0b2/uz.xpi) = 453390
SHA256 (xpi/firefox-i18n-54.0b2/vi.xpi) = 0cdb6fd7573de2f4315d6c1d6011b6d74abb33f1e562a42b5807f4be3218a71e
SIZE (xpi/firefox-i18n-54.0b2/vi.xpi) = 455840
SHA256 (xpi/firefox-i18n-54.0b2/xh.xpi) = 8999ad2228f4a96829e65a0c17f77bd2f9c21cba50f40238c381054dc358660d
SIZE (xpi/firefox-i18n-54.0b2/xh.xpi) = 446170
SHA256 (xpi/firefox-i18n-54.0b2/zh-CN.xpi) = 3a0efa39397231033295ba594f4fff36ec3e829727a3c4e1fd7cafa6cf6a67da
SIZE (xpi/firefox-i18n-54.0b2/zh-CN.xpi) = 463955
SHA256 (xpi/firefox-i18n-54.0b2/zh-TW.xpi) = 9e1f57da99b79fbce6d70f6d04e7295663c5e84fa151e9026c3519ab8d3bbd61
SIZE (xpi/firefox-i18n-54.0b2/zh-TW.xpi) = 474980




# $FreeBSD$

PORTNAME=	firefox
DISTVERSION=	54.0b6
DISTVERSIONSUFFIX=.source
PORTEPOCH=	1
CATEGORIES=	www ipv6

MAINTAINER=	gecko@FreeBSD.org
COMMENT=	Web browser based on the browser portion of Mozilla

BUILD_DEPENDS=	nspr>=4.14:devel/nspr \
		nss>=3.30.2:security/nss \
		libevent>=2.0.22:devel/libevent \
		harfbuzz>=1.4.3:print/harfbuzz \
		graphite2>=1.3.10:graphics/graphite2 \
		png>=1.6.28:graphics/png \
		libvorbis>=1.3.5,3:audio/libvorbis \
		libvpx>=1.5.0:multimedia/libvpx \

Lines 1-3 Link Here

(-)b/www/firefox/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1493948953	1	TIMESTAMP = 1494295533
2	SHA256 (firefox-53.0.2.source.tar.xz) = c536df9794fafe61e4e74562e2a37cd4a6fb1c13d99d5330d61be03b2d57ae54	2	SHA256 (firefox-54.0b6.source.tar.xz) = e2c4aab83889fb2f967ae910ee5859b5cb8abbb4cf3e3a1cde55745d5ac9e25f
3	SIZE (firefox-53.0.2.source.tar.xz) = 215124156	3	SIZE (firefox-54.0b6.source.tar.xz) = 229651508




commit bbd48a5613c8
Author: Ralph Giles <giles@mozilla.com>
Date:   Fri Feb 10 12:58:18 2017 -0800

    Bug 1338655 - Don't try to build mp4parse bindings. r=froydnj
    
    We use the cheddar crate to generate a C header file
    for our mp4parse_capi wrapper crate. Currently we
    do this at code check-in time via update-rust.sh.
    
    Cargo 0.18 and later will try to execute a build.rs
    file in the crate source tree regardless of whether
    it's specified in Cargo.toml so patching out that
    line just results in 'crate cheddar not found'.
    
    This change restores the old behaviour by substituting
    a 'build = false' line instead.
    
    We do have syntex vendored, but we don't currently build
    it by default, so I prefer this solution to just vendoring
    cheddar and generating the header at build time. The syntex
    crate is quite large and adds significantly to our compile
    time.
    
    MozReview-Commit-ID: InJRRODWAdP
    
    --HG--
    extra : rebase_source : 29378fcbc86015ce6cc22dc66d38a43ddbac204e
---
 media/libstagefright/binding/mp4parse-cargo.patch     | 5 +++--
 media/libstagefright/binding/mp4parse_capi/Cargo.toml | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git media/libstagefright/binding/mp4parse-cargo.patch media/libstagefright/binding/mp4parse-cargo.patch
index 1dd13d20472a..bfa0ab74b424 100644
--- media/libstagefright/binding/mp4parse-cargo.patch
+++ media/libstagefright/binding/mp4parse-cargo.patch
@@ -27,12 +27,13 @@ diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libst
 index aeeebc65..5c0836a 100644
 --- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml
 +++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
-@@ -18,18 +18,10 @@ exclude = [
+@@ -18,18 +18,12 @@ exclude = [
    "*.mp4",
  ]
  
 -build = "build.rs"
--
++build = false
+
  [dependencies]
  byteorder = "1.0.0"
  "mp4parse" = {version = "0.6.0", path = "../mp4parse"}
diff --git media/libstagefright/binding/mp4parse_capi/Cargo.toml media/libstagefright/binding/mp4parse_capi/Cargo.toml
index aee7ee947151..d7e3f55119d3 100644
--- media/libstagefright/binding/mp4parse_capi/Cargo.toml
+++ media/libstagefright/binding/mp4parse_capi/Cargo.toml
@@ -18,6 +18,8 @@ exclude = [
   "*.mp4",
 ]
 
+build = false
+
 [dependencies]
 byteorder = "1.0.0"
 "mp4parse" = {version = "0.6.0", path = "../mp4parse"}




commit fe7592e16fcc
Author: Sean Stangl <sstangl@mozilla.com>
Date:   Mon Apr 24 07:10:58 2017 -0700

    Bug 1359051 - Define cacheFlush for non-Simulator ARM64 builds. r=tcampbell
---
 js/src/jit/ExecutableAllocator.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git js/src/jit/ExecutableAllocator.h js/src/jit/ExecutableAllocator.h
index 3a42918142ef..570a25ff0dc3 100644
--- js/src/jit/ExecutableAllocator.h
+++ js/src/jit/ExecutableAllocator.h
@@ -259,7 +259,7 @@ class ExecutableAllocator
     {
         __clear_cache(code, reinterpret_cast<char*>(code) + size);
     }
-#elif defined(JS_CODEGEN_ARM) && defined(XP_IOS)
+#elif (defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_ARM64)) && defined(XP_IOS)
     static void cacheFlush(void* code, size_t size)
     {
         sys_icache_invalidate(code, size);
@@ -297,7 +297,7 @@ class ExecutableAllocator
                 : "r0", "r1", "r2");
         }
     }
-#elif defined(JS_CODEGEN_ARM64) && (defined(__linux__) || defined(ANDROID)) && defined(__GNUC__)
+#elif defined(JS_CODEGEN_ARM64)
     static void cacheFlush(void* code, size_t size)
     {
         vixl::CPU::EnsureIAndDCacheCoherency(code, size);




Define EPC_sig and RFP_sig for JS_CODEGEN_(ARM64|MIPS) on BSDs

diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp
index 1ab76eeb4bd9..bcdff0487837 100644
--- js/src/wasm/WasmSignalHandlers.cpp
+++ js/src/wasm/WasmSignalHandlers.cpp
@@ -108,7 +108,19 @@ class AutoSetHandlingSegFault
 # define R12_sig(p) ((p)->sc_r12)
 # define R13_sig(p) ((p)->sc_r13)
 # define R14_sig(p) ((p)->sc_r14)
-# define R15_sig(p) ((p)->sc_r15)
+# if defined(__arm__)
+#  define R15_sig(p) ((p)->sc_pc)
+# else
+#  define R15_sig(p) ((p)->sc_r15)
+# endif
+# if defined(__aarch64__)
+#  define EPC_sig(p) ((p)->sc_elr)
+#  define RFP_sig(p) ((p)->sc_x[29])
+# endif
+# if defined(__mips__)
+#  define EPC_sig(p) ((p)->sc_pc)
+#  define RFP_sig(p) ((p)->sc_regs[30])
+# endif
 #elif defined(__linux__) || defined(SOLARIS)
 # if defined(__linux__)
 #  define XMM_sig(p,i) ((p)->uc_mcontext.fpregs->_xmm[i])
@@ -171,6 +183,14 @@ class AutoSetHandlingSegFault
 # define R13_sig(p) ((p)->uc_mcontext.__gregs[_REG_R13])
 # define R14_sig(p) ((p)->uc_mcontext.__gregs[_REG_R14])
 # define R15_sig(p) ((p)->uc_mcontext.__gregs[_REG_R15])
+# if defined(__aarch64__)
+#  define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_PC])
+#  define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_X29])
+# endif
+# if defined(__mips__)
+#  define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_EPC])
+#  define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_S8])
+# endif
 #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 # if defined(__DragonFly__)
 #  define XMM_sig(p,i) (((union savefpu*)(p)->uc_mcontext.mc_fpregs)->sv_xmm.sv_xmm[i])
@@ -200,6 +220,14 @@ class AutoSetHandlingSegFault
 # else
 #  define R15_sig(p) ((p)->uc_mcontext.mc_r15)
 # endif
+# if defined(__FreeBSD__) && defined(__aarch64__)
+#  define EPC_sig(p) ((p)->uc_mcontext.mc_gpregs.gp_elr)
+#  define RFP_sig(p) ((p)->uc_mcontext.mc_gpregs.gp_x[29])
+# endif
+# if defined(__FreeBSD__) && defined(__mips__)
+#  define EPC_sig(p) ((p)->uc_mcontext.mc_pc)
+#  define RFP_sig(p) ((p)->uc_mcontext.mc_regs[30])
+# endif
 #elif defined(XP_DARWIN)
 # define EIP_sig(p) ((p)->uc_mcontext->__ss.__eip)
 # define EBP_sig(p) ((p)->uc_mcontext->__ss.__ebp)




     CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
     CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
diff --git gfx/thebes/moz.build gfx/thebes/moz.build
index 56f1b9fe3f4b..0ac1100b0df3 100644
--- gfx/thebes/moz.build
+++ gfx/thebes/moz.build
@@ -269,7 +269,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
 
 LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
 

index cb1233c56d7e..06fb1f9f174b 100644
--- intl/unicharutil/util/moz.build
+++ intl/unicharutil/util/moz.build
@@ -29,4 +29,7 @@ if CONFIG['ENABLE_INTL_API']:
         'ICUUtils.cpp',
     ]
 
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
 FINAL_LIBRARY = 'xul'
diff --git netwerk/dns/moz.build netwerk/dns/moz.build
index 79c26e3e7001..c4d93bc5f7dc 100644
--- netwerk/dns/moz.build

+                               * 100 + GR2_VERSION_BUGFIX >= \
+                               (major) * 10000 + (minor) * 100 + (bugfix) )
+                   ], [
+                     #if !GR2_VERSION_REQUIRE(1,3,10)
+                     #error "Insufficient graphite2 version."
+                     #endif
+                   ], [],

index 24f940e1ed7e..079a575adec3 100644
--- toolkit/library/moz.build
+++ toolkit/library/moz.build
@@ -224,6 +224,12 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
 if CONFIG['MOZ_SYSTEM_PNG']:
     OS_LIBS += CONFIG['MOZ_PNG_LIBS']
 

index 9297e4d6f501..d8e273887e4b 100644
--- toolkit/moz.configure
+++ toolkit/moz.configure
@@ -356,6 +356,26 @@ add_old_configure_assignment('FT2_LIBS',
 add_old_configure_assignment('FT2_CFLAGS',
                              delayed_getattr(ft2_info, 'cflags'))
 

+option('--with-system-harfbuzz',
+       help="Use system harfbuzz (located with pkgconfig)")
+
+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.3',
+                                    when='--with-system-harfbuzz')
+
+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))




Revert bug 1284816 and bug 1341967 to postpone bustage on non-x86 archs.

diff --git browser/confvars.sh browser/confvars.sh
index d8dcd99c2757..740d9d3e5fcf 100755
--- browser/confvars.sh
+++ browser/confvars.sh
@@ -56,6 +56,7 @@ ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release
 MAR_CHANNEL_ID=firefox-mozilla-beta
 MOZ_PROFILE_MIGRATOR=1
 MOZ_JSDOWNLOADS=1
+MOZ_RUST_MP4PARSE=1
 
 # Enable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=1
diff --git build/moz.configure/rust.configure build/moz.configure/rust.configure
index 267d989f1597..f709820e60ae 100644
--- build/moz.configure/rust.configure
+++ build/moz.configure/rust.configure
@@ -4,10 +4,20 @@
 # 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/.
 
-# Rust is required by `rust_compiler` below. We allow_missing here
-# to propagate failures to the better error message there.
-rustc = check_prog('RUSTC', ['rustc'], allow_missing=True)
-cargo = check_prog('CARGO', ['cargo'], allow_missing=True)
+option('--disable-rust', help='Don\'t include Rust language sources')
+
+@depends('--enable-rust')
+def rust_compiler_names(value):
+    if value:
+        return ['rustc']
+
+@depends('--enable-rust')
+def cargo_binary_names(value):
+    if value:
+        return ['cargo']
+
+rustc = check_prog('RUSTC', rust_compiler_names, allow_missing=True)
+cargo = check_prog('CARGO', cargo_binary_names, allow_missing=True)
 
 @depends_if(rustc)
 @checking('rustc version', lambda info: info.version)
@@ -43,9 +53,12 @@ def cargo_info(cargo):
         version=Version(version),
     )
 
-@depends(rustc_info, cargo_info)
+@depends('--enable-rust', rustc_info, cargo_info)
 @imports(_from='textwrap', _import='dedent')
-def rust_compiler(rustc_info, cargo_info):
+def rust_compiler(value, rustc_info, cargo_info):
+    if not value:
+        return None
+
     if not rustc_info:
         die(dedent('''\
         Rust compiler not found.
diff --git dom/media/MediaPrefs.h dom/media/MediaPrefs.h
index 4dcc659222a4..559334d89fd1 100644
--- dom/media/MediaPrefs.h
+++ dom/media/MediaPrefs.h
@@ -165,7 +165,7 @@ private:
   DECL_MEDIA_PREF("media.ogg.flac.enabled",                   FlacInOgg, bool, false);
   DECL_MEDIA_PREF("media.flac.enabled",                       FlacEnabled, bool, true);
 
-#if !defined(RELEASE_OR_BETA)
+#if defined(MOZ_RUST_MP4PARSE) && !defined(RELEASE_OR_BETA)
   DECL_MEDIA_PREF("media.rust.test_mode",                     RustTestMode, bool, false);
 #endif
 
diff --git media/libstagefright/binding/DecoderData.cpp media/libstagefright/binding/DecoderData.cpp
index 109ea329d154..a06e533b1e62 100644
--- media/libstagefright/binding/DecoderData.cpp
+++ media/libstagefright/binding/DecoderData.cpp
@@ -13,9 +13,11 @@
 #include "mozilla/ArrayUtils.h"
 #include "include/ESDS.h"
 
+#ifdef MOZ_RUST_MP4PARSE
 // OpusDecoder header is really needed only by MP4 in rust
 #include "OpusDecoder.h"
 #include "mp4parse.h"
+#endif // MOZ_RUST_MP4PARSE
 
 using namespace stagefright;
 
@@ -187,6 +189,7 @@ MP4VideoInfo::Update(const MetaData* aMetaData, const char* aMimeType)
 
 }
 
+#ifdef MOZ_RUST_MP4PARSE
 static void
 UpdateTrackProtectedInfo(mozilla::TrackInfo& aConfig,
                          const mp4parse_sinf_info& aSinf)
@@ -266,6 +269,7 @@ MP4VideoInfo::Update(const mp4parse_track_info* track,
     mExtraData->AppendElements(video->extra_data.data, video->extra_data.length);
   }
 }
+#endif // MOZ_RUST_MP4PARSE
 
 bool
 MP4VideoInfo::IsValid() const
diff --git media/libstagefright/binding/MP4Metadata.cpp media/libstagefright/binding/MP4Metadata.cpp
index 5c3810d99a38..5d14dfd8b8a9 100644
--- media/libstagefright/binding/MP4Metadata.cpp
+++ media/libstagefright/binding/MP4Metadata.cpp
@@ -19,14 +19,18 @@
 #include "mp4_demuxer/MP4Metadata.h"
 #include "mp4_demuxer/Stream.h"
 #include "MediaPrefs.h"
+#ifdef MOZ_RUST_MP4PARSE
 #include "mp4parse.h"
+#endif // MOZ_RUST_MP4PARSE
 
 #include <limits>
 #include <stdint.h>
 #include <vector>
 
 
+#ifdef MOZ_RUST_MP4PARSE
 struct FreeMP4Parser { void operator()(mp4parse_parser* aPtr) { mp4parse_free(aPtr); } };
+#endif // MOZ_RUST_MP4PARSE
 
 using namespace stagefright;
 
@@ -101,6 +103,7 @@ private:
   bool mCanSeek;
 };
 
+#ifdef MOZ_RUST_MP4PARSE
 // Wrap an mp4_demuxer::Stream to remember the read offset.
 
 class RustStreamAdaptor {
@@ -145,9 +149,11 @@ private:
   RustStreamAdaptor mRustSource;
   mozilla::UniquePtr<mp4parse_parser, FreeMP4Parser> mRustParser;
 };
+#endif // MOZ_RUST_MP4PARSE
 
 MP4Metadata::MP4Metadata(Stream* aSource)
  : mStagefright(MakeUnique<MP4MetadataStagefright>(aSource))
+#ifdef MOZ_RUST_MP4PARSE
  , mRust(MakeUnique<MP4MetadataRust>(aSource))
  , mPreferRust(false)
  , mReportedAudioTrackTelemetry(false)
@@ -155,6 +161,7 @@ MP4Metadata::MP4Metadata(Stream* aSource)
 #ifndef RELEASE_OR_BETA
  , mRustTestMode(MediaPrefs::RustTestMode())
 #endif
+#endif // MOZ_RUST_MP4PARSE
 {
 }
 
@@ -186,6 +193,7 @@ MP4Metadata::GetNumberTracks(mozilla::TrackInfo::TrackType aType) const
 {
   uint32_t numTracks = mStagefright->GetNumberTracks(aType);
 
+#ifdef MOZ_RUST_MP4PARSE
   if (!mRust) {
     return numTracks;
   }
@@ -211,10 +219,12 @@ MP4Metadata::GetNumberTracks(mozilla::TrackInfo::TrackType aType) const
     mPreferRust = true;
     return numTracksRust;
   }
+#endif // MOZ_RUST_MP4PARSE
 
   return numTracks;
 }
 
+#ifdef MOZ_RUST_MP4PARSE
 bool MP4Metadata::ShouldPreferRust() const {
   if (!mRust) {
     return false;
@@ -245,6 +255,7 @@ bool MP4Metadata::ShouldPreferRust() const {
   // Otherwise, fall back.
   return false;
 }
+#endif // MOZ_RUST_MP4PARSE
 
 mozilla::UniquePtr<mozilla::TrackInfo>
 MP4Metadata::GetTrackInfo(mozilla::TrackInfo::TrackType aType,
@@ -253,6 +264,7 @@ MP4Metadata::GetTrackInfo(mozilla::TrackInfo::TrackType aType,
   mozilla::UniquePtr<mozilla::TrackInfo> info =
       mStagefright->GetTrackInfo(aType, aTrackNumber);
 
+#ifdef MOZ_RUST_MP4PARSE
   if (!mRust) {
     return info;
   }
@@ -305,6 +317,7 @@ MP4Metadata::GetTrackInfo(mozilla::TrackInfo::TrackTyp
   if (mPreferRust) {
     return infoRust;
   }
+#endif // MOZ_RUST_MP4PARSE
 
   return info;
 }
@@ -319,6 +334,7 @@ const CryptoFile&
 MP4Metadata::Crypto() const
 {
   const CryptoFile& crypto = mStagefright->Crypto();
+#ifdef MOZ_RUST_MP4PARSE
   const CryptoFile& rustCrypto = mRust->Crypto();
 
 #ifndef RELEASE_OR_BETA
@@ -330,6 +347,7 @@ MP4Metadata::Crypto() const
   if (mPreferRust) {
     return rustCrypto;
   }
+#endif // MOZ_RUST_MP4PARSE
 
   return crypto;
 }
@@ -594,6 +612,7 @@ MP4MetadataStagefright::Metadata(Stream* aSource)
   return parser->Metadata();
 }
 
+#ifdef MOZ_RUST_MP4PARSE
 bool
 RustStreamAdaptor::Read(uint8_t* buffer, uintptr_t size, size_t* bytes_read)
 {
@@ -859,5 +878,6 @@ MP4MetadataRust::Metadata(Stream* aSource)
   MOZ_ASSERT(false, "Not yet implemented");
   return nullptr;
 }
+#endif // MOZ_RUST_MP4PARSE
 
 } // namespace mp4_demuxer
diff --git media/libstagefright/binding/include/mp4_demuxer/DecoderData.h media/libstagefright/binding/include/mp4_demuxer/DecoderData.h
index 3cd4b7c142f4..dc25ddf03b10 100644
--- media/libstagefright/binding/include/mp4_demuxer/DecoderData.h
+++ media/libstagefright/binding/include/mp4_demuxer/DecoderData.h
@@ -19,11 +19,13 @@ namespace stagefright
 class MetaData;
 }
 
+#ifdef MOZ_RUST_MP4PARSE
 extern "C" {
 typedef struct mp4parse_track_info mp4parse_track_info;
 typedef struct mp4parse_track_audio_info mp4parse_track_audio_info;
 typedef struct mp4parse_track_video_info mp4parse_track_video_info;
 }
+#endif // MOZ_RUST_MP4PARSE
 
 namespace mp4_demuxer
 {
@@ -71,8 +73,10 @@ public:
   void Update(const stagefright::MetaData* aMetaData,
               const char* aMimeType);
 
+#ifdef MOZ_RUST_MP4PARSE
   void Update(const mp4parse_track_info* track,
               const mp4parse_track_audio_info* audio);
+#endif // MOZ_RUST_MP4PARSE
 
   virtual bool IsValid() const override;
 };
@@ -85,8 +89,10 @@ public:
   void Update(const stagefright::MetaData* aMetaData,
               const char* aMimeType);
 
+#ifdef MOZ_RUST_MP4PARSE
   void Update(const mp4parse_track_info* track,
               const mp4parse_track_video_info* video);
+#endif // MOZ_RUST_MP4PARSE
 
   virtual bool IsValid() const override;
 };
diff --git media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h
index 492c9c1c1bc3..e16dbbd1155e 100644
--- media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h
+++ media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h
@@ -36,6 +36,7 @@ public:
 
 private:
   UniquePtr<MP4MetadataStagefright> mStagefright;
+#ifdef MOZ_RUST_MP4PARSE
   UniquePtr<MP4MetadataRust> mRust;
   mutable bool mPreferRust;
   mutable bool mReportedAudioTrackTelemetry;
@@ -44,6 +45,7 @@ private:
   mutable bool mRustTestMode;
 #endif
   bool ShouldPreferRust() const;
+#endif // MOZ_RUST_MP4PARSE
 };
 
 } // namespace mp4_demuxer
diff --git mobile/android/confvars.sh mobile/android/confvars.sh
index e79b6f5c0707..eb62763acaf7 100644
--- mobile/android/confvars.sh
+++ mobile/android/confvars.sh
@@ -30,6 +30,8 @@ MOZ_XULRUNNER=
 MOZ_CAPTURE=1
 MOZ_RAW=1
 
+MOZ_RUST_MP4PARSE=1
+
 # use custom widget for html:select
 MOZ_USE_NATIVE_POPUP_WINDOWS=1
 
diff --git toolkit/components/telemetry/Histograms.json toolkit/components/telemetry/Histograms.json
index 061c55f6a5b6..e49dfd176952 100644
--- toolkit/components/telemetry/Histograms.json
+++ toolkit/components/telemetry/Histograms.json
@@ -6996,7 +6996,8 @@
     "expires_in_version": "55",
     "kind": "boolean",
     "bug_numbers": [1220885],
-    "description": "(Bug 1220885) Whether the rust mp4 demuxer successfully parsed a stream segment."
+    "description": "(Bug 1220885) Whether the rust mp4 demuxer successfully parsed a stream segment.",
+    "cpp_guard": "MOZ_RUST_MP4PARSE"
   },
   "MEDIA_RUST_MP4PARSE_ERROR_CODE": {
     "alert_emails": ["giles@mozilla.com", "kinetik@flim.org"],
@@ -7004,21 +7005,24 @@
     "kind": "enumerated",
     "n_values": 32,
     "bug_numbers": [1238420],
-    "description": "The error code reported when an MP4 parse attempt has failed.0 = OK, 1 = bad argument, 2 = invalid data, 3 = unsupported, 4 = unexpected end of file, 5 = read error."
+    "description": "The error code reported when an MP4 parse attempt has failed.0 = OK, 1 = bad argument, 2 = invalid data, 3 = unsupported, 4 = unexpected end of file, 5 = read error.",
+    "cpp_guard": "MOZ_RUST_MP4PARSE"
   },
   "MEDIA_RUST_MP4PARSE_TRACK_MATCH_AUDIO": {
     "alert_emails": ["giles@mozilla.com", "kinetik@flim.org"],
     "expires_in_version": "55",
     "kind": "boolean",
     "bug_numbers": [1231169],
-    "description": "Whether rust and stagefight mp4 parser audio track results match."
+    "description": "Whether rust and stagefight mp4 parser audio track results match.",
+    "cpp_guard": "MOZ_RUST_MP4PARSE"
   },
   "MEDIA_RUST_MP4PARSE_TRACK_MATCH_VIDEO": {
     "alert_emails": ["giles@mozilla.com", "kinetik@flim.org"],
     "expires_in_version": "55",
     "kind": "boolean",
     "bug_numbers": [1231169],
-    "description": "Whether rust and stagefight mp4 parser video track results match."
+    "description": "Whether rust and stagefight mp4 parser video track results match.",
+    "cpp_guard": "MOZ_RUST_MP4PARSE"
   },
   "MEDIA_WMF_DECODE_ERROR": {
     "expires_in_version": "55",

Return to bug 218912

Lines 37-48 RUN_DEPENDS+= libxul>=45:www/libxul Link Here

(-)b/Mk/Uses/gecko.mk (-2 / +2 lines)
37	.elif ${gecko_ARGS:Mfirefox}	37	.elif ${gecko_ARGS:Mfirefox}
38		38
39	_GECKO_DEFAULT_VERSION= 52	39	_GECKO_DEFAULT_VERSION= 52
40	_GECKO_VERSIONS= 52 53	40	_GECKO_VERSIONS= 52 54
41	_GECKO_TYPE= firefox	41	_GECKO_TYPE= firefox
42		42
43	# Dependence lines for different Firefox versions	43	# Dependence lines for different Firefox versions
44	52_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox-esr	44	52_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox-esr
45	53_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox	45	54_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox
46		46
47	.if exists(${LOCALBASE}/bin/firefox)	47	.if exists(${LOCALBASE}/bin/firefox)
48	_GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null	48	_GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null

Lines 328-339 MOZ_OPTIONS+= --enable-gconf Link Here

(-)b/Mk/bsd.gecko.mk (-3 / +5 lines)
328	MOZ_OPTIONS+= --disable-gconf	328	MOZ_OPTIONS+= --disable-gconf
329	.endif	329	.endif
330		330
331	.if ${PORT_OPTIONS:MGNOMEUI}	331	.if ${MOZILLA_VER:R:R} < 55
		332	. if ${PORT_OPTIONS:MGNOMEUI}
332	BUILD_DEPENDS+= ${libgnomeui_DETECT}:${libgnomeui_LIB_DEPENDS:C/.*://}	333	BUILD_DEPENDS+= ${libgnomeui_DETECT}:${libgnomeui_LIB_DEPENDS:C/.*://}
333	USE_GNOME+= libgnomeui:build	334	USE_GNOME+= libgnomeui:build
334	MOZ_OPTIONS+= --enable-gnomeui	335	MOZ_OPTIONS+= --enable-gnomeui
335	.else	336	. else
336	MOZ_OPTIONS+= --disable-gnomeui	337	MOZ_OPTIONS+= --disable-gnomeui
		338	. endif
337	.endif	339	.endif
338		340
339	.if ${PORT_OPTIONS:MLIBPROXY}	341	.if ${PORT_OPTIONS:MLIBPROXY}
Lines 389-395 post-patch-SNDIO-on: Link Here
389	.endif	391	.endif
390		392
391	.if ${PORT_OPTIONS:MRUST}	393	.if ${PORT_OPTIONS:MRUST}
392	BUILD_DEPENDS+= rustc:${RUST_PORT}	394	BUILD_DEPENDS+= rust>=1.15.1:${RUST_PORT}
393	. if ${MOZILLA_VER:R:R} >= 51	395	. if ${MOZILLA_VER:R:R} >= 51
394	BUILD_DEPENDS+= cargo>=0.16.0:devel/cargo	396	BUILD_DEPENDS+= cargo>=0.16.0:devel/cargo
395	. endif	397	. endif

Lines 2-8 Link Here

(-)b/www/firefox/Makefile (-6 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= firefox	4	PORTNAME= firefox
5	DISTVERSION= 53.0.2	5	DISTVERSION= 54.0b6
6	DISTVERSIONSUFFIX=.source	6	DISTVERSIONSUFFIX=.source
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= www ipv6	8	CATEGORIES= www ipv6
Lines 12-22 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Link Here
12	MAINTAINER= gecko@FreeBSD.org	12	MAINTAINER= gecko@FreeBSD.org
13	COMMENT= Web browser based on the browser portion of Mozilla	13	COMMENT= Web browser based on the browser portion of Mozilla
14		14
15	BUILD_DEPENDS= nspr>=4.13.1:devel/nspr \	15	BUILD_DEPENDS= nspr>=4.14:devel/nspr \
16	nss>=3.29.5:security/nss \	16	nss>=3.30.2:security/nss \
17	libevent>=2.0.21_2:devel/libevent \	17	libevent>=2.0.22:devel/libevent \
18	harfbuzz>=1.4.1:print/harfbuzz \	18	harfbuzz>=1.4.3:print/harfbuzz \
19	graphite2>=1.3.8:graphics/graphite2 \	19	graphite2>=1.3.10:graphics/graphite2 \
20	png>=1.6.28:graphics/png \	20	png>=1.6.28:graphics/png \
21	libvorbis>=1.3.5,3:audio/libvorbis \	21	libvorbis>=1.3.5,3:audio/libvorbis \
22	libvpx>=1.5.0:multimedia/libvpx \	22	libvpx>=1.5.0:multimedia/libvpx \

Removed Link Here

(-)a/www/firefox/files/patch-bug1338655 (-66 lines)
1	commit bbd48a5613c8
2	Author: Ralph Giles <giles@mozilla.com>
3	Date: Fri Feb 10 12:58:18 2017 -0800
4
5	Bug 1338655 - Don't try to build mp4parse bindings. r=froydnj
6
7	We use the cheddar crate to generate a C header file
8	for our mp4parse_capi wrapper crate. Currently we
9	do this at code check-in time via update-rust.sh.
10
11	Cargo 0.18 and later will try to execute a build.rs
12	file in the crate source tree regardless of whether
13	it's specified in Cargo.toml so patching out that
14	line just results in 'crate cheddar not found'.
15
16	This change restores the old behaviour by substituting
17	a 'build = false' line instead.
18
19	We do have syntex vendored, but we don't currently build
20	it by default, so I prefer this solution to just vendoring
21	cheddar and generating the header at build time. The syntex
22	crate is quite large and adds significantly to our compile
23	time.
24
25	MozReview-Commit-ID: InJRRODWAdP
26
27	--HG--
28	extra : rebase_source : 29378fcbc86015ce6cc22dc66d38a43ddbac204e
29	---
30	media/libstagefright/binding/mp4parse-cargo.patch \| 5 +++--
31	media/libstagefright/binding/mp4parse_capi/Cargo.toml \| 2 ++
32	2 files changed, 5 insertions(+), 2 deletions(-)
33
34	diff --git media/libstagefright/binding/mp4parse-cargo.patch media/libstagefright/binding/mp4parse-cargo.patch
35	index 1dd13d20472a..bfa0ab74b424 100644
36	--- media/libstagefright/binding/mp4parse-cargo.patch
37	+++ media/libstagefright/binding/mp4parse-cargo.patch
38	@@ -27,12 +27,13 @@ diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libst
39	index aeeebc65..5c0836a 100644
40	--- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml
41	+++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
42	-@@ -18,18 +18,10 @@ exclude = [
43	+@@ -18,18 +18,12 @@ exclude = [
44	"*.mp4",
45	]
46
47	-build = "build.rs"
48	--
49	++build = false
50	+
51	[dependencies]
52	byteorder = "1.0.0"
53	"mp4parse" = {version = "0.6.0", path = "../mp4parse"}
54	diff --git media/libstagefright/binding/mp4parse_capi/Cargo.toml media/libstagefright/binding/mp4parse_capi/Cargo.toml
55	index aee7ee947151..d7e3f55119d3 100644
56	--- media/libstagefright/binding/mp4parse_capi/Cargo.toml
57	+++ media/libstagefright/binding/mp4parse_capi/Cargo.toml
58	@@ -18,6 +18,8 @@ exclude = [
59	"*.mp4",
60	]
61
62	+build = false
63	+
64	[dependencies]
65	byteorder = "1.0.0"
66	"mp4parse" = {version = "0.6.0", path = "../mp4parse"}

Removed Link Here

(-)a/www/firefox/files/patch-bug1359051 (-31 lines)
1	commit fe7592e16fcc
2	Author: Sean Stangl <sstangl@mozilla.com>
3	Date: Mon Apr 24 07:10:58 2017 -0700
4
5	Bug 1359051 - Define cacheFlush for non-Simulator ARM64 builds. r=tcampbell
6	---
7	js/src/jit/ExecutableAllocator.h \| 4 ++--
8	1 file changed, 2 insertions(+), 2 deletions(-)
9
10	diff --git js/src/jit/ExecutableAllocator.h js/src/jit/ExecutableAllocator.h
11	index 3a42918142ef..570a25ff0dc3 100644
12	--- js/src/jit/ExecutableAllocator.h
13	+++ js/src/jit/ExecutableAllocator.h
14	@@ -259,7 +259,7 @@ class ExecutableAllocator
15	{
16	__clear_cache(code, reinterpret_cast<char*>(code) + size);
17	}
18	-#elif defined(JS_CODEGEN_ARM) && defined(XP_IOS)
19	+#elif (defined(JS_CODEGEN_ARM) \|\| defined(JS_CODEGEN_ARM64)) && defined(XP_IOS)
20	static void cacheFlush(void* code, size_t size)
21	{
22	sys_icache_invalidate(code, size);
23	@@ -297,7 +297,7 @@ class ExecutableAllocator
24	: "r0", "r1", "r2");
25	}
26	}
27	-#elif defined(JS_CODEGEN_ARM64) && (defined(__linux__) \|\| defined(ANDROID)) && defined(__GNUC__)
28	+#elif defined(JS_CODEGEN_ARM64)
29	static void cacheFlush(void* code, size_t size)
30	{
31	vixl::CPU::EnsureIAndDCacheCoherency(code, size);

Removed Link Here

(-)a/www/firefox/files/patch-bug1359142 (-57 lines)
1	Define EPC_sig and RFP_sig for JS_CODEGEN_(ARM64\|MIPS) on BSDs
2
3	diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp
4	index 1ab76eeb4bd9..bcdff0487837 100644
5	--- js/src/wasm/WasmSignalHandlers.cpp
6	+++ js/src/wasm/WasmSignalHandlers.cpp
7	@@ -108,7 +108,19 @@ class AutoSetHandlingSegFault
8	# define R12_sig(p) ((p)->sc_r12)
9	# define R13_sig(p) ((p)->sc_r13)
10	# define R14_sig(p) ((p)->sc_r14)
11	-# define R15_sig(p) ((p)->sc_r15)
12	+# if defined(__arm__)
13	+# define R15_sig(p) ((p)->sc_pc)
14	+# else
15	+# define R15_sig(p) ((p)->sc_r15)
16	+# endif
17	+# if defined(__aarch64__)
18	+# define EPC_sig(p) ((p)->sc_elr)
19	+# define RFP_sig(p) ((p)->sc_x[29])
20	+# endif
21	+# if defined(__mips__)
22	+# define EPC_sig(p) ((p)->sc_pc)
23	+# define RFP_sig(p) ((p)->sc_regs[30])
24	+# endif
25	#elif defined(__linux__) \|\| defined(SOLARIS)
26	# if defined(__linux__)
27	# define XMM_sig(p,i) ((p)->uc_mcontext.fpregs->_xmm[i])
28	@@ -171,6 +183,14 @@ class AutoSetHandlingSegFault
29	# define R13_sig(p) ((p)->uc_mcontext.__gregs[_REG_R13])
30	# define R14_sig(p) ((p)->uc_mcontext.__gregs[_REG_R14])
31	# define R15_sig(p) ((p)->uc_mcontext.__gregs[_REG_R15])
32	+# if defined(__aarch64__)
33	+# define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_PC])
34	+# define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_X29])
35	+# endif
36	+# if defined(__mips__)
37	+# define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_EPC])
38	+# define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_S8])
39	+# endif
40	#elif defined(__DragonFly__) \|\| defined(__FreeBSD__) \|\| defined(__FreeBSD_kernel__)
41	# if defined(__DragonFly__)
42	# define XMM_sig(p,i) (((union savefpu*)(p)->uc_mcontext.mc_fpregs)->sv_xmm.sv_xmm[i])
43	@@ -200,6 +220,14 @@ class AutoSetHandlingSegFault
44	# else
45	# define R15_sig(p) ((p)->uc_mcontext.mc_r15)
46	# endif
47	+# if defined(__FreeBSD__) && defined(__aarch64__)
48	+# define EPC_sig(p) ((p)->uc_mcontext.mc_gpregs.gp_elr)
49	+# define RFP_sig(p) ((p)->uc_mcontext.mc_gpregs.gp_x[29])
50	+# endif
51	+# if defined(__FreeBSD__) && defined(__mips__)
52	+# define EPC_sig(p) ((p)->uc_mcontext.mc_pc)
53	+# define RFP_sig(p) ((p)->uc_mcontext.mc_regs[30])
54	+# endif
55	#elif defined(XP_DARWIN)
56	# define EIP_sig(p) ((p)->uc_mcontext->__ss.__eip)
57	# define EBP_sig(p) ((p)->uc_mcontext->__ss.__ebp)

Lines 145-154 index 2118677ca3a8..e4978b413784 100644 Link Here

(-)b/www/firefox/files/patch-bug847568 (-10 / +10 lines)
145	CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']	145	CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
146	CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']	146	CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
147	diff --git gfx/thebes/moz.build gfx/thebes/moz.build	147	diff --git gfx/thebes/moz.build gfx/thebes/moz.build
148	index dee9b7bfa2cb..bd801f3a468e 100644	148	index 56f1b9fe3f4b..0ac1100b0df3 100644
149	--- gfx/thebes/moz.build	149	--- gfx/thebes/moz.build
150	+++ gfx/thebes/moz.build	150	+++ gfx/thebes/moz.build
151	@@ -273,7 +273,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):	151	@@ -269,7 +269,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
152		152
153	LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']	153	LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
154		154
Lines 167-180 diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build Link Here
167	index cb1233c56d7e..06fb1f9f174b 100644	167	index cb1233c56d7e..06fb1f9f174b 100644
168	--- intl/unicharutil/util/moz.build	168	--- intl/unicharutil/util/moz.build
169	+++ intl/unicharutil/util/moz.build	169	+++ intl/unicharutil/util/moz.build
170	@@ -40,4 +40,7 @@ if CONFIG['_MSC_VER']:	170	@@ -29,4 +29,7 @@ if CONFIG['ENABLE_INTL_API']:
171	if CONFIG['ENABLE_INTL_API']:	171	'ICUUtils.cpp',
172	USE_LIBS += ['icu']	172	]
173		173
174	+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:	174	+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
175	+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']	175	+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
176	+	176	+
177	DIST_INSTALL = True	177	FINAL_LIBRARY = 'xul'
178	diff --git netwerk/dns/moz.build netwerk/dns/moz.build	178	diff --git netwerk/dns/moz.build netwerk/dns/moz.build
179	index 79c26e3e7001..c4d93bc5f7dc 100644	179	index 79c26e3e7001..c4d93bc5f7dc 100644
180	--- netwerk/dns/moz.build	180	--- netwerk/dns/moz.build
Lines 209-215 index 95a58b634593..b614eef85c89 100644 Link Here
209	+ * 100 + GR2_VERSION_BUGFIX >= \	209	+ * 100 + GR2_VERSION_BUGFIX >= \
210	+ (major) * 10000 + (minor) * 100 + (bugfix) )	210	+ (major) * 10000 + (minor) * 100 + (bugfix) )
211	+ ], [	211	+ ], [
212	+ #if !GR2_VERSION_REQUIRE(1,3,8)	212	+ #if !GR2_VERSION_REQUIRE(1,3,10)
213	+ #error "Insufficient graphite2 version."	213	+ #error "Insufficient graphite2 version."
214	+ #endif	214	+ #endif
215	+ ], [],	215	+ ], [],
Lines 225-231 diff --git toolkit/library/moz.build toolkit/library/moz.build Link Here
225	index 24f940e1ed7e..079a575adec3 100644	225	index 24f940e1ed7e..079a575adec3 100644
226	--- toolkit/library/moz.build	226	--- toolkit/library/moz.build
227	+++ toolkit/library/moz.build	227	+++ toolkit/library/moz.build
228	@@ -228,6 +228,12 @@ if CONFIG['MOZ_SYSTEM_JPEG']:	228	@@ -224,6 +224,12 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
229	if CONFIG['MOZ_SYSTEM_PNG']:	229	if CONFIG['MOZ_SYSTEM_PNG']:
230	OS_LIBS += CONFIG['MOZ_PNG_LIBS']	230	OS_LIBS += CONFIG['MOZ_PNG_LIBS']
231		231
Lines 242-248 diff --git toolkit/moz.configure toolkit/moz.configure Link Here
242	index 9297e4d6f501..d8e273887e4b 100644	242	index 9297e4d6f501..d8e273887e4b 100644
243	--- toolkit/moz.configure	243	--- toolkit/moz.configure
244	+++ toolkit/moz.configure	244	+++ toolkit/moz.configure
245	@@ -343,6 +343,26 @@ add_old_configure_assignment('FT2_LIBS',	245	@@ -356,6 +356,26 @@ add_old_configure_assignment('FT2_LIBS',
246	add_old_configure_assignment('FT2_CFLAGS',	246	add_old_configure_assignment('FT2_CFLAGS',
247	delayed_getattr(ft2_info, 'cflags'))	247	delayed_getattr(ft2_info, 'cflags'))
248		248
Lines 261-267 index 9297e4d6f501..d8e273887e4b 100644 Link Here
261	+option('--with-system-harfbuzz',	261	+option('--with-system-harfbuzz',
262	+ help="Use system harfbuzz (located with pkgconfig)")	262	+ help="Use system harfbuzz (located with pkgconfig)")
263	+	263	+
264	+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.1',	264	+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.3',
265	+ when='--with-system-harfbuzz')	265	+ when='--with-system-harfbuzz')
266	+	266	+
267	+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))	267	+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))

Added Link Here

(-)b/www/firefox/files/patch-rust-option (+345 lines)
1	Revert bug 1284816 and bug 1341967 to postpone bustage on non-x86 archs.
2
3	diff --git browser/confvars.sh browser/confvars.sh
4	index d8dcd99c2757..740d9d3e5fcf 100755
5	--- browser/confvars.sh
6	+++ browser/confvars.sh
7	@@ -56,6 +56,7 @@ ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release
8	MAR_CHANNEL_ID=firefox-mozilla-beta
9	MOZ_PROFILE_MIGRATOR=1
10	MOZ_JSDOWNLOADS=1
11	+MOZ_RUST_MP4PARSE=1
12
13	# Enable checking that add-ons are signed by the trusted root
14	MOZ_ADDON_SIGNING=1
15	diff --git build/moz.configure/rust.configure build/moz.configure/rust.configure
16	index 267d989f1597..f709820e60ae 100644
17	--- build/moz.configure/rust.configure
18	+++ build/moz.configure/rust.configure
19	@@ -4,10 +4,20 @@
20	# License, v. 2.0. If a copy of the MPL was not distributed with this
21	# file, You can obtain one at http://mozilla.org/MPL/2.0/.
22
23	-# Rust is required by `rust_compiler` below. We allow_missing here
24	-# to propagate failures to the better error message there.
25	-rustc = check_prog('RUSTC', ['rustc'], allow_missing=True)
26	-cargo = check_prog('CARGO', ['cargo'], allow_missing=True)
27	+option('--disable-rust', help='Don\'t include Rust language sources')
28	+
29	+@depends('--enable-rust')
30	+def rust_compiler_names(value):
31	+ if value:
32	+ return ['rustc']
33	+
34	+@depends('--enable-rust')
35	+def cargo_binary_names(value):
36	+ if value:
37	+ return ['cargo']
38	+
39	+rustc = check_prog('RUSTC', rust_compiler_names, allow_missing=True)
40	+cargo = check_prog('CARGO', cargo_binary_names, allow_missing=True)
41
42	@depends_if(rustc)
43	@checking('rustc version', lambda info: info.version)
44	@@ -43,9 +53,12 @@ def cargo_info(cargo):
45	version=Version(version),
46	)
47
48	-@depends(rustc_info, cargo_info)
49	+@depends('--enable-rust', rustc_info, cargo_info)
50	@imports(_from='textwrap', _import='dedent')
51	-def rust_compiler(rustc_info, cargo_info):
52	+def rust_compiler(value, rustc_info, cargo_info):
53	+ if not value:
54	+ return None
55	+
56	if not rustc_info:
57	die(dedent('''\
58	Rust compiler not found.
59	diff --git dom/media/MediaPrefs.h dom/media/MediaPrefs.h
60	index 4dcc659222a4..559334d89fd1 100644
61	--- dom/media/MediaPrefs.h
62	+++ dom/media/MediaPrefs.h
63	@@ -165,7 +165,7 @@ private:
64	DECL_MEDIA_PREF("media.ogg.flac.enabled", FlacInOgg, bool, false);
65	DECL_MEDIA_PREF("media.flac.enabled", FlacEnabled, bool, true);
66
67	-#if !defined(RELEASE_OR_BETA)
68	+#if defined(MOZ_RUST_MP4PARSE) && !defined(RELEASE_OR_BETA)
69	DECL_MEDIA_PREF("media.rust.test_mode", RustTestMode, bool, false);
70	#endif
71
72	diff --git media/libstagefright/binding/DecoderData.cpp media/libstagefright/binding/DecoderData.cpp
73	index 109ea329d154..a06e533b1e62 100644
74	--- media/libstagefright/binding/DecoderData.cpp
75	+++ media/libstagefright/binding/DecoderData.cpp
76	@@ -13,9 +13,11 @@
77	#include "mozilla/ArrayUtils.h"
78	#include "include/ESDS.h"
79
80	+#ifdef MOZ_RUST_MP4PARSE
81	// OpusDecoder header is really needed only by MP4 in rust
82	#include "OpusDecoder.h"
83	#include "mp4parse.h"
84	+#endif // MOZ_RUST_MP4PARSE
85
86	using namespace stagefright;
87
88	@@ -187,6 +189,7 @@ MP4VideoInfo::Update(const MetaData* aMetaData, const char* aMimeType)
89
90	}
91
92	+#ifdef MOZ_RUST_MP4PARSE
93	static void
94	UpdateTrackProtectedInfo(mozilla::TrackInfo& aConfig,
95	const mp4parse_sinf_info& aSinf)
96	@@ -266,6 +269,7 @@ MP4VideoInfo::Update(const mp4parse_track_info* track,
97	mExtraData->AppendElements(video->extra_data.data, video->extra_data.length);
98	}
99	}
100	+#endif // MOZ_RUST_MP4PARSE
101
102	bool
103	MP4VideoInfo::IsValid() const
104	diff --git media/libstagefright/binding/MP4Metadata.cpp media/libstagefright/binding/MP4Metadata.cpp
105	index 5c3810d99a38..5d14dfd8b8a9 100644
106	--- media/libstagefright/binding/MP4Metadata.cpp
107	+++ media/libstagefright/binding/MP4Metadata.cpp
108	@@ -19,14 +19,18 @@
109	#include "mp4_demuxer/MP4Metadata.h"
110	#include "mp4_demuxer/Stream.h"
111	#include "MediaPrefs.h"
112	+#ifdef MOZ_RUST_MP4PARSE
113	#include "mp4parse.h"
114	+#endif // MOZ_RUST_MP4PARSE
115
116	#include <limits>
117	#include <stdint.h>
118	#include <vector>
119
120
121	+#ifdef MOZ_RUST_MP4PARSE
122	struct FreeMP4Parser { void operator()(mp4parse_parser* aPtr) { mp4parse_free(aPtr); } };
123	+#endif // MOZ_RUST_MP4PARSE
124
125	using namespace stagefright;
126
127	@@ -101,6 +103,7 @@ private:
128	bool mCanSeek;
129	};
130
131	+#ifdef MOZ_RUST_MP4PARSE
132	// Wrap an mp4_demuxer::Stream to remember the read offset.
133
134	class RustStreamAdaptor {
135	@@ -145,9 +149,11 @@ private:
136	RustStreamAdaptor mRustSource;
137	mozilla::UniquePtr<mp4parse_parser, FreeMP4Parser> mRustParser;
138	};
139	+#endif // MOZ_RUST_MP4PARSE
140
141	MP4Metadata::MP4Metadata(Stream* aSource)
142	: mStagefright(MakeUnique<MP4MetadataStagefright>(aSource))
143	+#ifdef MOZ_RUST_MP4PARSE
144	, mRust(MakeUnique<MP4MetadataRust>(aSource))
145	, mPreferRust(false)
146	, mReportedAudioTrackTelemetry(false)
147	@@ -155,6 +161,7 @@ MP4Metadata::MP4Metadata(Stream* aSource)
148	#ifndef RELEASE_OR_BETA
149	, mRustTestMode(MediaPrefs::RustTestMode())
150	#endif
151	+#endif // MOZ_RUST_MP4PARSE
152	{
153	}
154
155	@@ -186,6 +193,7 @@ MP4Metadata::GetNumberTracks(mozilla::TrackInfo::TrackType aType) const
156	{
157	uint32_t numTracks = mStagefright->GetNumberTracks(aType);
158
159	+#ifdef MOZ_RUST_MP4PARSE
160	if (!mRust) {
161	return numTracks;
162	}
163	@@ -211,10 +219,12 @@ MP4Metadata::GetNumberTracks(mozilla::TrackInfo::TrackType aType) const
164	mPreferRust = true;
165	return numTracksRust;
166	}
167	+#endif // MOZ_RUST_MP4PARSE
168
169	return numTracks;
170	}
171
172	+#ifdef MOZ_RUST_MP4PARSE
173	bool MP4Metadata::ShouldPreferRust() const {
174	if (!mRust) {
175	return false;
176	@@ -245,6 +255,7 @@ bool MP4Metadata::ShouldPreferRust() const {
177	// Otherwise, fall back.
178	return false;
179	}
180	+#endif // MOZ_RUST_MP4PARSE
181
182	mozilla::UniquePtr<mozilla::TrackInfo>
183	MP4Metadata::GetTrackInfo(mozilla::TrackInfo::TrackType aType,
184	@@ -253,6 +264,7 @@ MP4Metadata::GetTrackInfo(mozilla::TrackInfo::TrackType aType,
185	mozilla::UniquePtr<mozilla::TrackInfo> info =
186	mStagefright->GetTrackInfo(aType, aTrackNumber);
187
188	+#ifdef MOZ_RUST_MP4PARSE
189	if (!mRust) {
190	return info;
191	}
192	@@ -305,6 +317,7 @@ MP4Metadata::GetTrackInfo(mozilla::TrackInfo::TrackTyp
193	if (mPreferRust) {
194	return infoRust;
195	}
196	+#endif // MOZ_RUST_MP4PARSE
197
198	return info;
199	}
200	@@ -319,6 +334,7 @@ const CryptoFile&
201	MP4Metadata::Crypto() const
202	{
203	const CryptoFile& crypto = mStagefright->Crypto();
204	+#ifdef MOZ_RUST_MP4PARSE
205	const CryptoFile& rustCrypto = mRust->Crypto();
206
207	#ifndef RELEASE_OR_BETA
208	@@ -330,6 +347,7 @@ MP4Metadata::Crypto() const
209	if (mPreferRust) {
210	return rustCrypto;
211	}
212	+#endif // MOZ_RUST_MP4PARSE
213
214	return crypto;
215	}
216	@@ -594,6 +612,7 @@ MP4MetadataStagefright::Metadata(Stream* aSource)
217	return parser->Metadata();
218	}
219
220	+#ifdef MOZ_RUST_MP4PARSE
221	bool
222	RustStreamAdaptor::Read(uint8_t* buffer, uintptr_t size, size_t* bytes_read)
223	{
224	@@ -859,5 +878,6 @@ MP4MetadataRust::Metadata(Stream* aSource)
225	MOZ_ASSERT(false, "Not yet implemented");
226	return nullptr;
227	}
228	+#endif // MOZ_RUST_MP4PARSE
229
230	} // namespace mp4_demuxer
231	diff --git media/libstagefright/binding/include/mp4_demuxer/DecoderData.h media/libstagefright/binding/include/mp4_demuxer/DecoderData.h
232	index 3cd4b7c142f4..dc25ddf03b10 100644
233	--- media/libstagefright/binding/include/mp4_demuxer/DecoderData.h
234	+++ media/libstagefright/binding/include/mp4_demuxer/DecoderData.h
235	@@ -19,11 +19,13 @@ namespace stagefright
236	class MetaData;
237	}
238
239	+#ifdef MOZ_RUST_MP4PARSE
240	extern "C" {
241	typedef struct mp4parse_track_info mp4parse_track_info;
242	typedef struct mp4parse_track_audio_info mp4parse_track_audio_info;
243	typedef struct mp4parse_track_video_info mp4parse_track_video_info;
244	}
245	+#endif // MOZ_RUST_MP4PARSE
246
247	namespace mp4_demuxer
248	{
249	@@ -71,8 +73,10 @@ public:
250	void Update(const stagefright::MetaData* aMetaData,
251	const char* aMimeType);
252
253	+#ifdef MOZ_RUST_MP4PARSE
254	void Update(const mp4parse_track_info* track,
255	const mp4parse_track_audio_info* audio);
256	+#endif // MOZ_RUST_MP4PARSE
257
258	virtual bool IsValid() const override;
259	};
260	@@ -85,8 +89,10 @@ public:
261	void Update(const stagefright::MetaData* aMetaData,
262	const char* aMimeType);
263
264	+#ifdef MOZ_RUST_MP4PARSE
265	void Update(const mp4parse_track_info* track,
266	const mp4parse_track_video_info* video);
267	+#endif // MOZ_RUST_MP4PARSE
268
269	virtual bool IsValid() const override;
270	};
271	diff --git media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h
272	index 492c9c1c1bc3..e16dbbd1155e 100644
273	--- media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h
274	+++ media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h
275	@@ -36,6 +36,7 @@ public:
276
277	private:
278	UniquePtr<MP4MetadataStagefright> mStagefright;
279	+#ifdef MOZ_RUST_MP4PARSE
280	UniquePtr<MP4MetadataRust> mRust;
281	mutable bool mPreferRust;
282	mutable bool mReportedAudioTrackTelemetry;
283	@@ -44,6 +45,7 @@ private:
284	mutable bool mRustTestMode;
285	#endif
286	bool ShouldPreferRust() const;
287	+#endif // MOZ_RUST_MP4PARSE
288	};
289
290	} // namespace mp4_demuxer
291	diff --git mobile/android/confvars.sh mobile/android/confvars.sh
292	index e79b6f5c0707..eb62763acaf7 100644
293	--- mobile/android/confvars.sh
294	+++ mobile/android/confvars.sh
295	@@ -30,6 +30,8 @@ MOZ_XULRUNNER=
296	MOZ_CAPTURE=1
297	MOZ_RAW=1
298
299	+MOZ_RUST_MP4PARSE=1
300	+
301	# use custom widget for html:select
302	MOZ_USE_NATIVE_POPUP_WINDOWS=1
303
304	diff --git toolkit/components/telemetry/Histograms.json toolkit/components/telemetry/Histograms.json
305	index 061c55f6a5b6..e49dfd176952 100644
306	--- toolkit/components/telemetry/Histograms.json
307	+++ toolkit/components/telemetry/Histograms.json
308	@@ -6996,7 +6996,8 @@
309	"expires_in_version": "55",
310	"kind": "boolean",
311	"bug_numbers": [1220885],
312	- "description": "(Bug 1220885) Whether the rust mp4 demuxer successfully parsed a stream segment."
313	+ "description": "(Bug 1220885) Whether the rust mp4 demuxer successfully parsed a stream segment.",
314	+ "cpp_guard": "MOZ_RUST_MP4PARSE"
315	},
316	"MEDIA_RUST_MP4PARSE_ERROR_CODE": {
317	"alert_emails": ["giles@mozilla.com", "kinetik@flim.org"],
318	@@ -7004,21 +7005,24 @@
319	"kind": "enumerated",
320	"n_values": 32,
321	"bug_numbers": [1238420],
322	- "description": "The error code reported when an MP4 parse attempt has failed.0 = OK, 1 = bad argument, 2 = invalid data, 3 = unsupported, 4 = unexpected end of file, 5 = read error."
323	+ "description": "The error code reported when an MP4 parse attempt has failed.0 = OK, 1 = bad argument, 2 = invalid data, 3 = unsupported, 4 = unexpected end of file, 5 = read error.",
324	+ "cpp_guard": "MOZ_RUST_MP4PARSE"
325	},
326	"MEDIA_RUST_MP4PARSE_TRACK_MATCH_AUDIO": {
327	"alert_emails": ["giles@mozilla.com", "kinetik@flim.org"],
328	"expires_in_version": "55",
329	"kind": "boolean",
330	"bug_numbers": [1231169],
331	- "description": "Whether rust and stagefight mp4 parser audio track results match."
332	+ "description": "Whether rust and stagefight mp4 parser audio track results match.",
333	+ "cpp_guard": "MOZ_RUST_MP4PARSE"
334	},
335	"MEDIA_RUST_MP4PARSE_TRACK_MATCH_VIDEO": {
336	"alert_emails": ["giles@mozilla.com", "kinetik@flim.org"],
337	"expires_in_version": "55",
338	"kind": "boolean",
339	"bug_numbers": [1231169],
340	- "description": "Whether rust and stagefight mp4 parser video track results match."
341	+ "description": "Whether rust and stagefight mp4 parser video track results match.",
342	+ "cpp_guard": "MOZ_RUST_MP4PARSE"
343	},
344	"MEDIA_WMF_DECODE_ERROR": {
345	"expires_in_version": "55",