Attachment #191654 for bug #226476




.elif ${gecko_ARGS:Mfirefox}

_GECKO_DEFAULT_VERSION=	52
_GECKO_VERSIONS=		52 60
_GECKO_TYPE=	firefox

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

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

Lines 379-385 post-patch-SNDIO-on: Link Here

(-)b/Mk/bsd.gecko.mk (-1 / +1 lines)
379	.endif	379	.endif
380		380
381	.if ${PORT_OPTIONS:MRUST} \|\| ${MOZILLA_VER:R:R} >= 54	381	.if ${PORT_OPTIONS:MRUST} \|\| ${MOZILLA_VER:R:R} >= 54
382	BUILD_DEPENDS+= ${RUST_PORT:T}>=1.22.1:${RUST_PORT}	382	BUILD_DEPENDS+= ${RUST_PORT:T}>=1.24:${RUST_PORT}
383	RUST_PORT?= lang/rust	383	RUST_PORT?= lang/rust
384	. if ${MOZILLA_VER:R:R} < 54	384	. if ${MOZILLA_VER:R:R} < 54
385	MOZ_OPTIONS+= --enable-rust	385	MOZ_OPTIONS+= --enable-rust

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= 59.0.1	5	PORTVERSION= 60.0b5
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,59,build	18	USES= zip:infozip gecko:firefox,60,build
19	USE_XPI= firefox	19	USE_XPI= firefox
20		20
21	NO_ARCH= yes	21	NO_ARCH= yes

Lines 6-12 FIREFOX_I18N_ALL_= ach af an ar as ast az be bg bn-BD bn-IN br bs ca cak \ Link Here

(-)b/www/firefox-i18n/Makefile.lang (-1 / +4 lines)
6	es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn \	6	es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn \
7	gu-IN he hi-IN hr hsb hu hy-AM ia id is it ja ka kab \	7	gu-IN he hi-IN hr hsb hu hy-AM ia id is it ja ka kab \
8	kk km kn ko lij lt lv mai mk ml mr ms my nb-NO ne-NP nl \	8	kk km kn ko lij lt lv mai mk ml mr ms my nb-NO ne-NP nl \
9	nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son \	9	nn-NO oc or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son \
10	sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW	10	sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW
11		11
12	.if defined(FIREFOX_I18N_ALL) \|\| defined(PACKAGE_BUILDING) \|\| target(package)	12	.if defined(FIREFOX_I18N_ALL) \|\| defined(PACKAGE_BUILDING) \|\| target(package)
Lines 225-230 FIREFOX_I18N+= nl Link Here
225	.if ${PORT_OPTIONS:MLANG_NN}	225	.if ${PORT_OPTIONS:MLANG_NN}
226	FIREFOX_I18N+= nn-NO	226	FIREFOX_I18N+= nn-NO
227	.endif	227	.endif
		228	.if ${PORT_OPTIONS:MLANG_OC}
		229	FIREFOX_I18N+= oc
		230	.endif
228	.if ${PORT_OPTIONS:MLANG_OR}	231	.if ${PORT_OPTIONS:MLANG_OR}
229	FIREFOX_I18N+= or	232	FIREFOX_I18N+= or
230	.endif	233	.endif

Lines 73-78 OPTIONS_DEFINE= LANG_ACH \ Link Here

(-)b/www/firefox-i18n/Makefile.option (+2 lines)
73	LANG_NE \	73	LANG_NE \
74	LANG_NL \	74	LANG_NL \
75	LANG_NN \	75	LANG_NN \
		76	LANG_OC \
76	LANG_OR \	77	LANG_OR \
77	LANG_PA \	78	LANG_PA \
78	LANG_PL \	79	LANG_PL \
Lines 122-127 LANG_LIJ_DESC?= Ligurian (Genoa) language support Link Here
122	LANG_MS_DESC?= Malay language support	123	LANG_MS_DESC?= Malay language support
123	LANG_MY_DESC?= Burmese language support	124	LANG_MY_DESC?= Burmese language support
124	LANG_NE_DESC?= Nepali language support	125	LANG_NE_DESC?= Nepali language support
		126	LANG_OC_DESC?= Occitan (lengadocian) language support
125	LANG_SW_DESC?= Swahili language support	127	LANG_SW_DESC?= Swahili language support
126	LANG_UR_DESC?= Urdu (Pakistan) language support	128	LANG_UR_DESC?= Urdu (Pakistan) language support
127	LANG_UZ_DESC?= Uzbek language support	129	LANG_UZ_DESC?= Uzbek language support




