Attachment #182633 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.0b8
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 = 1494888804
SHA256 (xpi/firefox-i18n-54.0b8/ach.xpi) = 66f3bb626633e178051688836308619d3560ec1fa4553a13f16d0d9e865328fd
SIZE (xpi/firefox-i18n-54.0b8/ach.xpi) = 426783
SHA256 (xpi/firefox-i18n-54.0b8/af.xpi) = 214430358e8cd937f3440c5e3b4bafa2ce71e40224b6d9a5c838c876f1db739c
SIZE (xpi/firefox-i18n-54.0b8/af.xpi) = 436585
SHA256 (xpi/firefox-i18n-54.0b8/an.xpi) = bd816b960ceb4246bb5d0b6c13b267eb12b98fe39e5289bc90831b08073c8c79
SIZE (xpi/firefox-i18n-54.0b8/an.xpi) = 445341
SHA256 (xpi/firefox-i18n-54.0b8/ar.xpi) = c9a56252fcc2678cebcc72f80b1e1f9205415211a8ba228349b461c3d71fa792
SIZE (xpi/firefox-i18n-54.0b8/ar.xpi) = 473123
SHA256 (xpi/firefox-i18n-54.0b8/as.xpi) = 631c9b7ee7b75ecdf2508033e70a616ec36235b6a178c0f70fc6fb986a34369a
SIZE (xpi/firefox-i18n-54.0b8/as.xpi) = 484171
SHA256 (xpi/firefox-i18n-54.0b8/ast.xpi) = da213fcf31ab76dea41557f5966df85a98da5c89846f621ae379d819dc5d3c78
SIZE (xpi/firefox-i18n-54.0b8/ast.xpi) = 440269
SHA256 (xpi/firefox-i18n-54.0b8/az.xpi) = f104a665d34c2f898d0958abc9dae78a334100d599bdc08fb34a8ea0f64e5a8f
SIZE (xpi/firefox-i18n-54.0b8/az.xpi) = 454241
SHA256 (xpi/firefox-i18n-54.0b8/bg.xpi) = a340bcf13f2ff8b0eae3bdc87b36b15a15582328970d934cb43daa4f8728dd7a
SIZE (xpi/firefox-i18n-54.0b8/bg.xpi) = 485833
SHA256 (xpi/firefox-i18n-54.0b8/bn-BD.xpi) = 759709c862f7b757859b60fa1c76bf485c4d8249b4a36d3c66efab980a95316a
SIZE (xpi/firefox-i18n-54.0b8/bn-BD.xpi) = 508866
SHA256 (xpi/firefox-i18n-54.0b8/bn-IN.xpi) = 432c21ee4615fd7ff0d6fe857442ffb7eae51c510beda37ef73becf4dfa2e90f
SIZE (xpi/firefox-i18n-54.0b8/bn-IN.xpi) = 506163
SHA256 (xpi/firefox-i18n-54.0b8/br.xpi) = 9f67abcb7eead063e04363325e31fe1b0bf24e41e7d70d86d7fca58857946c13
SIZE (xpi/firefox-i18n-54.0b8/br.xpi) = 434371
SHA256 (xpi/firefox-i18n-54.0b8/bs.xpi) = 468ade75a0f8aee9c9cea41ae98ed0228e2bc76ad4ed49d6e4f4218fa750c8ae
SIZE (xpi/firefox-i18n-54.0b8/bs.xpi) = 441129
SHA256 (xpi/firefox-i18n-54.0b8/ca.xpi) = 991b91dc88a45cc2692ab93e5964c59ccb29dc46914e30d0bb15549feebb76f5
SIZE (xpi/firefox-i18n-54.0b8/ca.xpi) = 443026
SHA256 (xpi/firefox-i18n-54.0b8/cs.xpi) = 16559ca00e875a433cf406007c8ebe89c0e8c20a2958d386a31cef8ddf38f230
SIZE (xpi/firefox-i18n-54.0b8/cs.xpi) = 443929
SHA256 (xpi/firefox-i18n-54.0b8/cy.xpi) = ec3cd27c9a3412c1e22f6b7c22cb8a38726395771a19c7e96f93829c8c21d8eb
SIZE (xpi/firefox-i18n-54.0b8/cy.xpi) = 436310
SHA256 (xpi/firefox-i18n-54.0b8/da.xpi) = da103432d7cbc66980873201d50ffe522f685c6508eaba20bd72c8b7c2497271
SIZE (xpi/firefox-i18n-54.0b8/da.xpi) = 423765
SHA256 (xpi/firefox-i18n-54.0b8/de.xpi) = 84e0b0b44e513d93d9ec55ebd72b218815c2cf56c41aa4cac19849a62402cae4
SIZE (xpi/firefox-i18n-54.0b8/de.xpi) = 442813
SHA256 (xpi/firefox-i18n-54.0b8/dsb.xpi) = a26fdd27719f129819a8bb83f6306d47176ba70e37e1d2c5d130a8a8a8fe0d83
SIZE (xpi/firefox-i18n-54.0b8/dsb.xpi) = 458686
SHA256 (xpi/firefox-i18n-54.0b8/el.xpi) = 03c0a57a0819a42342e968e2029d59230eefbff047cd9cac9c6a989feac98e39
SIZE (xpi/firefox-i18n-54.0b8/el.xpi) = 511228
SHA256 (xpi/firefox-i18n-54.0b8/en-GB.xpi) = 05dd49708022f3a03ef7fab55ee61fb222121142306c9aba480d96601a20a2a4
SIZE (xpi/firefox-i18n-54.0b8/en-GB.xpi) = 419543
SHA256 (xpi/firefox-i18n-54.0b8/en-US.xpi) = 0b03dac051a6a82165882106094e1bfa0ba9f6b31f17f033575dd9683cc032a9
SIZE (xpi/firefox-i18n-54.0b8/en-US.xpi) = 425756
SHA256 (xpi/firefox-i18n-54.0b8/en-ZA.xpi) = fb973087bcd2c5ca27d3725a57c63d552d8717374419d3e5f4da43b3136ce19f
SIZE (xpi/firefox-i18n-54.0b8/en-ZA.xpi) = 413430
SHA256 (xpi/firefox-i18n-54.0b8/eo.xpi) = 693cdc9639da78bf58175be10fef28c8653bf508496b4fbfade6b66271664ad8
SIZE (xpi/firefox-i18n-54.0b8/eo.xpi) = 437024
SHA256 (xpi/firefox-i18n-54.0b8/es-AR.xpi) = 6870f7db80f95975a36447f2d11d67f01483c9c56e3e80e0ef8c37d48c243d3b
SIZE (xpi/firefox-i18n-54.0b8/es-AR.xpi) = 445556
SHA256 (xpi/firefox-i18n-54.0b8/es-CL.xpi) = 8ac13156e82ab35d42a1cd87d386cf53720b8ba8a2856d60f23d98202f92bc4b
SIZE (xpi/firefox-i18n-54.0b8/es-CL.xpi) = 445582
SHA256 (xpi/firefox-i18n-54.0b8/es-ES.xpi) = a83389a3d4ce60c8b1a6efb153766171a67c81436fce5fc72f00e91830eef31d
SIZE (xpi/firefox-i18n-54.0b8/es-ES.xpi) = 341278
SHA256 (xpi/firefox-i18n-54.0b8/es-MX.xpi) = fb22018371658ce204dacc130aa84e044c1e124542af2aa44cacd3de93c3b5ef
SIZE (xpi/firefox-i18n-54.0b8/es-MX.xpi) = 447975
SHA256 (xpi/firefox-i18n-54.0b8/et.xpi) = e8ac91fcbdeb0f593b7b203bceaae69f7eead62880c36791c827dda29f753088
SIZE (xpi/firefox-i18n-54.0b8/et.xpi) = 423853
SHA256 (xpi/firefox-i18n-54.0b8/eu.xpi) = f4e360155fa6f7773ac9a775cff78f2fb9d68ad65895e947bd73468b4d761ad5
SIZE (xpi/firefox-i18n-54.0b8/eu.xpi) = 438023
SHA256 (xpi/firefox-i18n-54.0b8/fa.xpi) = 0940eb3fc7353cca2e39e03fa577cb05236155fba974da78a8dcc3e315b32d9d
SIZE (xpi/firefox-i18n-54.0b8/fa.xpi) = 490358
SHA256 (xpi/firefox-i18n-54.0b8/ff.xpi) = 0023fb9eafd2de25775372a48fd0c7cdaf27b5c06732a4492e13d7a98274f48d
SIZE (xpi/firefox-i18n-54.0b8/ff.xpi) = 441538
SHA256 (xpi/firefox-i18n-54.0b8/fi.xpi) = 2a531ff4b0531b4a87900c4c501ca27d8cfd28342dba9a8772cf44c0404c49a2
SIZE (xpi/firefox-i18n-54.0b8/fi.xpi) = 428997
SHA256 (xpi/firefox-i18n-54.0b8/fr.xpi) = 174663f62d76a101d942ebbcecf9afd3f76f6d5f2a0036bda392786429dde800
SIZE (xpi/firefox-i18n-54.0b8/fr.xpi) = 451595
SHA256 (xpi/firefox-i18n-54.0b8/fy-NL.xpi) = 449d51d1eb948563153c6efd61203182399daf32f2c8cc91014bfdda3f98f411
SIZE (xpi/firefox-i18n-54.0b8/fy-NL.xpi) = 444471
SHA256 (xpi/firefox-i18n-54.0b8/ga-IE.xpi) = 681b372d08c444d202d84d1cccdf3de3709c6933056a4e0a65b9d93037100cbf
SIZE (xpi/firefox-i18n-54.0b8/ga-IE.xpi) = 457481
SHA256 (xpi/firefox-i18n-54.0b8/gd.xpi) = e5c52d58adedb5123a6b84a8048b817e7b87d9f56661da4333d9b3caad790486
SIZE (xpi/firefox-i18n-54.0b8/gd.xpi) = 446083
SHA256 (xpi/firefox-i18n-54.0b8/gl.xpi) = d4d42bcfa6a944e323342b97105c81ae455dabe0d451cf8fcbcae237f1f0110e
SIZE (xpi/firefox-i18n-54.0b8/gl.xpi) = 443275
SHA256 (xpi/firefox-i18n-54.0b8/gn.xpi) = 8ad3e597f2d6dfa2118773306ee839bbf31210ab236c36b8100ff22253faba7c
SIZE (xpi/firefox-i18n-54.0b8/gn.xpi) = 456065
SHA256 (xpi/firefox-i18n-54.0b8/gu-IN.xpi) = 4796aa29379ebd4d63c971bc1e1d95f7d3b5098f41b75b40ce4499b9833c35a1
SIZE (xpi/firefox-i18n-54.0b8/gu-IN.xpi) = 487114
SHA256 (xpi/firefox-i18n-54.0b8/he.xpi) = 4e0e6841025ed13744859fd041ccab2451b59137f2a490bbb4ca68673e086d89
SIZE (xpi/firefox-i18n-54.0b8/he.xpi) = 454287
SHA256 (xpi/firefox-i18n-54.0b8/hi-IN.xpi) = 607df0d2a7c8fe67c868eed9e18490912f60828fd858f7253806b53d2fb13873
SIZE (xpi/firefox-i18n-54.0b8/hi-IN.xpi) = 504631
SHA256 (xpi/firefox-i18n-54.0b8/hr.xpi) = 6d3aefd443a1099fb36e33c8b9d372571275da4ba00160989e7d4a6310bf5fdd
SIZE (xpi/firefox-i18n-54.0b8/hr.xpi) = 447780
SHA256 (xpi/firefox-i18n-54.0b8/hsb.xpi) = 85c73c23f5e67b539d7cf3ab1db06c8fb54f0df1bf9d3e2b817f2f823acf510a
SIZE (xpi/firefox-i18n-54.0b8/hsb.xpi) = 456524
SHA256 (xpi/firefox-i18n-54.0b8/hu.xpi) = 504b2085905e1ece7a9a429e6159398f750ebf2ad640d4f2e5cb0991ab76ea5f
SIZE (xpi/firefox-i18n-54.0b8/hu.xpi) = 451120
SHA256 (xpi/firefox-i18n-54.0b8/hy-AM.xpi) = 46ebab8fa3bd786d8fce0b0dc099cc3b5edfa8ad887ea50134832a50f9417ac8
SIZE (xpi/firefox-i18n-54.0b8/hy-AM.xpi) = 496018
SHA256 (xpi/firefox-i18n-54.0b8/id.xpi) = fc9ff88eef12d816e4e77c555ec35af6fb34cc57b92abc2562e2efeee976e080
SIZE (xpi/firefox-i18n-54.0b8/id.xpi) = 425283
SHA256 (xpi/firefox-i18n-54.0b8/is.xpi) = d8e32c300aa71c7dd7a983598210398e293b21e52a6a5e51398397cd8b768813
SIZE (xpi/firefox-i18n-54.0b8/is.xpi) = 441708
SHA256 (xpi/firefox-i18n-54.0b8/it.xpi) = 045120eaca2addf36b9de9d1c3a0a33a427ba6fec00c9116fde5ecddef932ad6
SIZE (xpi/firefox-i18n-54.0b8/it.xpi) = 335500
SHA256 (xpi/firefox-i18n-54.0b8/ja.xpi) = d82adbdbe9d9b9ee781d347797c97cac6a85c232f0277b7ef89a5a264d6cab99
SIZE (xpi/firefox-i18n-54.0b8/ja.xpi) = 489327
SHA256 (xpi/firefox-i18n-54.0b8/kk.xpi) = 30ca335393611ecf1b4a432ca066eb9894560575718b0b73060ed8a1c2bb66f3
SIZE (xpi/firefox-i18n-54.0b8/kk.xpi) = 493047
SHA256 (xpi/firefox-i18n-54.0b8/km.xpi) = 670be0260239880a4d5de5ec93861b8bfe5a3338d25240d58a831c8cf2937286
SIZE (xpi/firefox-i18n-54.0b8/km.xpi) = 517240
SHA256 (xpi/firefox-i18n-54.0b8/kn.xpi) = 9a0b6ab17153f3f9d2798dc3c3bfed9a705dcfe5da8b49c2c4ce1c78842c6a87
SIZE (xpi/firefox-i18n-54.0b8/kn.xpi) = 516492
SHA256 (xpi/firefox-i18n-54.0b8/ko.xpi) = 6e1365b989bb0dce2942e9c73b7e5dbb0b4434ef4ff869739ed4517ec5bff5d9
SIZE (xpi/firefox-i18n-54.0b8/ko.xpi) = 460423
SHA256 (xpi/firefox-i18n-54.0b8/lij.xpi) = d87563d9f203a6225428d4096f45f9fe938d8416d8ac6287f6a00f09f499a041
SIZE (xpi/firefox-i18n-54.0b8/lij.xpi) = 431673
SHA256 (xpi/firefox-i18n-54.0b8/lt.xpi) = 05c32d0b4c3c605a3af7c0058c2a62720abd724c81ff18535a06eb54d200783a
SIZE (xpi/firefox-i18n-54.0b8/lt.xpi) = 451193
SHA256 (xpi/firefox-i18n-54.0b8/lv.xpi) = f03af683420024abb99d9c4b3f1a6f6cd6273419dc045ba0084cdcf3c8d497fa
SIZE (xpi/firefox-i18n-54.0b8/lv.xpi) = 447752
SHA256 (xpi/firefox-i18n-54.0b8/mai.xpi) = 5ce1d124d6dcce4aed4556f478737bd30c2ea574808564b9eb108ea5737f2469
SIZE (xpi/firefox-i18n-54.0b8/mai.xpi) = 497011
SHA256 (xpi/firefox-i18n-54.0b8/mk.xpi) = d402ea29b05b85ddae4cf93f6ae4da7a0bb13b43fa38feb0ba044900066ef98e
SIZE (xpi/firefox-i18n-54.0b8/mk.xpi) = 493118
SHA256 (xpi/firefox-i18n-54.0b8/ml.xpi) = 51b2c64a1db7f2b953f7caa9ac6597df26e25949675556057753dce65d058796
SIZE (xpi/firefox-i18n-54.0b8/ml.xpi) = 512264
SHA256 (xpi/firefox-i18n-54.0b8/mr.xpi) = 8af487b92bfa27c55cdf19aa6a7534baf115f2cb94e1067c6054de07d2feb181
SIZE (xpi/firefox-i18n-54.0b8/mr.xpi) = 501032
SHA256 (xpi/firefox-i18n-54.0b8/ms.xpi) = 93c06c1c1bfda46c426a387e9239d8a6c518590220e50877fda63752753ce305
SIZE (xpi/firefox-i18n-54.0b8/ms.xpi) = 435501
SHA256 (xpi/firefox-i18n-54.0b8/nb-NO.xpi) = 1d864224e93c2390f54451d154a0ad63acdb94ebbdbf6c27c5c93c5b2b5437ab
SIZE (xpi/firefox-i18n-54.0b8/nb-NO.xpi) = 433681
SHA256 (xpi/firefox-i18n-54.0b8/nl.xpi) = 5adb70f306156d003600067daf3b9fc35facdd0dad37fda8a0de3c2f257053aa
SIZE (xpi/firefox-i18n-54.0b8/nl.xpi) = 431501
SHA256 (xpi/firefox-i18n-54.0b8/nn-NO.xpi) = 197c0e19200f0f799a7051508156491b55ea1f8a6a46c4595f1e933618d201c6
SIZE (xpi/firefox-i18n-54.0b8/nn-NO.xpi) = 427870
SHA256 (xpi/firefox-i18n-54.0b8/or.xpi) = 019b5c164df7a3b935dfb6a3d5a29cdd5a8f4c4aee018cf0601bd00f1fc97aac
SIZE (xpi/firefox-i18n-54.0b8/or.xpi) = 494077
SHA256 (xpi/firefox-i18n-54.0b8/pa-IN.xpi) = cd446e2386d97b9c1258aea056c758a724bedf70b8c6661d64e28462abc27d3a
SIZE (xpi/firefox-i18n-54.0b8/pa-IN.xpi) = 473515
SHA256 (xpi/firefox-i18n-54.0b8/pl.xpi) = 4bc5d0b0996c9f5f9f565661e862e86affd0d4051513bf9a8ba97ab447fec19d
SIZE (xpi/firefox-i18n-54.0b8/pl.xpi) = 347203
SHA256 (xpi/firefox-i18n-54.0b8/pt-BR.xpi) = ef66d351b5ee38c07c80b0f510165160f949580bf7242dbadb8a90599d9dc53f
SIZE (xpi/firefox-i18n-54.0b8/pt-BR.xpi) = 437172
SHA256 (xpi/firefox-i18n-54.0b8/pt-PT.xpi) = fa958a2ac56ff6bbd088776fdc3ca9fcd27d1e18d5389536aa4ae53ab2e8b140
SIZE (xpi/firefox-i18n-54.0b8/pt-PT.xpi) = 436176
SHA256 (xpi/firefox-i18n-54.0b8/rm.xpi) = 213d5039e323a8bca08506ec25cfaefd86da93349256d219f30c7cf43a2aed45
SIZE (xpi/firefox-i18n-54.0b8/rm.xpi) = 433404
SHA256 (xpi/firefox-i18n-54.0b8/ro.xpi) = 9b2524673a654253e71a4f7940914f8ca7fb832f7c52e08e5dcae173d1a82b48
SIZE (xpi/firefox-i18n-54.0b8/ro.xpi) = 449473
SHA256 (xpi/firefox-i18n-54.0b8/ru.xpi) = 5bf3a32f5200f8f7b4ab291e0220bda35e3ab9d4862f437baff8d83b48701790
SIZE (xpi/firefox-i18n-54.0b8/ru.xpi) = 487731
SHA256 (xpi/firefox-i18n-54.0b8/si.xpi) = f14d68c352d16fe9c462a4c20b034da715e60e0ffd32fd825d1f1ec5f1d49b3e
SIZE (xpi/firefox-i18n-54.0b8/si.xpi) = 491067
SHA256 (xpi/firefox-i18n-54.0b8/sk.xpi) = 1d24a7407a5cb23e414d327d06737096080d17907361a796c32c6a4042b8a6bf
SIZE (xpi/firefox-i18n-54.0b8/sk.xpi) = 455016
SHA256 (xpi/firefox-i18n-54.0b8/sl.xpi) = a1f11eb2a599b9ccaee8e51011f83c5831ebb242f69a02170394120fc2bc22e0
SIZE (xpi/firefox-i18n-54.0b8/sl.xpi) = 433174
SHA256 (xpi/firefox-i18n-54.0b8/son.xpi) = 3bc66657e39b7543890fe1790e439599d69260c17e0d287a7ff13c39f7249326
SIZE (xpi/firefox-i18n-54.0b8/son.xpi) = 435051
SHA256 (xpi/firefox-i18n-54.0b8/sq.xpi) = 81aa0bb2741753a5189ff7df58fce9b4bb5925e1721b97614c4443100e798f63
SIZE (xpi/firefox-i18n-54.0b8/sq.xpi) = 448158
SHA256 (xpi/firefox-i18n-54.0b8/sr.xpi) = e16c0509f4862be880dc6944e9340f100af27790744ddeed4f8e5d32769b8778
SIZE (xpi/firefox-i18n-54.0b8/sr.xpi) = 461355
SHA256 (xpi/firefox-i18n-54.0b8/sv-SE.xpi) = 35d6e090b4bbdbdc3e7a70565bfbffab9ae31cbf2759f2f69c9b0d635e8bb401
SIZE (xpi/firefox-i18n-54.0b8/sv-SE.xpi) = 440477
SHA256 (xpi/firefox-i18n-54.0b8/ta.xpi) = a7bf359be46bd81874704fc02606ba2b2a810f319d340961e9cdb585984ff620
SIZE (xpi/firefox-i18n-54.0b8/ta.xpi) = 493956
SHA256 (xpi/firefox-i18n-54.0b8/te.xpi) = 55f41b31b92b4b3783c4df7dcc9bc5c05f1d4379f8d5fe1e7cc03dce74925d7d
SIZE (xpi/firefox-i18n-54.0b8/te.xpi) = 513284
SHA256 (xpi/firefox-i18n-54.0b8/th.xpi) = 7a902c21e4fbbe40ca713120d89bab6f0865d899e07800a6e13ffb9538bf21f4
SIZE (xpi/firefox-i18n-54.0b8/th.xpi) = 487216
SHA256 (xpi/firefox-i18n-54.0b8/tr.xpi) = eefecb29429619eded7dfb57275ae0f1bd097807d125536a79925a9f98f0002b
SIZE (xpi/firefox-i18n-54.0b8/tr.xpi) = 440412
SHA256 (xpi/firefox-i18n-54.0b8/uk.xpi) = dae0e785ce94ceaf5ee26a4a9dd7e720b7bc86f2c33f45cc1f3004ef300fc4d2
SIZE (xpi/firefox-i18n-54.0b8/uk.xpi) = 490756
SHA256 (xpi/firefox-i18n-54.0b8/uz.xpi) = 26ae129d0279aa1d07a65678d314e02a8cfdb8e44e6724a8b969f9249c23a52b
SIZE (xpi/firefox-i18n-54.0b8/uz.xpi) = 448112
SHA256 (xpi/firefox-i18n-54.0b8/vi.xpi) = 90adb2366e0e77579b94a98ef41914ed8e174dd048c42e12ea3ef19fb04df2be
SIZE (xpi/firefox-i18n-54.0b8/vi.xpi) = 449654
SHA256 (xpi/firefox-i18n-54.0b8/xh.xpi) = 3fd26ba139a2f6b27139a7b69fc6fa37525ad029659b126794773a9de86f0108
SIZE (xpi/firefox-i18n-54.0b8/xh.xpi) = 440802
SHA256 (xpi/firefox-i18n-54.0b8/zh-CN.xpi) = 752d78be88cef21f7694fd2ffb61a8d1bd67f39181d31771182bcdff4ad42a8b
SIZE (xpi/firefox-i18n-54.0b8/zh-CN.xpi) = 458333
SHA256 (xpi/firefox-i18n-54.0b8/zh-TW.xpi) = 3484a9fa6455fe82e9d77d899169eca29af5aa3fbd708b4eb76b8c9299f7575b
SIZE (xpi/firefox-i18n-54.0b8/zh-TW.xpi) = 469164




# $FreeBSD$

PORTNAME=	firefox
DISTVERSION=	54.0b8
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 = 1494888804
2	SHA256 (firefox-53.0.2.source.tar.xz) = c536df9794fafe61e4e74562e2a37cd4a6fb1c13d99d5330d61be03b2d57ae54	2	SHA256 (firefox-54.0b8.source.tar.xz) = e1e57b094f27506aacfea3c82e6019ec6813bc4a3aeec5a8dd1a0689ca6ec8cf
3	SIZE (firefox-53.0.2.source.tar.xz) = 215124156	3	SIZE (firefox-54.0b8.source.tar.xz) = 230171144




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.0b8
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",