Attachment #183262 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





LDFLAGS+=		-Wl,--as-needed

. if ${MOZILLA_VER:R:R} < 55
.if ${OPSYS} != DragonFly # XXX xpcshell crash during install
# use jemalloc 3.0.0 (4.0 for firefox 43+) API for stats/tuning
MOZ_EXPORT+=	MOZ_JEMALLOC3=1 MOZ_JEMALLOC4=1

. endif
.endif
.endif # !DragonFly
.endif # Mozilla < 55

# Standard depends
_ALL_DEPENDS=	cairo event ffi graphite harfbuzz hunspell icu jpeg nspr nss png pixman soundtouch sqlite vpx

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 1-8 Link Here

(-)b/www/firefox-i18n/Makefile (-3 / +3 lines)
1	# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>	1	# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
2	# $FreeBSD$	2	# $FreeBSD: head/www/firefox-i18n/Makefile 441284 2017-05-20 02:43:11Z jbeich $
3		3
4	PORTNAME= firefox-i18n	4	PORTNAME= firefox-i18n
5	PORTVERSION= 53.0.3	5	PORTVERSION= 54.0
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 = 1496740427
SHA256 (xpi/firefox-i18n-54.0/ach.xpi) = 7f783745298e65c347f39576d7f4da212d9adbba7fef8e90bd0038af906b4f31
SIZE (xpi/firefox-i18n-54.0/ach.xpi) = 426784
SHA256 (xpi/firefox-i18n-54.0/af.xpi) = 8f21ffd7cd10fd05c738a8bd7bf6b4d2f6ff12510385055bc3d81ceb7f0af882
SIZE (xpi/firefox-i18n-54.0/af.xpi) = 436584
SHA256 (xpi/firefox-i18n-54.0/an.xpi) = 1d315794e2cb960ea6c2eadca06ddfadd657eb85497f3b294837d1ff6b1da2da
SIZE (xpi/firefox-i18n-54.0/an.xpi) = 445342
SHA256 (xpi/firefox-i18n-54.0/ar.xpi) = 6292715c142f1be1254f643fe4a75c17539bb4b075bfc3d38b3a1e74dee4753c
SIZE (xpi/firefox-i18n-54.0/ar.xpi) = 473123
SHA256 (xpi/firefox-i18n-54.0/as.xpi) = f51af18c50e6a167127f702356adc5de6c6d05f732c139b255888349fbeb647e
SIZE (xpi/firefox-i18n-54.0/as.xpi) = 484170
SHA256 (xpi/firefox-i18n-54.0/ast.xpi) = 40fad9c18ba04550705eb8edad2b0335314613a70ab529f79d003ead0e6e086c
SIZE (xpi/firefox-i18n-54.0/ast.xpi) = 440269
SHA256 (xpi/firefox-i18n-54.0/az.xpi) = 451b7c74701d02232623b577270b1df32c0651215484bc22213dcb303972634a
SIZE (xpi/firefox-i18n-54.0/az.xpi) = 454242
SHA256 (xpi/firefox-i18n-54.0/bg.xpi) = 4502e3f5cc05a3f21a4dc51370fcf5f2f895f28bb3af9e1046f62ea6963fdd14
SIZE (xpi/firefox-i18n-54.0/bg.xpi) = 485834
SHA256 (xpi/firefox-i18n-54.0/bn-BD.xpi) = e53170b49837a6d50ac01a9c66117911aa70af80a8c5f6a27e9c7b54c608e25c
SIZE (xpi/firefox-i18n-54.0/bn-BD.xpi) = 508866
SHA256 (xpi/firefox-i18n-54.0/bn-IN.xpi) = 4b5bdfca1440d6b6bd32ada162d0434ad1f1ad29b4b6862a9d04e70fc435d821
SIZE (xpi/firefox-i18n-54.0/bn-IN.xpi) = 506163
SHA256 (xpi/firefox-i18n-54.0/br.xpi) = b53d4a2f4006ba6c10d169cb8e22ae3477f67b2ae5de0f42f3cf59dbe977136a
SIZE (xpi/firefox-i18n-54.0/br.xpi) = 434371
SHA256 (xpi/firefox-i18n-54.0/bs.xpi) = e90f46df8efe339966cdba9779fb10489c2a85eabeab888c59360e67d9b44283
SIZE (xpi/firefox-i18n-54.0/bs.xpi) = 441130
SHA256 (xpi/firefox-i18n-54.0/ca.xpi) = 297fe08327c58e76beced92ef3d99662e616cff4f13b48f4a88fae010488cffa
SIZE (xpi/firefox-i18n-54.0/ca.xpi) = 443025
SHA256 (xpi/firefox-i18n-54.0/cs.xpi) = ac29ec8e63bb16482cdcf868f879aa91d9f896766d7ad799ed20eed0b6fca054
SIZE (xpi/firefox-i18n-54.0/cs.xpi) = 443928
SHA256 (xpi/firefox-i18n-54.0/cy.xpi) = 7181795e00673ed6a47a08f7823c9ff08060be9db32f7a2be8990aa87a2eb9f8
SIZE (xpi/firefox-i18n-54.0/cy.xpi) = 436309
SHA256 (xpi/firefox-i18n-54.0/da.xpi) = 56778ce556670dffd2d5baf1396e991b19cba494bb30c4a6f82ed2b78c52cf36
SIZE (xpi/firefox-i18n-54.0/da.xpi) = 423764
SHA256 (xpi/firefox-i18n-54.0/de.xpi) = 44775ef605e4d57c41eed99613d2eae2b9d0e53c642be91a90ebf8f43d0eb50a
SIZE (xpi/firefox-i18n-54.0/de.xpi) = 442813
SHA256 (xpi/firefox-i18n-54.0/dsb.xpi) = 95ed7b67a85bc1e937db3c1bf8a9041697bf8cadf90a2533a60cf40b9305080d
SIZE (xpi/firefox-i18n-54.0/dsb.xpi) = 458687
SHA256 (xpi/firefox-i18n-54.0/el.xpi) = 6bb35d24d1262b65f5a1d39d0f629ce51202197ae5585d708750d243083da869
SIZE (xpi/firefox-i18n-54.0/el.xpi) = 511227
SHA256 (xpi/firefox-i18n-54.0/en-GB.xpi) = b33babbb6bfbf6d740158bdc576b4f1d8c3fdd4d8fb23aa2f0cdc1fe9051b179
SIZE (xpi/firefox-i18n-54.0/en-GB.xpi) = 419544
SHA256 (xpi/firefox-i18n-54.0/en-US.xpi) = 0b03dac051a6a82165882106094e1bfa0ba9f6b31f17f033575dd9683cc032a9
SIZE (xpi/firefox-i18n-54.0/en-US.xpi) = 425756
SHA256 (xpi/firefox-i18n-54.0/en-ZA.xpi) = 406e1109a9eb58c5c10fbcd329414ab731900c98199d0873e7cfd4a321e0e878
SIZE (xpi/firefox-i18n-54.0/en-ZA.xpi) = 413430
SHA256 (xpi/firefox-i18n-54.0/eo.xpi) = e02532f575b2fca711119812e733c657c5456993d4f046fed88cdf88d88443d6
SIZE (xpi/firefox-i18n-54.0/eo.xpi) = 437025
SHA256 (xpi/firefox-i18n-54.0/es-AR.xpi) = ad52c7efdf58d8a690c7db4d1cb19c5d5ac1bfd435ade9eff6125ba129bd257b
SIZE (xpi/firefox-i18n-54.0/es-AR.xpi) = 445557
SHA256 (xpi/firefox-i18n-54.0/es-CL.xpi) = 55fcffd87b1b481b86f5cbfe3415241b69eb384a296a59e8a47cc009841fb0cd
SIZE (xpi/firefox-i18n-54.0/es-CL.xpi) = 445583
SHA256 (xpi/firefox-i18n-54.0/es-ES.xpi) = 925cb493c9a773b3b90de7adaa8adaecc0ac416dcfc0dfcfa7bbe631d5d89d9c
SIZE (xpi/firefox-i18n-54.0/es-ES.xpi) = 341279
SHA256 (xpi/firefox-i18n-54.0/es-MX.xpi) = 0433d137dcd0efb5372623f091c5dd6214cff27b39d1e2717957881c41a288fb
SIZE (xpi/firefox-i18n-54.0/es-MX.xpi) = 447975
SHA256 (xpi/firefox-i18n-54.0/et.xpi) = 10f27527f61337929a89caa36a5680839e4d9b446fc3098db921747778e1c663
SIZE (xpi/firefox-i18n-54.0/et.xpi) = 423853
SHA256 (xpi/firefox-i18n-54.0/eu.xpi) = a90e8bc05e12809763efc89b36d8b141d979b7a243ddd666495ea69c5b7ca969
SIZE (xpi/firefox-i18n-54.0/eu.xpi) = 438024
SHA256 (xpi/firefox-i18n-54.0/fa.xpi) = 0722a962e8e96db6fdc0272ed95bc76396c040eac60ea19b846b4e913a879e42
SIZE (xpi/firefox-i18n-54.0/fa.xpi) = 490359
SHA256 (xpi/firefox-i18n-54.0/ff.xpi) = bd29a7aef898c7f784682a6dc7832d7464f3dea7a44a1a3bf06e826996b6c938
SIZE (xpi/firefox-i18n-54.0/ff.xpi) = 441538
SHA256 (xpi/firefox-i18n-54.0/fi.xpi) = 481b6a5c9526622f2e2deec64a671146d8085bf22c9e43d54ed0ae3a5c1560a8
SIZE (xpi/firefox-i18n-54.0/fi.xpi) = 428996
SHA256 (xpi/firefox-i18n-54.0/fr.xpi) = daff81d6ca8bc10a2577461b64454cb8d9ddf4c64672ef131bee614d13a157c8
SIZE (xpi/firefox-i18n-54.0/fr.xpi) = 451594
SHA256 (xpi/firefox-i18n-54.0/fy-NL.xpi) = c51621608972a81f032bbbfaab0a7f203201c3c7eae5ad5237733db5b133252a
SIZE (xpi/firefox-i18n-54.0/fy-NL.xpi) = 444472
SHA256 (xpi/firefox-i18n-54.0/ga-IE.xpi) = 021a86749b08b16ef6c2812a280675703f72a696112caa65172370b00a0acb0a
SIZE (xpi/firefox-i18n-54.0/ga-IE.xpi) = 457482
SHA256 (xpi/firefox-i18n-54.0/gd.xpi) = ca7601a3b8c20477072681af474958af447c0e771bd15a796212d58bcbaccd70
SIZE (xpi/firefox-i18n-54.0/gd.xpi) = 446083
SHA256 (xpi/firefox-i18n-54.0/gl.xpi) = eef6b1e2f5889799a9ca4f42ffc9a5943b1b7a3e0aff6d2b679f3845afdf0686
SIZE (xpi/firefox-i18n-54.0/gl.xpi) = 443275
SHA256 (xpi/firefox-i18n-54.0/gn.xpi) = 965632ef1b87528cec4b22d21340a938b86554c63187dc062c14b295ee04b976
SIZE (xpi/firefox-i18n-54.0/gn.xpi) = 456066
SHA256 (xpi/firefox-i18n-54.0/gu-IN.xpi) = 2d89112472e65ad8801393aab669e7ccbcc83a54205113f5f00dcccf3ed46789
SIZE (xpi/firefox-i18n-54.0/gu-IN.xpi) = 487117
SHA256 (xpi/firefox-i18n-54.0/he.xpi) = 769e7c50cea5e8bd1d3214c1c0c509ab7f6edeee19e587846fc1b9905eb82404
SIZE (xpi/firefox-i18n-54.0/he.xpi) = 454286
SHA256 (xpi/firefox-i18n-54.0/hi-IN.xpi) = 45069a5493735e4b8856c1f34c00d543b11405aec9eb6744e861035fc5e6e315
SIZE (xpi/firefox-i18n-54.0/hi-IN.xpi) = 504631
SHA256 (xpi/firefox-i18n-54.0/hr.xpi) = 7555bbbf2e060acbdb2538b12c857743a7abbc5e3ca0a3a868545f61698a5f5d
SIZE (xpi/firefox-i18n-54.0/hr.xpi) = 447779
SHA256 (xpi/firefox-i18n-54.0/hsb.xpi) = 4bb60b51acac017c3c3cc0524182a6d791acba8b5a9601d78fa1d882acbd5258
SIZE (xpi/firefox-i18n-54.0/hsb.xpi) = 456525
SHA256 (xpi/firefox-i18n-54.0/hu.xpi) = 59eeef5917e20a80d76f3fcfb73fbce6f1fabaf3856eb76c42084831d095bf4f
SIZE (xpi/firefox-i18n-54.0/hu.xpi) = 451119
SHA256 (xpi/firefox-i18n-54.0/hy-AM.xpi) = 08cd87b9bd9ec8962be05fd183dc81c88cd869a316a78e37f4349423bf637e1c
SIZE (xpi/firefox-i18n-54.0/hy-AM.xpi) = 496019
SHA256 (xpi/firefox-i18n-54.0/id.xpi) = e90873350cc4629e6291059f347c13c494b087b02d24c71978f7dcb55a4cebc3
SIZE (xpi/firefox-i18n-54.0/id.xpi) = 425282
SHA256 (xpi/firefox-i18n-54.0/is.xpi) = 85f8e6b62f8f095eb5aadd53297b00156db484bacbbfa8cfc8e9858ca9b97a5c
SIZE (xpi/firefox-i18n-54.0/is.xpi) = 441707
SHA256 (xpi/firefox-i18n-54.0/it.xpi) = 2c4a202e18abb9a6ca440b7a1c95dd702644f4146b5c5e6ed01fbbd2ebb7d4d2
SIZE (xpi/firefox-i18n-54.0/it.xpi) = 335499
SHA256 (xpi/firefox-i18n-54.0/ja.xpi) = 9a2a44a59a3baebfdba32a6acce42a9d0e191b510d8b85a63dd4b8df80fff935
SIZE (xpi/firefox-i18n-54.0/ja.xpi) = 486805
SHA256 (xpi/firefox-i18n-54.0/kk.xpi) = 1aebc18f5eaa33119c04d573b2292a4879398798c7e1e13a27bb06204df81236
SIZE (xpi/firefox-i18n-54.0/kk.xpi) = 493047
SHA256 (xpi/firefox-i18n-54.0/km.xpi) = cc763200afaf9dc8ea905df9cece16107b9de18ad287ac649cba2d5f49f5f0d3
SIZE (xpi/firefox-i18n-54.0/km.xpi) = 517239
SHA256 (xpi/firefox-i18n-54.0/kn.xpi) = d0f50369a6ac5da6ea463c4aef2923f3a9ee6b7ef7c456ef98a6219a54cf60d0
SIZE (xpi/firefox-i18n-54.0/kn.xpi) = 516491
SHA256 (xpi/firefox-i18n-54.0/ko.xpi) = 37a44a4e8bfebe5dd1f1bef894606176aa993c1d68b4b062dc0315d10ac16e64
SIZE (xpi/firefox-i18n-54.0/ko.xpi) = 460422
SHA256 (xpi/firefox-i18n-54.0/lij.xpi) = 3a7933758f05dfaed5f8ef3db85f2a24542346f766b6606b54d44992ee450645
SIZE (xpi/firefox-i18n-54.0/lij.xpi) = 431673
SHA256 (xpi/firefox-i18n-54.0/lt.xpi) = 355d7ac647cfa17ab2ca89e5429f98f5da0983e9a060c6f6e9cc17c8d9eb2dc2
SIZE (xpi/firefox-i18n-54.0/lt.xpi) = 451193
SHA256 (xpi/firefox-i18n-54.0/lv.xpi) = 69ee0ea0b565e923e738268341f25b3529dd99f9366cbd00abeab695eaa0d1a0
SIZE (xpi/firefox-i18n-54.0/lv.xpi) = 447752
SHA256 (xpi/firefox-i18n-54.0/mai.xpi) = cd475bcd0aa8bb981804cd6eb3365ba9187029ea70e1f1c96d5dde1c3ae7b980
SIZE (xpi/firefox-i18n-54.0/mai.xpi) = 497011
SHA256 (xpi/firefox-i18n-54.0/mk.xpi) = 377294d926f09e59667f2acf0ac867f3fc1f12668f320f448b672109eab99d01
SIZE (xpi/firefox-i18n-54.0/mk.xpi) = 493117
SHA256 (xpi/firefox-i18n-54.0/ml.xpi) = cb110e4a1b55a190a875e00bc08efabf9d52228c9ab12238c771af2157d414f2
SIZE (xpi/firefox-i18n-54.0/ml.xpi) = 512264
SHA256 (xpi/firefox-i18n-54.0/mr.xpi) = 64d18d7927d4bfae2ffaddb559ad5e74b642e72dabc3cb60052804807891b015
SIZE (xpi/firefox-i18n-54.0/mr.xpi) = 501033
SHA256 (xpi/firefox-i18n-54.0/ms.xpi) = 5950945e46e21891ab53f3bf5828888f132a056ffe5933a1acae94c031139015
SIZE (xpi/firefox-i18n-54.0/ms.xpi) = 435500
SHA256 (xpi/firefox-i18n-54.0/nb-NO.xpi) = efafebc209ef2d81e09ddc36809071064ab0ce2cbbed77adb621341d9d66962c
SIZE (xpi/firefox-i18n-54.0/nb-NO.xpi) = 433680
SHA256 (xpi/firefox-i18n-54.0/nl.xpi) = aa9fe3c007e84bb12267d789a41fff32caa235d6f242fc9ba7ed86da8d942968
SIZE (xpi/firefox-i18n-54.0/nl.xpi) = 431500
SHA256 (xpi/firefox-i18n-54.0/nn-NO.xpi) = 882a058faf72685ea0ff41900b57ff5eb0d97e892072ae0521ffbb05e4a0ccff
SIZE (xpi/firefox-i18n-54.0/nn-NO.xpi) = 427869
SHA256 (xpi/firefox-i18n-54.0/or.xpi) = 708a93f11bc6f71c1309da18e29ea18fd5be7daceb908909788766e22e336ae0
SIZE (xpi/firefox-i18n-54.0/or.xpi) = 494076
SHA256 (xpi/firefox-i18n-54.0/pa-IN.xpi) = 55e98f21d75ebe69b57eefa4ae2a1a32f60d108fc7ab4177138c77bdc32ae314
SIZE (xpi/firefox-i18n-54.0/pa-IN.xpi) = 473515
SHA256 (xpi/firefox-i18n-54.0/pl.xpi) = 3012752259b1043d55b71418eb23c69ee74230d39c0f5c336c6471b41ac2a60d
SIZE (xpi/firefox-i18n-54.0/pl.xpi) = 347203
SHA256 (xpi/firefox-i18n-54.0/pt-BR.xpi) = ef23036aedc70ff1c7b35890c9e8bd738da7df44d71f91a4bfe3d5c4206d6cad
SIZE (xpi/firefox-i18n-54.0/pt-BR.xpi) = 437172
SHA256 (xpi/firefox-i18n-54.0/pt-PT.xpi) = 9da6b5aa0f36e94ff7fb7bba94c9caf43614a985e07cf64544a92596a3acd874
SIZE (xpi/firefox-i18n-54.0/pt-PT.xpi) = 436177
SHA256 (xpi/firefox-i18n-54.0/rm.xpi) = 0d8e67d5650d7331640ea54c20572e75af24f08011ed4d10d9362a4ca64c1c61
SIZE (xpi/firefox-i18n-54.0/rm.xpi) = 433404
SHA256 (xpi/firefox-i18n-54.0/ro.xpi) = 7d48ec24b3edfce6da4182ab194cbc3051cea3898aef66cf8ceee20f50b275a3
SIZE (xpi/firefox-i18n-54.0/ro.xpi) = 449473
SHA256 (xpi/firefox-i18n-54.0/ru.xpi) = c4d107b88feef02fa1a510389102f6de58c372ecb7600c51b4cb6782f277b91e
SIZE (xpi/firefox-i18n-54.0/ru.xpi) = 487731
SHA256 (xpi/firefox-i18n-54.0/si.xpi) = 653e6314e92b9c7f156b5e57153eb4002dc6e8826c4c5fd7904a2cb8c0b37963
SIZE (xpi/firefox-i18n-54.0/si.xpi) = 491068
SHA256 (xpi/firefox-i18n-54.0/sk.xpi) = 478effe7b9e5e2328f47d9eeca2373af9bfc34293a715da482d89e7cba732379
SIZE (xpi/firefox-i18n-54.0/sk.xpi) = 455015
SHA256 (xpi/firefox-i18n-54.0/sl.xpi) = 5b2d34ddefda99b5420f94dd2bc1f52765a28cf949e317e9f2d2580bb78cebcd
SIZE (xpi/firefox-i18n-54.0/sl.xpi) = 433174
SHA256 (xpi/firefox-i18n-54.0/son.xpi) = a6ebc9f018ebff9ba6d7cf5302da772f8ad118489b05e44d64dc86331a521150
SIZE (xpi/firefox-i18n-54.0/son.xpi) = 435052
SHA256 (xpi/firefox-i18n-54.0/sq.xpi) = a19a8faeb8a28599dac9a0d2ca7432c72b12d5efabc9e5e4a696a46c5b8756d5
SIZE (xpi/firefox-i18n-54.0/sq.xpi) = 448157
SHA256 (xpi/firefox-i18n-54.0/sr.xpi) = a706281a42662db287adb9351df8a8d0b516368442063d5722a31cedd2d49044
SIZE (xpi/firefox-i18n-54.0/sr.xpi) = 461354
SHA256 (xpi/firefox-i18n-54.0/sv-SE.xpi) = 6055191f2b0aa12202630d98de3068e19675b05aa3ee063aec39d00a02892dad
SIZE (xpi/firefox-i18n-54.0/sv-SE.xpi) = 440478
SHA256 (xpi/firefox-i18n-54.0/ta.xpi) = ed574652254367b061ffcdb6a802ab8a6ccd7c3a30827ba90a3d141aa202c86f
SIZE (xpi/firefox-i18n-54.0/ta.xpi) = 493956
SHA256 (xpi/firefox-i18n-54.0/te.xpi) = 9e6e718564ddafd81b0dbc52cf9e91c06889ef5b8b1b270644985e6d02fd1f4d
SIZE (xpi/firefox-i18n-54.0/te.xpi) = 513337
SHA256 (xpi/firefox-i18n-54.0/th.xpi) = d25d08b7179a994b49dd6c90ecd2f88782b5fe16ade39b61be0a5e17461d7bc8
SIZE (xpi/firefox-i18n-54.0/th.xpi) = 487217
SHA256 (xpi/firefox-i18n-54.0/tr.xpi) = 57d9f03344ddc87bf4ec33406f5f22b31acc5d9ee821fcbe64fd288805c52038
SIZE (xpi/firefox-i18n-54.0/tr.xpi) = 440412
SHA256 (xpi/firefox-i18n-54.0/uk.xpi) = cfed556b32924b48084a0645bd30ec12c5de463edcb4bec1f349be08f55ba1e0
SIZE (xpi/firefox-i18n-54.0/uk.xpi) = 490755
SHA256 (xpi/firefox-i18n-54.0/uz.xpi) = a7d2c2182b873c694a19d48638cd72ff11c2a9c0dce12ccd486727bbf71c5ac1
SIZE (xpi/firefox-i18n-54.0/uz.xpi) = 448113
SHA256 (xpi/firefox-i18n-54.0/vi.xpi) = eb8a9f2177b5649a1227f1e850d1bf546bc3943ab5b5b19d587de49761522146
SIZE (xpi/firefox-i18n-54.0/vi.xpi) = 449653
SHA256 (xpi/firefox-i18n-54.0/xh.xpi) = bf99aaa4576ed39eb62ab8ffdd889833fb97c3d827bb374d2b71aa09fec8c04e
SIZE (xpi/firefox-i18n-54.0/xh.xpi) = 440801
SHA256 (xpi/firefox-i18n-54.0/zh-CN.xpi) = f066b94bc64a66d64848ccfea5989cf729c90023dd16a472a9f88a40fde1d493
SIZE (xpi/firefox-i18n-54.0/zh-CN.xpi) = 458332
SHA256 (xpi/firefox-i18n-54.0/zh-TW.xpi) = d2eee4a98157a120c112eb3a06a4bafd154938f8190d63ff1de48cf5e8f94a5e
SIZE (xpi/firefox-i18n-54.0/zh-TW.xpi) = 469164