TIMESTAMP = 1520629428
SHA256 (xpi/firefox-i18n-60.0b5/ach.xpi) = b7cf5a7782fe5ea3dfb2b0b84fbbddf1073baa5c761f693bda8b6210f9764ab4
SIZE (xpi/firefox-i18n-60.0b5/ach.xpi) = 448286
SHA256 (xpi/firefox-i18n-60.0b5/af.xpi) = 4a681f2f1d50ae82c9e4800837191b535183339ee2548b6210dd6359a3579f17
SIZE (xpi/firefox-i18n-60.0b5/af.xpi) = 445111
SHA256 (xpi/firefox-i18n-60.0b5/an.xpi) = 1e276b80b69be1b4ca0c29f2ee4be04be2087d5ef5e9a61f9f654513065d25b0
SIZE (xpi/firefox-i18n-60.0b5/an.xpi) = 471885
SHA256 (xpi/firefox-i18n-60.0b5/ar.xpi) = f7075ce587819a86ddc67560326ae87173b11d80c0797a7ef7211059155f9a4a
SIZE (xpi/firefox-i18n-60.0b5/ar.xpi) = 496781
SHA256 (xpi/firefox-i18n-60.0b5/as.xpi) = ea88703b732fc5d38b6d6faa24d0ca200b804ab6452f38f94bc22a790bd74b6f
SIZE (xpi/firefox-i18n-60.0b5/as.xpi) = 488768
SHA256 (xpi/firefox-i18n-60.0b5/ast.xpi) = 9a9a8862d04cd734056703a7a37d75ae47812a91ac882b36b65d1eab1cc830bb
SIZE (xpi/firefox-i18n-60.0b5/ast.xpi) = 463358
SHA256 (xpi/firefox-i18n-60.0b5/az.xpi) = 441509188e6802473385abf007dc0054eab8fa8a3ae967fd9552d004a5de62f6
SIZE (xpi/firefox-i18n-60.0b5/az.xpi) = 474971
SHA256 (xpi/firefox-i18n-60.0b5/be.xpi) = 2964abfae0dc5e5426ca3f76fec4bc8d4c84a5d458143ec4476e2f8c9d64d974
SIZE (xpi/firefox-i18n-60.0b5/be.xpi) = 527011
SHA256 (xpi/firefox-i18n-60.0b5/bg.xpi) = 7e8d92eafddee1219ae10252a28364f42b5552e0b12d55baeea278434956bc6a
SIZE (xpi/firefox-i18n-60.0b5/bg.xpi) = 519364
SHA256 (xpi/firefox-i18n-60.0b5/bn-BD.xpi) = fad38c9616ae78fe05ff15086ea71edaba85158e663012b385956f465f31ed29
SIZE (xpi/firefox-i18n-60.0b5/bn-BD.xpi) = 535934
SHA256 (xpi/firefox-i18n-60.0b5/bn-IN.xpi) = b1249a21dc0dad013129c94704bb21738a48750f57b2f0be59b7272c6e054cea
SIZE (xpi/firefox-i18n-60.0b5/bn-IN.xpi) = 521685
SHA256 (xpi/firefox-i18n-60.0b5/br.xpi) = 43285a9247553958c7da682c19c6199a09103a9bff78c0afda2933eba2c71456
SIZE (xpi/firefox-i18n-60.0b5/br.xpi) = 461123
SHA256 (xpi/firefox-i18n-60.0b5/bs.xpi) = ac7da15b195864c924742deaf88cb164de5144365c38b44408c23e0d06831ec1
SIZE (xpi/firefox-i18n-60.0b5/bs.xpi) = 467820
SHA256 (xpi/firefox-i18n-60.0b5/ca.xpi) = 58104f74da3a9d65f8965b8593197a8c91c9b2425fac7df2887e565b41f57793
SIZE (xpi/firefox-i18n-60.0b5/ca.xpi) = 475143
SHA256 (xpi/firefox-i18n-60.0b5/cak.xpi) = 926e65519dd0a13e3f9182dbee519e992dbe2b44fb1a625e37a6652edb5e5120
SIZE (xpi/firefox-i18n-60.0b5/cak.xpi) = 484300
SHA256 (xpi/firefox-i18n-60.0b5/cs.xpi) = bc87e9e0e3e41e6a9e887eeedc3781501e5fbd17ee9b8f848a57622f2a1bf164
SIZE (xpi/firefox-i18n-60.0b5/cs.xpi) = 479914
SHA256 (xpi/firefox-i18n-60.0b5/cy.xpi) = 91df18438c912e179c24962d21b85757cb27865366f07a994596296873261168
SIZE (xpi/firefox-i18n-60.0b5/cy.xpi) = 464789
SHA256 (xpi/firefox-i18n-60.0b5/da.xpi) = 1ae9c916f511d15c2db512567324cb4c78ad841b5b6eb1a6b81491e09fdc029b
SIZE (xpi/firefox-i18n-60.0b5/da.xpi) = 457543
SHA256 (xpi/firefox-i18n-60.0b5/de.xpi) = a7adb54c9e14f8d10be9199173b999b3a1511a8fe694bc5e769ea50a58a5ac3c
SIZE (xpi/firefox-i18n-60.0b5/de.xpi) = 477424
SHA256 (xpi/firefox-i18n-60.0b5/dsb.xpi) = 7d8157914b32dabe94c9170677ece16adf2d07bba6a23be0ab2146116f097c61
SIZE (xpi/firefox-i18n-60.0b5/dsb.xpi) = 487485
SHA256 (xpi/firefox-i18n-60.0b5/el.xpi) = 333154f0cf1bac6cb3b7e11534425c7fd1094fe8b9ac9b6c6285f712ad41b748
SIZE (xpi/firefox-i18n-60.0b5/el.xpi) = 542988
SHA256 (xpi/firefox-i18n-60.0b5/en-GB.xpi) = b1cb2f212ecf473a7d42457bee772d5e45f7c3c778e65db6a42523761ef57f04
SIZE (xpi/firefox-i18n-60.0b5/en-GB.xpi) = 444252
SHA256 (xpi/firefox-i18n-60.0b5/en-US.xpi) = a9cc08dd5aed430a2dec6679e92a3f9b048a078c7a5006fd33d831f8e6db72b8
SIZE (xpi/firefox-i18n-60.0b5/en-US.xpi) = 439229
SHA256 (xpi/firefox-i18n-60.0b5/en-ZA.xpi) = 16ef865f91de2cbed7d674d800db09aba33ca4508b38c53cd3e14eccaaadaa3f
SIZE (xpi/firefox-i18n-60.0b5/en-ZA.xpi) = 433955
SHA256 (xpi/firefox-i18n-60.0b5/eo.xpi) = 85090f769b791a0fef7ec13c84c2af7abee2b107af476b6950921f4fef1f450d
SIZE (xpi/firefox-i18n-60.0b5/eo.xpi) = 462259
SHA256 (xpi/firefox-i18n-60.0b5/es-AR.xpi) = 51e60414a0d07f4a43a32ba0d1023b0b5cfdba1d4fefc8e91a8cbb4ca74d5dee
SIZE (xpi/firefox-i18n-60.0b5/es-AR.xpi) = 472921
SHA256 (xpi/firefox-i18n-60.0b5/es-CL.xpi) = 97007a7ef53291e22be4cb3c8b496d26c8468d616e3f9242ca26937930ae4647
SIZE (xpi/firefox-i18n-60.0b5/es-CL.xpi) = 475773
SHA256 (xpi/firefox-i18n-60.0b5/es-ES.xpi) = da6cdb1eb11d98745e7aa4ebb2c782523e528dec3036babb4d2c9523cbcd5195
SIZE (xpi/firefox-i18n-60.0b5/es-ES.xpi) = 398018
SHA256 (xpi/firefox-i18n-60.0b5/es-MX.xpi) = e2989a87730f2f8f1a1ebcebb68c19af299e7e93c996ca2137d21b04ab7ce6e4
SIZE (xpi/firefox-i18n-60.0b5/es-MX.xpi) = 476894
SHA256 (xpi/firefox-i18n-60.0b5/et.xpi) = d88ca2f58c51403b83efc86ae86518eab8b6bd97457a5d3b9c707dc51b4dab0d
SIZE (xpi/firefox-i18n-60.0b5/et.xpi) = 457630
SHA256 (xpi/firefox-i18n-60.0b5/eu.xpi) = f9b29ea85d04b736fb4900fd1b8cb27be5430abcfc2bd6b40a6e3cea14eb7f25
SIZE (xpi/firefox-i18n-60.0b5/eu.xpi) = 463833
SHA256 (xpi/firefox-i18n-60.0b5/fa.xpi) = bc9db6a6019e7c28b2678d55de93e137f286f4465bea77945c1bc6f8be75bb01
SIZE (xpi/firefox-i18n-60.0b5/fa.xpi) = 518992
SHA256 (xpi/firefox-i18n-60.0b5/ff.xpi) = fcda0e781e7c3e330d0177f57a67cbc0ce0032b4fca832de2d1ed8c3f975f0a7
SIZE (xpi/firefox-i18n-60.0b5/ff.xpi) = 464894
SHA256 (xpi/firefox-i18n-60.0b5/fi.xpi) = 1afd02a57647e4e4735b2d4a5b954e931a7afaaff4666578b7631f360203ba45
SIZE (xpi/firefox-i18n-60.0b5/fi.xpi) = 455914
SHA256 (xpi/firefox-i18n-60.0b5/fr.xpi) = bb53a99a0e8dd6bfcd7278f431f3e87d90d7ec31d3a6e05e656f1947ddb287a0
SIZE (xpi/firefox-i18n-60.0b5/fr.xpi) = 484331
SHA256 (xpi/firefox-i18n-60.0b5/fy-NL.xpi) = 6bd3b918ae762d320fbc79e331e547af3bc2c70561aa3486d06521da252c40e8
SIZE (xpi/firefox-i18n-60.0b5/fy-NL.xpi) = 472863
SHA256 (xpi/firefox-i18n-60.0b5/ga-IE.xpi) = ef86d1dee9496d5d45cdce85856089d0be14914ab34f9262f30b5aaf9e484597
SIZE (xpi/firefox-i18n-60.0b5/ga-IE.xpi) = 481965
SHA256 (xpi/firefox-i18n-60.0b5/gd.xpi) = 93c2f11e334c3a53279306a1ba60657421e7bcd09fb814e803eee0117d8d604d
SIZE (xpi/firefox-i18n-60.0b5/gd.xpi) = 473021
SHA256 (xpi/firefox-i18n-60.0b5/gl.xpi) = 6732198d6ef592cb901fa6433681e4cd8ebd4b97f80d7a3ef5e9679874893220
SIZE (xpi/firefox-i18n-60.0b5/gl.xpi) = 451630
SHA256 (xpi/firefox-i18n-60.0b5/gn.xpi) = b2b5ef8c8d8157459c79a1e085259329f18b6277276e28da69ee81557264c2fb
SIZE (xpi/firefox-i18n-60.0b5/gn.xpi) = 481098
SHA256 (xpi/firefox-i18n-60.0b5/gu-IN.xpi) = e551c9f5cde21ae01d63495a0330a15bef33c21dbf2de4cff8a65b43919b9026
SIZE (xpi/firefox-i18n-60.0b5/gu-IN.xpi) = 532920
SHA256 (xpi/firefox-i18n-60.0b5/he.xpi) = 4987b389973dcc614a27ddf7edbb6866f21fa061a0992ae43d6875a1d0ca1117
SIZE (xpi/firefox-i18n-60.0b5/he.xpi) = 483088
SHA256 (xpi/firefox-i18n-60.0b5/hi-IN.xpi) = ff63fe8dfdb2f8b2e08d3167f8d6bb753837d43a8bd4abeade4848eb232b4e72
SIZE (xpi/firefox-i18n-60.0b5/hi-IN.xpi) = 535068
SHA256 (xpi/firefox-i18n-60.0b5/hr.xpi) = 85d36cded0c606a92f85c9bb528b1490c1ce155ce4d6d371b202ccce81d3dc86
SIZE (xpi/firefox-i18n-60.0b5/hr.xpi) = 470247
SHA256 (xpi/firefox-i18n-60.0b5/hsb.xpi) = f4a0766dc42066315111441b9197967b0f0553cc4f0ee85755cbc0b20fbe05c8
SIZE (xpi/firefox-i18n-60.0b5/hsb.xpi) = 485230
SHA256 (xpi/firefox-i18n-60.0b5/hu.xpi) = b5c586021c4a52006592d61f9c63d5f7edb8804509e583a1e124d77bf7732a07
SIZE (xpi/firefox-i18n-60.0b5/hu.xpi) = 486386
SHA256 (xpi/firefox-i18n-60.0b5/hy-AM.xpi) = 9d6f1f8c02fa19037446162faf7ab60f473db31c66da493c54554db26e2c2154
SIZE (xpi/firefox-i18n-60.0b5/hy-AM.xpi) = 519060
SHA256 (xpi/firefox-i18n-60.0b5/ia.xpi) = f152ebfe70485089bda5c43113fdb62fcc33d4a334854aa462f8de262d3f4694
SIZE (xpi/firefox-i18n-60.0b5/ia.xpi) = 459829
SHA256 (xpi/firefox-i18n-60.0b5/id.xpi) = 00d0687dc816591de008f67af1368e9074ec0bc09367a87baaba740561d50c88
SIZE (xpi/firefox-i18n-60.0b5/id.xpi) = 451635
SHA256 (xpi/firefox-i18n-60.0b5/is.xpi) = 0fcb3442d9797806530e1ad8f4cb4ecc66decd2184ccfa059e42823693365aac
SIZE (xpi/firefox-i18n-60.0b5/is.xpi) = 462146
SHA256 (xpi/firefox-i18n-60.0b5/it.xpi) = 3a0b2be033eb754f89c606494a926fc2dbb29ce9b0e5ae9befcfdb06564124e4
SIZE (xpi/firefox-i18n-60.0b5/it.xpi) = 349832
SHA256 (xpi/firefox-i18n-60.0b5/ja.xpi) = 1b0bf234562fb1e10b5aabec4bd06a65cce5f2e0b0764eeb5ba0fe23b3c9ab43
SIZE (xpi/firefox-i18n-60.0b5/ja.xpi) = 518987
SHA256 (xpi/firefox-i18n-60.0b5/ka.xpi) = 7680a934f46841c0640626de1803cf524fef8af1d5e7c6bf65d040b73624c66e
SIZE (xpi/firefox-i18n-60.0b5/ka.xpi) = 502445
SHA256 (xpi/firefox-i18n-60.0b5/kab.xpi) = 253ae20877f17cc405b4dbcf1ab83e8722e9385583203ecc63de7dc1ffa8acfb
SIZE (xpi/firefox-i18n-60.0b5/kab.xpi) = 470984
SHA256 (xpi/firefox-i18n-60.0b5/kk.xpi) = 469145f8141ef31b8c26d26e0dab49fdc8cc2f213219618fdc8146a42af6657d
SIZE (xpi/firefox-i18n-60.0b5/kk.xpi) = 528100
SHA256 (xpi/firefox-i18n-60.0b5/km.xpi) = c43bdfb638df2390c9d482f49c488c2f7e49711ca32285d20fb8f97003c83094
SIZE (xpi/firefox-i18n-60.0b5/km.xpi) = 535561
SHA256 (xpi/firefox-i18n-60.0b5/kn.xpi) = 5e550ea930289a8b6e9492f7127c412250a7b98676f6763210aad2a8e4821369
SIZE (xpi/firefox-i18n-60.0b5/kn.xpi) = 535720
SHA256 (xpi/firefox-i18n-60.0b5/ko.xpi) = 4c4d583a94b5d6b986b0ada70bebf77dec103f35e216c429822748e6623ec92a
SIZE (xpi/firefox-i18n-60.0b5/ko.xpi) = 495624
SHA256 (xpi/firefox-i18n-60.0b5/lij.xpi) = df7ccc944c53e4670f56d7cec12e3ce3acfa98893ba1e845a878e66705f3258d
SIZE (xpi/firefox-i18n-60.0b5/lij.xpi) = 458698
SHA256 (xpi/firefox-i18n-60.0b5/lt.xpi) = 8c361d81e4d1acf876e002ad7512c58d8905802352c815c6e752b1ebda67c750
SIZE (xpi/firefox-i18n-60.0b5/lt.xpi) = 483935
SHA256 (xpi/firefox-i18n-60.0b5/lv.xpi) = e09c12f9ef45f5b5dd37458cc3e866fe5c3465a56030f4eb897722be66244f16
SIZE (xpi/firefox-i18n-60.0b5/lv.xpi) = 474182
SHA256 (xpi/firefox-i18n-60.0b5/mai.xpi) = 16336213becc43dfd2f54e6e7a5d116568da95c0c01978da1c830bba9243cc0b
SIZE (xpi/firefox-i18n-60.0b5/mai.xpi) = 506308
SHA256 (xpi/firefox-i18n-60.0b5/mk.xpi) = 14a6e7fb692d452f4dc306a6d198090dafc209a0ad4ca0c75760158547d93d26
SIZE (xpi/firefox-i18n-60.0b5/mk.xpi) = 471743
SHA256 (xpi/firefox-i18n-60.0b5/ml.xpi) = f5ce2ac9dda600a7e07ed4a3e27ab08db1f026535dedf13bd3623212a928509c
SIZE (xpi/firefox-i18n-60.0b5/ml.xpi) = 548989
SHA256 (xpi/firefox-i18n-60.0b5/mr.xpi) = 9fc3f147376f31c17f22d7844a11ffb3ef50b45f59eefc236e1128cd06a0e589
SIZE (xpi/firefox-i18n-60.0b5/mr.xpi) = 529031
SHA256 (xpi/firefox-i18n-60.0b5/ms.xpi) = 50903f02e2364eb78131d3dc8bcfcb03ae9936b18460f3389b1c8553701f117a
SIZE (xpi/firefox-i18n-60.0b5/ms.xpi) = 459172
SHA256 (xpi/firefox-i18n-60.0b5/my.xpi) = 2dcaaf4ebd56548a802e4b57b76171b64d44fd0aa857356d18b34060eb26d2be
SIZE (xpi/firefox-i18n-60.0b5/my.xpi) = 521497
SHA256 (xpi/firefox-i18n-60.0b5/nb-NO.xpi) = 14470345bf6515d9d0faa5e28862a0deef41d74e9c6f6d7d8644e595b5d7f5c1
SIZE (xpi/firefox-i18n-60.0b5/nb-NO.xpi) = 458957
SHA256 (xpi/firefox-i18n-60.0b5/ne-NP.xpi) = 098122a1473bdfd589334fc1e292b7e547082e360cf8c1044bbab491a85a4a6d
SIZE (xpi/firefox-i18n-60.0b5/ne-NP.xpi) = 506098
SHA256 (xpi/firefox-i18n-60.0b5/nl.xpi) = bc578a51f18bd31bfaa2a67746ae1d67c603a837526e715216fbf72502a0ef2c
SIZE (xpi/firefox-i18n-60.0b5/nl.xpi) = 465843
SHA256 (xpi/firefox-i18n-60.0b5/nn-NO.xpi) = 538e75a3bb7548a54b63fd36b50e45a4e7cf6d0d6aa1b5e5ef6e766388e28d9a
SIZE (xpi/firefox-i18n-60.0b5/nn-NO.xpi) = 460193
SHA256 (xpi/firefox-i18n-60.0b5/oc.xpi) = 010f9524fddfceaa188e3ff39a3bb2d77a03e8dd4b468dec015a60228de7c757
SIZE (xpi/firefox-i18n-60.0b5/oc.xpi) = 476425
SHA256 (xpi/firefox-i18n-60.0b5/or.xpi) = 4e9ea3006d3f0317b8c7274f60b776e017762f6abb7476dbaf7d83c822ac1834
SIZE (xpi/firefox-i18n-60.0b5/or.xpi) = 499272
SHA256 (xpi/firefox-i18n-60.0b5/pa-IN.xpi) = 8ce08219356e56cd7d065a8660e1780025ceeabdc1e2bbdcde4688fe50895aae
SIZE (xpi/firefox-i18n-60.0b5/pa-IN.xpi) = 502588
SHA256 (xpi/firefox-i18n-60.0b5/pl.xpi) = b80a206b5b6325145ca5aac78f99781657f8f8e58b3101b41313333f5a1a82b7
SIZE (xpi/firefox-i18n-60.0b5/pl.xpi) = 369871
SHA256 (xpi/firefox-i18n-60.0b5/pt-BR.xpi) = a28e0096598fdd7cb36e79d1c796100a86eca620f5c3e59816d151a7997c98b2
SIZE (xpi/firefox-i18n-60.0b5/pt-BR.xpi) = 464670
SHA256 (xpi/firefox-i18n-60.0b5/pt-PT.xpi) = eb44de0a3a7737eda483c9ac47bb7414d3e070c5f0579dae047d51dd9a06b849
SIZE (xpi/firefox-i18n-60.0b5/pt-PT.xpi) = 468502
SHA256 (xpi/firefox-i18n-60.0b5/rm.xpi) = 07f8d2a499a0ebbd99a83df293342d3ffe8927fc59731a67de1276b3d6002a93
SIZE (xpi/firefox-i18n-60.0b5/rm.xpi) = 460291
SHA256 (xpi/firefox-i18n-60.0b5/ro.xpi) = 788f3c9ab08d8df1ab5a71e64c7d7ee5e8152e4cd172a9af28d4feb33c9435fe
SIZE (xpi/firefox-i18n-60.0b5/ro.xpi) = 465519
SHA256 (xpi/firefox-i18n-60.0b5/ru.xpi) = 72b7d6b81c118b4c20c936cc12b74be163226eb25cd2bf44008785fcdd3cd36d
SIZE (xpi/firefox-i18n-60.0b5/ru.xpi) = 537214
SHA256 (xpi/firefox-i18n-60.0b5/si.xpi) = 6c69973c78a4dc6a5e0a3c0e9ca954926b1dffccbac7b539c760e8a206fce855
SIZE (xpi/firefox-i18n-60.0b5/si.xpi) = 500594
SHA256 (xpi/firefox-i18n-60.0b5/sk.xpi) = 338d9a0e847194aad995b41cfbf491aa83de3dcb4ec6440018ad3ed0f453a226
SIZE (xpi/firefox-i18n-60.0b5/sk.xpi) = 489623
SHA256 (xpi/firefox-i18n-60.0b5/sl.xpi) = d4f6a41b6e47ebd2776d6b4d3544f08adb15dd2a674bfb9b995238d0aea49dbe
SIZE (xpi/firefox-i18n-60.0b5/sl.xpi) = 468030
SHA256 (xpi/firefox-i18n-60.0b5/son.xpi) = 52dd556656c7b3c4654cd812166a3b54c75ae003352406d9db3a34a47ea8f431
SIZE (xpi/firefox-i18n-60.0b5/son.xpi) = 454713
SHA256 (xpi/firefox-i18n-60.0b5/sq.xpi) = 28c25be76f6ad202f6e1bc5135d719083189c2e012ae58633e8be544a1fc93ed
SIZE (xpi/firefox-i18n-60.0b5/sq.xpi) = 473747
SHA256 (xpi/firefox-i18n-60.0b5/sr.xpi) = c5dfda1cd4d78162338792d66f33d97d10fcc6c81b846fabcff225bd76d5df80
SIZE (xpi/firefox-i18n-60.0b5/sr.xpi) = 495757
SHA256 (xpi/firefox-i18n-60.0b5/sv-SE.xpi) = 43e9e615944a4eedebbf7b9213d4779d49f92c9d5b84e3b9004ae482d6b22324
SIZE (xpi/firefox-i18n-60.0b5/sv-SE.xpi) = 467363
SHA256 (xpi/firefox-i18n-60.0b5/ta.xpi) = d155e354747e3137b3f9aa57bdabbc08e5bc52600356cf236218f090a94870a9
SIZE (xpi/firefox-i18n-60.0b5/ta.xpi) = 523844
SHA256 (xpi/firefox-i18n-60.0b5/te.xpi) = e7cb950c258f7d7dc3bd37c3960c5074e75f30ff3b84fa6ca7ed30f604a1d56e
SIZE (xpi/firefox-i18n-60.0b5/te.xpi) = 537295
SHA256 (xpi/firefox-i18n-60.0b5/th.xpi) = a9542adea2505a78bc194855a2908ceec369b3875c6ee04627154a4318746626
SIZE (xpi/firefox-i18n-60.0b5/th.xpi) = 509139
SHA256 (xpi/firefox-i18n-60.0b5/tr.xpi) = 79315bfa5a79d4bedb0d7aaba2a6134dc2d2f39223d1523175cd3ee6de54522e
SIZE (xpi/firefox-i18n-60.0b5/tr.xpi) = 474040
SHA256 (xpi/firefox-i18n-60.0b5/uk.xpi) = 61d0872effa759f2df1f5496aff3e1d0d758884820864e4adcf6d49502b72019
SIZE (xpi/firefox-i18n-60.0b5/uk.xpi) = 526896
SHA256 (xpi/firefox-i18n-60.0b5/ur.xpi) = 3ce6bfa9a9575d08d46259de93d043c5f847f011f15d99e1fb6d598705a5c78a
SIZE (xpi/firefox-i18n-60.0b5/ur.xpi) = 516998
SHA256 (xpi/firefox-i18n-60.0b5/uz.xpi) = e865bf0cc7e82df1220d0f31e814835f0da139241988decac02536319310056d
SIZE (xpi/firefox-i18n-60.0b5/uz.xpi) = 466306
SHA256 (xpi/firefox-i18n-60.0b5/vi.xpi) = b171eae7d5b851e81ad18ba3d82284ef0f962c6a2c48789093fb2222527c85e9
SIZE (xpi/firefox-i18n-60.0b5/vi.xpi) = 480589
SHA256 (xpi/firefox-i18n-60.0b5/xh.xpi) = 0950710c50a284084b5bf1fc48a48c68c0c3dc0a84e272a288a8eb49ccac34fe
SIZE (xpi/firefox-i18n-60.0b5/xh.xpi) = 468364
SHA256 (xpi/firefox-i18n-60.0b5/zh-CN.xpi) = 6bc8b8a69c1684deb0659f1ad50e0e1c29f8c1e5a2089fcf0c64163123f5518a
SIZE (xpi/firefox-i18n-60.0b5/zh-CN.xpi) = 492222
SHA256 (xpi/firefox-i18n-60.0b5/zh-TW.xpi) = ce50ce7772e774502f0ac85f93820653dd8c9c2c707975d6423ddbb1a3b2e189
SIZE (xpi/firefox-i18n-60.0b5/zh-TW.xpi) = 489618