# Created by: Alan Eldridge <alane@FreeBSD.org>
# $FreeBSD: head/www/firefox/Makefile 441503 2017-05-23 05:03:14Z rezny $

PORTNAME=	firefox
DISTVERSION=	54.0
PORTREVISION=	1
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 = 1495100875	1	TIMESTAMP = 1496738343
2	SHA256 (firefox-53.0.3.source.tar.xz) = 78cc89650b6d8baacaf55f1a486de06bf3bb5b8a3082fd044e70225e2816e348	2	SHA256 (firefox-54.0.source.tar.xz) = 0e9f1d1b03163789e5c84f1eacaddb7f3c7ce8ba0728b0cdff5c9cf9bfee0c16
3	SIZE (firefox-53.0.3.source.tar.xz) = 215253212	3	SIZE (firefox-54.0.source.tar.xz) = 228836168




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
@@ -30,6 +30,7 @@ if test "$OS_ARCH" = "WINNT"; then
   fi
 fi
 
+MOZ_RUST_MP4PARSE=1
 if test "$NIGHTLY_BUILD"; then
   MOZ_RUST_URLPARSE=1
 fi
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 139-144 MOZ_MK_OPTIONS+=MOZ_OBJDIR="${MOZ_OBJDIR}" Link Here

(-)b/Mk/bsd.gecko.mk (-3 / +7 lines)
139		139
140	LDFLAGS+= -Wl,--as-needed	140	LDFLAGS+= -Wl,--as-needed
141		141
		142	. if ${MOZILLA_VER:R:R} < 55
142	.if ${OPSYS} != DragonFly # XXX xpcshell crash during install	143	.if ${OPSYS} != DragonFly # XXX xpcshell crash during install
143	# use jemalloc 3.0.0 (4.0 for firefox 43+) API for stats/tuning	144	# use jemalloc 3.0.0 (4.0 for firefox 43+) API for stats/tuning
144	MOZ_EXPORT+= MOZ_JEMALLOC3=1 MOZ_JEMALLOC4=1	145	MOZ_EXPORT+= MOZ_JEMALLOC3=1 MOZ_JEMALLOC4=1
Lines 150-155 MOZ_OPTIONS+= --enable-jemalloc Link Here
150	. endif	151	. endif
151	.endif	152	.endif
152	.endif # !DragonFly	153	.endif # !DragonFly
		154	.endif # Mozilla < 55
153		155
154	# Standard depends	156	# Standard depends
155	_ALL_DEPENDS= cairo event ffi graphite harfbuzz hunspell icu jpeg nspr nss png pixman soundtouch sqlite vpx	157	_ALL_DEPENDS= cairo event ffi graphite harfbuzz hunspell icu jpeg nspr nss png pixman soundtouch sqlite vpx
Lines 328-339 MOZ_OPTIONS+= --enable-gconf Link Here
328	MOZ_OPTIONS+= --disable-gconf	330	MOZ_OPTIONS+= --disable-gconf
329	.endif	331	.endif
330		332
331	.if ${PORT_OPTIONS:MGNOMEUI}	333	.if ${MOZILLA_VER:R:R} < 55
		334	. if ${PORT_OPTIONS:MGNOMEUI}