# $FreeBSD$

PORTNAME=	firefox
DISTVERSION=	60.0b5
PORTEPOCH=	1
CATEGORIES=	www ipv6
MASTER_SITES=	https://hg.mozilla.org/releases/mozilla-beta/archive/
DISTNAME=	${MASTER_SITES:M*hg*:S,/archive/,,:T}-760d74c088b29012c8f37a8ef61981b80fda22ac
DISTFILES=	${DISTNAME:C/.*-//}${EXTRACT_SUFX}
DIST_SUBDIR=	firefox

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

BUILD_DEPENDS=	nspr>=4.19:devel/nspr \
		nss>=3.36:security/nss \
		icu>=59.1,1:devel/icu \
		libevent>=2.1.8:devel/libevent \
		harfbuzz>=1.7.6:print/harfbuzz \
		graphite2>=1.3.11:graphics/graphite2 \
		png>=1.6.34:graphics/png \
		libvorbis>=1.3.5,3:audio/libvorbis \
		libvpx>=1.5.0:multimedia/libvpx \
		sqlite3>=3.22.0:databases/sqlite3 \
		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
		v4l_compat>0:multimedia/v4l_compat \
		autoconf-2.13:devel/autoconf213 \

		zip:archivers/zip
#		soundtouch>=1.9.0:audio/soundtouch \

LIB_DEPENDS=	libv4l2.so:multimedia/libv4l

USE_GECKO=	gecko
CONFLICTS_INSTALL=	firefox-esr
MOZ_PKGCONFIG_FILES=	# empty

Lines 1-3 Link Here

(-)b/www/firefox/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1521151925	1	TIMESTAMP = 1520629428
2	SHA256 (firefox/3db9e3d52b17563efca181ccbb50deb8660c59ae.tar.bz2) = 06201e824d2460f100312518524d20ec53186f6437a1932d7b78157c78416ed3	2	SHA256 (firefox/760d74c088b29012c8f37a8ef61981b80fda22ac.tar.bz2) = ab161f239834201009477368d9744ad57ebb4743e4eb6594236439e360c1a67c
3	SIZE (firefox/3db9e3d52b17563efca181ccbb50deb8660c59ae.tar.bz2) = 304965726	3	SIZE (firefox/760d74c088b29012c8f37a8ef61981b80fda22ac.tar.bz2) = 329794089

Lines 1198-1206 index b139b8f497fd..d1f8a223c6d8 100755 Link Here

(-)b/www/firefox/files/patch-bug1021761 (-3 / +3 lines)
1198	cp $1/src/cubeb_mixer.h src	1198	cp $1/src/cubeb_mixer.h src
1199	cp $1/src/cubeb_opensl.c src	1199	cp $1/src/cubeb_opensl.c src
1200	+cp $1/src/cubeb_oss.c src	1200	+cp $1/src/cubeb_oss.c src
1201	cp $1/src/cubeb_osx_run_loop.h src	1201	cp $1/src/cubeb-jni.cpp src
1202	cp $1/src/cubeb_panner.cpp src	1202	cp $1/src/cubeb-jni.h src
1203	cp $1/src/cubeb_panner.h src	1203	cp $1/src/android/cubeb-output-latency.h src/android
1204	diff --git toolkit/library/moz.build toolkit/library/moz.build	1204	diff --git toolkit/library/moz.build toolkit/library/moz.build
1205	index a61c689c83c3..7764df6f8a6b 100644	1205	index a61c689c83c3..7764df6f8a6b 100644
1206	--- toolkit/library/moz.build	1206	--- toolkit/library/moz.build




commit b2ebb8d82be2
Author: Tom Ritter <tom@mozilla.com>
Date:   Mon Feb 19 09:43:27 2018 -0600

    Bug 1418162 Use a build constant to determine update channel, and update ESR equation for 60 r?gijs,Build
    
    Previously we used Services.appinfo.defaultUpdateChannel to determine if we were on ESR
    and if so, we would assert to make sure the ESR equation hadn't changed. But that method
    is a footgun.  We could use UpdateUtils.getUpdateChannel, but for our purposes here, the
    compile-time constant will work just as well.
    
    If it's set correctly, for Mozilla, we will perform our assert check. If it's not set to
    esr (e.g. for Tor), they'll skip the assert. They probably want to control their user agent
    themselves anyway.
    
    MozReview-Commit-ID: DLnWSEpCVJ6
---
 .../resistfingerprinting/nsRFPService.cpp           | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git toolkit/components/resistfingerprinting/nsRFPService.cpp toolkit/components/resistfingerprinting/nsRFPService.cpp
index aeb3cb6b3539..1fd6a6e8fe8d 100644
--- toolkit/components/resistfingerprinting/nsRFPService.cpp
+++ toolkit/components/resistfingerprinting/nsRFPService.cpp
@@ -606,26 +606,19 @@ nsRFPService::GetSpoofedUserAgent(nsACString &userAgent)
   uint32_t firefoxVersion = appVersion.ToInteger(&rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  // Starting from Firefox 10, Firefox ESR was released once every seven
-  // Firefox releases, e.g. Firefox 10, 17, 24, 31, and so on.
-  // We infer the last and closest ESR version based on this rule.
-  nsCOMPtr<nsIXULRuntime> runtime =
-    do_GetService("@mozilla.org/xre/runtime;1", &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsAutoCString updateChannel;
-  rv = runtime->GetDefaultUpdateChannel(updateChannel);
-  NS_ENSURE_SUCCESS(rv, rv);
-
   // If we are running in Firefox ESR, determine whether the formula of ESR
   // version has changed.  Once changed, we must update the formula in this
   // function.
-  if (updateChannel.EqualsLiteral("esr")) {
-    MOZ_ASSERT(((firefoxVersion % 7) == 3),
+  if (!strcmp(NS_STRINGIFY(MOZ_UPDATE_CHANNEL), "esr")) {
+    MOZ_ASSERT(((firefoxVersion % 7) == 4),
       "Please udpate ESR version formula in nsRFPService.cpp");
   }
 
-  uint32_t spoofedVersion = firefoxVersion - ((firefoxVersion - 3) % 7);
+  // Starting from Firefox 10, Firefox ESR was released once every seven
+  // Firefox releases, e.g. Firefox 10, 17, 24, 31, and so on.
+  // Except we used 60 as an ESR instead of 59.
+  // We infer the last and closest ESR version based on this rule.
+  uint32_t spoofedVersion = firefoxVersion - ((firefoxVersion - 4) % 7);
   userAgent.Assign(nsPrintfCString(
     "Mozilla/5.0 (%s; rv:%d.0) Gecko/%s Firefox/%d.0",
     SPOOFED_UA_OS, spoofedVersion, LEGACY_BUILD_ID, spoofedVersion));




Apply simd@cf87865a998a to unbreak -C target-cpu with Rust >= 1.24

diff --git third_party/rust/simd/.cargo-checksum.json third_party/rust/simd/.cargo-checksum.json
index 65f31b0560e6..f16d0dd4fd61 100644
--- third_party/rust/simd/.cargo-checksum.json
+++ third_party/rust/simd/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{".travis.yml":"e2c720c3633b7671efce49147c62b12bcbf630d7c5d6fc65cd97620bfa4ddcea","Cargo.toml":"608aad04f17a524ee21048fa2ce9f656ae344e0473dd0e331dc954f0f9677c63","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6d3a9431e65e69c73a8923e6517b889d17549b23db406b9ec027710d16af701f","README.md":"249294a9a5f63c64c0f7fe4a607060f43f3507dce2378067aa59d25fb3ae681d","benches/mandelbrot.rs":"051b5199e66bca6cf7774e9024915fd4e1349ab39726a10a14e06b60d65d87a4","benches/matrix.rs":"048a21dacdb62365e0105d00d2c8cd6bd2396ac81134f2bff7eb4f7d095fb735","examples/axpy.rs":"4307626045d64ec08361c97c9c72c5dc8d361bdc88f64453b97ac0212041a1b2","examples/convert.rs":"8e658fde050f8a0d8b84ad7570446b10fcf544afbd551b940ca340474f324840","examples/dot-product.rs":"6fe2e007c147af5353804173a593c5b9d57dbccec156e1da37e9e32537363f91","examples/fannkuch-redux-nosimd.rs":"7b2fbde35e8666929d14d67328471cb0483d038a5325232f8db148b30865312b","examples/fannkuch-redux.rs":"ea21fdbd2274488a62cc984acad6e0b65d52f24fb4ff63b7057a3a667e9c8aae","examples/mandelbrot.rs":"8b8fdca1edac50e5a33e0e0592bd41eb75114f31839ccd40d485c61a9a664380","examples/matrix-inverse.rs":"a378d20ef20c2119bb10a86de27c92fec2c2f77f374e6bfd36707c9825a5fe92","examples/nbody-nosimd.rs":"2c8e0a7feacd202fdd65eeceb6420d6e9f43340b81f20a8e532704a587a2796b","examples/nbody.rs":"a864311affab262024479d6348ff51af43d809e9ad332ec30ea4aacceaa2eae1","examples/ops.rs":"1316f915d0afcfa98fdc4077e965ccccf6b4b21c433cbe487ff0cdc60df3cd39","examples/spectral-norm-nosimd.rs":"ffc8512ecde779078ea467f38f423a0ea623c63da7078193f9dd370200773f79","examples/spectral-norm.rs":"edb09c9d477f83939098cfb77a27cc298bc7a0c8a8e29cece0cccae0d70d890e","src/aarch64/mod.rs":"83f52775364c98de0cecb7e1509530c18972e932469f5f1522aa24a735d0fa37","src/aarch64/neon.rs":"1fe769979e07d8e2bc3c78ce116e05d735860744efe097a894cc9421153257fb","src/arm/mod.rs":"dcdd90bc0b39abaf86a0c8946d442b16313563fbae1ff03248628275c74d8617","src/arm/neon.rs":"51cc509856200e80f8e4cc2c982586e6d1cef593ec4537e153dce0cfe31d3428","src/common.rs":"62f4e7e0fefb52ad190d0f2191bc435ac4deab3f2bc70dc427f2a7f9ccb7856e","src/lib.rs":"25f0b39c038fa85af858318135dfd87865be26c33bb4bd1438aec96a1e68d8b5","src/sixty_four.rs":"510a9e00189a61e4f0a5beb7052d5dee37fc8261f94a2af45ef10327e0f3b7df","src/v256.rs":"2e328e49034876d535e0627c7a62191da2b4fb156a657614bf531a5fc75b1385","src/x86/avx.rs":"c66140abefca634b48eae307c3ec8cf5a40f2279b10e246a7e2ac602a2a2bb28","src/x86/avx2.rs":"efe3006b13a13261a3dec3d37dc1d8cb53950f3803c420069231803374949937","src/x86/mod.rs":"0acc5a5e2672e2a0fddc11065663be8b8fa2da87320ea291fa86ff8c2f33edf5","src/x86/sse2.rs":"5ceda75a401958a135fc9d851b22075314cdeed69fd483b6a7be4f11373f40da","src/x86/sse3.rs":"9bd01a4f08069ca4f445952e744d651efe887e3835b18872e757375f0d053bd2","src/x86/sse4_1.rs":"9ceb80dd70a7e7dfeef508cb935e1a2637175bc87a3b090f5dea691ff6aa0516","src/x86/sse4_2.rs":"c59321aed8decdce4d0d8570cff46aed02e1a8265647ef7702e9b180fc581254","src/x86/ssse3.rs":"2290f0269bae316b8e0491495645ee38a9bd73525c8572759c1328341c3bdb4c"},"package":"7a94d14a2ae1f1f110937de5fb69e494372560181c7e1739a097fcc2cee37ba0"}
\ No newline at end of file
+{"files":{".travis.yml":"e2c720c3633b7671efce49147c62b12bcbf630d7c5d6fc65cd97620bfa4ddcea","Cargo.toml":"608aad04f17a524ee21048fa2ce9f656ae344e0473dd0e331dc954f0f9677c63","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6d3a9431e65e69c73a8923e6517b889d17549b23db406b9ec027710d16af701f","README.md":"249294a9a5f63c64c0f7fe4a607060f43f3507dce2378067aa59d25fb3ae681d","benches/mandelbrot.rs":"051b5199e66bca6cf7774e9024915fd4e1349ab39726a10a14e06b60d65d87a4","benches/matrix.rs":"048a21dacdb62365e0105d00d2c8cd6bd2396ac81134f2bff7eb4f7d095fb735","examples/axpy.rs":"4307626045d64ec08361c97c9c72c5dc8d361bdc88f64453b97ac0212041a1b2","examples/convert.rs":"8e658fde050f8a0d8b84ad7570446b10fcf544afbd551b940ca340474f324840","examples/dot-product.rs":"6fe2e007c147af5353804173a593c5b9d57dbccec156e1da37e9e32537363f91","examples/fannkuch-redux-nosimd.rs":"7b2fbde35e8666929d14d67328471cb0483d038a5325232f8db148b30865312b","examples/fannkuch-redux.rs":"ea21fdbd2274488a62cc984acad6e0b65d52f24fb4ff63b7057a3a667e9c8aae","examples/mandelbrot.rs":"8b8fdca1edac50e5a33e0e0592bd41eb75114f31839ccd40d485c61a9a664380","examples/matrix-inverse.rs":"a378d20ef20c2119bb10a86de27c92fec2c2f77f374e6bfd36707c9825a5fe92","examples/nbody-nosimd.rs":"2c8e0a7feacd202fdd65eeceb6420d6e9f43340b81f20a8e532704a587a2796b","examples/nbody.rs":"a864311affab262024479d6348ff51af43d809e9ad332ec30ea4aacceaa2eae1","examples/ops.rs":"1316f915d0afcfa98fdc4077e965ccccf6b4b21c433cbe487ff0cdc60df3cd39","examples/spectral-norm-nosimd.rs":"ffc8512ecde779078ea467f38f423a0ea623c63da7078193f9dd370200773f79","examples/spectral-norm.rs":"edb09c9d477f83939098cfb77a27cc298bc7a0c8a8e29cece0cccae0d70d890e","src/aarch64/mod.rs":"83f52775364c98de0cecb7e1509530c18972e932469f5f1522aa24a735d0fa37","src/aarch64/neon.rs":"1fe769979e07d8e2bc3c78ce116e05d735860744efe097a894cc9421153257fb","src/arm/mod.rs":"dcdd90bc0b39abaf86a0c8946d442b16313563fbae1ff03248628275c74d8617","src/arm/neon.rs":"51cc509856200e80f8e4cc2c982586e6d1cef593ec4537e153dce0cfe31d3428","src/common.rs":"62f4e7e0fefb52ad190d0f2191bc435ac4deab3f2bc70dc427f2a7f9ccb7856e","src/lib.rs":"25f0b39c038fa85af858318135dfd87865be26c33bb4bd1438aec96a1e68d8b5","src/sixty_four.rs":"510a9e00189a61e4f0a5beb7052d5dee37fc8261f94a2af45ef10327e0f3b7df","src/v256.rs":"2e328e49034876d535e0627c7a62191da2b4fb156a657614bf531a5fc75b1385","src/x86/avx.rs":"c66140abefca634b48eae307c3ec8cf5a40f2279b10e246a7e2ac602a2a2bb28","src/x86/avx2.rs":"3bcb3f391ad5f16f0a6da0bc1301329beb478ad6265bd3b2c9c124fc2e6198e5","src/x86/mod.rs":"0acc5a5e2672e2a0fddc11065663be8b8fa2da87320ea291fa86ff8c2f33edf5","src/x86/sse2.rs":"5ceda75a401958a135fc9d851b22075314cdeed69fd483b6a7be4f11373f40da","src/x86/sse3.rs":"9bd01a4f08069ca4f445952e744d651efe887e3835b18872e757375f0d053bd2","src/x86/sse4_1.rs":"9ceb80dd70a7e7dfeef508cb935e1a2637175bc87a3b090f5dea691ff6aa0516","src/x86/sse4_2.rs":"c59321aed8decdce4d0d8570cff46aed02e1a8265647ef7702e9b180fc581254","src/x86/ssse3.rs":"2290f0269bae316b8e0491495645ee38a9bd73525c8572759c1328341c3bdb4c"},"package":"7a94d14a2ae1f1f110937de5fb69e494372560181c7e1739a097fcc2cee37ba0"}
\ No newline at end of file
diff --git third_party/rust/simd/src/x86/avx2.rs third_party/rust/simd/src/x86/avx2.rs
index fa92e3b60786..e86a33d3b5bb 100644
--- third_party/rust/simd/src/x86/avx2.rs
+++ third_party/rust/simd/src/x86/avx2.rs
@@ -42,7 +42,7 @@ extern "platform-intrinsic" {
     fn x86_mm256_packus_epi32(x: i32x8, y: i32x8) -> u16x16;
     fn x86_mm256_permutevar8x32_epi32(x: i32x8, y: i32x8) -> i32x8;
     fn x86_mm256_permutevar8x32_ps(x: f32x8, y: i32x8) -> f32x8;
-    fn x86_mm256_sad_epu8(x: u8x32, y: u8x32) -> u8x32;
+    fn x86_mm256_sad_epu8(x: u8x32, y: u8x32) -> u64x4;
     fn x86_mm256_shuffle_epi8(x: i8x32, y: i8x32) -> i8x32;
     fn x86_mm256_sign_epi8(x: i8x32, y: i8x32) -> i8x32;
     fn x86_mm256_sign_epi16(x: i16x16, y: i16x16) -> i16x16;




Build Linux version of GetExecutablePathImpl() on other Unix systems
    
ANGLE system_utils* are unused in Gecko.
https://searchfox.org/mozilla-central/search?regexp=true&q=\bGetExecutable%28Path%7CDirectory%29\B

diff --git gfx/angle/targets/angle_common/moz.build gfx/angle/targets/angle_common/moz.build
index bd4b743ec0dd..3c0dbfae491a 100644
--- gfx/angle/targets/angle_common/moz.build
+++ gfx/angle/targets/angle_common/moz.build
@@ -118,17 +118,17 @@ SOURCES += [
     '../../checkout/src/common/uniform_type_info_autogen.cpp',
     '../../checkout/src/common/utilities.cpp',
 ]
-if CONFIG['OS_ARCH'] == 'Darwin':
+if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += [
-        '../../checkout/src/common/system_utils_mac.cpp',
+        '../../checkout/src/common/system_utils_win.cpp',
     ]
-if CONFIG['OS_ARCH'] == 'Linux':
+elif CONFIG['OS_ARCH'] == 'Darwin':
     SOURCES += [
-        '../../checkout/src/common/system_utils_linux.cpp',
+        '../../checkout/src/common/system_utils_mac.cpp',
     ]
-if CONFIG['OS_ARCH'] == 'WINNT':
+else: # Android, Linux, BSDs, etc.
     SOURCES += [
-        '../../checkout/src/common/system_utils_win.cpp',
+        '../../checkout/src/common/system_utils_linux.cpp',
     ]
 #
 #LDFLAGS += [




Enable full-duplex by default for all platforms

diff --git modules/libpref/init/all.js modules/libpref/init/all.js
index a152e4944e95..322d009da739 100644
--- modules/libpref/init/all.js
+++ modules/libpref/init/all.js
@@ -557,25 +557,18 @@ pref("media.getusermedia.agc", 3); // kAgcAdaptiveDigital
 // capture_delay: Adjustments for OS-specific input delay (lower bound)
 // playout_delay: Adjustments for OS-specific AudioStream+cubeb+output delay (lower bound)
 // full_duplex: enable cubeb full-duplex capture/playback
+pref("media.navigator.audio.full_duplex", true);
 #if defined(XP_MACOSX)
 pref("media.peerconnection.capture_delay", 50);
-pref("media.navigator.audio.full_duplex", true);
 #elif defined(XP_WIN)
 pref("media.peerconnection.capture_delay", 50);
-pref("media.navigator.audio.full_duplex", true);
 #elif defined(ANDROID)
 pref("media.peerconnection.capture_delay", 100);
-pref("media.navigator.audio.full_duplex", true);
 pref("media.navigator.hardware.vp8_encode.acceleration_enabled", true);
 pref("media.navigator.hardware.vp8_encode.acceleration_remote_enabled", true);
 pref("media.navigator.hardware.vp8_decode.acceleration_enabled", false);
-#elif defined(XP_LINUX) || defined(MOZ_SNDIO)
-pref("media.peerconnection.capture_delay", 70);
-pref("media.navigator.audio.full_duplex", true);
 #else
-// *BSD, others - merely a guess for now
-pref("media.peerconnection.capture_delay", 50);
-pref("media.navigator.audio.full_duplex", false);
+pref("media.peerconnection.capture_delay", 70);
 #endif
 // Use MediaDataDecoder API for WebRTC, this includes hardware acceleration for
 // decoding.




Disable custom styling for <select> and <option> on Tier3 as well

diff --git modules/libpref/init/all.js modules/libpref/init/all.js
index 322d009da739..06e2fd7f664a 100644
--- modules/libpref/init/all.js
+++ modules/libpref/init/all.js
@@ -1359,8 +1359,8 @@ pref("dom.forms.autocomplete.formautofill", false);
 // Enable search in <select> dropdowns (more than 40 options)
 pref("dom.forms.selectSearch", false);
 // Allow for webpages to provide custom styling for <select>
-// popups. Disabled on Linux due to bug 1338283.
-#ifdef XP_LINUX
+// popups. Disabled on GTK due to bug 1338283.
+#ifdef MOZ_WIDGET_GTK
 pref("dom.forms.select.customstyling", false);
 #else
 pref("dom.forms.select.customstyling", true);




commit 8024d93
Author: Henrik Gulbrandsen <henrik@gulbra.net>
Date:   Fri Jan 4 13:49:22 2013 +0100

    Bug 826985 - Support more video formats for WebRTC via libv4l2 on Linux.
---
 config/system-headers                                   |  1 +
 old-configure.in                                        |  7 +++++++
 media/webrtc/signaling/test/Makefile.in                 |  1 +
 .../modules/video_capture/linux/device_info_linux.cc    | 17 +++++++++++++++++
 .../modules/video_capture/linux/video_capture_linux.cc  | 16 +++++++++++++++-
 .../webrtc/modules/video_capture/video_capture.gypi     | 11 +++++++++++
 toolkit/library/Makefile.in                             |  1 +
 6 files changed, 52 insertions(+), 1 deletion(-)

diff --git config/system-headers.mozbuild config/system-headers.mozbuild
index e02d381a12e9..7620b4d00623 100644
--- config/system-headers.mozbuild
+++ config/system-headers.mozbuild
@@ -428,6 +428,7 @@ system_headers = [
     'libgnomeui/gnome-icon-theme.h',
     'libgnomeui/gnome-ui-init.h',
     'libutil.h',
+    'libv4l2.h',
     'limits.h',
     'link.h',
     'linux/ioprio.h',
diff --git old-configure.in configure.in
index 55e4cd1..76567b3 100644
--- old-configure.in
+++ old-configure.in
@@ -2558,6 +2558,9 @@ if test -n "$MOZ_WEBRTC"; then
     if test -n "$MOZ_X11"; then
       MOZ_WEBRTC_X11_LIBS="-lXext -lXdamage -lXfixes -lXcomposite"
     fi
+
+    dnl with libv4l2 we can support more cameras
+    PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)
 else
     MOZ_SYNTH_PICO=
 fi
diff --git build/gyp.mozbuild build/gyp.mozbuild
index b483cd1..f1dd1f0 100644
--- build/gyp.mozbuild
+++ build/gyp.mozbuild
@@ -11,6 +11,7 @@ gyp_vars = {
     'have_ethtool_cmd_speed_hi': 1 if CONFIG['MOZ_WEBRTC_HAVE_ETHTOOL_SPEED_HI'] else 0,
     'include_alsa_audio': 1 if CONFIG['MOZ_ALSA'] else 0,
     'include_pulse_audio': 1 if CONFIG['MOZ_PULSEAUDIO'] else 0,
+    'use_libv4l2': 1 if CONFIG['MOZ_LIBV4L2_LIBS'] else 0,
     # basic stuff for everything
     'include_internal_video_render': 0,
     'clang_use_chrome_plugins': 0,
diff --git media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
index 239a292..bab496c 100644
--- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
+++ media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
@@ -25,6 +25,9 @@
 #else
 #include <linux/videodev2.h>
 #endif
+#ifdef HAVE_LIBV4L2
+#include <libv4l2.h>
+#endif
 
 #include "webrtc/system_wrappers/interface/ref_count.h"
 #include "webrtc/system_wrappers/interface/trace.h"
@@ -34,6 +37,15 @@
 #define BUF_LEN     ( 1024 * ( EVENT_SIZE + 16 ) )
 #endif
 
+#ifdef HAVE_LIBV4L2
+#define open	v4l2_open
+#define close	v4l2_close
+#define dup	v4l2_dup
+#define ioctl	v4l2_ioctl
+#define mmap	v4l2_mmap
+#define munmap	v4l2_munmap
+#endif
+
 namespace webrtc
 {
 namespace videocapturemodule
@@ -274,6 +286,11 @@ int32_t DeviceInfoLinux::GetDeviceName(
     memset(deviceNameUTF8, 0, deviceNameLength);
     memcpy(cameraName, cap.card, sizeof(cap.card));
 
+    if (cameraName[0] == '\0')
+    {
+        sprintf(cameraName, "Camera at /dev/video%d", deviceNumber);
+    }
+
     if (deviceNameLength >= strlen(cameraName))
     {
         memcpy(deviceNameUTF8, cameraName, strlen(cameraName));
diff --git media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
index 12df1b3..e9863ba 100644
--- media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
+++ media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
@@ -25,6 +25,9 @@
 #else
 #include <linux/videodev2.h>
 #endif
+#ifdef HAVE_LIBV4L2
+#include <libv4l2.h>
+#endif
 
 #include <new>
 
@@ -32,6 +35,15 @@
 #include "webrtc/modules/video_capture/linux/video_capture_linux.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/include/trace.h"
+
+#ifdef HAVE_LIBV4L2
+#define open	v4l2_open
+#define close	v4l2_close
+#define dup	v4l2_dup
+#define ioctl	v4l2_ioctl
+#define mmap	v4l2_mmap
+#define munmap	v4l2_munmap
+#endif
 
 namespace webrtc {
 namespace videocapturemodule {
diff --git media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
index d46b5aa..e452223 100644
--- media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
+++ media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
@@ -7,6 +7,9 @@
 # be found in the AUTHORS file in the root of the source tree.
 
 {
+  'variables': {
+     'use_libv4l2%': 0,
+  },
   'targets': [
     {
       'target_name': 'video_capture_module',
@@ -76,6 +76,19 @@
                 'linux/video_capture_linux.cc',
                 'linux/video_capture_linux.h',
               ],
+              'conditions': [
+                ['use_libv4l2==1', {
+                  'defines': [
+                    'HAVE_LIBV4L2',
+                  ],
+                  'cflags_mozilla': [
+                    '$(MOZ_LIBV4L2_CFLAGS)',
+                  ],
+                  'libraries': [
+                    '-lv4l2',
+                  ],
+                }],
+              ],
             }],
             ['OS=="mac"', {
               'sources': [
diff --git toolkit/library/moz.build toolkit/library/moz.build
index 9c16ffa..1db3794 100644
--- toolkit/library/moz.build
+++ toolkit/library/moz.build
@@ -163,6 +163,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF
     ]
 
 OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
+OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS']
 OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
 OS_LIBS += CONFIG['MOZ_APP_EXTRA_LIBS']
 




index 86b051c58d33..fb6186dce78b 100644
--- dom/media/moz.build
+++ dom/media/moz.build
@@ -326,6 +326,21 @@ if CONFIG['MOZ_WEBRTC']:
 
 DEFINES['MOZILLA_INTERNAL_API'] = True
 

+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
+    CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS']
+
 if CONFIG['MOZ_ANDROID_HLS_SUPPORT']:
     DEFINES['MOZ_ANDROID_HLS_SUPPORT'] = True
 
diff --git dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
index 078f6ea5ef60..c600db067539 100644
--- dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
+++ dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
@@ -15,9 +15,13 @@
 #include <windows.h>
 #endif
 
+#ifdef MOZ_SYSTEM_SOUNDTOUCH
+#include "nsXPCOMPrivate.h" // for XUL_DLL

 
 namespace mozilla {
 
@@ -64,6 +68,12 @@ FFVPXRuntimeLinker::Init()
 
   sLinkStatus = LinkStatus_FAILED;
 

+#else
   // We retrieve the path of the lgpllibs library as this is where mozavcodec
   // and mozavutil libs are located.
   PathString lgpllibsname = GetLibraryName(nullptr, "lgpllibs");
@@ -73,6 +83,7 @@ FFVPXRuntimeLinker::Init()
   PathString path =
     GetLibraryFilePathname(lgpllibsname.get(),
                            (PRFuncPtr)&soundtouch::SoundTouch::getVersionId);
+#endif
   if (path.IsEmpty()) {
     return false;
   }
diff --git media/libogg/README_MOZILLA media/libogg/README_MOZILLA

Return to bug 226476

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 59	40	_GECKO_VERSIONS= 52 60
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	59_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox	45	60_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 2-28 Link Here

(-)b/www/firefox/Makefile (-10 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= firefox	4	PORTNAME= firefox
5	DISTVERSION= 59.0.1	5	DISTVERSION= 60.0b5
6	PORTEPOCH= 1	6	PORTEPOCH= 1
7	CATEGORIES= www ipv6	7	CATEGORIES= www ipv6
8	MASTER_SITES= https://hg.mozilla.org/releases/mozilla-release/archive/	8	MASTER_SITES= https://hg.mozilla.org/releases/mozilla-beta/archive/
9	DISTNAME= ${MASTER_SITES:Mhg:S,/archive/,,:T}-3db9e3d52b17563efca181ccbb50deb8660c59ae	9	DISTNAME= ${MASTER_SITES:Mhg:S,/archive/,,:T}-760d74c088b29012c8f37a8ef61981b80fda22ac
10	DISTFILES= ${DISTNAME:C/.*-//}${EXTRACT_SUFX}	10	DISTFILES= ${DISTNAME:C/.*-//}${EXTRACT_SUFX}
11	DIST_SUBDIR= firefox	11	DIST_SUBDIR= firefox
12		12
13	MAINTAINER= gecko@FreeBSD.org	13	MAINTAINER= gecko@FreeBSD.org
14	COMMENT= Web browser based on the browser portion of Mozilla	14	COMMENT= Web browser based on the browser portion of Mozilla
15		15
16	BUILD_DEPENDS= nspr>=4.18:devel/nspr \	16	BUILD_DEPENDS= nspr>=4.19:devel/nspr \
17	nss>=3.35:security/nss \	17	nss>=3.36:security/nss \
18	icu>=59.1,1:devel/icu \	18	icu>=59.1,1:devel/icu \
19	libevent>=2.1.8:devel/libevent \	19	libevent>=2.1.8:devel/libevent \
20	harfbuzz>=1.7.4:print/harfbuzz \	20	harfbuzz>=1.7.6:print/harfbuzz \
21	graphite2>=1.3.10:graphics/graphite2 \	21	graphite2>=1.3.11:graphics/graphite2 \
22	png>=1.6.34:graphics/png \	22	png>=1.6.34:graphics/png \
23	libvorbis>=1.3.5,3:audio/libvorbis \	23	libvorbis>=1.3.5,3:audio/libvorbis \
24	libvpx>=1.5.0:multimedia/libvpx \	24	libvpx>=1.5.0:multimedia/libvpx \
25	sqlite3>=3.21.0:databases/sqlite3 \	25	sqlite3>=3.22.0:databases/sqlite3 \
26	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \	26	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
27	v4l_compat>0:multimedia/v4l_compat \	27	v4l_compat>0:multimedia/v4l_compat \
28	autoconf-2.13:devel/autoconf213 \	28	autoconf-2.13:devel/autoconf213 \
Lines 30-37 BUILD_DEPENDS= nspr>=4.18:devel/nspr \ Link Here
30	zip:archivers/zip	30	zip:archivers/zip
31	# soundtouch>=1.9.0:audio/soundtouch \	31	# soundtouch>=1.9.0:audio/soundtouch \
32		32
33	LIB_DEPENDS= libv4l2.so:multimedia/libv4l
34
35	USE_GECKO= gecko	33	USE_GECKO= gecko
36	CONFLICTS_INSTALL= firefox-esr	34	CONFLICTS_INSTALL= firefox-esr
37	MOZ_PKGCONFIG_FILES= # empty	35	MOZ_PKGCONFIG_FILES= # empty

Added Link Here

(-)b/www/firefox/files/patch-bug1418162 (+58 lines)
1	commit b2ebb8d82be2
2	Author: Tom Ritter <tom@mozilla.com>
3	Date: Mon Feb 19 09:43:27 2018 -0600
4
5	Bug 1418162 Use a build constant to determine update channel, and update ESR equation for 60 r?gijs,Build
6
7	Previously we used Services.appinfo.defaultUpdateChannel to determine if we were on ESR
8	and if so, we would assert to make sure the ESR equation hadn't changed. But that method
9	is a footgun. We could use UpdateUtils.getUpdateChannel, but for our purposes here, the
10	compile-time constant will work just as well.
11
12	If it's set correctly, for Mozilla, we will perform our assert check. If it's not set to
13	esr (e.g. for Tor), they'll skip the assert. They probably want to control their user agent
14	themselves anyway.
15
16	MozReview-Commit-ID: DLnWSEpCVJ6
17	---
18	.../resistfingerprinting/nsRFPService.cpp \| 21 +++++++--------------
19	1 file changed, 7 insertions(+), 14 deletions(-)
20
21	diff --git toolkit/components/resistfingerprinting/nsRFPService.cpp toolkit/components/resistfingerprinting/nsRFPService.cpp
22	index aeb3cb6b3539..1fd6a6e8fe8d 100644
23	--- toolkit/components/resistfingerprinting/nsRFPService.cpp
24	+++ toolkit/components/resistfingerprinting/nsRFPService.cpp
25	@@ -606,26 +606,19 @@ nsRFPService::GetSpoofedUserAgent(nsACString &userAgent)
26	uint32_t firefoxVersion = appVersion.ToInteger(&rv);
27	NS_ENSURE_SUCCESS(rv, rv);
28
29	- // Starting from Firefox 10, Firefox ESR was released once every seven
30	- // Firefox releases, e.g. Firefox 10, 17, 24, 31, and so on.
31	- // We infer the last and closest ESR version based on this rule.
32	- nsCOMPtr<nsIXULRuntime> runtime =
33	- do_GetService("@mozilla.org/xre/runtime;1", &rv);
34	- NS_ENSURE_SUCCESS(rv, rv);
35	-
36	- nsAutoCString updateChannel;
37	- rv = runtime->GetDefaultUpdateChannel(updateChannel);
38	- NS_ENSURE_SUCCESS(rv, rv);
39	-
40	// If we are running in Firefox ESR, determine whether the formula of ESR
41	// version has changed. Once changed, we must update the formula in this
42	// function.
43	- if (updateChannel.EqualsLiteral("esr")) {
44	- MOZ_ASSERT(((firefoxVersion % 7) == 3),
45	+ if (!strcmp(NS_STRINGIFY(MOZ_UPDATE_CHANNEL), "esr")) {
46	+ MOZ_ASSERT(((firefoxVersion % 7) == 4),
47	"Please udpate ESR version formula in nsRFPService.cpp");
48	}
49
50	- uint32_t spoofedVersion = firefoxVersion - ((firefoxVersion - 3) % 7);
51	+ // Starting from Firefox 10, Firefox ESR was released once every seven
52	+ // Firefox releases, e.g. Firefox 10, 17, 24, 31, and so on.
53	+ // Except we used 60 as an ESR instead of 59.
54	+ // We infer the last and closest ESR version based on this rule.
55	+ uint32_t spoofedVersion = firefoxVersion - ((firefoxVersion - 4) % 7);
56	userAgent.Assign(nsPrintfCString(
57	"Mozilla/5.0 (%s; rv:%d.0) Gecko/%s Firefox/%d.0",
58	SPOOFED_UA_OS, spoofedVersion, LEGACY_BUILD_ID, spoofedVersion));

Removed Link Here

(-)a/www/firefox/files/patch-bug1433747 (-24 lines)
1	Apply simd@cf87865a998a to unbreak -C target-cpu with Rust >= 1.24
2
3	diff --git third_party/rust/simd/.cargo-checksum.json third_party/rust/simd/.cargo-checksum.json
4	index 65f31b0560e6..f16d0dd4fd61 100644
5	--- third_party/rust/simd/.cargo-checksum.json
6	+++ third_party/rust/simd/.cargo-checksum.json
7	@@ -1 +1 @@
8	-{"files":{".travis.yml":"e2c720c3633b7671efce49147c62b12bcbf630d7c5d6fc65cd97620bfa4ddcea","Cargo.toml":"608aad04f17a524ee21048fa2ce9f656ae344e0473dd0e331dc954f0f9677c63","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6d3a9431e65e69c73a8923e6517b889d17549b23db406b9ec027710d16af701f","README.md":"249294a9a5f63c64c0f7fe4a607060f43f3507dce2378067aa59d25fb3ae681d","benches/mandelbrot.rs":"051b5199e66bca6cf7774e9024915fd4e1349ab39726a10a14e06b60d65d87a4","benches/matrix.rs":"048a21dacdb62365e0105d00d2c8cd6bd2396ac81134f2bff7eb4f7d095fb735","examples/axpy.rs":"4307626045d64ec08361c97c9c72c5dc8d361bdc88f64453b97ac0212041a1b2","examples/convert.rs":"8e658fde050f8a0d8b84ad7570446b10fcf544afbd551b940ca340474f324840","examples/dot-product.rs":"6fe2e007c147af5353804173a593c5b9d57dbccec156e1da37e9e32537363f91","examples/fannkuch-redux-nosimd.rs":"7b2fbde35e8666929d14d67328471cb0483d038a5325232f8db148b30865312b","examples/fannkuch-redux.rs":"ea21fdbd2274488a62cc984acad6e0b65d52f24fb4ff63b7057a3a667e9c8aae","examples/mandelbrot.rs":"8b8fdca1edac50e5a33e0e0592bd41eb75114f31839ccd40d485c61a9a664380","examples/matrix-inverse.rs":"a378d20ef20c2119bb10a86de27c92fec2c2f77f374e6bfd36707c9825a5fe92","examples/nbody-nosimd.rs":"2c8e0a7feacd202fdd65eeceb6420d6e9f43340b81f20a8e532704a587a2796b","examples/nbody.rs":"a864311affab262024479d6348ff51af43d809e9ad332ec30ea4aacceaa2eae1","examples/ops.rs":"1316f915d0afcfa98fdc4077e965ccccf6b4b21c433cbe487ff0cdc60df3cd39","examples/spectral-norm-nosimd.rs":"ffc8512ecde779078ea467f38f423a0ea623c63da7078193f9dd370200773f79","examples/spectral-norm.rs":"edb09c9d477f83939098cfb77a27cc298bc7a0c8a8e29cece0cccae0d70d890e","src/aarch64/mod.rs":"83f52775364c98de0cecb7e1509530c18972e932469f5f1522aa24a735d0fa37","src/aarch64/neon.rs":"1fe769979e07d8e2bc3c78ce116e05d735860744efe097a894cc9421153257fb","src/arm/mod.rs":"dcdd90bc0b39abaf86a0c8946d442b16313563fbae1ff03248628275c74d8617","src/arm/neon.rs":"51cc509856200e80f8e4cc2c982586e6d1cef593ec4537e153dce0cfe31d3428","src/common.rs":"62f4e7e0fefb52ad190d0f2191bc435ac4deab3f2bc70dc427f2a7f9ccb7856e","src/lib.rs":"25f0b39c038fa85af858318135dfd87865be26c33bb4bd1438aec96a1e68d8b5","src/sixty_four.rs":"510a9e00189a61e4f0a5beb7052d5dee37fc8261f94a2af45ef10327e0f3b7df","src/v256.rs":"2e328e49034876d535e0627c7a62191da2b4fb156a657614bf531a5fc75b1385","src/x86/avx.rs":"c66140abefca634b48eae307c3ec8cf5a40f2279b10e246a7e2ac602a2a2bb28","src/x86/avx2.rs":"efe3006b13a13261a3dec3d37dc1d8cb53950f3803c420069231803374949937","src/x86/mod.rs":"0acc5a5e2672e2a0fddc11065663be8b8fa2da87320ea291fa86ff8c2f33edf5","src/x86/sse2.rs":"5ceda75a401958a135fc9d851b22075314cdeed69fd483b6a7be4f11373f40da","src/x86/sse3.rs":"9bd01a4f08069ca4f445952e744d651efe887e3835b18872e757375f0d053bd2","src/x86/sse4_1.rs":"9ceb80dd70a7e7dfeef508cb935e1a2637175bc87a3b090f5dea691ff6aa0516","src/x86/sse4_2.rs":"c59321aed8decdce4d0d8570cff46aed02e1a8265647ef7702e9b180fc581254","src/x86/ssse3.rs":"2290f0269bae316b8e0491495645ee38a9bd73525c8572759c1328341c3bdb4c"},"package":"7a94d14a2ae1f1f110937de5fb69e494372560181c7e1739a097fcc2cee37ba0"}
9	\ No newline at end of file
10	+{"files":{".travis.yml":"e2c720c3633b7671efce49147c62b12bcbf630d7c5d6fc65cd97620bfa4ddcea","Cargo.toml":"608aad04f17a524ee21048fa2ce9f656ae344e0473dd0e331dc954f0f9677c63","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6d3a9431e65e69c73a8923e6517b889d17549b23db406b9ec027710d16af701f","README.md":"249294a9a5f63c64c0f7fe4a607060f43f3507dce2378067aa59d25fb3ae681d","benches/mandelbrot.rs":"051b5199e66bca6cf7774e9024915fd4e1349ab39726a10a14e06b60d65d87a4","benches/matrix.rs":"048a21dacdb62365e0105d00d2c8cd6bd2396ac81134f2bff7eb4f7d095fb735","examples/axpy.rs":"4307626045d64ec08361c97c9c72c5dc8d361bdc88f64453b97ac0212041a1b2","examples/convert.rs":"8e658fde050f8a0d8b84ad7570446b10fcf544afbd551b940ca340474f324840","examples/dot-product.rs":"6fe2e007c147af5353804173a593c5b9d57dbccec156e1da37e9e32537363f91","examples/fannkuch-redux-nosimd.rs":"7b2fbde35e8666929d14d67328471cb0483d038a5325232f8db148b30865312b","examples/fannkuch-redux.rs":"ea21fdbd2274488a62cc984acad6e0b65d52f24fb4ff63b7057a3a667e9c8aae","examples/mandelbrot.rs":"8b8fdca1edac50e5a33e0e0592bd41eb75114f31839ccd40d485c61a9a664380","examples/matrix-inverse.rs":"a378d20ef20c2119bb10a86de27c92fec2c2f77f374e6bfd36707c9825a5fe92","examples/nbody-nosimd.rs":"2c8e0a7feacd202fdd65eeceb6420d6e9f43340b81f20a8e532704a587a2796b","examples/nbody.rs":"a864311affab262024479d6348ff51af43d809e9ad332ec30ea4aacceaa2eae1","examples/ops.rs":"1316f915d0afcfa98fdc4077e965ccccf6b4b21c433cbe487ff0cdc60df3cd39","examples/spectral-norm-nosimd.rs":"ffc8512ecde779078ea467f38f423a0ea623c63da7078193f9dd370200773f79","examples/spectral-norm.rs":"edb09c9d477f83939098cfb77a27cc298bc7a0c8a8e29cece0cccae0d70d890e","src/aarch64/mod.rs":"83f52775364c98de0cecb7e1509530c18972e932469f5f1522aa24a735d0fa37","src/aarch64/neon.rs":"1fe769979e07d8e2bc3c78ce116e05d735860744efe097a894cc9421153257fb","src/arm/mod.rs":"dcdd90bc0b39abaf86a0c8946d442b16313563fbae1ff03248628275c74d8617","src/arm/neon.rs":"51cc509856200e80f8e4cc2c982586e6d1cef593ec4537e153dce0cfe31d3428","src/common.rs":"62f4e7e0fefb52ad190d0f2191bc435ac4deab3f2bc70dc427f2a7f9ccb7856e","src/lib.rs":"25f0b39c038fa85af858318135dfd87865be26c33bb4bd1438aec96a1e68d8b5","src/sixty_four.rs":"510a9e00189a61e4f0a5beb7052d5dee37fc8261f94a2af45ef10327e0f3b7df","src/v256.rs":"2e328e49034876d535e0627c7a62191da2b4fb156a657614bf531a5fc75b1385","src/x86/avx.rs":"c66140abefca634b48eae307c3ec8cf5a40f2279b10e246a7e2ac602a2a2bb28","src/x86/avx2.rs":"3bcb3f391ad5f16f0a6da0bc1301329beb478ad6265bd3b2c9c124fc2e6198e5","src/x86/mod.rs":"0acc5a5e2672e2a0fddc11065663be8b8fa2da87320ea291fa86ff8c2f33edf5","src/x86/sse2.rs":"5ceda75a401958a135fc9d851b22075314cdeed69fd483b6a7be4f11373f40da","src/x86/sse3.rs":"9bd01a4f08069ca4f445952e744d651efe887e3835b18872e757375f0d053bd2","src/x86/sse4_1.rs":"9ceb80dd70a7e7dfeef508cb935e1a2637175bc87a3b090f5dea691ff6aa0516","src/x86/sse4_2.rs":"c59321aed8decdce4d0d8570cff46aed02e1a8265647ef7702e9b180fc581254","src/x86/ssse3.rs":"2290f0269bae316b8e0491495645ee38a9bd73525c8572759c1328341c3bdb4c"},"package":"7a94d14a2ae1f1f110937de5fb69e494372560181c7e1739a097fcc2cee37ba0"}
11	\ No newline at end of file
12	diff --git third_party/rust/simd/src/x86/avx2.rs third_party/rust/simd/src/x86/avx2.rs
13	index fa92e3b60786..e86a33d3b5bb 100644
14	--- third_party/rust/simd/src/x86/avx2.rs
15	+++ third_party/rust/simd/src/x86/avx2.rs
16	@@ -42,7 +42,7 @@ extern "platform-intrinsic" {
17	fn x86_mm256_packus_epi32(x: i32x8, y: i32x8) -> u16x16;
18	fn x86_mm256_permutevar8x32_epi32(x: i32x8, y: i32x8) -> i32x8;
19	fn x86_mm256_permutevar8x32_ps(x: f32x8, y: i32x8) -> f32x8;
20	- fn x86_mm256_sad_epu8(x: u8x32, y: u8x32) -> u8x32;
21	+ fn x86_mm256_sad_epu8(x: u8x32, y: u8x32) -> u64x4;
22	fn x86_mm256_shuffle_epi8(x: i8x32, y: i8x32) -> i8x32;
23	fn x86_mm256_sign_epi8(x: i8x32, y: i8x32) -> i8x32;
24	fn x86_mm256_sign_epi16(x: i16x16, y: i16x16) -> i16x16;

Added Link Here

(-)b/www/firefox/files/patch-bug1442791 (+33 lines)
1	Build Linux version of GetExecutablePathImpl() on other Unix systems
2
3	ANGLE system_utils* are unused in Gecko.
4	https://searchfox.org/mozilla-central/search?regexp=true&q=\bGetExecutable%28Path%7CDirectory%29\B
5
6	diff --git gfx/angle/targets/angle_common/moz.build gfx/angle/targets/angle_common/moz.build
7	index bd4b743ec0dd..3c0dbfae491a 100644
8	--- gfx/angle/targets/angle_common/moz.build
9	+++ gfx/angle/targets/angle_common/moz.build
10	@@ -118,17 +118,17 @@ SOURCES += [
11	'../../checkout/src/common/uniform_type_info_autogen.cpp',
12	'../../checkout/src/common/utilities.cpp',
13	]
14	-if CONFIG['OS_ARCH'] == 'Darwin':
15	+if CONFIG['OS_ARCH'] == 'WINNT':
16	SOURCES += [
17	- '../../checkout/src/common/system_utils_mac.cpp',
18	+ '../../checkout/src/common/system_utils_win.cpp',
19	]
20	-if CONFIG['OS_ARCH'] == 'Linux':
21	+elif CONFIG['OS_ARCH'] == 'Darwin':
22	SOURCES += [
23	- '../../checkout/src/common/system_utils_linux.cpp',
24	+ '../../checkout/src/common/system_utils_mac.cpp',
25	]
26	-if CONFIG['OS_ARCH'] == 'WINNT':
27	+else: # Android, Linux, BSDs, etc.
28	SOURCES += [
29	- '../../checkout/src/common/system_utils_win.cpp',
30	+ '../../checkout/src/common/system_utils_linux.cpp',
31	]
32	#
33	#LDFLAGS += [

Removed Link Here

(-)a/www/firefox/files/patch-bug1444074 (-34 lines)
1	Enable full-duplex by default for all platforms
2
3	diff --git modules/libpref/init/all.js modules/libpref/init/all.js
4	index a152e4944e95..322d009da739 100644
5	--- modules/libpref/init/all.js
6	+++ modules/libpref/init/all.js
7	@@ -557,25 +557,18 @@ pref("media.getusermedia.agc", 3); // kAgcAdaptiveDigital
8	// capture_delay: Adjustments for OS-specific input delay (lower bound)
9	// playout_delay: Adjustments for OS-specific AudioStream+cubeb+output delay (lower bound)
10	// full_duplex: enable cubeb full-duplex capture/playback
11	+pref("media.navigator.audio.full_duplex", true);
12	#if defined(XP_MACOSX)
13	pref("media.peerconnection.capture_delay", 50);
14	-pref("media.navigator.audio.full_duplex", true);
15	#elif defined(XP_WIN)
16	pref("media.peerconnection.capture_delay", 50);
17	-pref("media.navigator.audio.full_duplex", true);
18	#elif defined(ANDROID)
19	pref("media.peerconnection.capture_delay", 100);
20	-pref("media.navigator.audio.full_duplex", true);
21	pref("media.navigator.hardware.vp8_encode.acceleration_enabled", true);
22	pref("media.navigator.hardware.vp8_encode.acceleration_remote_enabled", true);
23	pref("media.navigator.hardware.vp8_decode.acceleration_enabled", false);
24	-#elif defined(XP_LINUX) \|\| defined(MOZ_SNDIO)
25	-pref("media.peerconnection.capture_delay", 70);
26	-pref("media.navigator.audio.full_duplex", true);
27	#else
28	-// *BSD, others - merely a guess for now
29	-pref("media.peerconnection.capture_delay", 50);
30	-pref("media.navigator.audio.full_duplex", false);
31	+pref("media.peerconnection.capture_delay", 70);
32	#endif
33	// Use MediaDataDecoder API for WebRTC, this includes hardware acceleration for
34	// decoding.

Removed Link Here

(-)a/www/firefox/files/patch-bug1444083 (-17 lines)
1	Disable custom styling for <select> and <option> on Tier3 as well
2
3	diff --git modules/libpref/init/all.js modules/libpref/init/all.js
4	index 322d009da739..06e2fd7f664a 100644
5	--- modules/libpref/init/all.js
6	+++ modules/libpref/init/all.js
7	@@ -1359,8 +1359,8 @@ pref("dom.forms.autocomplete.formautofill", false);
8	// Enable search in <select> dropdowns (more than 40 options)
9	pref("dom.forms.selectSearch", false);
10	// Allow for webpages to provide custom styling for <select>
11	-// popups. Disabled on Linux due to bug 1338283.
12	-#ifdef XP_LINUX
13	+// popups. Disabled on GTK due to bug 1338283.
14	+#ifdef MOZ_WIDGET_GTK
15	pref("dom.forms.select.customstyling", false);
16	#else
17	pref("dom.forms.select.customstyling", true);

Removed Link Here

(-)a/www/firefox/files/patch-bug826985 (-171 lines)
1	commit 8024d93
2	Author: Henrik Gulbrandsen <henrik@gulbra.net>
3	Date: Fri Jan 4 13:49:22 2013 +0100
4
5	Bug 826985 - Support more video formats for WebRTC via libv4l2 on Linux.
6	---
7	config/system-headers \| 1 +
8	old-configure.in \| 7 +++++++
9	media/webrtc/signaling/test/Makefile.in \| 1 +
10	.../modules/video_capture/linux/device_info_linux.cc \| 17 +++++++++++++++++
11	.../modules/video_capture/linux/video_capture_linux.cc \| 16 +++++++++++++++-
12	.../webrtc/modules/video_capture/video_capture.gypi \| 11 +++++++++++
13	toolkit/library/Makefile.in \| 1 +
14	6 files changed, 52 insertions(+), 1 deletion(-)
15
16	diff --git config/system-headers.mozbuild config/system-headers.mozbuild
17	index e02d381a12e9..7620b4d00623 100644
18	--- config/system-headers.mozbuild
19	+++ config/system-headers.mozbuild
20	@@ -428,6 +428,7 @@ system_headers = [
21	'libgnomeui/gnome-icon-theme.h',
22	'libgnomeui/gnome-ui-init.h',
23	'libutil.h',
24	+ 'libv4l2.h',
25	'limits.h',
26	'link.h',
27	'linux/ioprio.h',
28	diff --git old-configure.in configure.in
29	index 55e4cd1..76567b3 100644
30	--- old-configure.in
31	+++ old-configure.in
32	@@ -2558,6 +2558,9 @@ if test -n "$MOZ_WEBRTC"; then
33	if test -n "$MOZ_X11"; then
34	MOZ_WEBRTC_X11_LIBS="-lXext -lXdamage -lXfixes -lXcomposite"
35	fi
36	+
37	+ dnl with libv4l2 we can support more cameras
38	+ PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)
39	else
40	MOZ_SYNTH_PICO=
41	fi
42	diff --git build/gyp.mozbuild build/gyp.mozbuild
43	index b483cd1..f1dd1f0 100644
44	--- build/gyp.mozbuild
45	+++ build/gyp.mozbuild
46	@@ -11,6 +11,7 @@ gyp_vars = {
47	'have_ethtool_cmd_speed_hi': 1 if CONFIG['MOZ_WEBRTC_HAVE_ETHTOOL_SPEED_HI'] else 0,
48	'include_alsa_audio': 1 if CONFIG['MOZ_ALSA'] else 0,
49	'include_pulse_audio': 1 if CONFIG['MOZ_PULSEAUDIO'] else 0,
50	+ 'use_libv4l2': 1 if CONFIG['MOZ_LIBV4L2_LIBS'] else 0,
51	# basic stuff for everything
52	'include_internal_video_render': 0,
53	'clang_use_chrome_plugins': 0,
54	diff --git media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
55	index 239a292..bab496c 100644
56	--- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
57	+++ media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
58	@@ -25,6 +25,9 @@
59	#else
60	#include <linux/videodev2.h>
61	#endif
62	+#ifdef HAVE_LIBV4L2
63	+#include <libv4l2.h>
64	+#endif
65
66	#include "webrtc/system_wrappers/interface/ref_count.h"
67	#include "webrtc/system_wrappers/interface/trace.h"
68	@@ -34,6 +37,15 @@
69	#define BUF_LEN ( 1024 * ( EVENT_SIZE + 16 ) )
70	#endif
71
72	+#ifdef HAVE_LIBV4L2
73	+#define open v4l2_open
74	+#define close v4l2_close
75	+#define dup v4l2_dup
76	+#define ioctl v4l2_ioctl
77	+#define mmap v4l2_mmap
78	+#define munmap v4l2_munmap
79	+#endif
80	+
81	namespace webrtc
82	{
83	namespace videocapturemodule
84	@@ -274,6 +286,11 @@ int32_t DeviceInfoLinux::GetDeviceName(
85	memset(deviceNameUTF8, 0, deviceNameLength);
86	memcpy(cameraName, cap.card, sizeof(cap.card));
87
88	+ if (cameraName[0] == '\0')
89	+ {
90	+ sprintf(cameraName, "Camera at /dev/video%d", deviceNumber);
91	+ }
92	+
93	if (deviceNameLength >= strlen(cameraName))
94	{
95	memcpy(deviceNameUTF8, cameraName, strlen(cameraName));
96	diff --git media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
97	index 12df1b3..e9863ba 100644
98	--- media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
99	+++ media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
100	@@ -25,6 +25,9 @@
101	#else
102	#include <linux/videodev2.h>
103	#endif
104	+#ifdef HAVE_LIBV4L2
105	+#include <libv4l2.h>
106	+#endif
107
108	#include <new>
109
110	@@ -32,6 +35,15 @@
111	#include "webrtc/modules/video_capture/linux/video_capture_linux.h"
112	#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
113	#include "webrtc/system_wrappers/include/trace.h"
114	+
115	+#ifdef HAVE_LIBV4L2
116	+#define open v4l2_open
117	+#define close v4l2_close
118	+#define dup v4l2_dup
119	+#define ioctl v4l2_ioctl
120	+#define mmap v4l2_mmap
121	+#define munmap v4l2_munmap
122	+#endif
123
124	namespace webrtc {
125	namespace videocapturemodule {
126	diff --git media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
127	index d46b5aa..e452223 100644
128	--- media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
129	+++ media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
130	@@ -7,6 +7,9 @@
131	# be found in the AUTHORS file in the root of the source tree.
132
133	{
134	+ 'variables': {
135	+ 'use_libv4l2%': 0,
136	+ },
137	'targets': [
138	{
139	'target_name': 'video_capture_module',
140	@@ -76,6 +76,19 @@
141	'linux/video_capture_linux.cc',
142	'linux/video_capture_linux.h',
143	],
144	+ 'conditions': [
145	+ ['use_libv4l2==1', {
146	+ 'defines': [
147	+ 'HAVE_LIBV4L2',
148	+ ],
149	+ 'cflags_mozilla': [
150	+ '$(MOZ_LIBV4L2_CFLAGS)',
151	+ ],
152	+ 'libraries': [
153	+ '-lv4l2',
154	+ ],
155	+ }],
156	+ ],
157	}],
158	['OS=="mac"', {
159	'sources': [
160	diff --git toolkit/library/moz.build toolkit/library/moz.build
161	index 9c16ffa..1db3794 100644
162	--- toolkit/library/moz.build
163	+++ toolkit/library/moz.build
164	@@ -163,6 +163,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF
165	]
166
167	OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
168	+OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS']
169	OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
170	OS_LIBS += CONFIG['MOZ_APP_EXTRA_LIBS']
171

Lines 160-166 diff --git dom/media/moz.build dom/media/moz.build Link Here

(-)b/www/firefox/files/patch-z-bug517422 (-12 / +12 lines)
160	index 86b051c58d33..fb6186dce78b 100644	160	index 86b051c58d33..fb6186dce78b 100644
161	--- dom/media/moz.build	161	--- dom/media/moz.build
162	+++ dom/media/moz.build	162	+++ dom/media/moz.build
163	@@ -318,6 +318,21 @@ if CONFIG['MOZ_WEBRTC']:	163	@@ -326,6 +326,21 @@ if CONFIG['MOZ_WEBRTC']:
164		164
165	DEFINES['MOZILLA_INTERNAL_API'] = True	165	DEFINES['MOZILLA_INTERNAL_API'] = True
166		166
Lines 179-194 index 86b051c58d33..fb6186dce78b 100644 Link Here
179	+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:	179	+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
180	+ CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS']	180	+ CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS']
181	+	181	+
182	if CONFIG['MOZ_ANDROID_HLS_SUPPORT'] and CONFIG['MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE']:	182	if CONFIG['MOZ_ANDROID_HLS_SUPPORT']:
183	DEFINES['MOZ_ANDROID_HLS_SUPPORT'] = True	183	DEFINES['MOZ_ANDROID_HLS_SUPPORT'] = True
184		184
185	diff --git dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp	185	diff --git dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
186	index 078f6ea5ef60..c600db067539 100644	186	index 078f6ea5ef60..c600db067539 100644
187	--- dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp	187	--- dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
188	+++ dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp	188	+++ dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
189	@@ -11,9 +11,13 @@	189	@@ -15,9 +15,13 @@
190	#include "prmem.h"	190	#include <windows.h>
191	#include "prlink.h"	191	#endif
192		192
193	+#ifdef MOZ_SYSTEM_SOUNDTOUCH	193	+#ifdef MOZ_SYSTEM_SOUNDTOUCH
194	+#include "nsXPCOMPrivate.h" // for XUL_DLL	194	+#include "nsXPCOMPrivate.h" // for XUL_DLL
Lines 200-206 index 078f6ea5ef60..c600db067539 100644 Link Here
200		200
201	namespace mozilla {	201	namespace mozilla {
202		202
203	@@ -54,6 +58,12 @@ FFVPXRuntimeLinker::Init()	203	@@ -64,6 +68,12 @@ FFVPXRuntimeLinker::Init()
204		204
205	sLinkStatus = LinkStatus_FAILED;	205	sLinkStatus = LinkStatus_FAILED;
206		206
Lines 212-224 index 078f6ea5ef60..c600db067539 100644 Link Here
212	+#else	212	+#else
213	// We retrieve the path of the lgpllibs library as this is where mozavcodec	213	// We retrieve the path of the lgpllibs library as this is where mozavcodec
214	// and mozavutil libs are located.	214	// and mozavutil libs are located.
215	char* lgpllibsname = PR_GetLibraryName(nullptr, "lgpllibs");	215	PathString lgpllibsname = GetLibraryName(nullptr, "lgpllibs");
216	@@ -64,6 +74,7 @@ FFVPXRuntimeLinker::Init()	216	@@ -73,6 +83,7 @@ FFVPXRuntimeLinker::Init()
217	PR_GetLibraryFilePathname(lgpllibsname,	217	PathString path =
218	(PRFuncPtr)&soundtouch::SoundTouch::getVersionId);	218	GetLibraryFilePathname(lgpllibsname.get(),
219	PR_FreeLibraryName(lgpllibsname);	219	(PRFuncPtr)&soundtouch::SoundTouch::getVersionId);
220	+#endif	220	+#endif
221	if (!path) {	221	if (path.IsEmpty()) {
222	return false;	222	return false;
223	}	223	}
224	diff --git media/libogg/README_MOZILLA media/libogg/README_MOZILLA	224	diff --git media/libogg/README_MOZILLA media/libogg/README_MOZILLA