332	BUILD_DEPENDS+= ${libgnomeui_DETECT}:${libgnomeui_LIB_DEPENDS:C/.*://}	335	BUILD_DEPENDS+= ${libgnomeui_DETECT}:${libgnomeui_LIB_DEPENDS:C/.*://}
333	USE_GNOME+= libgnomeui:build	336	USE_GNOME+= libgnomeui:build
334	MOZ_OPTIONS+= --enable-gnomeui	337	MOZ_OPTIONS+= --enable-gnomeui
335	.else	338	. else
336	MOZ_OPTIONS+= --disable-gnomeui	339	MOZ_OPTIONS+= --disable-gnomeui
		340	. endif
337	.endif	341	.endif
338		342
339	.if ${PORT_OPTIONS:MLIBPROXY}	343	.if ${PORT_OPTIONS:MLIBPROXY}
Lines 389-395 post-patch-SNDIO-on: Link Here
389	.endif	393	.endif
390		394
391	.if ${PORT_OPTIONS:MRUST}	395	.if ${PORT_OPTIONS:MRUST}
392	BUILD_DEPENDS+= rustc:${RUST_PORT}	396	BUILD_DEPENDS+= rust>=1.15.1:${RUST_PORT}
393	. if ${MOZILLA_VER:R:R} >= 51	397	. if ${MOZILLA_VER:R:R} >= 51
394	BUILD_DEPENDS+= cargo>=0.16.0:devel/cargo	398	BUILD_DEPENDS+= cargo>=0.16.0:devel/cargo
395	. endif	399	. endif

Lines 1-9 Link Here

(-)b/www/firefox/Makefile (-8 / +7 lines)
1	# Created by: Alan Eldridge <alane@FreeBSD.org>	1	# Created by: Alan Eldridge <alane@FreeBSD.org>
2	# $FreeBSD$	2	# $FreeBSD: head/www/firefox/Makefile 441503 2017-05-23 05:03:14Z rezny $
3		3
4	PORTNAME= firefox	4	PORTNAME= firefox
5	DISTVERSION= 53.0.3	5	DISTVERSION= 54.0
6	PORTREVISION= 1
7	DISTVERSIONSUFFIX=.source	6	DISTVERSIONSUFFIX=.source
8	PORTEPOCH= 1	7	PORTEPOCH= 1
9	CATEGORIES= www ipv6	8	CATEGORIES= www ipv6
Lines 13-23 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Link Here
13	MAINTAINER= gecko@FreeBSD.org	12	MAINTAINER= gecko@FreeBSD.org
14	COMMENT= Web browser based on the browser portion of Mozilla	13	COMMENT= Web browser based on the browser portion of Mozilla
15		14
16	BUILD_DEPENDS= nspr>=4.13.1:devel/nspr \	15	BUILD_DEPENDS= nspr>=4.14:devel/nspr \
17	nss>=3.29.5:security/nss \	16	nss>=3.30.2:security/nss \
18	libevent>=2.0.21_2:devel/libevent \	17	libevent>=2.0.22:devel/libevent \
19	harfbuzz>=1.4.1:print/harfbuzz \	18	harfbuzz>=1.4.3:print/harfbuzz \
20	graphite2>=1.3.8:graphics/graphite2 \	19	graphite2>=1.3.10:graphics/graphite2 \
21	png>=1.6.28:graphics/png \	20	png>=1.6.28:graphics/png \
22	libvorbis>=1.3.5,3:audio/libvorbis \	21	libvorbis>=1.3.5,3:audio/libvorbis \
23	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 (-1 / +345 lines)
0	-	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	@@ -30,6 +30,7 @@ if test "$OS_ARCH" = "WINNT"; then
		8	fi
		9	fi
		10
		11	+MOZ_RUST_MP4PARSE=1
		12	if test "$NIGHTLY_BUILD"; then
		13	MOZ_RUST_URLPARSE=1
		14	fi
		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",