Date: Tue, 10 Jun 2014 04:47:02 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1595 - in trunk: Mk Mk/Uses devel/nspr mail/linux-thunderbird mail/thunderbird mail/thunderbird-i18n www/firefox www/firefox-esr www/firefox-esr-i18n www/firefox-i18n www/firefox-nightly www/firefox-nightly/files www/libxul www/linux-firefox www/seamonkey www/seamonkey/files Message-ID: <201406100447.s5A4l2uq054294@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Jun 10 04:47:02 2014
New Revision: 1595
Log:
update
Added:
trunk/www/firefox-nightly/files/patch-bug1023028
trunk/www/seamonkey/files/patch-bug981348
Deleted:
trunk/www/seamonkey/files/patch-bug806917
trunk/www/seamonkey/files/patch-bug973744
trunk/www/seamonkey/files/patch-bug975634
trunk/www/seamonkey/files/patch-bug977457
trunk/www/seamonkey/files/patch-bug985848
trunk/www/seamonkey/files/patch-bug989112
trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
Modified:
trunk/Mk/Uses/gecko.mk
trunk/Mk/bsd.gecko.mk
trunk/devel/nspr/Makefile
trunk/devel/nspr/distinfo
trunk/mail/linux-thunderbird/Makefile
trunk/mail/linux-thunderbird/distinfo
trunk/mail/thunderbird-i18n/Makefile
trunk/mail/thunderbird-i18n/distinfo
trunk/mail/thunderbird/Makefile
trunk/mail/thunderbird/distinfo
trunk/www/firefox-esr-i18n/distinfo
trunk/www/firefox-esr/distinfo
trunk/www/firefox-i18n/distinfo
trunk/www/firefox-nightly/Makefile
trunk/www/firefox-nightly/Makefile.hgrev
trunk/www/firefox-nightly/distinfo
trunk/www/firefox/Makefile
trunk/www/firefox/distinfo
trunk/www/libxul/Makefile
trunk/www/libxul/distinfo
trunk/www/linux-firefox/distinfo
trunk/www/seamonkey/Makefile
trunk/www/seamonkey/files/patch-bug847568
trunk/www/seamonkey/files/patch-bug975397
trunk/www/seamonkey/files/patch-clang34-disable-stdcall
trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in
trunk/www/seamonkey/files/patch-z-bug517422
Modified: trunk/Mk/Uses/gecko.mk
==============================================================================
--- trunk/Mk/Uses/gecko.mk Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/Mk/Uses/gecko.mk Tue Jun 10 04:47:02 2014 (r1595)
@@ -53,8 +53,8 @@
.elif ${_GECKO_ARGS:Mseamonkey}
-_GECKO_DEFAULT_VERSION= 26
-_GECKO_VERSIONS= 26
+_GECKO_DEFAULT_VERSION= 27
+_GECKO_VERSIONS= 27
_GECKO_TYPE= seamonkey
.if exists(${LOCALBASE}/bin/seamonkey)
@@ -63,7 +63,7 @@
.endif
# Dependence lines for different Seamonkey versions
-26_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
+27_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
.elif ${_GECKO_ARGS:Mthunderbird}
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/Mk/bsd.gecko.mk Tue Jun 10 04:47:02 2014 (r1595)
@@ -310,7 +310,7 @@
.endif
.if ${PORT_OPTIONS:MGSTREAMER}
-. if ${MOZILLA_VER:R:R} >= 30 || exists(${FILESDIR}/patch-bug806917)
+. if ${MOZILLA_VER:R:R} >= 30 || ${MOZILLA} == "seamonkey"
USE_GSTREAMER1?=good libav
MOZ_OPTIONS+= --enable-gstreamer=1.0
. else
Modified: trunk/devel/nspr/Makefile
==============================================================================
--- trunk/devel/nspr/Makefile Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/devel/nspr/Makefile Tue Jun 10 04:47:02 2014 (r1595)
@@ -2,7 +2,7 @@
# $FreeBSD: head/devel/nspr/Makefile 336446 2013-12-14 13:42:06Z flo $
PORTNAME= nspr
-DISTVERSION= 4.10.5
+DISTVERSION= 4.10.6
CATEGORIES= devel
MASTER_SITES= MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src
Modified: trunk/devel/nspr/distinfo
==============================================================================
--- trunk/devel/nspr/distinfo Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/devel/nspr/distinfo Tue Jun 10 04:47:02 2014 (r1595)
@@ -1,2 +1,2 @@
-SHA256 (nspr-4.10.5.tar.gz) = a453744714fe92c3220cc48bdb226b58b863fd7eccef608d1427d6f68ec9f60c
-SIZE (nspr-4.10.5.tar.gz) = 1130889
+SHA256 (nspr-4.10.6.tar.gz) = df69ac8b0126f11907792384468adf42712b1d6db9772f4aa20c6d471594644a
+SIZE (nspr-4.10.6.tar.gz) = 1131328
Modified: trunk/mail/linux-thunderbird/Makefile
==============================================================================
--- trunk/mail/linux-thunderbird/Makefile Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/mail/linux-thunderbird/Makefile Tue Jun 10 04:47:02 2014 (r1595)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= thunderbird
-DISTVERSION= 24.5.0
+DISTVERSION= 24.6.0
CATEGORIES= mail news net-im ipv6
DISTNAME= ${PORTNAME}-${DISTVERSION}
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US
Modified: trunk/mail/linux-thunderbird/distinfo
==============================================================================
--- trunk/mail/linux-thunderbird/distinfo Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/mail/linux-thunderbird/distinfo Tue Jun 10 04:47:02 2014 (r1595)
@@ -1,5 +1,5 @@
-SHA256 (thunderbird-24.5.0.tar.bz2) = 6441f90eda22808c37bca023748efee7735cf9b18b1d21ce75878c10da8baad7
-SIZE (thunderbird-24.5.0.tar.bz2) = 28958353
+SHA256 (thunderbird-24.6.0.tar.bz2) = 1a4b3b2211cbc4d8ce88810397ccabe789bbdb57c5d627ae65ac3eebd3fbc2f7
+SIZE (thunderbird-24.6.0.tar.bz2) = 29031351
SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99
SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908
SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b
Modified: trunk/mail/thunderbird-i18n/Makefile
==============================================================================
--- trunk/mail/thunderbird-i18n/Makefile Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/mail/thunderbird-i18n/Makefile Tue Jun 10 04:47:02 2014 (r1595)
@@ -2,7 +2,7 @@
# $FreeBSD: head/mail/thunderbird-i18n/Makefile 356960 2014-06-07 23:46:45Z antoine $
PORTNAME= thunderbird-i18n
-PORTVERSION= 24.5.0
+PORTVERSION= 24.6.0
CATEGORIES= mail news net-im
MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/linux-i686/xpi
PKGNAMEPREFIX=
Modified: trunk/mail/thunderbird-i18n/distinfo
==============================================================================
--- trunk/mail/thunderbird-i18n/distinfo Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/mail/thunderbird-i18n/distinfo Tue Jun 10 04:47:02 2014 (r1595)
@@ -1,110 +1,110 @@
-SHA256 (xpi/thunderbird-i18n-24.5.0/ar.xpi) = 61c387758c281431653c0d2a40f9779dea513358129fca8838b7568bfcb2f046
-SIZE (xpi/thunderbird-i18n-24.5.0/ar.xpi) = 457862
-SHA256 (xpi/thunderbird-i18n-24.5.0/ast.xpi) = a24e106915b718563a6b59e43d0152c027ac8f851192ca9c26135eaf2d0bf5f4
-SIZE (xpi/thunderbird-i18n-24.5.0/ast.xpi) = 373831
-SHA256 (xpi/thunderbird-i18n-24.5.0/be.xpi) = 46f2f6a22fc8eaa40793be47e7f3351297182cc7ddfb8116b00da965d6ef4a20
-SIZE (xpi/thunderbird-i18n-24.5.0/be.xpi) = 416882
-SHA256 (xpi/thunderbird-i18n-24.5.0/bg.xpi) = e36c78b5dc1667c2a66000a94d4858fd315637b2072491abd5678739c3745f88
-SIZE (xpi/thunderbird-i18n-24.5.0/bg.xpi) = 485023
-SHA256 (xpi/thunderbird-i18n-24.5.0/bn-BD.xpi) = 84b0646dc6ab24c3d366dcb93f30c0e93a53215f2d837acfbfe6757d36cf8b2a
-SIZE (xpi/thunderbird-i18n-24.5.0/bn-BD.xpi) = 537258
-SHA256 (xpi/thunderbird-i18n-24.5.0/br.xpi) = 735a7dcf944090ded122ac7fd94ca081599018091b6b948629281b2dd053ea11
-SIZE (xpi/thunderbird-i18n-24.5.0/br.xpi) = 427679
-SHA256 (xpi/thunderbird-i18n-24.5.0/ca.xpi) = b44c121db7370a79569b8309658dcff73df319f19ce446695964a8913dfffa6d
-SIZE (xpi/thunderbird-i18n-24.5.0/ca.xpi) = 429746
-SHA256 (xpi/thunderbird-i18n-24.5.0/cs.xpi) = 500809375921ab12902f81c0d700c6b66ec2c3bd3a0d03cd58fd94bc59e61040
-SIZE (xpi/thunderbird-i18n-24.5.0/cs.xpi) = 431476
-SHA256 (xpi/thunderbird-i18n-24.5.0/da.xpi) = d9c3e799b534164318262e936b9a5b50016ffea58276d67a6f6cca3c8fad6a83
-SIZE (xpi/thunderbird-i18n-24.5.0/da.xpi) = 409626
-SHA256 (xpi/thunderbird-i18n-24.5.0/de.xpi) = e03fa8c3a32b66955c7b95ccb0651d555e73f62411ed55aa2a44237dbc27b624
-SIZE (xpi/thunderbird-i18n-24.5.0/de.xpi) = 408674
-SHA256 (xpi/thunderbird-i18n-24.5.0/el.xpi) = 490f21edef433189cbcb0e16acb87ebc6e4047bce5c53ae35073782ac2539ea5
-SIZE (xpi/thunderbird-i18n-24.5.0/el.xpi) = 464552
-SHA256 (xpi/thunderbird-i18n-24.5.0/en-GB.xpi) = df6884048a7cc4579cf8d01b9846f4a4fada50c35486a5ef753b92c9e6e9eca4
-SIZE (xpi/thunderbird-i18n-24.5.0/en-GB.xpi) = 400962
-SHA256 (xpi/thunderbird-i18n-24.5.0/en-US.xpi) = 7b6c84303047b2cd7b8def5050978852d5133837f2b805b445da553b7c61ad26
-SIZE (xpi/thunderbird-i18n-24.5.0/en-US.xpi) = 402144
-SHA256 (xpi/thunderbird-i18n-24.5.0/es-AR.xpi) = 1f89c991a958a89913c4ce7d398d3727505f1c5ea18188691f2503d4fc4808f0
-SIZE (xpi/thunderbird-i18n-24.5.0/es-AR.xpi) = 425656
-SHA256 (xpi/thunderbird-i18n-24.5.0/es-ES.xpi) = f4793deb6ddbe8be6af31fe809ba2e6b1a85c16c42fc023d9c798b2a48ed1aab
-SIZE (xpi/thunderbird-i18n-24.5.0/es-ES.xpi) = 366308
-SHA256 (xpi/thunderbird-i18n-24.5.0/et.xpi) = 96a8367da63bbb573386ef2301089a676b963e5000a7638dd616cf66f0fefc06
-SIZE (xpi/thunderbird-i18n-24.5.0/et.xpi) = 422893
-SHA256 (xpi/thunderbird-i18n-24.5.0/eu.xpi) = b3617b39f949ad5e2cc06ad96de92eb76240fb5299fc9ef65479365a390ba2f3
-SIZE (xpi/thunderbird-i18n-24.5.0/eu.xpi) = 418497
-SHA256 (xpi/thunderbird-i18n-24.5.0/fi.xpi) = 3732e9d56156d836dbe69cac9e0d17e2b9e65b3436d54337f01bad07ca79ad86
-SIZE (xpi/thunderbird-i18n-24.5.0/fi.xpi) = 424264
-SHA256 (xpi/thunderbird-i18n-24.5.0/fr.xpi) = 4f6749e30cd43d41d3ad963e09e891c5455f4afba5d659482c945bf2d3ffa041
-SIZE (xpi/thunderbird-i18n-24.5.0/fr.xpi) = 431289
-SHA256 (xpi/thunderbird-i18n-24.5.0/fy-NL.xpi) = 5fd8a7748cb741587e6f8f5608edd1b930adfd597d7c41572ef938acabf5527d
-SIZE (xpi/thunderbird-i18n-24.5.0/fy-NL.xpi) = 426098
-SHA256 (xpi/thunderbird-i18n-24.5.0/ga-IE.xpi) = 5c680e902636dbbdb0850afd8c52016716d2a45bee15661626f8e66dc40d7f3c
-SIZE (xpi/thunderbird-i18n-24.5.0/ga-IE.xpi) = 437114
-SHA256 (xpi/thunderbird-i18n-24.5.0/gd.xpi) = 49941bbc298c4ca251dc799280236e3f687a75a1650bf47ece9da7a6390f1c76
-SIZE (xpi/thunderbird-i18n-24.5.0/gd.xpi) = 440091
-SHA256 (xpi/thunderbird-i18n-24.5.0/gl.xpi) = 2498b883e3cd6d7a81c02824afdaede981228dde6f0a9c13217a34e6d6dfa7c1
-SIZE (xpi/thunderbird-i18n-24.5.0/gl.xpi) = 427543
-SHA256 (xpi/thunderbird-i18n-24.5.0/he.xpi) = a5546f26a205db3a0196c5032c8e69314affecd2174f7880f5ae517af73785f9
-SIZE (xpi/thunderbird-i18n-24.5.0/he.xpi) = 457065
-SHA256 (xpi/thunderbird-i18n-24.5.0/hr.xpi) = b225e5428b4ec30eb618fcac0de66557e2f7bfdc88957dc739ec142d7968a3b2
-SIZE (xpi/thunderbird-i18n-24.5.0/hr.xpi) = 422387
-SHA256 (xpi/thunderbird-i18n-24.5.0/hu.xpi) = a24e6b47bb40a6b71319b5a4f7638574e3eede2163238da059bf0876cf7ec3fa
-SIZE (xpi/thunderbird-i18n-24.5.0/hu.xpi) = 441511
-SHA256 (xpi/thunderbird-i18n-24.5.0/hy-AM.xpi) = a8021d93dc1f3d372ee94d4c7eaacae2f30df06e2bd6cfc37a1ab564c90b6fb4
-SIZE (xpi/thunderbird-i18n-24.5.0/hy-AM.xpi) = 477923
-SHA256 (xpi/thunderbird-i18n-24.5.0/id.xpi) = 41222ef78db07a5da8b388485cd3536184caf8eb7264830e410026c279972454
-SIZE (xpi/thunderbird-i18n-24.5.0/id.xpi) = 457499
-SHA256 (xpi/thunderbird-i18n-24.5.0/is.xpi) = 3fdd5a7f5692ba2103bec6037d77bf848f78cb02eb1644d46641e89fe52cae2c
-SIZE (xpi/thunderbird-i18n-24.5.0/is.xpi) = 425710
-SHA256 (xpi/thunderbird-i18n-24.5.0/it.xpi) = 7c9a296019584d63c44ec03dda76200b83f07f50dcbafbe7c3b69af8f894f5cd
-SIZE (xpi/thunderbird-i18n-24.5.0/it.xpi) = 357933
-SHA256 (xpi/thunderbird-i18n-24.5.0/ja.xpi) = 624bf5f383fbcaf6eff9164232b72395733ae01a3a1f5e10d4a3e6fda10de1b8
-SIZE (xpi/thunderbird-i18n-24.5.0/ja.xpi) = 475559
-SHA256 (xpi/thunderbird-i18n-24.5.0/ko.xpi) = 830f3245b7f246e2269a758b7cc9186d7aadbf519ee72fa33b3d2325e285a291
-SIZE (xpi/thunderbird-i18n-24.5.0/ko.xpi) = 428071
-SHA256 (xpi/thunderbird-i18n-24.5.0/lt.xpi) = dff8b84bcfbb8c07d76d415b6ef378d6024bd81f0655ca438927572b85f4e37c
-SIZE (xpi/thunderbird-i18n-24.5.0/lt.xpi) = 443259
-SHA256 (xpi/thunderbird-i18n-24.5.0/nb-NO.xpi) = 2ae8f6c1a61d6f17cfb4f86d5d9926688fb8a403ab64fe1950c89a8997bcdd55
-SIZE (xpi/thunderbird-i18n-24.5.0/nb-NO.xpi) = 418922
-SHA256 (xpi/thunderbird-i18n-24.5.0/nl.xpi) = da2532d21fb594927f59979d4c022297b0ee5f0c29cdf2209d7e4f9296931cd9
-SIZE (xpi/thunderbird-i18n-24.5.0/nl.xpi) = 418764
-SHA256 (xpi/thunderbird-i18n-24.5.0/nn-NO.xpi) = 2a52857fca772239f14207755946dbdd36ba1c0209f8c09f30cfe6cdc94a5892
-SIZE (xpi/thunderbird-i18n-24.5.0/nn-NO.xpi) = 421134
-SHA256 (xpi/thunderbird-i18n-24.5.0/pa-IN.xpi) = f817ef8578af107efe45cc2406be7568440c1b4e020c3764afbec774b3b17a4b
-SIZE (xpi/thunderbird-i18n-24.5.0/pa-IN.xpi) = 508272
-SHA256 (xpi/thunderbird-i18n-24.5.0/pl.xpi) = 13fd347b116e6d5e1c0b168f020270cc179f32b1e056e333cc3a86a8406f901a
-SIZE (xpi/thunderbird-i18n-24.5.0/pl.xpi) = 401752
-SHA256 (xpi/thunderbird-i18n-24.5.0/pt-BR.xpi) = 57f7c85aa5ff76cd01387ff1752a63e8d2b26749765dd7daf7137de4a06eb6fe
-SIZE (xpi/thunderbird-i18n-24.5.0/pt-BR.xpi) = 430909
-SHA256 (xpi/thunderbird-i18n-24.5.0/pt-PT.xpi) = 828f0920581519070aa58c366f603d964638a60b2de74ad49fcf9397db169145
-SIZE (xpi/thunderbird-i18n-24.5.0/pt-PT.xpi) = 425025
-SHA256 (xpi/thunderbird-i18n-24.5.0/rm.xpi) = b5ad4b75ba5670223b6f16686830f2eed904a764c72a61c88e054d9574518d44
-SIZE (xpi/thunderbird-i18n-24.5.0/rm.xpi) = 432384
-SHA256 (xpi/thunderbird-i18n-24.5.0/ro.xpi) = a5a8215d718a6be1c576059168c9913c55d557b26bed500a4e39a888e0f18c4b
-SIZE (xpi/thunderbird-i18n-24.5.0/ro.xpi) = 497491
-SHA256 (xpi/thunderbird-i18n-24.5.0/ru.xpi) = 53277de17e52ed168368153902b498ea478eed06e00fc9a3f6b880cfbcb48c1f
-SIZE (xpi/thunderbird-i18n-24.5.0/ru.xpi) = 425097
-SHA256 (xpi/thunderbird-i18n-24.5.0/si.xpi) = aca1ede31da89a6ab476aad09696306f61522cdd878c5e1dabd37ba7f5b28713
-SIZE (xpi/thunderbird-i18n-24.5.0/si.xpi) = 511166
-SHA256 (xpi/thunderbird-i18n-24.5.0/sk.xpi) = a64b7290e92579b75a6cf34ba1baed18bb086265c8452c08ddb0228c714b5ed5
-SIZE (xpi/thunderbird-i18n-24.5.0/sk.xpi) = 440106
-SHA256 (xpi/thunderbird-i18n-24.5.0/sl.xpi) = ebab16114f3fe94cd15c9993a94693412afa121ce8975afadf54bf06d9a5fbab
-SIZE (xpi/thunderbird-i18n-24.5.0/sl.xpi) = 421706
-SHA256 (xpi/thunderbird-i18n-24.5.0/sq.xpi) = 5f933fa1e66e16c15d6237099cf65f5f3300ff423d3352f6e5aa3b2d207c7f0a
-SIZE (xpi/thunderbird-i18n-24.5.0/sq.xpi) = 435215
-SHA256 (xpi/thunderbird-i18n-24.5.0/sr.xpi) = 21ee6b0854e5e0052ef4eacca593c0ff41ea000dd0dc75f1d7b647b34591ad49
-SIZE (xpi/thunderbird-i18n-24.5.0/sr.xpi) = 518889
-SHA256 (xpi/thunderbird-i18n-24.5.0/sv-SE.xpi) = 17e752fbcf6e24203b6d27bce06df39766a7878fced1db516b96e2f9ec7e7426
-SIZE (xpi/thunderbird-i18n-24.5.0/sv-SE.xpi) = 423815
-SHA256 (xpi/thunderbird-i18n-24.5.0/ta-LK.xpi) = 55b10f60dea2abc565c69c841988110b989e69e7ce880500f9990af1b7e7437a
-SIZE (xpi/thunderbird-i18n-24.5.0/ta-LK.xpi) = 534922
-SHA256 (xpi/thunderbird-i18n-24.5.0/tr.xpi) = 25b1be7c836addc60bfa36e6c759dcd2b12c73c468351bc830f125080489dd92
-SIZE (xpi/thunderbird-i18n-24.5.0/tr.xpi) = 438066
-SHA256 (xpi/thunderbird-i18n-24.5.0/uk.xpi) = 331ed11d6d4b873db63e33db707a205d98eb0f4b6201a75921431b2e7e4e0755
-SIZE (xpi/thunderbird-i18n-24.5.0/uk.xpi) = 480949
-SHA256 (xpi/thunderbird-i18n-24.5.0/vi.xpi) = 993eb8b5869166b51dab725fea1126445cc132cafadab1b5096f6850f2aaadd3
-SIZE (xpi/thunderbird-i18n-24.5.0/vi.xpi) = 495558
-SHA256 (xpi/thunderbird-i18n-24.5.0/zh-CN.xpi) = e587849f5bae5bbb65bc68087fb9bbe672162e5bca69a7e99f0ca7e4559d5354
-SIZE (xpi/thunderbird-i18n-24.5.0/zh-CN.xpi) = 449181
-SHA256 (xpi/thunderbird-i18n-24.5.0/zh-TW.xpi) = ace0e695c8112ba1754f16603ee14418303ae053b97f8af0b23272a308c4f066
-SIZE (xpi/thunderbird-i18n-24.5.0/zh-TW.xpi) = 450000
+SHA256 (xpi/thunderbird-i18n-24.6.0/ar.xpi) = 17c15dff54c4df3ed6b2e94e4214155584b27ec36532115fd7ff67dd1592f64d
+SIZE (xpi/thunderbird-i18n-24.6.0/ar.xpi) = 457862
+SHA256 (xpi/thunderbird-i18n-24.6.0/ast.xpi) = c7bbd66d3c1256675ffc97eaa4348f4a5fe7f3a4673563c1d68bed00bec56717
+SIZE (xpi/thunderbird-i18n-24.6.0/ast.xpi) = 373831
+SHA256 (xpi/thunderbird-i18n-24.6.0/be.xpi) = 6798c92d5f47ce38828d91e426a7cac9043d8f276b3ecddf4990cd17a26d60ef
+SIZE (xpi/thunderbird-i18n-24.6.0/be.xpi) = 416882
+SHA256 (xpi/thunderbird-i18n-24.6.0/bg.xpi) = 8aa99de4c0fbaef3e73f650adc8a481c30fc3f7e30e3e26d4499a5cab6e176e2
+SIZE (xpi/thunderbird-i18n-24.6.0/bg.xpi) = 485024
+SHA256 (xpi/thunderbird-i18n-24.6.0/bn-BD.xpi) = ae24e4f3aff29cac99ee72e9fc6f72711737a358fd5727031ffd3cd6803ab78a
+SIZE (xpi/thunderbird-i18n-24.6.0/bn-BD.xpi) = 537258
+SHA256 (xpi/thunderbird-i18n-24.6.0/br.xpi) = e9f722a70b98b036140f703dcb6860a8b953d4e811efa7081d19bd841f00d44f
+SIZE (xpi/thunderbird-i18n-24.6.0/br.xpi) = 427680
+SHA256 (xpi/thunderbird-i18n-24.6.0/ca.xpi) = a617d74e14e7890612ea2431e337dfad947eeeb53e9bb56628cf08aeda30fb9b
+SIZE (xpi/thunderbird-i18n-24.6.0/ca.xpi) = 429746
+SHA256 (xpi/thunderbird-i18n-24.6.0/cs.xpi) = e351d889e8fde0b6b0d13de8b94d71c71e8065473b8c2af449eaa83077182ad9
+SIZE (xpi/thunderbird-i18n-24.6.0/cs.xpi) = 431476
+SHA256 (xpi/thunderbird-i18n-24.6.0/da.xpi) = 87177c2c311c76062095e1a88aae002c1841bccb4cf3269d26a0cad14f908013
+SIZE (xpi/thunderbird-i18n-24.6.0/da.xpi) = 409627
+SHA256 (xpi/thunderbird-i18n-24.6.0/de.xpi) = 4bb7030276184e1d5a22bd3b8177301d1987a94acae5b023e156c1316fd3f906
+SIZE (xpi/thunderbird-i18n-24.6.0/de.xpi) = 408674
+SHA256 (xpi/thunderbird-i18n-24.6.0/el.xpi) = 47a477894c50a3a98f7cb4283f8115dfdec8b99c7d2005437f90cf27091b9e4b
+SIZE (xpi/thunderbird-i18n-24.6.0/el.xpi) = 464553
+SHA256 (xpi/thunderbird-i18n-24.6.0/en-GB.xpi) = b80143321e669ff4cbf9de1a74906165e2467126613755823b5d95b28247a498
+SIZE (xpi/thunderbird-i18n-24.6.0/en-GB.xpi) = 400962
+SHA256 (xpi/thunderbird-i18n-24.6.0/en-US.xpi) = 112518d5464763b12a642b8ad5f24d246e3ddc0dbe815cb879ac8f0d22e1b8a4
+SIZE (xpi/thunderbird-i18n-24.6.0/en-US.xpi) = 402144
+SHA256 (xpi/thunderbird-i18n-24.6.0/es-AR.xpi) = a77f1cc88721695bf122265d781da1f6e7e152adb28b5c8f1dcb4b53abec7e13
+SIZE (xpi/thunderbird-i18n-24.6.0/es-AR.xpi) = 425657
+SHA256 (xpi/thunderbird-i18n-24.6.0/es-ES.xpi) = e7228a9bc34a70f04fe4b6bb44cb193e8303ee985c20ac71951691faf8f303e5
+SIZE (xpi/thunderbird-i18n-24.6.0/es-ES.xpi) = 366308
+SHA256 (xpi/thunderbird-i18n-24.6.0/et.xpi) = dbe79156d159f99eaa4212f06a4892e8d57c2c638674b7eb48a9411dc33bd896
+SIZE (xpi/thunderbird-i18n-24.6.0/et.xpi) = 422893
+SHA256 (xpi/thunderbird-i18n-24.6.0/eu.xpi) = ef24864e5477b9546d7e16bdb551f8fea880b9a626cbf2e141fae6c19c82f31a
+SIZE (xpi/thunderbird-i18n-24.6.0/eu.xpi) = 418497
+SHA256 (xpi/thunderbird-i18n-24.6.0/fi.xpi) = 64e456b04f28c10bc588c0ac37a164240eeb6269975a8e2ebf82815182863009
+SIZE (xpi/thunderbird-i18n-24.6.0/fi.xpi) = 424265
+SHA256 (xpi/thunderbird-i18n-24.6.0/fr.xpi) = cb2a157da1d19b007441f361369198e065e83a413f538ee072fb5b5336cae507
+SIZE (xpi/thunderbird-i18n-24.6.0/fr.xpi) = 431289
+SHA256 (xpi/thunderbird-i18n-24.6.0/fy-NL.xpi) = 3332bf259d5b4ddacf240b7bf00dcbbb9a34db48f3b6f8075362ab4f4d498ea1
+SIZE (xpi/thunderbird-i18n-24.6.0/fy-NL.xpi) = 426098
+SHA256 (xpi/thunderbird-i18n-24.6.0/ga-IE.xpi) = 6c0f264ae94c77c3c6f1699f161c4c2ab52150361d332d133d18b3ca74ae396f
+SIZE (xpi/thunderbird-i18n-24.6.0/ga-IE.xpi) = 437114
+SHA256 (xpi/thunderbird-i18n-24.6.0/gd.xpi) = 11b63c83a6cd875d18e6de1372e6d22bd52ecf01da14cf2fbe8c4290e1b46ba1
+SIZE (xpi/thunderbird-i18n-24.6.0/gd.xpi) = 440092
+SHA256 (xpi/thunderbird-i18n-24.6.0/gl.xpi) = 8c7e91e354935d1b3ba9f9717e085edaebf8ef807ab297be1007c839fea83959
+SIZE (xpi/thunderbird-i18n-24.6.0/gl.xpi) = 427543
+SHA256 (xpi/thunderbird-i18n-24.6.0/he.xpi) = ac5e70e428c632a81b7df33704885b9d0cdea0d209783d901f6b6283faf1aa7f
+SIZE (xpi/thunderbird-i18n-24.6.0/he.xpi) = 457066
+SHA256 (xpi/thunderbird-i18n-24.6.0/hr.xpi) = 8a4218eb59f0bf0b06849835268b9f3ae0fcf109a12ef4d41036692434ab4816
+SIZE (xpi/thunderbird-i18n-24.6.0/hr.xpi) = 422387
+SHA256 (xpi/thunderbird-i18n-24.6.0/hu.xpi) = e57cd0837c359cdef58648408f6eecd1cbbc47b432478b22ccc13add88f5ea7b
+SIZE (xpi/thunderbird-i18n-24.6.0/hu.xpi) = 441512
+SHA256 (xpi/thunderbird-i18n-24.6.0/hy-AM.xpi) = 15ce69087c8b75c1d06581b9a42078179ed23f212cde57a6f443ff61062869f8
+SIZE (xpi/thunderbird-i18n-24.6.0/hy-AM.xpi) = 477923
+SHA256 (xpi/thunderbird-i18n-24.6.0/id.xpi) = b0d47c428e230e22a8763ed6d2c708a2d56f78e1ff028afb423b91eb14a7fe61
+SIZE (xpi/thunderbird-i18n-24.6.0/id.xpi) = 457499
+SHA256 (xpi/thunderbird-i18n-24.6.0/is.xpi) = a3b7ec605787122f75a07326d0bebcfa115d9f540d2d09dca61c85c7c8797a95
+SIZE (xpi/thunderbird-i18n-24.6.0/is.xpi) = 425710
+SHA256 (xpi/thunderbird-i18n-24.6.0/it.xpi) = cbc99bb400bc1942e824e4d8b3ff70c9a3543af4883f46ddbba7d2da3ca7fcc0
+SIZE (xpi/thunderbird-i18n-24.6.0/it.xpi) = 357933
+SHA256 (xpi/thunderbird-i18n-24.6.0/ja.xpi) = ef614d5909591bc82ce763780504759f834b4650d97385e6a6f08677a0e8fce9
+SIZE (xpi/thunderbird-i18n-24.6.0/ja.xpi) = 475559
+SHA256 (xpi/thunderbird-i18n-24.6.0/ko.xpi) = 8064614276a1486df269677f3d1f0b4118e30baf5596d2bc704aa1e3fd6d99da
+SIZE (xpi/thunderbird-i18n-24.6.0/ko.xpi) = 428071
+SHA256 (xpi/thunderbird-i18n-24.6.0/lt.xpi) = 902c0a385bea8d77b8ebddf04889e9d4fba6a19628aaee5f6d3dbd114145029f
+SIZE (xpi/thunderbird-i18n-24.6.0/lt.xpi) = 443260
+SHA256 (xpi/thunderbird-i18n-24.6.0/nb-NO.xpi) = acb35e8653c1f41f690e37d8d29d42ba09489fcd81e136928b0c555531a6f6a1
+SIZE (xpi/thunderbird-i18n-24.6.0/nb-NO.xpi) = 418922
+SHA256 (xpi/thunderbird-i18n-24.6.0/nl.xpi) = 291fc386c76ed01927344afe0611c80560f29504a398c7e96c52bdf915a537c8
+SIZE (xpi/thunderbird-i18n-24.6.0/nl.xpi) = 418764
+SHA256 (xpi/thunderbird-i18n-24.6.0/nn-NO.xpi) = 70843b8c43e3f707fe2a53f5401635f81e63a7055a038e984e1bfee25626c2f1
+SIZE (xpi/thunderbird-i18n-24.6.0/nn-NO.xpi) = 421134
+SHA256 (xpi/thunderbird-i18n-24.6.0/pa-IN.xpi) = 1f46cc15aaf9862b6a584fd458bbb84102d0005d1dd31ed14adb79d4a1c77827
+SIZE (xpi/thunderbird-i18n-24.6.0/pa-IN.xpi) = 508272
+SHA256 (xpi/thunderbird-i18n-24.6.0/pl.xpi) = 91d8e2eae75533431a47bdceb4984b7dc37a32c7d05b55347053b1c2388a4eff
+SIZE (xpi/thunderbird-i18n-24.6.0/pl.xpi) = 401753
+SHA256 (xpi/thunderbird-i18n-24.6.0/pt-BR.xpi) = ee0126f821648b3dfdf2c707828bba476ce9ec65ff3474090fae3c2b9569e4f2
+SIZE (xpi/thunderbird-i18n-24.6.0/pt-BR.xpi) = 430909
+SHA256 (xpi/thunderbird-i18n-24.6.0/pt-PT.xpi) = 3d45604b348cacbb733049c9b212dacebc47bcbd2b5bd69a42ce9342463fdd44
+SIZE (xpi/thunderbird-i18n-24.6.0/pt-PT.xpi) = 425026
+SHA256 (xpi/thunderbird-i18n-24.6.0/rm.xpi) = 10702682354f3caea6c68de79e706662cdc1f0bd2764f13342da8e759f70664a
+SIZE (xpi/thunderbird-i18n-24.6.0/rm.xpi) = 432384
+SHA256 (xpi/thunderbird-i18n-24.6.0/ro.xpi) = b25ae8ab37cc36ca8bfd7974bcaffff49d97dbaa8f825e17d7a3922585abb461
+SIZE (xpi/thunderbird-i18n-24.6.0/ro.xpi) = 497491
+SHA256 (xpi/thunderbird-i18n-24.6.0/ru.xpi) = b4c2ac97185d661e90ecd034117b5cd0cee08b90dc0cc2aa3ca4da4839016a36
+SIZE (xpi/thunderbird-i18n-24.6.0/ru.xpi) = 425098
+SHA256 (xpi/thunderbird-i18n-24.6.0/si.xpi) = 4d879737f492c61a1afe8345a2c21da5ece7808235c332d2ce2e56a024e64f64
+SIZE (xpi/thunderbird-i18n-24.6.0/si.xpi) = 511167
+SHA256 (xpi/thunderbird-i18n-24.6.0/sk.xpi) = a7ad8f81f289dd865e201ab96d11c43528b64ab4d6b1c6c68f3c43405afcf11d
+SIZE (xpi/thunderbird-i18n-24.6.0/sk.xpi) = 440106
+SHA256 (xpi/thunderbird-i18n-24.6.0/sl.xpi) = 19108bba085142f7752ee53bb411b952275ce481af9a1b07138e8ba492017884
+SIZE (xpi/thunderbird-i18n-24.6.0/sl.xpi) = 421706
+SHA256 (xpi/thunderbird-i18n-24.6.0/sq.xpi) = 84f26fc90cabc52d19bd4cb4adff60607f3e00acb717405917d5596535f4478e
+SIZE (xpi/thunderbird-i18n-24.6.0/sq.xpi) = 435215
+SHA256 (xpi/thunderbird-i18n-24.6.0/sr.xpi) = acafdbb54d034450c939bf1e440005f998a8fc870a59386b50311a6d36d4851a
+SIZE (xpi/thunderbird-i18n-24.6.0/sr.xpi) = 518890
+SHA256 (xpi/thunderbird-i18n-24.6.0/sv-SE.xpi) = 1b14e9eeef56ffb12b142c98549cf32590053c51125f9b14d5f1d92f52cdbaed
+SIZE (xpi/thunderbird-i18n-24.6.0/sv-SE.xpi) = 423816
+SHA256 (xpi/thunderbird-i18n-24.6.0/ta-LK.xpi) = 432b008f0752fdeccce411d5d506e9128b6a383295d75647fe1e1a7f7b90c5b0
+SIZE (xpi/thunderbird-i18n-24.6.0/ta-LK.xpi) = 534923
+SHA256 (xpi/thunderbird-i18n-24.6.0/tr.xpi) = 7174f4b8072aa3e13d26e5cf55a8439a47a68270740beca51c7d38c2fbd34a38
+SIZE (xpi/thunderbird-i18n-24.6.0/tr.xpi) = 438067
+SHA256 (xpi/thunderbird-i18n-24.6.0/uk.xpi) = ea8d2eafbc0e309feace44458c0d75297a5709301a2bbd073e78334c53bd5e5c
+SIZE (xpi/thunderbird-i18n-24.6.0/uk.xpi) = 480949
+SHA256 (xpi/thunderbird-i18n-24.6.0/vi.xpi) = d1578c8b452d4d1ce0219c7d95b4183f727b14a4d8484de02c6dfe04444e7d1d
+SIZE (xpi/thunderbird-i18n-24.6.0/vi.xpi) = 495559
+SHA256 (xpi/thunderbird-i18n-24.6.0/zh-CN.xpi) = f02300ee532bcc9c3d2a94c18636a112d757e49882c160149fa14bac07778bd3
+SIZE (xpi/thunderbird-i18n-24.6.0/zh-CN.xpi) = 449182
+SHA256 (xpi/thunderbird-i18n-24.6.0/zh-TW.xpi) = 3c7182d57ba762a78c96d4f15960ce87e72bd057eef906f0632d20cd724bd8b7
+SIZE (xpi/thunderbird-i18n-24.6.0/zh-TW.xpi) = 450001
Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/mail/thunderbird/Makefile Tue Jun 10 04:47:02 2014 (r1595)
@@ -2,10 +2,10 @@
# $FreeBSD: head/mail/thunderbird/Makefile 339634 2014-01-13 21:00:02Z rene $
PORTNAME= thunderbird
-DISTVERSION= 24.5.0
+DISTVERSION= 24.6.0
CATEGORIES= mail news net-im ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
- https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/
+ https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source/
DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
Modified: trunk/mail/thunderbird/distinfo
==============================================================================
--- trunk/mail/thunderbird/distinfo Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/mail/thunderbird/distinfo Tue Jun 10 04:47:02 2014 (r1595)
@@ -1,4 +1,2 @@
-SHA256 (thunderbird-24.5.0.source.tar.bz2) = 971c48db11328613340ed97a92018403647b8cca6a692b3d6b4145aed124382a
-SIZE (thunderbird-24.5.0.source.tar.bz2) = 140048545
-SHA256 (enigmail-1.6.tar.gz) = 10d5eb7ba364b9b6e6275aae8bba1d0e4321ed7d55a715337d566ccf2a56ea4d
-SIZE (enigmail-1.6.tar.gz) = 1231111
+SHA256 (thunderbird-24.6.0.source.tar.bz2) = 14ece268a3a83f8658cb140884892ca662c08751614bf9b250931f7fdc5b25f0
+SIZE (thunderbird-24.6.0.source.tar.bz2) = 140368737
Modified: trunk/www/firefox-esr-i18n/distinfo
==============================================================================
--- trunk/www/firefox-esr-i18n/distinfo Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/www/firefox-esr-i18n/distinfo Tue Jun 10 04:47:02 2014 (r1595)
@@ -1,4 +1,4 @@
-SHA256 (xpi/firefox-24.6.0/ach.xpi) = c61cea1854bfbf7a929ab2aeb633bf6dc167396068411b2622683d55a5043fc5
+SHA256 (xpi/firefox-24.6.0/ach.xpi) = 760eaa7d308061e43ba9c57e28ed6f26e3821d286f8425bcb06fe31fa4f375c3
SIZE (xpi/firefox-24.6.0/ach.xpi) = 339946
SHA256 (xpi/firefox-24.6.0/af.xpi) = c36f10e15bf1c7a5479fb052c17acd7b70310e752db7c3b01f2b7a12b5dade2b
SIZE (xpi/firefox-24.6.0/af.xpi) = 333184
@@ -34,13 +34,13 @@
SIZE (xpi/firefox-24.6.0/da.xpi) = 326882
SHA256 (xpi/firefox-24.6.0/de.xpi) = 9d985eae440c8d3b73354946594c8e585037fd991e3531a7bfc46792ad939e4f
SIZE (xpi/firefox-24.6.0/de.xpi) = 323258
-SHA256 (xpi/firefox-24.6.0/el.xpi) = 3a8a030b011ca1c8222842f37ad6cac0ae09450042785d1aa37653af2869c366
+SHA256 (xpi/firefox-24.6.0/el.xpi) = c33759d7fe6e3a7f5117af81e82d29e9a05f9384825a8ba8e85943f84d8c4991
SIZE (xpi/firefox-24.6.0/el.xpi) = 365320
-SHA256 (xpi/firefox-24.6.0/en-GB.xpi) = c98e31a9df5c5aab907acc26d3f324746f96872cbcafbf432174bd43a5e9d290
+SHA256 (xpi/firefox-24.6.0/en-GB.xpi) = 886959f3bdd2f14d243812982c5fcc68af7acc742cfad0dc58e3d30fa790256e
SIZE (xpi/firefox-24.6.0/en-GB.xpi) = 318297
-SHA256 (xpi/firefox-24.6.0/en-US.xpi) = 75526ba4931219cc60c2787a40cde298bfead9091bd70454badb526cee858939
+SHA256 (xpi/firefox-24.6.0/en-US.xpi) = 5fb0d62bf3e08c73db0086a5a4721f588dc4b8282d098aff52c83078f1751ce0
SIZE (xpi/firefox-24.6.0/en-US.xpi) = 320993
-SHA256 (xpi/firefox-24.6.0/en-ZA.xpi) = e52689e534c0f3bbabd23131a696f2e56260d71c7cc4351ce4927cafc3378d74
+SHA256 (xpi/firefox-24.6.0/en-ZA.xpi) = 207ae891c739deded157f390981ead19120184df069a790d1ed84276df792ea9
SIZE (xpi/firefox-24.6.0/en-ZA.xpi) = 319321
SHA256 (xpi/firefox-24.6.0/eo.xpi) = 4306590eae498ca0d8bf397392c7b75947f77b2cf0b0b58d81ee748a8863e06a
SIZE (xpi/firefox-24.6.0/eo.xpi) = 334940
@@ -54,11 +54,11 @@
SIZE (xpi/firefox-24.6.0/es-MX.xpi) = 302625
SHA256 (xpi/firefox-24.6.0/et.xpi) = ee697fa88e06c54657224bc42f54bcb2157dbd857f46b39318a7a46a6d395ebf
SIZE (xpi/firefox-24.6.0/et.xpi) = 327697
-SHA256 (xpi/firefox-24.6.0/eu.xpi) = e5bbb12afac61ceb0752372d379bfda31e8bc1c186ffa8c9fff49caffab7fd42
+SHA256 (xpi/firefox-24.6.0/eu.xpi) = 1822d8c824126df5cd3f7819787173d009420fed02d9e858acd78140d8c4e8d4
SIZE (xpi/firefox-24.6.0/eu.xpi) = 332422
-SHA256 (xpi/firefox-24.6.0/fa.xpi) = 8fdc50d771037e04b2842b280125750140731bf779a69dc033b0b14bca1dc6fb
+SHA256 (xpi/firefox-24.6.0/fa.xpi) = 4d4e10237d0e69a0aac83c7e4c5045a199bc0e263bb46b10e936d8a5484cb456
SIZE (xpi/firefox-24.6.0/fa.xpi) = 375633
-SHA256 (xpi/firefox-24.6.0/ff.xpi) = fd179511157fc94f29fa24e893b6c3b6534067dd8b0721323671526aef8fa1b0
+SHA256 (xpi/firefox-24.6.0/ff.xpi) = 9fe433bed01296ccd02ce631bfbb8eb29cb87da27ce987dfe23bfff6c1a7bb5a
SIZE (xpi/firefox-24.6.0/ff.xpi) = 332815
SHA256 (xpi/firefox-24.6.0/fi.xpi) = 25ceb9ab6aa9b82d260a4d476348f0e45fccde9684efb8ea210592c84922aadd
SIZE (xpi/firefox-24.6.0/fi.xpi) = 328892
@@ -72,11 +72,11 @@
SIZE (xpi/firefox-24.6.0/gd.xpi) = 344811
SHA256 (xpi/firefox-24.6.0/gl.xpi) = 906683126c03a4e18d793d0922bc2c0ffd4da2ff9e7644c77383605415232dac
SIZE (xpi/firefox-24.6.0/gl.xpi) = 336919
-SHA256 (xpi/firefox-24.6.0/gu-IN.xpi) = 076b27deb4342011a113cafc4e2a2a4bf9ae4c91cbf3321331aa5e17efd49bf3
+SHA256 (xpi/firefox-24.6.0/gu-IN.xpi) = c8bb7bb276c09cfed037179bf72ba5438b80636b5a700e5db9e84b3ee08edeae
SIZE (xpi/firefox-24.6.0/gu-IN.xpi) = 359359
-SHA256 (xpi/firefox-24.6.0/he.xpi) = b85c2d36426578cc80e48ae16edd6b7e5b1058926bad3b401af9a236abdcc4e5
+SHA256 (xpi/firefox-24.6.0/he.xpi) = 46ef2e3b53745da0cad551efef985adb7933f0b6090c3e187dc4609b207608bd
SIZE (xpi/firefox-24.6.0/he.xpi) = 354631
-SHA256 (xpi/firefox-24.6.0/hi-IN.xpi) = 3aaed2adb6e9a0ebd5848f32f07792a94b1afafefa42d37a1d78ba84ac90fe75
+SHA256 (xpi/firefox-24.6.0/hi-IN.xpi) = e0ce6c822817a759f08f2fd3978cff91ca010fd4712981a1c5fa2351d7e89be8
SIZE (xpi/firefox-24.6.0/hi-IN.xpi) = 379121
SHA256 (xpi/firefox-24.6.0/hr.xpi) = cfdbb317708b3e92b19f1ef0a9e3515833926cd84bdb859a25a1ebea301f598d
SIZE (xpi/firefox-24.6.0/hr.xpi) = 336841
@@ -108,11 +108,11 @@
SIZE (xpi/firefox-24.6.0/lij.xpi) = 322703
SHA256 (xpi/firefox-24.6.0/lt.xpi) = 3dda139f8825d8753a3af7db55e4ef036fe0594c41f67739ef71af4c8ddfec6e
SIZE (xpi/firefox-24.6.0/lt.xpi) = 352045
-SHA256 (xpi/firefox-24.6.0/lv.xpi) = 1d5fda0ff9e559e3990b16b69ec46252cba7cc67f7de264a5be26ecf7eab17ae
+SHA256 (xpi/firefox-24.6.0/lv.xpi) = dfac1a3f01537c6df9a39f05b5ac9c29fdedb3745120c07dc9dbe8bf200244d2
SIZE (xpi/firefox-24.6.0/lv.xpi) = 328664
-SHA256 (xpi/firefox-24.6.0/mai.xpi) = ebac1edeea09fd40a9d1e5ea9aeb5bf76e9c74d288c792e43fb476691c713721
+SHA256 (xpi/firefox-24.6.0/mai.xpi) = ccd6b3cc898738961fedce93f5f21ce0e122e51bcd9c4fb4b2d795011cd93ecf
SIZE (xpi/firefox-24.6.0/mai.xpi) = 379767
-SHA256 (xpi/firefox-24.6.0/mk.xpi) = cbc158f9865b868ed51778ed0dae758ef4b1e3c3924ed49de9c7364a9aa37b52
+SHA256 (xpi/firefox-24.6.0/mk.xpi) = 87a5117d48ae0b5cb2ad00087f0e33a5c41034197ac77f252d7f017fcc05ffa7
SIZE (xpi/firefox-24.6.0/mk.xpi) = 376316
SHA256 (xpi/firefox-24.6.0/ml.xpi) = 249eb01d034c804d95650a7499a24076f069772652f5c4308d9a52469d4d35b0
SIZE (xpi/firefox-24.6.0/ml.xpi) = 399677
@@ -126,9 +126,9 @@
SIZE (xpi/firefox-24.6.0/nn-NO.xpi) = 333907
SHA256 (xpi/firefox-24.6.0/nso.xpi) = 6160445fa393ed40ac6fd2bb4ce212a0624008d51598d00e7225b5e4a834feb1
SIZE (xpi/firefox-24.6.0/nso.xpi) = 336298
-SHA256 (xpi/firefox-24.6.0/or.xpi) = 2e325782f8f301b42b2c64d4af1265c53e36647bb899373531b13616c6ce8c0a
+SHA256 (xpi/firefox-24.6.0/or.xpi) = 2907e2f67266186499d845d4e5ca413e8567e619ccad58568e91ad304029910b
SIZE (xpi/firefox-24.6.0/or.xpi) = 364593
-SHA256 (xpi/firefox-24.6.0/pa-IN.xpi) = 01f2fbdd56175de781caa6c34676d22fcd5043b4b5f13e0239101c5297cc0123
+SHA256 (xpi/firefox-24.6.0/pa-IN.xpi) = 5359438a698deb45572471a959cc7dbcb60d667b99b38ca3289e52d657bb5514
SIZE (xpi/firefox-24.6.0/pa-IN.xpi) = 365653
SHA256 (xpi/firefox-24.6.0/pl.xpi) = 86d06eb9a8e3e2cc4fde9caea1fbf38245b00663d1908a8b40fe7231cd97079a
SIZE (xpi/firefox-24.6.0/pl.xpi) = 341995
@@ -144,11 +144,11 @@
SIZE (xpi/firefox-24.6.0/ru.xpi) = 322761
SHA256 (xpi/firefox-24.6.0/si.xpi) = 3066cadbd92091eda99fa2ecaee6e61db1bc50dc5ebd6ebb25a7301356369af0
SIZE (xpi/firefox-24.6.0/si.xpi) = 372982
-SHA256 (xpi/firefox-24.6.0/sk.xpi) = bf94d872d98d37d6f01b23efdb2233f8d7122ae9564a9f919fd0f69d39837994
+SHA256 (xpi/firefox-24.6.0/sk.xpi) = 8b513cb6acc9df9ae84800114bcf361a119f3f9e9c55b72ead5833fb111d9193
SIZE (xpi/firefox-24.6.0/sk.xpi) = 347879
-SHA256 (xpi/firefox-24.6.0/sl.xpi) = 8adb3783ffecf07dfdbaa94fb8a340321ae9c7f5c7cbcbd4061e8203a94a6cff
+SHA256 (xpi/firefox-24.6.0/sl.xpi) = cedb15a7b0a0b6ed54be366226634111fd8e9a547497dd7ed9196d698193cdd8
SIZE (xpi/firefox-24.6.0/sl.xpi) = 331572
-SHA256 (xpi/firefox-24.6.0/son.xpi) = af29af57337bf09f20875a73711f607d637988f81e89fefec7271fdaf18d9e9f
+SHA256 (xpi/firefox-24.6.0/son.xpi) = 34a568be2b0254416ed0ccd6f38fd56bafe6f7a048130c6b56ce107ca82cc107
SIZE (xpi/firefox-24.6.0/son.xpi) = 328899
SHA256 (xpi/firefox-24.6.0/sq.xpi) = 2aa1072eaef54d5b1d5380bce8d035e1bf56b274d32fefe6991d4182e770cae3
SIZE (xpi/firefox-24.6.0/sq.xpi) = 340677
@@ -160,7 +160,7 @@
SIZE (xpi/firefox-24.6.0/ta-LK.xpi) = 384155
SHA256 (xpi/firefox-24.6.0/ta.xpi) = 97b1cbe31e7af75cbac64746e9f7fc4d5c451a209ad9e2cdbd5c07ea720b49a1
SIZE (xpi/firefox-24.6.0/ta.xpi) = 381423
-SHA256 (xpi/firefox-24.6.0/te.xpi) = a8015733199dcf00573fd019a6b4f6b47af30688ea32718849cd89fbdc01b9f5
+SHA256 (xpi/firefox-24.6.0/te.xpi) = 3812771caa640514ebc9abd1d170402b7fdaf53a447d355bd91ae13ec7746372
SIZE (xpi/firefox-24.6.0/te.xpi) = 394563
SHA256 (xpi/firefox-24.6.0/th.xpi) = e770a1fe50998396acbf794e09f6b72f99ebf9909c118e6a8453295370215215
SIZE (xpi/firefox-24.6.0/th.xpi) = 379823
Modified: trunk/www/firefox-esr/distinfo
==============================================================================
--- trunk/www/firefox-esr/distinfo Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/www/firefox-esr/distinfo Tue Jun 10 04:47:02 2014 (r1595)
@@ -1,2 +1,2 @@
-SHA256 (firefox-24.6.0esr.source.tar.bz2) = 2906a6e3208d4b78f7fbe21c7612280e132c1eaceecaaae2ed558ae45e3f8227
-SIZE (firefox-24.6.0esr.source.tar.bz2) = 119458612
+SHA256 (firefox-24.6.0esr.source.tar.bz2) = 02ee0424ddefd912768a3ae700a4581053ef68f9dea46c34e43e833c119289e4
+SIZE (firefox-24.6.0esr.source.tar.bz2) = 119465935
Modified: trunk/www/firefox-i18n/distinfo
==============================================================================
--- trunk/www/firefox-i18n/distinfo Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/www/firefox-i18n/distinfo Tue Jun 10 04:47:02 2014 (r1595)
@@ -1,170 +1,170 @@
-SHA256 (xpi/firefox-i18n-30.0/ach.xpi) = 47e34cd9e075c1f7a77035eba1f351258936981159f332d3f4be90b7e4caeab1
+SHA256 (xpi/firefox-i18n-30.0/ach.xpi) = f5053187ef0c83bf72bd5c71ab09a7ddc1e63baefb416ac1d6b68ba2314ac701
SIZE (xpi/firefox-i18n-30.0/ach.xpi) = 375205
-SHA256 (xpi/firefox-i18n-30.0/af.xpi) = 3b7ced2da407233bf114e63e063298cb4fee09fb68b2ff5efe57ddc09c42e25a
+SHA256 (xpi/firefox-i18n-30.0/af.xpi) = 1f39dc94db67d1b0f936a21237d98c25fd452a69636e53c6d7ece6c844307c39
SIZE (xpi/firefox-i18n-30.0/af.xpi) = 369085
-SHA256 (xpi/firefox-i18n-30.0/ar.xpi) = 49ffa5b08f22c162f47e8d3e6a5fcd07fff60d0cbd816c58aad661bd013b0b39
+SHA256 (xpi/firefox-i18n-30.0/ar.xpi) = ec7beaee554067af17a3a62220b8f038f75b618a186d2eb73ec948056765c428
SIZE (xpi/firefox-i18n-30.0/ar.xpi) = 397913
-SHA256 (xpi/firefox-i18n-30.0/as.xpi) = c99667923275e7a7a40445a5826c1807649b38a4975f31a88d0f787443321f0c
+SHA256 (xpi/firefox-i18n-30.0/as.xpi) = cf9716f7b62bd6f34bb453420dec17a039199d11197c1920553ab299c496d654
SIZE (xpi/firefox-i18n-30.0/as.xpi) = 416813
-SHA256 (xpi/firefox-i18n-30.0/ast.xpi) = 334c0f5b4e0340474cbee17a44bca58536f60d5a1845da9588c398c98f4fca76
+SHA256 (xpi/firefox-i18n-30.0/ast.xpi) = fd83fe909ecb39803f0f7b43d159f34be70d2975584b4246d3625da72f8de09a
SIZE (xpi/firefox-i18n-30.0/ast.xpi) = 321937
-SHA256 (xpi/firefox-i18n-30.0/be.xpi) = 33c0821fe157952ab05cbfa67cf28dc7515d84b35d97930b5b57a7ea79f4a3d9
+SHA256 (xpi/firefox-i18n-30.0/be.xpi) = 325f8bddf7131f3e7a4a2daa8c632848ade0557bdfe8f8591898c9266ea6349f
SIZE (xpi/firefox-i18n-30.0/be.xpi) = 341619
-SHA256 (xpi/firefox-i18n-30.0/bg.xpi) = cb9f8033364d0558940144b6ee2d8032ab1e5ff7600885519567908255e3c965
+SHA256 (xpi/firefox-i18n-30.0/bg.xpi) = b0603d804c90164d3059b86036e67d3f12491c5b698e51ac03f57c909effc2e6
SIZE (xpi/firefox-i18n-30.0/bg.xpi) = 406716
-SHA256 (xpi/firefox-i18n-30.0/bn-BD.xpi) = 6c72610a34f914bf79584a314284a0ad46f5859aa856b2ebb053aec233e6f0b2
+SHA256 (xpi/firefox-i18n-30.0/bn-BD.xpi) = 3e044ca099473c577e8849605d3341ab51bafc939e79713da7cb85193b29be77
SIZE (xpi/firefox-i18n-30.0/bn-BD.xpi) = 428542
-SHA256 (xpi/firefox-i18n-30.0/bn-IN.xpi) = eb4b2d1290369a1f85d91485b6444d7715c61935e6b7bcf7b7d25549f2f800df
+SHA256 (xpi/firefox-i18n-30.0/bn-IN.xpi) = 9dcb9cff07bf636bedf835bb373fa4bc35260824d9d505c4a09fa1f0a1bf9ce4
SIZE (xpi/firefox-i18n-30.0/bn-IN.xpi) = 426490
-SHA256 (xpi/firefox-i18n-30.0/br.xpi) = a01ee9058303873ca1fdca3d7d4126fd204d4d1998dee8289905dc8e0edc6a29
+SHA256 (xpi/firefox-i18n-30.0/br.xpi) = 43c85f1d81bc421104577519cd5bee9aaa3893627fd4540cbb24b2e2275f1a6b
SIZE (xpi/firefox-i18n-30.0/br.xpi) = 365142
-SHA256 (xpi/firefox-i18n-30.0/bs.xpi) = 54b1fb3cd8682c226bd6370c20f8174a0d66b5904d0d25bc0eef5c722b8eeee3
+SHA256 (xpi/firefox-i18n-30.0/bs.xpi) = c1efd1ae60586b16e50f61d20ffaf41e836c62e7371e3f2bda8e8e45f39bcd31
SIZE (xpi/firefox-i18n-30.0/bs.xpi) = 373273
-SHA256 (xpi/firefox-i18n-30.0/ca.xpi) = 38f815f0890657c8cbdb14accc3c4359b7cce76ea18a64ce420c3f0a493d862e
+SHA256 (xpi/firefox-i18n-30.0/ca.xpi) = 5f20854d7168d20f5b595ff415ca50417a2ad5e39f7bbe0f6f67a9eaede2aaf6
SIZE (xpi/firefox-i18n-30.0/ca.xpi) = 371485
-SHA256 (xpi/firefox-i18n-30.0/cs.xpi) = fe48536fa3194f56fb4335690e21f1c6f1f2b7e03cffd6ae5f339b69da77aed6
+SHA256 (xpi/firefox-i18n-30.0/cs.xpi) = 3197bcc9e38f2b5720a0ae1aa9ed61ebcde6518e675e0ed98c8d3d0feee4d512
SIZE (xpi/firefox-i18n-30.0/cs.xpi) = 366052
-SHA256 (xpi/firefox-i18n-30.0/csb.xpi) = 843307587de0d4fa7b12053690dd8ea3d110c655ee0f4c437dd7f0edfbabb0e7
+SHA256 (xpi/firefox-i18n-30.0/csb.xpi) = 989e01fbdf3516295429d3da58331078c9e41ba79ae31e24f34d9c828fbd9944
SIZE (xpi/firefox-i18n-30.0/csb.xpi) = 358268
-SHA256 (xpi/firefox-i18n-30.0/cy.xpi) = ed67e6a2ff6453c56c06b7ab286632ee5a13ee721474f5021dd36b7d3287fc67
+SHA256 (xpi/firefox-i18n-30.0/cy.xpi) = b2327cac42ebd5880653f7ed02835b3a0b85441a0d514d72518231acc32e5dea
SIZE (xpi/firefox-i18n-30.0/cy.xpi) = 366034
-SHA256 (xpi/firefox-i18n-30.0/da.xpi) = acc72728c82544933d5b5f7dcf942121e6cb19e6de3439f6b5136230636c0f8f
+SHA256 (xpi/firefox-i18n-30.0/da.xpi) = 2a0b1447de518bd3c714dd0fa023ae0f3189d98b6035eeb8e2f87f1a37bf4c1f
SIZE (xpi/firefox-i18n-30.0/da.xpi) = 356771
-SHA256 (xpi/firefox-i18n-30.0/de.xpi) = 107210ab3c854a9a859cad71bc2dd034ef85699d3a275c7f80c82794fc6e9457
+SHA256 (xpi/firefox-i18n-30.0/de.xpi) = fefa0eee68d3cae832e9afee0a64271b7dd621c0d14479eec472c28a8bb55f25
SIZE (xpi/firefox-i18n-30.0/de.xpi) = 366021
-SHA256 (xpi/firefox-i18n-30.0/el.xpi) = 42a600ba7cf423906033f634839f5661862283828d8a5012e5a7ec748737cb5f
+SHA256 (xpi/firefox-i18n-30.0/el.xpi) = b70382f47ff0e0999d4b9ff13e13eabee4ac6771ce1d3560b7fbfd1e6452b76b
SIZE (xpi/firefox-i18n-30.0/el.xpi) = 398962
-SHA256 (xpi/firefox-i18n-30.0/en-GB.xpi) = 70eef15dc4ccbbbf4994a5883eb00c9ee3ac2447425bf7a061883f1eb26eed71
+SHA256 (xpi/firefox-i18n-30.0/en-GB.xpi) = 4fae63b6e5236ef8f21e411165aa1919bb285fe0bb3905d7daf00c6a3cccd480
SIZE (xpi/firefox-i18n-30.0/en-GB.xpi) = 353587
-SHA256 (xpi/firefox-i18n-30.0/en-US.xpi) = 8f4b534bedab87b55053b6a03685402732704acd2f895195c1fcaf86cbb55c99
+SHA256 (xpi/firefox-i18n-30.0/en-US.xpi) = 73879a12023d35214a85cff0d722652f669dba1e62631e815e7b850dfb403e69
SIZE (xpi/firefox-i18n-30.0/en-US.xpi) = 353451
-SHA256 (xpi/firefox-i18n-30.0/en-ZA.xpi) = 8517a1ee8c1ecb1d649dd2f9150a5816357af68cc833a3ea7570fad3a68827d4
+SHA256 (xpi/firefox-i18n-30.0/en-ZA.xpi) = 9750f4362f8304c5665153d008ae3b158249a7cba5bd3a79cef7e822959c4bef
SIZE (xpi/firefox-i18n-30.0/en-ZA.xpi) = 345015
-SHA256 (xpi/firefox-i18n-30.0/eo.xpi) = fd486844247947e630537719697b97471be58a4e1625f8b81fa59dd72e325d1f
+SHA256 (xpi/firefox-i18n-30.0/eo.xpi) = 0f77949f980f8037484f5a3ce2669d732f036772ccecfcb16ced1decc53a9f1b
SIZE (xpi/firefox-i18n-30.0/eo.xpi) = 370141
-SHA256 (xpi/firefox-i18n-30.0/es-AR.xpi) = 8dcb5c89693c283c676c431784e7c33c8a4ae345b6693af59b67b8a49e05e395
+SHA256 (xpi/firefox-i18n-30.0/es-AR.xpi) = 263d318d53cd9e64c0a3f4122fa399f4fcbf528c7151dce352f4084e1784f2cd
SIZE (xpi/firefox-i18n-30.0/es-AR.xpi) = 368587
-SHA256 (xpi/firefox-i18n-30.0/es-CL.xpi) = 3c6cde7eead9aa65182e8663e7cb0316d0003c685a781710b6ae651d84977994
+SHA256 (xpi/firefox-i18n-30.0/es-CL.xpi) = 7bfbb5aa80e61082736383b01190d97c3b066f97c79cef479c97322695267f7f
SIZE (xpi/firefox-i18n-30.0/es-CL.xpi) = 315322
-SHA256 (xpi/firefox-i18n-30.0/es-ES.xpi) = 11d95fa9035dc5c05dd236564f2bf7db011b6fd236f2ab5f5e6ede560fb4588d
+SHA256 (xpi/firefox-i18n-30.0/es-ES.xpi) = a42b61243fc1596f5352daf6bf27ecf27c0eb70d960bfcfb401c7dc9b22b0bad
SIZE (xpi/firefox-i18n-30.0/es-ES.xpi) = 306415
-SHA256 (xpi/firefox-i18n-30.0/es-MX.xpi) = ef6dfe62f404254e5291d4c41b0855739d7a801e0ff193de941663461e48b53d
+SHA256 (xpi/firefox-i18n-30.0/es-MX.xpi) = 077a9c0741e8c6dfe560c11503700713fa46c31f26436d7ab482ccda93a9b6bb
SIZE (xpi/firefox-i18n-30.0/es-MX.xpi) = 373549
-SHA256 (xpi/firefox-i18n-30.0/et.xpi) = eaa836e2fe0048561e594476884459a0aeb56518893235013e8796949f006c2b
+SHA256 (xpi/firefox-i18n-30.0/et.xpi) = b3405694ba783f2b4724ee77438d43c5bb9fa9c99b062179da83359b75def75e
SIZE (xpi/firefox-i18n-30.0/et.xpi) = 353707
-SHA256 (xpi/firefox-i18n-30.0/eu.xpi) = 050e0e11b5b2bd8207c34179a8a92322aa425f04f5ebc295932a6c7b9ed115be
+SHA256 (xpi/firefox-i18n-30.0/eu.xpi) = 470e1e96f57a1d34b657446a226305729ac9e4cfee102eba603c252c9a176596
SIZE (xpi/firefox-i18n-30.0/eu.xpi) = 369555
-SHA256 (xpi/firefox-i18n-30.0/fa.xpi) = 9f6eec5cd4f3b652758252c77ab965991fe5548754826213cfe503a70382a503
+SHA256 (xpi/firefox-i18n-30.0/fa.xpi) = 72aee9607616834fb9bf7fa3dda0fd468d2bdcc973cdfa6ba49debe05a35f90c
SIZE (xpi/firefox-i18n-30.0/fa.xpi) = 410903
-SHA256 (xpi/firefox-i18n-30.0/ff.xpi) = 65b54a0af5b4f57a599e92489f3f6ec331e19d5291edf866293ceefd33ec1fe5
+SHA256 (xpi/firefox-i18n-30.0/ff.xpi) = b261a6ddcd9b077df4e89603ffcb6fe6568c5a2125fc6a8750bbc61994d59a2d
SIZE (xpi/firefox-i18n-30.0/ff.xpi) = 370692
-SHA256 (xpi/firefox-i18n-30.0/fi.xpi) = 89011ad5e6793e4e62a4856562ea0a8e6ba94a44b47faa619be0c6d26a8548ca
+SHA256 (xpi/firefox-i18n-30.0/fi.xpi) = e99f6bce22b9e7ce27233d37d1d5c5e465d5737118c2cacfee132aae88de1891
SIZE (xpi/firefox-i18n-30.0/fi.xpi) = 364259
-SHA256 (xpi/firefox-i18n-30.0/fr.xpi) = 603c778d816259cc4c17035da6c00c10616fc90e7fe96262b6d5b1ca94f054e0
+SHA256 (xpi/firefox-i18n-30.0/fr.xpi) = cde387fb6d2ac70793a387b79b1193f1578d4e09b7e1b551edcda0176c853981
SIZE (xpi/firefox-i18n-30.0/fr.xpi) = 377371
-SHA256 (xpi/firefox-i18n-30.0/fy-NL.xpi) = 8be25e694b0a4e6a31025aaa4834363df4020aa7e083586c0b5ca2a674d95272
+SHA256 (xpi/firefox-i18n-30.0/fy-NL.xpi) = 298865967f4c80a3521c01a4e22e9c7cdda1edbb85755f4e9fc69fcfe73e8e8a
SIZE (xpi/firefox-i18n-30.0/fy-NL.xpi) = 373136
-SHA256 (xpi/firefox-i18n-30.0/ga-IE.xpi) = 315a77aef696451a54d62829c6355599bbaa34c38ea61552211a988195d999d3
+SHA256 (xpi/firefox-i18n-30.0/ga-IE.xpi) = 8351b8f50482fc719081dca1cd848aaed271c15922b8e2939ef335c4eb62ffb7
SIZE (xpi/firefox-i18n-30.0/ga-IE.xpi) = 381256
-SHA256 (xpi/firefox-i18n-30.0/gd.xpi) = ee1e5ae4620e5101614620727bdf04efb21ed82102c75974d463cc84af1cf301
+SHA256 (xpi/firefox-i18n-30.0/gd.xpi) = 24efa269698b83eeab9ed138ff0c239fd53e0c8c89e07864ce0c1017e586b947
SIZE (xpi/firefox-i18n-30.0/gd.xpi) = 378207
-SHA256 (xpi/firefox-i18n-30.0/gl.xpi) = f5763a285c3d9459ac3362f6ee539b51b6f9c8a681aa42a16509c310a3b3ab29
+SHA256 (xpi/firefox-i18n-30.0/gl.xpi) = 860b3cbe4fa38ed7607ec6416286a1210d27a63ef48d3c3dcd25d45e0fda9569
SIZE (xpi/firefox-i18n-30.0/gl.xpi) = 365569
-SHA256 (xpi/firefox-i18n-30.0/gu-IN.xpi) = b3abc3608bc64d3ae251d2cb84b2064fda8da91ef4d872f22ddb138f02bf36ed
+SHA256 (xpi/firefox-i18n-30.0/gu-IN.xpi) = 3d5e6dc2b975001df42725dabbdb513999438a75427284dd9b3235ea6b46d3ae
SIZE (xpi/firefox-i18n-30.0/gu-IN.xpi) = 394097
-SHA256 (xpi/firefox-i18n-30.0/he.xpi) = 7736dd218def7257e4a3337c1ae697229aff465381d5ebda135d36d942f090c1
+SHA256 (xpi/firefox-i18n-30.0/he.xpi) = 43ad9bb68e7f2f9c7934ec411725e5b9883f8ebabad5f7e716b6e39b420e3a45
SIZE (xpi/firefox-i18n-30.0/he.xpi) = 387621
-SHA256 (xpi/firefox-i18n-30.0/hi-IN.xpi) = 0598a2a405d7a9f2a06169264a021c2601b7b7802119c8dd6c47afd86c32731f
+SHA256 (xpi/firefox-i18n-30.0/hi-IN.xpi) = 053751b323b6faeef472833b24494ddbe018bd9cd917b19e096184972bb4d19a
SIZE (xpi/firefox-i18n-30.0/hi-IN.xpi) = 412281
-SHA256 (xpi/firefox-i18n-30.0/hr.xpi) = ed139ae2027db0cc0f4158b44633b14eceaf2d3bdf902d4a542df64ab64d3766
+SHA256 (xpi/firefox-i18n-30.0/hr.xpi) = 9ffdb635b3ed103ab3f434d8472f4d66fabc29326d8dd53431b854e6c7a92ad6
SIZE (xpi/firefox-i18n-30.0/hr.xpi) = 377103
-SHA256 (xpi/firefox-i18n-30.0/hu.xpi) = e8188e2b59cc6b3a50760badce88b120436293535d9c0917f97e8e52f384cbdc
+SHA256 (xpi/firefox-i18n-30.0/hu.xpi) = 4eac70ba043bcc51a23beb322ef1cc55267b8d6eec339bc2479c38238c4cc706
SIZE (xpi/firefox-i18n-30.0/hu.xpi) = 373672
-SHA256 (xpi/firefox-i18n-30.0/hy-AM.xpi) = 6b5d7da6877c1512047805a45a07d534d1529d20e3f56506236e681fe6ed9ca7
+SHA256 (xpi/firefox-i18n-30.0/hy-AM.xpi) = 1584743623016ef2c922b3d1d861880e1c2ba8864836089ed173d37bb0f59a78
SIZE (xpi/firefox-i18n-30.0/hy-AM.xpi) = 420567
-SHA256 (xpi/firefox-i18n-30.0/id.xpi) = 95cfe3974247357a524978fbd9f403a3135fe3e17ea6580a2e9cfda2f30a1d73
+SHA256 (xpi/firefox-i18n-30.0/id.xpi) = 6b9331cab4a2ebc9b23d44ba02c5f8262cec1733e22f80eaba2b194dffa34521
SIZE (xpi/firefox-i18n-30.0/id.xpi) = 353458
-SHA256 (xpi/firefox-i18n-30.0/is.xpi) = 962f2adf098c3d9c4de63f26c3aa997d4fa233a59af148f25eead663eb598d90
+SHA256 (xpi/firefox-i18n-30.0/is.xpi) = 58112df3ea4cc57b99d002f19ac1bf414b17b6c1d1941c7b5806f0f524fc8b9f
SIZE (xpi/firefox-i18n-30.0/is.xpi) = 365850
-SHA256 (xpi/firefox-i18n-30.0/it.xpi) = 0f9c274c202e133a14202071b7ca8eabe32f87be46d1e08a4d6260c58b0580de
+SHA256 (xpi/firefox-i18n-30.0/it.xpi) = d84b4cf65fbd1a23c2683346887da15334f48c64381998aa7d5422e303b0656e
SIZE (xpi/firefox-i18n-30.0/it.xpi) = 304978
-SHA256 (xpi/firefox-i18n-30.0/ja.xpi) = 91c2d1670254b47868df3918a23344373eca55b7eb54f3094fc45a15a90caf23
+SHA256 (xpi/firefox-i18n-30.0/ja.xpi) = 94e0b3d7535ca00cb7229cd7c20fd0760b51bec25f0ccd93e3a1797a8ae94c7a
SIZE (xpi/firefox-i18n-30.0/ja.xpi) = 405379
-SHA256 (xpi/firefox-i18n-30.0/kk.xpi) = f0c1a36890721095cc5237fdad1972903f79bfaedd4f46139d50a4ce67f32fd2
+SHA256 (xpi/firefox-i18n-30.0/kk.xpi) = 87a73e136e2ebfebc5cbd92d7b20e16a065eef04df9b6050afd29de83e1a6785
SIZE (xpi/firefox-i18n-30.0/kk.xpi) = 409876
-SHA256 (xpi/firefox-i18n-30.0/km.xpi) = ae6f9f502fd46b5f1508bb14955e5a4196c7a3a48281ed3a040171cac497c510
+SHA256 (xpi/firefox-i18n-30.0/km.xpi) = 0979630969fa1c4c40ef5ea4e2a17df39e452cade2d0ccdda10d55b756ec5c70
SIZE (xpi/firefox-i18n-30.0/km.xpi) = 440407
-SHA256 (xpi/firefox-i18n-30.0/kn.xpi) = 271f959f38bccefe14baa188c1099af27b58f45c7e5a54492408a0861f458b33
+SHA256 (xpi/firefox-i18n-30.0/kn.xpi) = feace52a5744fd754b807c84eac24319224781de30ccd295ba8442fb724620de
SIZE (xpi/firefox-i18n-30.0/kn.xpi) = 423620
-SHA256 (xpi/firefox-i18n-30.0/ko.xpi) = 730465c980dc7d5721ac6d5cc6dfece89d429dee74de4bde39fa1c002f0a7503
+SHA256 (xpi/firefox-i18n-30.0/ko.xpi) = 2e49e1e6cffb892ea14089a6b49bdfa21de49fc60eb4c13cfe13cf613792d4b4
SIZE (xpi/firefox-i18n-30.0/ko.xpi) = 374829
-SHA256 (xpi/firefox-i18n-30.0/ku.xpi) = 5b48283348037c21060097dcdcde29ede0b9fa4f21d41b8996d3a3a9dba3f232
+SHA256 (xpi/firefox-i18n-30.0/ku.xpi) = 06e1c16dcd80db781fc734ecb41445e07f5fb3a4ae895c71a50fe7dc409ddc8b
SIZE (xpi/firefox-i18n-30.0/ku.xpi) = 379930
-SHA256 (xpi/firefox-i18n-30.0/lij.xpi) = aa554cf1b2293c0e58a8fe57913f065f528fb53bdfebd2e021347c7524a0835f
+SHA256 (xpi/firefox-i18n-30.0/lij.xpi) = 86e1b4ba7acef11d4bbb211679bf8f810e8bdf466cc22aa670cda79fad2055e7
SIZE (xpi/firefox-i18n-30.0/lij.xpi) = 356150
-SHA256 (xpi/firefox-i18n-30.0/lt.xpi) = 5db4c35ace7a845a2d89270a865a1878e441af268d67e061f677a463af8173d1
+SHA256 (xpi/firefox-i18n-30.0/lt.xpi) = d51545cfec7b8b26724f73e80cc8f9db1b1ba502b6668f01983013a69362fbd1
SIZE (xpi/firefox-i18n-30.0/lt.xpi) = 383890
-SHA256 (xpi/firefox-i18n-30.0/lv.xpi) = d807ffce2cf181da376290f3cccf85085f65eea17050a6c296fb572154813033
+SHA256 (xpi/firefox-i18n-30.0/lv.xpi) = 0d51417b425a2136d33701bda3eb4f510f8db4e8e3a47f59ac9438771eced133
SIZE (xpi/firefox-i18n-30.0/lv.xpi) = 359059
-SHA256 (xpi/firefox-i18n-30.0/mai.xpi) = e668335fded4dcd8f846b463eccf5d0337fa080c344369268aaa19bc0a705f2c
+SHA256 (xpi/firefox-i18n-30.0/mai.xpi) = a2f3563cfb10731fd7a20e2d3817daeb6273d46e7f610786719274fa4c9de053
SIZE (xpi/firefox-i18n-30.0/mai.xpi) = 412127
-SHA256 (xpi/firefox-i18n-30.0/mk.xpi) = fdd89d00526723541ea7860cb1a075c9c3f75d6323cafb0f8620c6fb99aa2111
+SHA256 (xpi/firefox-i18n-30.0/mk.xpi) = 8c123ce0d0829adc001fb01714303733e21cade4287a388ed0a5195a89918504
SIZE (xpi/firefox-i18n-30.0/mk.xpi) = 413366
-SHA256 (xpi/firefox-i18n-30.0/ml.xpi) = 7da44b1dea69fc59bd123bb089778038d92b2e12b9151766b12b61bd768ace34
+SHA256 (xpi/firefox-i18n-30.0/ml.xpi) = 8d877768025f6138a880f2d921d4386181b737a423a35367063794b608728f56
SIZE (xpi/firefox-i18n-30.0/ml.xpi) = 432785
-SHA256 (xpi/firefox-i18n-30.0/mr.xpi) = 1c9ab23df1e0aac51a538c7d2ceb05d6241968e76b11566cbe4de2a4c289ae6d
+SHA256 (xpi/firefox-i18n-30.0/mr.xpi) = 5e72c1a4722333b9aad812e172b781bea624d8a0ec0aeec5b52f5729e2df3da7
SIZE (xpi/firefox-i18n-30.0/mr.xpi) = 410579
-SHA256 (xpi/firefox-i18n-30.0/nb-NO.xpi) = 055a601c44cf29722874cb2e18077f2601deedfda88b11324ac7d672a64839a7
+SHA256 (xpi/firefox-i18n-30.0/nb-NO.xpi) = 6e8dbff214a16125ff907669b269b7b2e0b3a83de4cff6a2fe39ebd38f59f49d
SIZE (xpi/firefox-i18n-30.0/nb-NO.xpi) = 363801
-SHA256 (xpi/firefox-i18n-30.0/nl.xpi) = 22af91ecd50c5de022843eebf9fdcdc3a02711e01adede00481a075a554ecb5a
+SHA256 (xpi/firefox-i18n-30.0/nl.xpi) = bb2988b3089fbb3f617d5dc4da317d6bda6a16f3c812dd01d593ad0d9595d948
SIZE (xpi/firefox-i18n-30.0/nl.xpi) = 362382
-SHA256 (xpi/firefox-i18n-30.0/nn-NO.xpi) = 1e7d3297d8c418e61b9024791dfe2e12b60eff57798e58bfe9a3fa04d1bc93dd
+SHA256 (xpi/firefox-i18n-30.0/nn-NO.xpi) = e9d3e938083fdafb1010e962302e34300eb9c599b9bfe5de6daed0e85207c00b
SIZE (xpi/firefox-i18n-30.0/nn-NO.xpi) = 360851
-SHA256 (xpi/firefox-i18n-30.0/or.xpi) = e99b38e813b64ecf23f0c4b5d9ec608dce263c276e19c43441614d4d34d2d3d6
+SHA256 (xpi/firefox-i18n-30.0/or.xpi) = fdff4fb0c596aa26a1bf53aabbba9f536194616b9914b3fe31dada0377f937a5
SIZE (xpi/firefox-i18n-30.0/or.xpi) = 428965
-SHA256 (xpi/firefox-i18n-30.0/pa-IN.xpi) = c6577a566a89b0feb13f57e86dd45eb946903d004dbbaa4f577a898d82a68ef5
+SHA256 (xpi/firefox-i18n-30.0/pa-IN.xpi) = d2e5cd1c396bdfe4ebac57ca90d20dd59d7c6c31c51d92c0752adedc4dd0821a
SIZE (xpi/firefox-i18n-30.0/pa-IN.xpi) = 406759
-SHA256 (xpi/firefox-i18n-30.0/pl.xpi) = ef4771bee404fc9f6eb8fd886a8c7a7e5e16f52c4c683ecead37f4c05ff649b4
+SHA256 (xpi/firefox-i18n-30.0/pl.xpi) = 7b0fcbfbdbab445fb1be5b3e6a787a706f26ca72bfe811e2a1cf39b7d9fc6a4a
SIZE (xpi/firefox-i18n-30.0/pl.xpi) = 353581
-SHA256 (xpi/firefox-i18n-30.0/pt-BR.xpi) = e6504845ca4efb0a09cabac3b67fc99f6e7253f845b70ad877bf24a8e867585c
+SHA256 (xpi/firefox-i18n-30.0/pt-BR.xpi) = 53c41242f436d3814ffb1bea6b00d0bf9b758bd08120d9a8444d11271e8530de
SIZE (xpi/firefox-i18n-30.0/pt-BR.xpi) = 373136
-SHA256 (xpi/firefox-i18n-30.0/pt-PT.xpi) = 2fcc10d254488269e351d16d92fbc074479d09fccb3970427fb25333071cfef4
+SHA256 (xpi/firefox-i18n-30.0/pt-PT.xpi) = 9aef188d9a9f55f68db712880ce464b95be7b064b6fdc2eb2fc09953261a3996
SIZE (xpi/firefox-i18n-30.0/pt-PT.xpi) = 360707
-SHA256 (xpi/firefox-i18n-30.0/rm.xpi) = 0f8d47b0e62d0d3abdf0d0a6ca778ded2a139ac66f1c9b1916bcfced719a1d8b
+SHA256 (xpi/firefox-i18n-30.0/rm.xpi) = c6f7d1006cf56eedcfbceb25f66a1eaa957d6f40d4715ba92b74d1ca35b62b78
SIZE (xpi/firefox-i18n-30.0/rm.xpi) = 370536
-SHA256 (xpi/firefox-i18n-30.0/ro.xpi) = f3615b774ee1d2c930db19574ce7360e73f48ff9baf6d3cd121fbfd5e6b95890
+SHA256 (xpi/firefox-i18n-30.0/ro.xpi) = 9293bd081bd00590962f9c51a838f1a3304e0f1db00be0039c47e782350b16f6
SIZE (xpi/firefox-i18n-30.0/ro.xpi) = 399527
-SHA256 (xpi/firefox-i18n-30.0/ru.xpi) = cf8a88e296b00c47148c346089f1c763f639aa1dad27cad6263554fa2c3a1fa0
+SHA256 (xpi/firefox-i18n-30.0/ru.xpi) = 0fec86cfbb14f2e2962b94f81aeaa2925cb26af912dd8fbec15f71f7891c8ba8
SIZE (xpi/firefox-i18n-30.0/ru.xpi) = 345465
-SHA256 (xpi/firefox-i18n-30.0/si.xpi) = d8596c85e71eb2ceafb0626c76d0339053a65b73158489465536955e30745a63
+SHA256 (xpi/firefox-i18n-30.0/si.xpi) = fb2e952ddbbf870665450a8632b276cbb62e37dbeb29130513e3d66dab872060
SIZE (xpi/firefox-i18n-30.0/si.xpi) = 405107
-SHA256 (xpi/firefox-i18n-30.0/sk.xpi) = 25382aa305b64a689cd2029e6e1a0f8df329e85e92f2269da7122147756ac2ae
+SHA256 (xpi/firefox-i18n-30.0/sk.xpi) = 6397df9319a6df628445255085b53c14bb1a3200d9c735de15f3fe0b2d7eb2e1
SIZE (xpi/firefox-i18n-30.0/sk.xpi) = 376836
-SHA256 (xpi/firefox-i18n-30.0/sl.xpi) = 2a3de40c90347ee7e65cfa3983d5f0b33f910b67336d4eb6d8190305c45013d7
+SHA256 (xpi/firefox-i18n-30.0/sl.xpi) = 7704430faf5c7e70a37a3dd6a0e22904c9c205f34e624006e939eda68b09a64a
SIZE (xpi/firefox-i18n-30.0/sl.xpi) = 358783
-SHA256 (xpi/firefox-i18n-30.0/son.xpi) = d4b5503b4e64d0263b556e3a5578b384ae2143939cf975b33984229bc5a52224
+SHA256 (xpi/firefox-i18n-30.0/son.xpi) = 6817b48334da873f9a177c2d02456b4608cc6e97f3e1f1ff2b257f4420282e91
SIZE (xpi/firefox-i18n-30.0/son.xpi) = 360519
-SHA256 (xpi/firefox-i18n-30.0/sq.xpi) = c8f5b518f2cf8df78f60c8c0a887eb4ef009b49178d385164b528036cd114c59
+SHA256 (xpi/firefox-i18n-30.0/sq.xpi) = 8c0c9ea9c1b3a004bd95284ccaaaf33274056dcbed42e46b061f66785e115f4a
SIZE (xpi/firefox-i18n-30.0/sq.xpi) = 375451
-SHA256 (xpi/firefox-i18n-30.0/sr.xpi) = 1c7235c9d37f8ad84c2ba7593efa61cbbe4aedcb046663751da00245f56814dd
+SHA256 (xpi/firefox-i18n-30.0/sr.xpi) = 6ec3951f21f71b6623172e5d55375e6ea286fa771480bb34d57be370a6bdf027
SIZE (xpi/firefox-i18n-30.0/sr.xpi) = 414412
-SHA256 (xpi/firefox-i18n-30.0/sv-SE.xpi) = 418709b468c7e94162d500f125e103303a86204836cd2c30f015b1ce22e07c4b
+SHA256 (xpi/firefox-i18n-30.0/sv-SE.xpi) = 881d929aad2ae887652840256db032c6f82459172608faf4360981909ad64205
SIZE (xpi/firefox-i18n-30.0/sv-SE.xpi) = 369471
-SHA256 (xpi/firefox-i18n-30.0/ta.xpi) = b64cbd782473df40328686482873bb68a3742884b04f1460effaede3a06bfa26
+SHA256 (xpi/firefox-i18n-30.0/ta.xpi) = 99695ce5a90a717ce71bc0ecfd4c2a0423190e0b1ed6e0dba20f88c7cb103d13
SIZE (xpi/firefox-i18n-30.0/ta.xpi) = 421293
-SHA256 (xpi/firefox-i18n-30.0/te.xpi) = 56c722341fe3de9046de5020bb870823e9983d6be77196918b574f6b399cdeed
+SHA256 (xpi/firefox-i18n-30.0/te.xpi) = cb6895dc2722b1b896be519ed92724f691392d47fd4931978cb07b28ae272856
SIZE (xpi/firefox-i18n-30.0/te.xpi) = 431168
-SHA256 (xpi/firefox-i18n-30.0/th.xpi) = ecfef4eec9031571f3d0599cf68fd76a1492069b32ec0da53122e1f93bff72bb
+SHA256 (xpi/firefox-i18n-30.0/th.xpi) = 19b4b26bb6680d4e6d4012bd368436cf4b189bf76c20dad775a241a9e3ebfcd4
SIZE (xpi/firefox-i18n-30.0/th.xpi) = 415959
-SHA256 (xpi/firefox-i18n-30.0/tr.xpi) = 2961fbae3ecef584dea1a5ef7d1ab1877a56cd8648cb5aa8424f248146b5fe35
+SHA256 (xpi/firefox-i18n-30.0/tr.xpi) = 11c3dc80161c8381aab9ca174b6067ae72b0ef3ebcda918fb6cbb4ed9477ae8f
SIZE (xpi/firefox-i18n-30.0/tr.xpi) = 370698
-SHA256 (xpi/firefox-i18n-30.0/uk.xpi) = 63657f11cbe5fe7221efe21d0b0f51f9156e741662212f28f2464eeba582acce
+SHA256 (xpi/firefox-i18n-30.0/uk.xpi) = ec8f6faf6c271f7fa7c06113134cb7f8c5e77466cfe1f337e1a875614ba6a950
SIZE (xpi/firefox-i18n-30.0/uk.xpi) = 401695
-SHA256 (xpi/firefox-i18n-30.0/vi.xpi) = 960bda70dee5411c4a78f7ecd30437cbdcdbaae92d35bae658a2a5b6183a8b2f
+SHA256 (xpi/firefox-i18n-30.0/vi.xpi) = 26be5d152903c759092fa998806dd06aff400aa240f994cf043676b2c9f01f32
SIZE (xpi/firefox-i18n-30.0/vi.xpi) = 388346
-SHA256 (xpi/firefox-i18n-30.0/zh-CN.xpi) = 8166e709c14edf5e004b06c987f286ec3aeed56c2478d708273acbd15a2145c2
+SHA256 (xpi/firefox-i18n-30.0/zh-CN.xpi) = 6c145b57901063e2edde3d9fed91e5fa6fee9eba6a2b1d6ae539c47b7ecd1d40
SIZE (xpi/firefox-i18n-30.0/zh-CN.xpi) = 390679
-SHA256 (xpi/firefox-i18n-30.0/zh-TW.xpi) = 9a93d2f314b7f2a85eb30b82c6f6617797e6602b14ce84d7a3a696a29d5ea3aa
+SHA256 (xpi/firefox-i18n-30.0/zh-TW.xpi) = f9adbf394304da88af89a100840f08a15cc5cdd1dfe0604f3748d360beacac3e
SIZE (xpi/firefox-i18n-30.0/zh-TW.xpi) = 387316
-SHA256 (xpi/firefox-i18n-30.0/zu.xpi) = 3f827393f29405a85478882eb414f76790877b9fee5484811635792ef7798bdc
+SHA256 (xpi/firefox-i18n-30.0/zu.xpi) = 2f1d7b072fe28cebd49de1ca825db5cad33be27290c183df772a27426cad60af
SIZE (xpi/firefox-i18n-30.0/zu.xpi) = 375213
Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/www/firefox-nightly/Makefile Tue Jun 10 04:47:02 2014 (r1595)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= firefox
-PORTVERSION= 32.0.${HGREV:C/:.*//}
+PORTVERSION= 33.0.${HGREV:C/:.*//}
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= https://hg.mozilla.org/integration/mozilla-inbound/archive/
@@ -125,15 +125,10 @@
${MAKE_ENV} ${PYTHON_CMD} ${MOZSRC}/mach build
.endif
-port-pre-install:
- ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF}
- ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLISTF}
-
post-install:
- ${MKDIR} ${PREFIX}/share/pixmaps
- ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/
- ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON}
- @${CAT} ${PKGMESSAGE}
+ ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
+ ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${STAGEDIR}${PREFIX}/share/applications/
+ ${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
update: fetch-depends
@${FETCH_ENV} ${FETCH_CMD} -qo- ${MASTER_SITES:M*hg*:S/archive/rev/}/tip \
Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/www/firefox-nightly/Makefile.hgrev Tue Jun 10 04:47:02 2014 (r1595)
@@ -1 +1 @@
-HGREV= 186468:4b3198fb55a0
+HGREV= 187791:4d0a7ec4a19b
Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/www/firefox-nightly/distinfo Tue Jun 10 04:47:02 2014 (r1595)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/4b3198fb55a0.tar.bz2) = 5a8e56f81a9c7a29d1a736c87efcd90ad4f6c43d998cd83c1b41df5ccbce95b1
-SIZE (firefox-nightly/4b3198fb55a0.tar.bz2) = 147208977
+SHA256 (firefox-nightly/4d0a7ec4a19b.tar.bz2) = d821d3239129e5e9d9ba5c22b9a16c4afdbd3abcabc6e37608215cae9f752001
+SIZE (firefox-nightly/4d0a7ec4a19b.tar.bz2) = 147660604
Added: trunk/www/firefox-nightly/files/patch-bug1023028
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-bug1023028 Tue Jun 10 04:47:02 2014 (r1595)
@@ -0,0 +1,88 @@
+diff --git configure.in configure.in
+index 41aebf5..c2dfac7 100644
+--- configure.in
++++ configure.in
+@@ -1302,6 +1302,9 @@ dnl ========================================================
+ dnl GNU specific defaults
+ dnl ========================================================
+ if test "$GNU_CC"; then
++ MMX_FLAGS="-mmmx"
++ SSE_FLAGS="-msse"
++ SSE2_FLAGS="-msse2"
+ # Per bug 719659 comment 2, some of the headers on ancient build machines
+ # may require gnu89 inline semantics. But otherwise, we use C99.
+ # But on OS X we just use C99 plus GNU extensions, in order to fix
+@@ -1915,10 +1918,6 @@ case "$target" in
+ fi
+ TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
+
+- MMX_FLAGS="-mmmx"
+- SSE_FLAGS="-msse"
+- SSE2_FLAGS="-msse2"
+-
+ if test "x$lto_is_enabled" = "xyes"; then
+ echo "Skipping -dead_strip because lto is enabled."
+ dnl DTrace and -dead_strip don't interact well. See bug 403132.
+@@ -2010,10 +2009,6 @@ ia64*-hpux*)
+ fi
+ TARGET_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
+
+- MMX_FLAGS="-mmmx"
+- SSE_FLAGS="-msse"
+- SSE2_FLAGS="-msse2"
+-
+ MOZ_GFX_OPTIMIZE_MOBILE=1
+ MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-reorder-functions"
+ ;;
+@@ -2035,10 +2030,6 @@ ia64*-hpux*)
+ MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks $MOZ_OPTIMIZE_SIZE_TWEAK"
+ fi
+
+- MMX_FLAGS="-mmmx"
+- SSE_FLAGS="-msse"
+- SSE2_FLAGS="-msse2"
+-
+ TARGET_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
+
+ MOZ_MEMORY=1
+@@ -2084,10 +2075,6 @@ ia64*-hpux*)
+ DLL_PREFIX=
+ IMPORT_LIB_SUFFIX=dll.a
+
+- MMX_FLAGS="-mmmx"
+- SSE_FLAGS="-msse"
+- SSE2_FLAGS="-msse2"
+-
+ # We use mix of both POSIX and Win32 printf format across the tree, so format
+ # warnings are useless on mingw.
+ MOZ_C_SUPPORTS_WARNING(-Wno-, format, ac_c_has_wno_format)
+@@ -2297,9 +2284,6 @@ ia64*-hpux*)
+ fi
+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(notdir $@) -o $@'
+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(notdir $@)) -o $@'
+- MMX_FLAGS="-mmmx"
+- SSE_FLAGS="-msse"
+- SSE2_FLAGS="-msse2"
+ ;;
+
+ *-openbsd*)
+@@ -2315,9 +2299,6 @@ ia64*-hpux*)
+ if test "$LIBRUNPATH"; then
+ DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
+ fi
+- MMX_FLAGS="-mmmx"
+- SSE_FLAGS="-msse"
+- SSE2_FLAGS="-msse2"
+ ;;
+
+ *-solaris*)
+@@ -2399,9 +2380,6 @@ ia64*-hpux*)
+ if test "$OS_RELEASE" = "5.3"; then
+ AC_DEFINE(MUST_UNDEF_HAVE_BOOLEAN_AFTER_INCLUDES)
+ fi
+- MMX_FLAGS="-mmmx"
+- SSE_FLAGS="-msse"
+- SSE2_FLAGS="-msse2"
+ fi
+ if test "$OS_RELEASE" = "5.5.1"; then
+ AC_DEFINE(NEED_USLEEP_PROTOTYPE)
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/www/firefox/Makefile Tue Jun 10 04:47:02 2014 (r1595)
@@ -6,7 +6,7 @@
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
- https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/
+ https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source/
DISTNAME= ${PORTNAME}-${DISTVERSION}.source
MAINTAINER= gecko@FreeBSD.org
Modified: trunk/www/firefox/distinfo
==============================================================================
--- trunk/www/firefox/distinfo Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/www/firefox/distinfo Tue Jun 10 04:47:02 2014 (r1595)
@@ -1,2 +1,2 @@
-SHA256 (firefox-30.0.source.tar.bz2) = bf5b43f85a7749da1272baa6414eb031a4b8cca5868fc9544f81339c96d2f53e
-SIZE (firefox-30.0.source.tar.bz2) = 143183203
+SHA256 (firefox-30.0.source.tar.bz2) = 1e95740a8cf7095e210fb6a2313c4d0fba4fdf44ee7c327d01f202638403c22c
+SIZE (firefox-30.0.source.tar.bz2) = 143171952
Modified: trunk/www/libxul/Makefile
==============================================================================
--- trunk/www/libxul/Makefile Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/www/libxul/Makefile Tue Jun 10 04:47:02 2014 (r1595)
@@ -2,7 +2,7 @@
# $FreeBSD: head/www/libxul/Makefile 339634 2014-01-13 21:00:02Z rene $
PORTNAME= libxul
-DISTVERSION= 24.5.0
+DISTVERSION= 24.6.0
CATEGORIES?= www devel
MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \
https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${DISTVERSION}esr-candidates/build1/source/
Modified: trunk/www/libxul/distinfo
==============================================================================
--- trunk/www/libxul/distinfo Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/www/libxul/distinfo Tue Jun 10 04:47:02 2014 (r1595)
@@ -1,2 +1,2 @@
-SHA256 (firefox-24.5.0esr.source.tar.bz2) = 1670e72511cad6047eb8726fa6c2362adcb95b5d53a3c327c4c38bed4b788701
-SIZE (firefox-24.5.0esr.source.tar.bz2) = 119830718
+SHA256 (firefox-24.6.0esr.source.tar.bz2) = 02ee0424ddefd912768a3ae700a4581053ef68f9dea46c34e43e833c119289e4
+SIZE (firefox-24.6.0esr.source.tar.bz2) = 119465935
Modified: trunk/www/linux-firefox/distinfo
==============================================================================
--- trunk/www/linux-firefox/distinfo Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/www/linux-firefox/distinfo Tue Jun 10 04:47:02 2014 (r1595)
@@ -1,5 +1,5 @@
-SHA256 (firefox-30.0.tar.bz2) = ecf6988f22cec736ee218577207a84772f8362a911c1376368f29de6214c7d09
-SIZE (firefox-30.0.tar.bz2) = 37330295
+SHA256 (firefox-30.0.tar.bz2) = 4bca44a1ba94bf5616f7ea650e37cd3e5a719546def9e4a08ee88aedbc3a4db6
+SIZE (firefox-30.0.tar.bz2) = 37350490
SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99
SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908
SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b
Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/www/seamonkey/Makefile Tue Jun 10 04:47:02 2014 (r1595)
@@ -2,7 +2,7 @@
# $FreeBSD: head/www/seamonkey/Makefile 339634 2014-01-13 21:00:02Z rene $
PORTNAME= seamonkey
-DISTVERSION= 2.26
+DISTVERSION= 2.27b1
CATEGORIES?= www mail news editors irc ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/
@@ -20,7 +20,7 @@
libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \
opus>=1.1:${PORTSDIR}/audio/opus \
libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
- sqlite3>=3.8.2:${PORTSDIR}/databases/sqlite3 \
+ sqlite3>=3.8.3.1:${PORTSDIR}/databases/sqlite3 \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
zip:${PORTSDIR}/archivers/zip \
@@ -30,7 +30,7 @@
LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l
EM_VERSION= 1.6.1_pre20140112
-L_VERSION= 3.1
+L_VERSION= 3.2
SSP_UNSAFE= yes
USE_AUTOTOOLS= autoconf213:env
@@ -38,7 +38,7 @@
OBJDIR_BUILD= # in-tree build broken after bug 789837
USE_GECKO= gecko
WANT_GNOME= yes
-USE_QT4= # empty
+USE_QT5= # empty
QT_NONSTANDARD= yes
WANT_PERL= yes
ALL_TARGET= default
@@ -78,7 +78,7 @@
.include <bsd.port.pre.mk>
-WRKSRC= ${WRKDIR}/comm-release
+WRKSRC= ${WRKDIR}/comm-beta
MOZSRC:= ${WRKSRC}/mozilla
XPI_LIBDIR= ${PREFIX}/lib/xpi
Deleted: trunk/www/seamonkey/files/patch-bug806917
==============================================================================
--- trunk/www/seamonkey/files/patch-bug806917 Tue Jun 10 04:47:02 2014 (r1594)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,1999 +0,0 @@
-commit cb40a26
-Author: Alessandro Decina <alessandro.d@gmail.com>
-Date: Fri Jan 03 08:16:54 2014 -0800
-
- Bug 806917 - support GStreamer 1.0
----
- configure.in | 66 ++-
- content/media/gstreamer/GStreamerAllocator.cpp | 197 +++++++
- content/media/gstreamer/GStreamerAllocator.h | 25 +
- content/media/gstreamer/GStreamerFormatHelper.cpp | 13 +-
- content/media/gstreamer/GStreamerFunctionList.h | 93 +++-
- content/media/gstreamer/GStreamerLoader.cpp | 48 +-
- content/media/gstreamer/GStreamerLoader.h | 8 +
- content/media/gstreamer/GStreamerReader-0.10.cpp | 200 +++++++
- content/media/gstreamer/GStreamerReader.cpp | 632 ++++++++++++++--------
- content/media/gstreamer/GStreamerReader.h | 42 +-
- content/media/gstreamer/moz.build | 11 +-
- content/media/test/manifest.js | 6 +-
- 12 files changed, 1057 insertions(+), 284 deletions(-)
-
-diff --git configure.in configure.in
-index 9776b8d..0b1698d 100644
---- mozilla/configure.in
-+++ mozilla/configure.in
-@@ -3988,6 +3988,7 @@ MOZ_SAMPLE_TYPE_FLOAT32=
- MOZ_SAMPLE_TYPE_S16=
- MOZ_OPUS=1
- MOZ_WEBM=1
-+MOZ_GSTREAMER=
- MOZ_DIRECTSHOW=
- MOZ_WMF=
- MOZ_FMP4=
-@@ -5634,44 +5635,61 @@ WINNT|Darwin|Android)
- ;;
- *)
- MOZ_GSTREAMER=1
-+ GST_API_VERSION=0.10
- ;;
- esac
-
--MOZ_ARG_ENABLE_BOOL(gstreamer,
--[ --enable-gstreamer Enable GStreamer support],
--MOZ_GSTREAMER=1,
--MOZ_GSTREAMER=)
--
--if test "$MOZ_GSTREAMER"; then
-- # API version, eg 0.10, 1.0 etc
-+MOZ_ARG_ENABLE_STRING(gstreamer,
-+[ --enable-gstreamer[=0.10] Enable GStreamer support],
-+[ MOZ_GSTREAMER=1
-+ # API version, eg 0.10, 1.0 etc
-+ if test -z "$enableval" -o "$enableval" = "yes"; then
- GST_API_VERSION=0.10
-+ elif test "$enableval" = "no"; then
-+ MOZ_GSTREAMER=
-+ else
-+ GST_API_VERSION=$enableval
-+ fi],
-+)
-+
-+if test -n "$MOZ_GSTREAMER"; then
- # core/base release number
-- GST_VERSION=0.10.25
-+ if test "$GST_API_VERSION" = "1.0"; then
-+ GST_VERSION=1.0
-+ else
-+ GST_VERSION=0.10.25
-+ fi
-+
- PKG_CHECK_MODULES(GSTREAMER,
- gstreamer-$GST_API_VERSION >= $GST_VERSION
- gstreamer-app-$GST_API_VERSION
-- gstreamer-plugins-base-$GST_API_VERSION, ,
-- AC_MSG_ERROR([gstreamer and gstreamer-plugins-base development packages are needed to build gstreamer backend. Install them or disable gstreamer support with --disable-gstreamer]))
-- if test -n "$GSTREAMER_LIBS"; then
-- _SAVE_LDFLAGS=$LDFLAGS
-- LDFLAGS="$LDFLAGS $GSTREAMER_LIBS -lgstvideo-$GST_API_VERSION"
-- AC_TRY_LINK(,[return 0;],_HAVE_LIBGSTVIDEO=1,_HAVE_LIBGSTVIDEO=)
-- if test -n "$_HAVE_LIBGSTVIDEO" ; then
-- GSTREAMER_LIBS="$GSTREAMER_LIBS -lgstvideo-$GST_API_VERSION"
-- else
-- AC_MSG_ERROR([gstreamer-plugins-base found, but no libgstvideo. Something has gone terribly wrong. Try reinstalling gstreamer-plugins-base; failing that, disable the gstreamer backend with --disable-gstreamer.])
-- fi
-- LDFLAGS=$_SAVE_LDFLAGS
-+ gstreamer-plugins-base-$GST_API_VERSION,
-+ [_HAVE_GSTREAMER=1],
-+ [_HAVE_GSTREAMER=])
-+ if test -z "$_HAVE_GSTREAMER"; then
-+ AC_MSG_ERROR([gstreamer and gstreamer-plugins-base development packages are needed to build gstreamer backend. Install them or disable gstreamer support with --disable-gstreamer])
-+ fi
-+
-+ _SAVE_LDFLAGS=$LDFLAGS
-+ LDFLAGS="$LDFLAGS $GSTREAMER_LIBS -lgstvideo-$GST_API_VERSION"
-+ AC_TRY_LINK(,[return 0;],_HAVE_LIBGSTVIDEO=1,_HAVE_LIBGSTVIDEO=)
-+ if test -n "$_HAVE_LIBGSTVIDEO" ; then
-+ GSTREAMER_LIBS="$GSTREAMER_LIBS -lgstvideo-$GST_API_VERSION"
- else
-- AC_MSG_ERROR([gstreamer and gstreamer-plugins-base development packages are needed to build gstreamer backend. Install them or disable gstreamer support with --disable-gstreamer])
-+ AC_MSG_ERROR([gstreamer-plugins-base found, but no libgstvideo. Something has gone terribly wrong. Try reinstalling gstreamer-plugins-base; failing that, disable the gstreamer backend with --disable-gstreamer.])
- fi
-+ LDFLAGS=$_SAVE_LDFLAGS
-+
-+ AC_SUBST(GSTREAMER_CFLAGS)
-+ AC_SUBST(GSTREAMER_LIBS)
- fi
--AC_SUBST(GSTREAMER_CFLAGS)
--AC_SUBST(GSTREAMER_LIBS)
-+
- AC_SUBST(MOZ_GSTREAMER)
-+AC_SUBST(GST_API_VERSION)
-
- if test -n "$MOZ_GSTREAMER"; then
-- AC_DEFINE(MOZ_GSTREAMER)
-+ AC_DEFINE(MOZ_GSTREAMER)
-+ AC_DEFINE_UNQUOTED(GST_API_VERSION, "$GST_API_VERSION")
- fi
-
-
-diff --git content/media/gstreamer/GStreamerAllocator.cpp content/media/gstreamer/GStreamerAllocator.cpp
-new file mode 100644
-index 0000000..69d0385
---- /dev/null
-+++ mozilla/content/media/gstreamer/GStreamerAllocator.cpp
-@@ -0,0 +1,197 @@
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include "GStreamerAllocator.h"
-+
-+#include <gst/video/video.h>
-+#include <gst/video/gstvideometa.h>
-+
-+#include "GStreamerLoader.h"
-+
-+using namespace mozilla::layers;
-+
-+namespace mozilla {
-+
-+typedef struct
-+{
-+ GstAllocator parent;
-+ GStreamerReader *reader;
-+} MozGfxMemoryAllocator;
-+
-+typedef struct
-+{
-+ GstAllocatorClass parent;
-+} MozGfxMemoryAllocatorClass;
-+
-+typedef struct
-+{
-+ GstMemory memory;
-+ PlanarYCbCrImage* image;
-+ guint8* data;
-+} MozGfxMemory;
-+
-+typedef struct
-+{
-+ GstMeta meta;
-+} MozGfxMeta;
-+
-+typedef struct
-+{
-+ GstVideoBufferPoolClass parent_class;
-+} MozGfxBufferPoolClass;
-+
-+typedef struct
-+{
-+ GstVideoBufferPool pool;
-+} MozGfxBufferPool;
-+
-+G_DEFINE_TYPE(MozGfxMemoryAllocator, moz_gfx_memory_allocator, GST_TYPE_ALLOCATOR);
-+G_DEFINE_TYPE(MozGfxBufferPool, moz_gfx_buffer_pool, GST_TYPE_VIDEO_BUFFER_POOL);
-+
-+void
-+moz_gfx_memory_reset(MozGfxMemory *mem)
-+{
-+ if (mem->image)
-+ mem->image->Release();
-+
-+ ImageContainer* container = ((MozGfxMemoryAllocator*) mem->memory.allocator)->reader->GetImageContainer();
-+ mem->image = reinterpret_cast<PlanarYCbCrImage*>(container->CreateImage(ImageFormat::PLANAR_YCBCR).get());
-+ mem->data = mem->image->AllocateAndGetNewBuffer(mem->memory.size);
-+}
-+
-+static GstMemory*
-+moz_gfx_memory_allocator_alloc(GstAllocator* aAllocator, gsize aSize,
-+ GstAllocationParams* aParams)
-+{
-+ MozGfxMemory* mem = g_slice_new (MozGfxMemory);
-+ gsize maxsize = aSize + aParams->prefix + aParams->padding;
-+ gst_memory_init(GST_MEMORY_CAST (mem),
-+ (GstMemoryFlags)aParams->flags,
-+ aAllocator, NULL, maxsize, aParams->align,
-+ aParams->prefix, aSize);
-+ mem->image = NULL;
-+ moz_gfx_memory_reset(mem);
-+
-+ return (GstMemory *) mem;
-+}
-+
-+static void
-+moz_gfx_memory_allocator_free (GstAllocator * allocator, GstMemory * gmem)
-+{
-+ MozGfxMemory *mem = (MozGfxMemory *) gmem;
-+
-+ if (mem->memory.parent)
-+ goto sub_mem;
-+
-+ if (mem->image)
-+ mem->image->Release();
-+
-+sub_mem:
-+ g_slice_free (MozGfxMemory, mem);
-+}
-+
-+static gpointer
-+moz_gfx_memory_map (MozGfxMemory * mem, gsize maxsize, GstMapFlags flags)
-+{
-+ // check that the allocation didn't fail
-+ if (mem->data == nullptr)
-+ return nullptr;
-+
-+ return mem->data + mem->memory.offset;
-+}
-+
-+static gboolean
-+moz_gfx_memory_unmap (MozGfxMemory * mem)
-+{
-+ return TRUE;
-+}
-+
-+static MozGfxMemory *
-+moz_gfx_memory_share (MozGfxMemory * mem, gssize offset, gsize size)
-+{
-+ MozGfxMemory *sub;
-+ GstMemory *parent;
-+
-+ /* find the real parent */
-+ if ((parent = mem->memory.parent) == NULL)
-+ parent = (GstMemory *) mem;
-+
-+ if (size == (gsize) -1)
-+ size = mem->memory.size - offset;
-+
-+ /* the shared memory is always readonly */
-+ sub = g_slice_new (MozGfxMemory);
-+
-+ gst_memory_init (GST_MEMORY_CAST (sub),
-+ (GstMemoryFlags) (GST_MINI_OBJECT_FLAGS (parent) | GST_MINI_OBJECT_FLAG_LOCK_READONLY),
-+ mem->memory.allocator, &mem->memory, mem->memory.maxsize, mem->memory.align,
-+ mem->memory.offset + offset, size);
-+
-+ sub->image = mem->image;
-+ sub->data = mem->data;
-+
-+ return sub;
-+}
-+
-+static void
-+moz_gfx_memory_allocator_class_init (MozGfxMemoryAllocatorClass * klass)
-+{
-+ GstAllocatorClass *allocator_class;
-+
-+ allocator_class = (GstAllocatorClass *) klass;
-+
-+ allocator_class->alloc = moz_gfx_memory_allocator_alloc;
-+ allocator_class->free = moz_gfx_memory_allocator_free;
-+}
-+
-+static void
-+moz_gfx_memory_allocator_init (MozGfxMemoryAllocator * allocator)
-+{
-+ GstAllocator *alloc = GST_ALLOCATOR_CAST (allocator);
-+
-+ alloc->mem_type = "moz-gfx-image";
-+ alloc->mem_map = (GstMemoryMapFunction) moz_gfx_memory_map;
-+ alloc->mem_unmap = (GstMemoryUnmapFunction) moz_gfx_memory_unmap;
-+ alloc->mem_share = (GstMemoryShareFunction) moz_gfx_memory_share;
-+ /* fallback copy and is_span */
-+}
-+
-+void
-+moz_gfx_memory_allocator_set_reader(GstAllocator* aAllocator, GStreamerReader* aReader)
-+{
-+ MozGfxMemoryAllocator *allocator = (MozGfxMemoryAllocator *) aAllocator;
-+ allocator->reader = aReader;
-+}
-+
-+nsRefPtr<PlanarYCbCrImage>
-+moz_gfx_memory_get_image(GstMemory *aMemory)
-+{
-+ NS_ASSERTION(GST_IS_MOZ_GFX_MEMORY_ALLOCATOR(aMemory->allocator), "Should be a gfx image");
-+
-+ return ((MozGfxMemory *) aMemory)->image;
-+}
-+
-+void
-+moz_gfx_buffer_pool_reset_buffer (GstBufferPool* aPool, GstBuffer* aBuffer)
-+{
-+ GstMemory* mem = gst_buffer_peek_memory(aBuffer, 0);
-+
-+ NS_ASSERTION(GST_IS_MOZ_GFX_MEMORY_ALLOCATOR(mem->allocator), "Should be a gfx image");
-+ moz_gfx_memory_reset((MozGfxMemory *) mem);
-+ GST_BUFFER_POOL_CLASS(moz_gfx_buffer_pool_parent_class)->reset_buffer(aPool, aBuffer);
-+}
-+
-+static void
-+moz_gfx_buffer_pool_class_init (MozGfxBufferPoolClass * klass)
-+{
-+ GstBufferPoolClass *pool_class = (GstBufferPoolClass *) klass;
-+ pool_class->reset_buffer = moz_gfx_buffer_pool_reset_buffer;
-+}
-+
-+static void
-+moz_gfx_buffer_pool_init (MozGfxBufferPool * pool)
-+{
-+}
-+
-+} // namespace mozilla
-diff --git content/media/gstreamer/GStreamerAllocator.h content/media/gstreamer/GStreamerAllocator.h
-new file mode 100644
-index 0000000..05a4412
---- /dev/null
-+++ mozilla/content/media/gstreamer/GStreamerAllocator.h
-@@ -0,0 +1,25 @@
-+/* This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
-+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+#if !defined(GStreamerAllocator_h_)
-+#define GStreamerAllocator_h_
-+
-+#include "GStreamerReader.h"
-+
-+#define GST_TYPE_MOZ_GFX_MEMORY_ALLOCATOR (moz_gfx_memory_allocator_get_type())
-+#define GST_IS_MOZ_GFX_MEMORY_ALLOCATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_MOZ_GFX_MEMORY_ALLOCATOR))
-+#define GST_TYPE_MOZ_GFX_BUFFER_POOL (moz_gfx_buffer_pool_get_type())
-+#define GST_IS_MOZ_GFX_BUFFER_POOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_MOZ_GFX_BUFFER_POOL))
-+
-+namespace mozilla {
-+
-+GType moz_gfx_memory_allocator_get_type();
-+void moz_gfx_memory_allocator_set_reader(GstAllocator *aAllocator, GStreamerReader* aReader);
-+nsRefPtr<layers::PlanarYCbCrImage> moz_gfx_memory_get_image(GstMemory *aMemory);
-+
-+GType moz_gfx_buffer_pool_get_type();
-+
-+} // namespace mozilla
-+
-+#endif
-diff --git content/media/gstreamer/GStreamerFormatHelper.cpp content/media/gstreamer/GStreamerFormatHelper.cpp
-index be71331..a5e5db8 100644
---- mozilla/content/media/gstreamer/GStreamerFormatHelper.cpp
-+++ mozilla/content/media/gstreamer/GStreamerFormatHelper.cpp
-@@ -294,12 +294,23 @@ bool GStreamerFormatHelper::CanHandleCodecCaps(GstCaps* aCaps)
- GList* GStreamerFormatHelper::GetFactories() {
- NS_ASSERTION(sLoadOK, "GStreamer library not linked");
-
-- uint32_t cookie = gst_default_registry_get_feature_list_cookie ();
-+#if GST_VERSION_MAJOR >= 1
-+ uint32_t cookie = gst_registry_get_feature_list_cookie(gst_registry_get());
-+#else
-+ uint32_t cookie = gst_default_registry_get_feature_list_cookie();
-+#endif
- if (cookie != mCookie) {
- g_list_free(mFactories);
-+#if GST_VERSION_MAJOR >= 1
-+ mFactories =
-+ gst_registry_feature_filter(gst_registry_get(),
-+ (GstPluginFeatureFilter)FactoryFilter,
-+ false, nullptr);
-+#else
- mFactories =
- gst_default_registry_feature_filter((GstPluginFeatureFilter)FactoryFilter,
- false, nullptr);
-+#endif
- mCookie = cookie;
- }
-
-diff --git content/media/gstreamer/GStreamerFunctionList.h content/media/gstreamer/GStreamerFunctionList.h
-index 56877c0..e169449 100644
---- mozilla/content/media/gstreamer/GStreamerFunctionList.h
-+++ mozilla/content/media/gstreamer/GStreamerFunctionList.h
-@@ -9,7 +9,6 @@
- * List of symbol names we need to dlsym from the gstreamer library.
- */
- GST_FUNC(LIBGSTAPP, gst_app_sink_get_type)
--GST_FUNC(LIBGSTAPP, gst_app_sink_pull_buffer)
- GST_FUNC(LIBGSTAPP, gst_app_sink_set_callbacks)
- GST_FUNC(LIBGSTAPP, gst_app_src_end_of_stream)
- GST_FUNC(LIBGSTAPP, gst_app_src_get_size)
-@@ -22,10 +21,8 @@ GST_FUNC(LIBGSTAPP, gst_app_src_set_stream_type)
- GST_FUNC(LIBGSTREAMER, gst_bin_get_by_name)
- GST_FUNC(LIBGSTREAMER, gst_bin_get_type)
- GST_FUNC(LIBGSTREAMER, gst_bin_iterate_recurse)
--GST_FUNC(LIBGSTREAMER, gst_buffer_copy_metadata)
- GST_FUNC(LIBGSTREAMER, gst_buffer_get_type)
- GST_FUNC(LIBGSTREAMER, gst_buffer_new)
--GST_FUNC(LIBGSTREAMER, gst_buffer_new_and_alloc)
- GST_FUNC(LIBGSTREAMER, gst_bus_set_sync_handler)
- GST_FUNC(LIBGSTREAMER, gst_bus_timed_pop_filtered)
- GST_FUNC(LIBGSTREAMER, gst_caps_append)
-@@ -37,47 +34,37 @@ GST_FUNC(LIBGSTREAMER, gst_caps_new_any)
- GST_FUNC(LIBGSTREAMER, gst_caps_new_empty)
- GST_FUNC(LIBGSTREAMER, gst_caps_new_full)
- GST_FUNC(LIBGSTREAMER, gst_caps_new_simple)
--GST_FUNC(LIBGSTREAMER, gst_caps_unref)
--GST_FUNC(LIBGSTREAMER, gst_element_factory_get_klass)
-+GST_FUNC(LIBGSTREAMER, gst_caps_set_simple)
- GST_FUNC(LIBGSTREAMER, gst_element_factory_get_static_pad_templates)
- GST_FUNC(LIBGSTREAMER, gst_element_factory_get_type)
- GST_FUNC(LIBGSTREAMER, gst_element_factory_make)
- GST_FUNC(LIBGSTREAMER, gst_element_get_factory)
--GST_FUNC(LIBGSTREAMER, gst_element_get_pad)
-+GST_FUNC(LIBGSTREAMER, gst_element_get_static_pad)
- GST_FUNC(LIBGSTREAMER, gst_element_get_type)
- GST_FUNC(LIBGSTREAMER, gst_element_query_convert)
- GST_FUNC(LIBGSTREAMER, gst_element_query_duration)
- GST_FUNC(LIBGSTREAMER, gst_element_seek_simple)
- GST_FUNC(LIBGSTREAMER, gst_element_set_state)
--GST_FUNC(LIBGSTREAMER, gst_event_parse_new_segment)
- GST_FUNC(LIBGSTREAMER, gst_flow_get_name)
- GST_FUNC(LIBGSTREAMER, gst_init)
- GST_FUNC(LIBGSTREAMER, gst_init_check)
- GST_FUNC(LIBGSTREAMER, gst_iterator_next)
- GST_FUNC(LIBGSTREAMER, gst_message_parse_error)
- GST_FUNC(LIBGSTREAMER, gst_message_type_get_name)
--GST_FUNC(LIBGSTREAMER, gst_mini_object_get_type)
--GST_FUNC(LIBGSTREAMER, gst_mini_object_new)
- GST_FUNC(LIBGSTREAMER, gst_mini_object_ref)
- GST_FUNC(LIBGSTREAMER, gst_mini_object_unref)
- GST_FUNC(LIBGSTREAMER, gst_object_get_name)
- GST_FUNC(LIBGSTREAMER, gst_object_get_parent)
- GST_FUNC(LIBGSTREAMER, gst_object_unref)
--GST_FUNC(LIBGSTREAMER, gst_pad_add_event_probe)
--GST_FUNC(LIBGSTREAMER, gst_pad_alloc_buffer)
- GST_FUNC(LIBGSTREAMER, gst_pad_get_element_private)
--GST_FUNC(LIBGSTREAMER, gst_pad_get_negotiated_caps)
--GST_FUNC(LIBGSTREAMER, gst_pad_set_bufferalloc_function)
- GST_FUNC(LIBGSTREAMER, gst_pad_set_element_private)
- GST_FUNC(LIBGSTREAMER, gst_parse_bin_from_description)
- GST_FUNC(LIBGSTREAMER, gst_pipeline_get_bus)
- GST_FUNC(LIBGSTREAMER, gst_pipeline_get_type)
- GST_FUNC(LIBGSTREAMER, gst_plugin_feature_get_rank)
- GST_FUNC(LIBGSTREAMER, gst_registry_feature_filter)
--GST_FUNC(LIBGSTREAMER, gst_registry_get_default)
- GST_FUNC(LIBGSTREAMER, gst_registry_get_feature_list_cookie)
- GST_FUNC(LIBGSTREAMER, gst_segment_init)
--GST_FUNC(LIBGSTREAMER, gst_segment_set_newsegment)
- GST_FUNC(LIBGSTREAMER, gst_segment_to_stream_time)
- GST_FUNC(LIBGSTREAMER, gst_static_caps_get)
- GST_FUNC(LIBGSTREAMER, gst_structure_copy)
-@@ -85,11 +72,82 @@ GST_FUNC(LIBGSTREAMER, gst_structure_get_int)
- GST_FUNC(LIBGSTREAMER, gst_structure_get_value)
- GST_FUNC(LIBGSTREAMER, gst_structure_new)
- GST_FUNC(LIBGSTREAMER, gst_util_uint64_scale)
-+
-+#if GST_VERSION_MAJOR == 0
-+GST_FUNC(LIBGSTAPP, gst_app_sink_pull_buffer)
-+GST_FUNC(LIBGSTREAMER, gst_buffer_copy_metadata)
-+GST_FUNC(LIBGSTREAMER, gst_buffer_new_and_alloc)
-+GST_FUNC(LIBGSTREAMER, gst_caps_unref)
-+GST_FUNC(LIBGSTREAMER, gst_element_factory_get_klass)
-+GST_FUNC(LIBGSTREAMER, gst_element_get_pad)
-+GST_FUNC(LIBGSTREAMER, gst_event_parse_new_segment)
-+GST_FUNC(LIBGSTREAMER, gst_mini_object_get_type)
-+GST_FUNC(LIBGSTREAMER, gst_mini_object_new)
-+GST_FUNC(LIBGSTREAMER, gst_pad_add_event_probe)
-+GST_FUNC(LIBGSTREAMER, gst_pad_alloc_buffer)
-+GST_FUNC(LIBGSTREAMER, gst_pad_get_negotiated_caps)
-+GST_FUNC(LIBGSTREAMER, gst_pad_set_bufferalloc_function)
-+GST_FUNC(LIBGSTREAMER, gst_registry_get_default)
-+GST_FUNC(LIBGSTREAMER, gst_segment_set_newsegment)
- GST_FUNC(LIBGSTVIDEO, gst_video_format_get_component_height)
- GST_FUNC(LIBGSTVIDEO, gst_video_format_get_component_offset)
- GST_FUNC(LIBGSTVIDEO, gst_video_format_get_component_width)
-+GST_FUNC(LIBGSTVIDEO, gst_video_format_get_pixel_stride)
- GST_FUNC(LIBGSTVIDEO, gst_video_format_get_row_stride)
- GST_FUNC(LIBGSTVIDEO, gst_video_format_parse_caps)
-+#else
-+
-+GST_FUNC(LIBGSTAPP, gst_app_sink_pull_sample)
-+GST_FUNC(LIBGSTREAMER, _gst_caps_any)
-+GST_FUNC(LIBGSTREAMER, gst_allocator_get_type)
-+GST_FUNC(LIBGSTREAMER, gst_buffer_copy_into)
-+GST_FUNC(LIBGSTREAMER, gst_buffer_extract)
-+GST_FUNC(LIBGSTREAMER, gst_buffer_get_meta)
-+GST_FUNC(LIBGSTREAMER, gst_buffer_get_size)
-+GST_FUNC(LIBGSTREAMER, gst_buffer_map)
-+GST_FUNC(LIBGSTREAMER, gst_buffer_new_allocate)
-+GST_FUNC(LIBGSTREAMER, gst_buffer_n_memory)
-+GST_FUNC(LIBGSTREAMER, gst_buffer_peek_memory)
-+GST_FUNC(LIBGSTREAMER, gst_buffer_pool_acquire_buffer)
-+GST_FUNC(LIBGSTREAMER, gst_buffer_pool_config_set_allocator)
-+GST_FUNC(LIBGSTREAMER, gst_buffer_pool_config_set_params)
-+GST_FUNC(LIBGSTREAMER, gst_buffer_pool_get_config)
-+GST_FUNC(LIBGSTREAMER, gst_buffer_pool_get_type)
-+GST_FUNC(LIBGSTREAMER, gst_buffer_pool_is_active)
-+GST_FUNC(LIBGSTREAMER, gst_buffer_pool_set_active)
-+GST_FUNC(LIBGSTREAMER, gst_buffer_pool_set_config)
-+GST_FUNC(LIBGSTREAMER, gst_buffer_set_size)
-+GST_FUNC(LIBGSTREAMER, gst_buffer_unmap)
-+GST_FUNC(LIBGSTREAMER, gst_element_factory_get_metadata)
-+GST_FUNC(LIBGSTREAMER, gst_event_parse_segment)
-+GST_FUNC(LIBGSTREAMER, gst_memory_init)
-+GST_FUNC(LIBGSTREAMER, gst_memory_map)
-+GST_FUNC(LIBGSTREAMER, gst_memory_unmap)
-+GST_FUNC(LIBGSTREAMER, gst_object_get_type)
-+GST_FUNC(LIBGSTREAMER, gst_pad_add_probe)
-+GST_FUNC(LIBGSTREAMER, gst_pad_get_current_caps)
-+GST_FUNC(LIBGSTREAMER, gst_pad_probe_info_get_query)
-+GST_FUNC(LIBGSTREAMER, gst_query_add_allocation_meta)
-+GST_FUNC(LIBGSTREAMER, gst_query_add_allocation_param)
-+GST_FUNC(LIBGSTREAMER, gst_query_add_allocation_pool)
-+GST_FUNC(LIBGSTREAMER, gst_query_parse_allocation)
-+GST_FUNC(LIBGSTREAMER, gst_registry_get)
-+GST_FUNC(LIBGSTREAMER, gst_sample_get_buffer)
-+GST_FUNC(LIBGSTREAMER, gst_segment_copy_into)
-+GST_FUNC(LIBGSTREAMER, gst_structure_free)
-+GST_FUNC(LIBGSTVIDEO, gst_buffer_pool_config_get_video_alignment)
-+GST_FUNC(LIBGSTVIDEO, gst_buffer_pool_has_option)
-+GST_FUNC(LIBGSTVIDEO, gst_video_buffer_pool_get_type)
-+GST_FUNC(LIBGSTVIDEO, gst_video_frame_map)
-+GST_FUNC(LIBGSTVIDEO, gst_video_frame_unmap)
-+GST_FUNC(LIBGSTVIDEO, gst_video_info_align)
-+GST_FUNC(LIBGSTVIDEO, gst_video_info_from_caps)
-+GST_FUNC(LIBGSTVIDEO, gst_video_info_init)
-+GST_FUNC(LIBGSTVIDEO, gst_video_meta_api_get_type)
-+GST_FUNC(LIBGSTVIDEO, gst_video_meta_map)
-+GST_FUNC(LIBGSTVIDEO, gst_video_meta_unmap)
-+
-+#endif
-
- /*
- * Functions that have been defined in the header file. We replace them so that
-@@ -99,6 +157,11 @@ GST_FUNC(LIBGSTVIDEO, gst_video_format_parse_caps)
- REPLACE_FUNC(gst_buffer_ref);
- REPLACE_FUNC(gst_buffer_unref);
- REPLACE_FUNC(gst_message_unref);
-+
-+#if GST_VERSION_MAJOR == 1
-+REPLACE_FUNC(gst_caps_unref);
-+REPLACE_FUNC(gst_sample_unref);
-+#endif
- #endif
-
- #endif // !defined(__APPLE__)
-diff --git content/media/gstreamer/GStreamerLoader.cpp content/media/gstreamer/GStreamerLoader.cpp
-index 5961b23..e6457e0 100644
---- mozilla/content/media/gstreamer/GStreamerLoader.cpp
-+++ mozilla/content/media/gstreamer/GStreamerLoader.cpp
-@@ -6,13 +6,21 @@
- #include <dlfcn.h>
- #include <stdio.h>
-
--#include "GStreamerLoader.h"
-+#include "nsDebug.h"
- #include "mozilla/NullPtr.h"
-
-+#include "GStreamerLoader.h"
-+
- #define LIBGSTREAMER 0
- #define LIBGSTAPP 1
- #define LIBGSTVIDEO 2
-
-+#ifdef __OpenBSD__
-+#define LIB_GST_SUFFIX ".so"
-+#else
-+#define LIB_GST_SUFFIX ".so.0"
-+#endif
-+
- namespace mozilla {
-
- /*
-@@ -32,6 +40,11 @@ namespace mozilla {
- GstBuffer * gst_buffer_ref_impl(GstBuffer *buf);
- void gst_buffer_unref_impl(GstBuffer *buf);
- void gst_message_unref_impl(GstMessage *msg);
-+void gst_caps_unref_impl(GstCaps *caps);
-+
-+#if GST_VERSION_MAJOR == 1
-+void gst_sample_unref_impl(GstSample *sample);
-+#endif
-
- bool
- load_gstreamer()
-@@ -58,32 +71,25 @@ load_gstreamer()
- if (major == GST_VERSION_MAJOR && minor == GST_VERSION_MINOR) {
- gstreamerLib = RTLD_DEFAULT;
- } else {
--#ifdef __OpenBSD__
-- gstreamerLib = dlopen("libgstreamer-0.10.so", RTLD_NOW | RTLD_LOCAL);
--#else
-- gstreamerLib = dlopen("libgstreamer-0.10.so.0", RTLD_NOW | RTLD_LOCAL);
--#endif
-+ gstreamerLib = dlopen("libgstreamer-" GST_API_VERSION LIB_GST_SUFFIX, RTLD_NOW | RTLD_LOCAL);
- }
-
-- void *handles[] = {
-+ void *handles[3] = {
- gstreamerLib,
--#ifdef __OpenBSD__
-- dlopen("libgstapp-0.10.so", RTLD_NOW | RTLD_LOCAL),
-- dlopen("libgstvideo-0.10.so", RTLD_NOW | RTLD_LOCAL)
--#else
-- dlopen("libgstapp-0.10.so.0", RTLD_NOW | RTLD_LOCAL),
-- dlopen("libgstvideo-0.10.so.0", RTLD_NOW | RTLD_LOCAL)
--#endif
-+ dlopen("libgstapp-" GST_API_VERSION LIB_GST_SUFFIX, RTLD_NOW | RTLD_LOCAL),
-+ dlopen("libgstvideo-" GST_API_VERSION LIB_GST_SUFFIX, RTLD_NOW | RTLD_LOCAL)
- };
-
- for (size_t i = 0; i < sizeof(handles) / sizeof(handles[0]); i++) {
- if (!handles[i]) {
-+ NS_WARNING("Couldn't link gstreamer libraries");
- goto fail;
- }
- }
-
- #define GST_FUNC(lib, symbol) \
- if (!(symbol = (typeof(symbol))dlsym(handles[lib], #symbol))) { \
-+ NS_WARNING("Couldn't link symbol " #symbol); \
- goto fail; \
- }
- #define REPLACE_FUNC(symbol) symbol = symbol##_impl;
-@@ -123,4 +129,18 @@ gst_message_unref_impl(GstMessage *msg)
- gst_mini_object_unref(GST_MINI_OBJECT_CAST(msg));
- }
-
-+#if GST_VERSION_MAJOR == 1
-+void
-+gst_sample_unref_impl(GstSample *sample)
-+{
-+ gst_mini_object_unref(GST_MINI_OBJECT_CAST(sample));
-+}
-+#endif
-+
-+void
-+gst_caps_unref_impl(GstCaps *caps)
-+{
-+ gst_mini_object_unref(GST_MINI_OBJECT_CAST(caps));
-+}
-+
- }
-diff --git content/media/gstreamer/GStreamerLoader.h content/media/gstreamer/GStreamerLoader.h
-index 2d801722..cd7fe6d 100644
---- mozilla/content/media/gstreamer/GStreamerLoader.h
-+++ mozilla/content/media/gstreamer/GStreamerLoader.h
-@@ -22,6 +22,11 @@
- #include <gst/video/video.h>
- #pragma GCC diagnostic pop
-
-+#if GST_VERSION_MAJOR == 1
-+#include <gst/video/gstvideometa.h>
-+#include <gst/video/gstvideopool.h>
-+#endif
-+
- namespace mozilla {
-
- /*
-@@ -42,4 +47,7 @@ bool load_gstreamer();
-
- }
-
-+#undef GST_CAPS_ANY
-+#define GST_CAPS_ANY (*_gst_caps_any)
-+
- #endif // GStreamerLoader_h_
-diff --git content/media/gstreamer/GStreamerReader-0.10.cpp content/media/gstreamer/GStreamerReader-0.10.cpp
-new file mode 100644
-index 0000000..fb98bde
---- /dev/null
-+++ mozilla/content/media/gstreamer/GStreamerReader-0.10.cpp
-@@ -0,0 +1,200 @@
-+#include "nsError.h"
-+#include "MediaDecoderStateMachine.h"
-+#include "AbstractMediaDecoder.h"
-+#include "MediaResource.h"
-+#include "GStreamerReader.h"
-+#include "GStreamerMozVideoBuffer.h"
-+#include "GStreamerFormatHelper.h"
-+#include "VideoUtils.h"
-+#include "mozilla/dom/TimeRanges.h"
-+#include "mozilla/Preferences.h"
-+
-+using namespace mozilla;
-+using mozilla::layers::PlanarYCbCrImage;
-+using mozilla::layers::ImageContainer;
-+
-+GstFlowReturn GStreamerReader::AllocateVideoBufferCb(GstPad* aPad,
-+ guint64 aOffset,
-+ guint aSize,
-+ GstCaps* aCaps,
-+ GstBuffer** aBuf)
-+{
-+ GStreamerReader* reader = reinterpret_cast<GStreamerReader*>(gst_pad_get_element_private(aPad));
-+ return reader->AllocateVideoBuffer(aPad, aOffset, aSize, aCaps, aBuf);
-+}
-+
-+GstFlowReturn GStreamerReader::AllocateVideoBuffer(GstPad* aPad,
-+ guint64 aOffset,
-+ guint aSize,
-+ GstCaps* aCaps,
-+ GstBuffer** aBuf)
-+{
-+ nsRefPtr<PlanarYCbCrImage> image;
-+ return AllocateVideoBufferFull(aPad, aOffset, aSize, aCaps, aBuf, image);
-+}
-+
-+GstFlowReturn GStreamerReader::AllocateVideoBufferFull(GstPad* aPad,
-+ guint64 aOffset,
-+ guint aSize,
-+ GstCaps* aCaps,
-+ GstBuffer** aBuf,
-+ nsRefPtr<PlanarYCbCrImage>& aImage)
-+{
-+ /* allocate an image using the container */
-+ ImageContainer* container = mDecoder->GetImageContainer();
-+ if (container == nullptr) {
-+ return GST_FLOW_ERROR;
-+ }
-+ PlanarYCbCrImage* img = reinterpret_cast<PlanarYCbCrImage*>(container->CreateImage(ImageFormat::PLANAR_YCBCR).get());
-+ nsRefPtr<PlanarYCbCrImage> image = dont_AddRef(img);
-+
-+ /* prepare a GstBuffer pointing to the underlying PlanarYCbCrImage buffer */
-+ GstBuffer* buf = GST_BUFFER(gst_moz_video_buffer_new());
-+ GST_BUFFER_SIZE(buf) = aSize;
-+ /* allocate the actual YUV buffer */
-+ GST_BUFFER_DATA(buf) = image->AllocateAndGetNewBuffer(aSize);
-+
-+ aImage = image;
-+
-+ /* create a GstMozVideoBufferData to hold the image */
-+ GstMozVideoBufferData* bufferdata = new GstMozVideoBufferData(image);
-+
-+ /* Attach bufferdata to our GstMozVideoBuffer, it will take care to free it */
-+ gst_moz_video_buffer_set_data(GST_MOZ_VIDEO_BUFFER(buf), bufferdata);
-+
-+ *aBuf = buf;
-+ return GST_FLOW_OK;
-+}
-+
-+gboolean GStreamerReader::EventProbe(GstPad* aPad, GstEvent* aEvent)
-+{
-+ GstElement* parent = GST_ELEMENT(gst_pad_get_parent(aPad));
-+ switch(GST_EVENT_TYPE(aEvent)) {
-+ case GST_EVENT_NEWSEGMENT:
-+ {
-+ gboolean update;
-+ gdouble rate;
-+ GstFormat format;
-+ gint64 start, stop, position;
-+ GstSegment* segment;
-+
-+ /* Store the segments so we can convert timestamps to stream time, which
-+ * is what the upper layers sync on.
-+ */
-+ ReentrantMonitorAutoEnter mon(mGstThreadsMonitor);
-+ gst_event_parse_new_segment(aEvent, &update, &rate, &format,
-+ &start, &stop, &position);
-+ if (parent == GST_ELEMENT(mVideoAppSink))
-+ segment = &mVideoSegment;
-+ else
-+ segment = &mAudioSegment;
-+ gst_segment_set_newsegment(segment, update, rate, format,
-+ start, stop, position);
-+ break;
-+ }
-+ case GST_EVENT_FLUSH_STOP:
-+ /* Reset on seeks */
-+ ResetDecode();
-+ break;
-+ default:
-+ break;
-+ }
-+ gst_object_unref(parent);
-+
-+ return TRUE;
-+}
-+
-+gboolean GStreamerReader::EventProbeCb(GstPad* aPad,
-+ GstEvent* aEvent,
-+ gpointer aUserData)
-+{
-+ GStreamerReader* reader = reinterpret_cast<GStreamerReader*>(aUserData);
-+ return reader->EventProbe(aPad, aEvent);
-+}
-+
-+nsRefPtr<PlanarYCbCrImage> GStreamerReader::GetImageFromBuffer(GstBuffer* aBuffer)
-+{
-+ if (!GST_IS_MOZ_VIDEO_BUFFER (aBuffer))
-+ return nullptr;
-+
-+ nsRefPtr<PlanarYCbCrImage> image;
-+ GstMozVideoBufferData* bufferdata = reinterpret_cast<GstMozVideoBufferData*>(gst_moz_video_buffer_get_data(GST_MOZ_VIDEO_BUFFER(aBuffer)));
-+ image = bufferdata->mImage;
-+
-+ PlanarYCbCrImage::Data data;
-+ data.mPicX = data.mPicY = 0;
-+ data.mPicSize = gfx::IntSize(mPicture.width, mPicture.height);
-+ data.mStereoMode = StereoMode::MONO;
-+
-+ data.mYChannel = GST_BUFFER_DATA(aBuffer);
-+ data.mYStride = gst_video_format_get_row_stride(mFormat, 0, mPicture.width);
-+ data.mYSize = gfx::IntSize(data.mYStride,
-+ gst_video_format_get_component_height(mFormat, 0, mPicture.height));
-+ data.mYSkip = 0;
-+ data.mCbCrStride = gst_video_format_get_row_stride(mFormat, 1, mPicture.width);
-+ data.mCbCrSize = gfx::IntSize(data.mCbCrStride,
-+ gst_video_format_get_component_height(mFormat, 1, mPicture.height));
-+ data.mCbChannel = data.mYChannel + gst_video_format_get_component_offset(mFormat, 1,
-+ mPicture.width, mPicture.height);
-+ data.mCrChannel = data.mYChannel + gst_video_format_get_component_offset(mFormat, 2,
-+ mPicture.width, mPicture.height);
-+ data.mCbSkip = 0;
-+ data.mCrSkip = 0;
-+
-+ image->SetDataNoCopy(data);
-+
-+ return image;
-+}
-+
-+void GStreamerReader::CopyIntoImageBuffer(GstBuffer* aBuffer,
-+ GstBuffer** aOutBuffer,
-+ nsRefPtr<PlanarYCbCrImage> &aImage)
-+{
-+ AllocateVideoBufferFull(nullptr, GST_BUFFER_OFFSET(aBuffer),
-+ GST_BUFFER_SIZE(aBuffer), nullptr, aOutBuffer, aImage);
-+
-+ gst_buffer_copy_metadata(*aOutBuffer, aBuffer, (GstBufferCopyFlags)GST_BUFFER_COPY_ALL);
-+ memcpy(GST_BUFFER_DATA(*aOutBuffer), GST_BUFFER_DATA(aBuffer), GST_BUFFER_SIZE(*aOutBuffer));
-+
-+ aImage = GetImageFromBuffer(*aOutBuffer);
-+}
-+
-+GstCaps* GStreamerReader::BuildAudioSinkCaps()
-+{
-+ GstCaps* caps;
-+#ifdef IS_LITTLE_ENDIAN
-+ int endianness = 1234;
-+#else
-+ int endianness = 4321;
-+#endif
-+ gint width;
-+#ifdef MOZ_SAMPLE_TYPE_FLOAT32
-+ caps = gst_caps_from_string("audio/x-raw-float, channels={1,2}");
-+ width = 32;
-+#else /* !MOZ_SAMPLE_TYPE_FLOAT32 */
-+ caps = gst_caps_from_string("audio/x-raw-int, channels={1,2}");
-+ width = 16;
-+#endif
-+ gst_caps_set_simple(caps,
-+ "width", G_TYPE_INT, width,
-+ "endianness", G_TYPE_INT, endianness,
-+ NULL);
-+
-+ return caps;
-+}
-+
-+void GStreamerReader::InstallPadCallbacks()
-+{
-+ GstPad* sinkpad = gst_element_get_static_pad(GST_ELEMENT(mVideoAppSink), "sink");
-+ gst_pad_add_event_probe(sinkpad,
-+ G_CALLBACK(&GStreamerReader::EventProbeCb), this);
-+
-+ gst_pad_set_bufferalloc_function(sinkpad, GStreamerReader::AllocateVideoBufferCb);
-+ gst_pad_set_element_private(sinkpad, this);
-+ gst_object_unref(sinkpad);
-+
-+ sinkpad = gst_element_get_static_pad(GST_ELEMENT(mAudioAppSink), "sink");
-+ gst_pad_add_event_probe(sinkpad,
-+ G_CALLBACK(&GStreamerReader::EventProbeCb), this);
-+ gst_object_unref(sinkpad);
-+}
-diff --git content/media/gstreamer/GStreamerReader.cpp content/media/gstreamer/GStreamerReader.cpp
-index 2be45dc..54509e3 100644
---- mozilla/content/media/gstreamer/GStreamerReader.cpp
-+++ mozilla/content/media/gstreamer/GStreamerReader.cpp
-@@ -10,8 +10,10 @@
- #include "AbstractMediaDecoder.h"
- #include "MediaResource.h"
- #include "GStreamerReader.h"
-+#if GST_VERSION_MAJOR >= 1
-+#include "GStreamerAllocator.h"
-+#endif
- #include "GStreamerFormatHelper.h"
--#include "GStreamerMozVideoBuffer.h"
- #include "VideoUtils.h"
- #include "mozilla/dom/TimeRanges.h"
- #include "mozilla/Preferences.h"
-@@ -31,14 +33,16 @@ extern PRLogModuleInfo* gMediaDecoderLog;
- #define LOG(type, msg, ...)
- #endif
-
--extern bool
--IsYV12Format(const VideoData::YCbCrBuffer::Plane& aYPlane,
-- const VideoData::YCbCrBuffer::Plane& aCbPlane,
-- const VideoData::YCbCrBuffer::Plane& aCrPlane);
--
-+#if DEBUG
- static const unsigned int MAX_CHANNELS = 4;
--// Let the demuxer work in pull mode for short files
--static const int SHORT_FILE_SIZE = 1024 * 1024;
-+#endif
-+// Let the demuxer work in pull mode for short files. This used to be a micro
-+// optimization to have more accurate durations for ogg files in mochitests.
-+// Since as of today we aren't using gstreamer to demux ogg, and having demuxers
-+// work in pull mode over http makes them slower (since they really assume
-+// near-zero latency in pull mode) set the constant to 0 for now, which
-+// effectively disables it.
-+static const int SHORT_FILE_SIZE = 0;
- // The default resource->Read() size when working in push mode
- static const int DEFAULT_SOURCE_READ_SIZE = 50 * 1024;
-
-@@ -60,6 +62,10 @@ GStreamerReader::GStreamerReader(AbstractMediaDecoder* aDecoder)
- : MediaDecoderReader(aDecoder),
- mMP3FrameParser(aDecoder->GetResource()->GetLength()),
- mUseParserDuration(false),
-+#if GST_VERSION_MAJOR >= 1
-+ mAllocator(nullptr),
-+ mBufferPool(nullptr),
-+#endif
- mPlayBin(nullptr),
- mBus(nullptr),
- mSource(nullptr),
-@@ -72,6 +78,9 @@ GStreamerReader::GStreamerReader(AbstractMediaDecoder* aDecoder)
- mAudioSinkBufferCount(0),
- mGstThreadsMonitor("media.gst.threads"),
- mReachedEos(false),
-+#if GST_VERSION_MAJOR >= 1
-+ mConfigureAlignment(true),
-+#endif
- fpsNum(0),
- fpsDen(0)
- {
-@@ -83,8 +92,12 @@ GStreamerReader::GStreamerReader(AbstractMediaDecoder* aDecoder)
-
- mSinkCallbacks.eos = GStreamerReader::EosCb;
- mSinkCallbacks.new_preroll = GStreamerReader::NewPrerollCb;
-+#if GST_VERSION_MAJOR >= 1
-+ mSinkCallbacks.new_sample = GStreamerReader::NewBufferCb;
-+#else
- mSinkCallbacks.new_buffer = GStreamerReader::NewBufferCb;
- mSinkCallbacks.new_buffer_list = nullptr;
-+#endif
-
- gst_segment_init(&mVideoSegment, GST_FORMAT_UNDEFINED);
- gst_segment_init(&mAudioSegment, GST_FORMAT_UNDEFINED);
-@@ -108,65 +121,59 @@ GStreamerReader::~GStreamerReader()
- mAudioAppSink = nullptr;
- gst_object_unref(mBus);
- mBus = nullptr;
-+#if GST_VERSION_MAJOR >= 1
-+ g_object_unref(mAllocator);
-+ g_object_unref(mBufferPool);
-+#endif
- }
- }
-
- nsresult GStreamerReader::Init(MediaDecoderReader* aCloneDonor)
- {
-- GError* error = nullptr;
-- if (!gst_init_check(0, 0, &error)) {
-- LOG(PR_LOG_ERROR, "gst initialization failed: %s", error->message);
-- g_error_free(error);
-- return NS_ERROR_FAILURE;
-- }
-+ GStreamerFormatHelper::Instance();
-+
-+#if GST_VERSION_MAJOR >= 1
-+ mAllocator = static_cast<GstAllocator*>(g_object_new(GST_TYPE_MOZ_GFX_MEMORY_ALLOCATOR, nullptr));
-+ moz_gfx_memory_allocator_set_reader(mAllocator, this);
-+
-+ mBufferPool = static_cast<GstBufferPool*>(g_object_new(GST_TYPE_MOZ_GFX_BUFFER_POOL, nullptr));
-+#endif
-
-+#if GST_VERSION_MAJOR >= 1
-+ mPlayBin = gst_element_factory_make("playbin", nullptr);
-+#else
- mPlayBin = gst_element_factory_make("playbin2", nullptr);
-+#endif
- if (!mPlayBin) {
-- LOG(PR_LOG_ERROR, "couldn't create playbin2");
-+ LOG(PR_LOG_ERROR, "couldn't create playbin");
- return NS_ERROR_FAILURE;
- }
- g_object_set(mPlayBin, "buffer-size", 0, nullptr);
- mBus = gst_pipeline_get_bus(GST_PIPELINE(mPlayBin));
-
- mVideoSink = gst_parse_bin_from_description("capsfilter name=filter ! "
-- "appsink name=videosink sync=true max-buffers=1 "
-+ "appsink name=videosink sync=false max-buffers=1 "
-+#if GST_VERSION_MAJOR >= 1
-+ "caps=video/x-raw,format=I420"
-+#else
- "caps=video/x-raw-yuv,format=(fourcc)I420"
-+#endif
- , TRUE, nullptr);
- mVideoAppSink = GST_APP_SINK(gst_bin_get_by_name(GST_BIN(mVideoSink),
- "videosink"));
-- gst_app_sink_set_callbacks(mVideoAppSink, &mSinkCallbacks,
-- (gpointer) this, nullptr);
-- GstPad* sinkpad = gst_element_get_pad(GST_ELEMENT(mVideoAppSink), "sink");
-- gst_pad_add_event_probe(sinkpad,
-- G_CALLBACK(&GStreamerReader::EventProbeCb), this);
-- gst_object_unref(sinkpad);
-- gst_pad_set_bufferalloc_function(sinkpad, GStreamerReader::AllocateVideoBufferCb);
-- gst_pad_set_element_private(sinkpad, this);
--
- mAudioSink = gst_parse_bin_from_description("capsfilter name=filter ! "
--#ifdef MOZ_SAMPLE_TYPE_FLOAT32
-- "appsink name=audiosink max-buffers=2 sync=false caps=audio/x-raw-float,"
--#ifdef IS_LITTLE_ENDIAN
-- "channels={1,2},width=32,endianness=1234", TRUE, nullptr);
--#else
-- "channels={1,2},width=32,endianness=4321", TRUE, nullptr);
--#endif
--#else
-- "appsink name=audiosink max-buffers=2 sync=false caps=audio/x-raw-int,"
--#ifdef IS_LITTLE_ENDIAN
-- "channels={1,2},width=16,endianness=1234", TRUE, nullptr);
--#else
-- "channels={1,2},width=16,endianness=4321", TRUE, nullptr);
--#endif
--#endif
-+ "appsink name=audiosink sync=false max-buffers=1", TRUE, nullptr);
- mAudioAppSink = GST_APP_SINK(gst_bin_get_by_name(GST_BIN(mAudioSink),
- "audiosink"));
-+ GstCaps* caps = BuildAudioSinkCaps();
-+ g_object_set(mAudioAppSink, "caps", caps, nullptr);
-+ gst_caps_unref(caps);
-+
-+ gst_app_sink_set_callbacks(mVideoAppSink, &mSinkCallbacks,
-+ (gpointer) this, nullptr);
- gst_app_sink_set_callbacks(mAudioAppSink, &mSinkCallbacks,
- (gpointer) this, nullptr);
-- sinkpad = gst_element_get_pad(GST_ELEMENT(mAudioAppSink), "sink");
-- gst_pad_add_event_probe(sinkpad,
-- G_CALLBACK(&GStreamerReader::EventProbeCb), this);
-- gst_object_unref(sinkpad);
-+ InstallPadCallbacks();
-
- g_object_set(mPlayBin, "uri", "appsrc://",
- "video-sink", mVideoSink,
-@@ -331,13 +340,12 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
- /* Little trick: set the target caps to "skip" so that playbin2 fails to
- * find a decoder for the stream we want to skip.
- */
-- GstCaps* filterCaps = gst_caps_new_simple ("skip", nullptr);
-+ GstCaps* filterCaps = gst_caps_new_simple ("skip", nullptr, nullptr);
- g_object_set(filter, "caps", filterCaps, nullptr);
- gst_caps_unref(filterCaps);
- gst_object_unref(filter);
- }
-
-- /* start the pipeline */
- LOG(PR_LOG_DEBUG, "starting metadata pipeline");
- gst_element_set_state(mPlayBin, GST_STATE_PAUSED);
-
-@@ -358,6 +366,7 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
- gst_message_unref(message);
- ret = NS_ERROR_FAILURE;
- } else {
-+ LOG(PR_LOG_DEBUG, "read metadata pipeline prerolled");
- gst_message_unref(message);
- ret = NS_OK;
- break;
-@@ -373,21 +383,24 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
-
- /* FIXME: workaround for a bug in matroskademux. This seek makes matroskademux
- * parse the index */
-+ LOG(PR_LOG_DEBUG, "doing matroskademux seek hack");
- if (gst_element_seek_simple(mPlayBin, GST_FORMAT_TIME,
- GST_SEEK_FLAG_FLUSH, 0)) {
- /* after a seek we need to wait again for ASYNC_DONE */
-- message = gst_bus_timed_pop_filtered(mBus, GST_CLOCK_TIME_NONE,
-+ message = gst_bus_timed_pop_filtered(mBus, 5 * GST_SECOND,
- (GstMessageType)(GST_MESSAGE_ASYNC_DONE | GST_MESSAGE_ERROR));
-- if (GST_MESSAGE_TYPE(message) == GST_MESSAGE_ERROR) {
-+ LOG(PR_LOG_DEBUG, "matroskademux seek hack done");
-+ if (GST_MESSAGE_TYPE(message) != GST_MESSAGE_ASYNC_DONE) {
- gst_element_set_state(mPlayBin, GST_STATE_NULL);
- gst_message_unref(message);
- return NS_ERROR_FAILURE;
- }
-+ } else {
-+ LOG(PR_LOG_DEBUG, "matroskademux seek hack failed (non fatal)");
- }
-
- /* report the duration */
- gint64 duration;
-- GstFormat format = GST_FORMAT_TIME;
-
- if (isMP3 && mMP3FrameParser.IsMP3()) {
- // The MP3FrameParser has reported a duration; use that over the gstreamer
-@@ -396,17 +409,25 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
- mUseParserDuration = true;
- mLastParserDuration = mMP3FrameParser.GetDuration();
- mDecoder->SetMediaDuration(mLastParserDuration);
--
-- } else if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
-- &format, &duration) && format == GST_FORMAT_TIME) {
-- // Otherwise use the gstreamer duration.
-- ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
-- LOG(PR_LOG_DEBUG, "returning duration %" GST_TIME_FORMAT, GST_TIME_ARGS(duration));
-- duration = GST_TIME_AS_USECONDS (duration);
-- mDecoder->SetMediaDuration(duration);
--
- } else {
-- mDecoder->SetMediaSeekable(false);
-+ LOG(PR_LOG_DEBUG, "querying duration");
-+ // Otherwise use the gstreamer duration.
-+#if GST_VERSION_MAJOR >= 1
-+ if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
-+ GST_FORMAT_TIME, &duration)) {
-+#else
-+ GstFormat format = GST_FORMAT_TIME;
-+ if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
-+ &format, &duration) && format == GST_FORMAT_TIME) {
-+#endif
-+ ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
-+ LOG(PR_LOG_DEBUG, "have duration %" GST_TIME_FORMAT,
-+ GST_TIME_ARGS (duration));
-+ duration = GST_TIME_AS_USECONDS (duration);
-+ mDecoder->SetMediaDuration(duration);
-+ } else {
-+ mDecoder->SetMediaSeekable(false);
-+ }
- }
-
- int n_video = 0, n_audio = 0;
-@@ -410,7 +428,11 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
- *aTags = nullptr;
-
- // Watch the pipeline for fatal errors
-+#if GST_VERSION_MAJOR >= 1
-+ gst_bus_set_sync_handler(mBus, GStreamerReader::ErrorCb, this, nullptr);
-+#else
- gst_bus_set_sync_handler(mBus, GStreamerReader::ErrorCb, this);
-+#endif
-
- /* set the pipeline to PLAYING so that it starts decoding and queueing data in
- * the appsinks */
-@@ -424,19 +446,35 @@ nsresult GStreamerReader::CheckSupportedFormats()
- bool done = false;
- bool unsupported = false;
-
-- GstIterator *it = gst_bin_iterate_recurse(GST_BIN(mPlayBin));
-+ GstIterator* it = gst_bin_iterate_recurse(GST_BIN(mPlayBin));
- while (!done) {
-+ GstIteratorResult res;
- GstElement* element;
-- GstIteratorResult res = gst_iterator_next(it, (void **)&element);
-+
-+#if GST_VERSION_MAJOR >= 1
-+ GValue value = {0,};
-+ res = gst_iterator_next(it, &value);
-+#else
-+ res = gst_iterator_next(it, (void **) &element);
-+#endif
- switch(res) {
- case GST_ITERATOR_OK:
- {
-+#if GST_VERSION_MAJOR >= 1
-+ element = GST_ELEMENT (g_value_get_object (&value));
-+#endif
- GstElementFactory* factory = gst_element_get_factory(element);
- if (factory) {
- const char* klass = gst_element_factory_get_klass(factory);
-- GstPad* pad = gst_element_get_pad(element, "sink");
-+ GstPad* pad = gst_element_get_static_pad(element, "sink");
- if (pad) {
-- GstCaps* caps = gst_pad_get_negotiated_caps(pad);
-+ GstCaps* caps;
-+
-+#if GST_VERSION_MAJOR >= 1
-+ caps = gst_pad_get_current_caps(pad);
-+#else
-+ caps = gst_pad_get_negotiated_caps(pad);
-+#endif
-
- if (caps) {
- /* check for demuxers but ignore elements like id3demux */
-@@ -451,7 +489,11 @@ nsresult GStreamerReader::CheckSupportedFormats()
- }
- }
-
-+#if GST_VERSION_MAJOR >= 1
-+ g_value_unset (&value);
-+#else
- gst_object_unref(element);
-+#endif
- done = unsupported;
- break;
- }
-@@ -475,6 +517,8 @@ nsresult GStreamerReader::ResetDecode()
- {
- nsresult res = NS_OK;
-
-+ LOG(PR_LOG_DEBUG, "reset decode");
-+
- if (NS_FAILED(MediaDecoderReader::ResetDecode())) {
- res = NS_ERROR_FAILURE;
- }
-@@ -485,6 +529,11 @@ nsresult GStreamerReader::ResetDecode()
- mVideoSinkBufferCount = 0;
- mAudioSinkBufferCount = 0;
- mReachedEos = false;
-+#if GST_VERSION_MAJOR >= 1
-+ mConfigureAlignment = true;
-+#endif
-+
-+ LOG(PR_LOG_DEBUG, "reset decode done");
-
- return res;
- }
-@@ -508,11 +557,11 @@ bool GStreamerReader::DecodeAudioData()
- /* We have nothing decoded so it makes no sense to return to the state machine
- * as it will call us back immediately, we'll return again and so on, wasting
- * CPU cycles for no job done. So, block here until there is either video or
-- * audio data available
-+ * audio data available
- */
- mon.Wait();
- if (!mAudioSinkBufferCount) {
-- /* There is still no audio data available, so either there is video data or
-+ /* There is still no audio data available, so either there is video data or
- * something else has happened (Eos, etc...). Return to the state machine
- * to process it.
- */
-@@ -533,24 +584,44 @@ bool GStreamerReader::DecodeAudioData()
- }
- }
-
-+#if GST_VERSION_MAJOR >= 1
-+ GstSample *sample = gst_app_sink_pull_sample(mAudioAppSink);
-+ buffer = gst_buffer_ref(gst_sample_get_buffer(sample));
-+ gst_sample_unref(sample);
-+#else
- buffer = gst_app_sink_pull_buffer(mAudioAppSink);
-+#endif
-+
- mAudioSinkBufferCount--;
- }
-
- int64_t timestamp = GST_BUFFER_TIMESTAMP(buffer);
- timestamp = gst_segment_to_stream_time(&mAudioSegment,
- GST_FORMAT_TIME, timestamp);
-+
- timestamp = GST_TIME_AS_USECONDS(timestamp);
-+
- int64_t duration = 0;
- if (GST_CLOCK_TIME_IS_VALID(GST_BUFFER_DURATION(buffer)))
- duration = GST_TIME_AS_USECONDS(GST_BUFFER_DURATION(buffer));
-
- int64_t offset = GST_BUFFER_OFFSET(buffer);
-+#if GST_VERSION_MAJOR >= 1
-+ GstMapInfo info;
-+ gst_buffer_map(buffer, &info, GST_MAP_READ);
-+ unsigned int size = info.size;
-+#else
- unsigned int size = GST_BUFFER_SIZE(buffer);
-+#endif
- int32_t frames = (size / sizeof(AudioDataValue)) / mInfo.mAudio.mChannels;
- ssize_t outSize = static_cast<size_t>(size / sizeof(AudioDataValue));
- nsAutoArrayPtr<AudioDataValue> data(new AudioDataValue[outSize]);
-+#if GST_VERSION_MAJOR >= 1
-+ memcpy(data, info.data, info.size);
-+ gst_buffer_unmap(buffer, &info);
-+#else
- memcpy(data, GST_BUFFER_DATA(buffer), GST_BUFFER_SIZE(buffer));
-+#endif
- AudioData* audio = new AudioData(offset, timestamp, duration,
- frames, data.forget(), mInfo.mAudio.mChannels);
-
-@@ -552,7 +620,7 @@ bool GStreamerReader::DecodeAudioData()
- }
-
- bool GStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip,
-- int64_t aTimeThreshold)
-+ int64_t aTimeThreshold)
- {
- NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread.");
-
-@@ -571,11 +639,11 @@ bool GStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip,
- /* We have nothing decoded so it makes no sense to return to the state machine
- * as it will call us back immediately, we'll return again and so on, wasting
- * CPU cycles for no job done. So, block here until there is either video or
-- * audio data available
-+ * audio data available
- */
- mon.Wait();
- if (!mVideoSinkBufferCount) {
-- /* There is still no video data available, so either there is audio data or
-+ /* There is still no video data available, so either there is audio data or
- * something else has happened (Eos, etc...). Return to the state machine
- * to process it
- */
-@@ -589,11 +657,17 @@ bool GStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip,
-
- mDecoder->NotifyDecodedFrames(0, 1);
-
-+#if GST_VERSION_MAJOR >= 1
-+ GstSample *sample = gst_app_sink_pull_sample(mVideoAppSink);
-+ buffer = gst_buffer_ref(gst_sample_get_buffer(sample));
-+ gst_sample_unref(sample);
-+#else
- buffer = gst_app_sink_pull_buffer(mVideoAppSink);
-+#endif
- mVideoSinkBufferCount--;
- }
-
-- bool isKeyframe = !GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DISCONT);
-+ bool isKeyframe = !GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DELTA_UNIT);
- if ((aKeyFrameSkip && !isKeyframe)) {
- gst_buffer_unref(buffer);
- return true;
-@@ -611,10 +687,18 @@ bool GStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip,
- "frame has invalid timestamp");
-
- timestamp = GST_TIME_AS_USECONDS(timestamp);
-+ int64_t duration;
-+ if (GST_CLOCK_TIME_IS_VALID(GST_BUFFER_DURATION(buffer)))
-+ duration = GST_TIME_AS_USECONDS(GST_BUFFER_DURATION(buffer));
-+ else if (fpsNum && fpsDen)
-+ /* add 1-frame duration */
-+ duration = gst_util_uint64_scale(GST_USECOND, fpsDen, fpsNum);
-+
- if (timestamp < aTimeThreshold) {
- LOG(PR_LOG_DEBUG, "skipping frame %" GST_TIME_FORMAT
- " threshold %" GST_TIME_FORMAT,
-- GST_TIME_ARGS(timestamp), GST_TIME_ARGS(aTimeThreshold));
-+ GST_TIME_ARGS(timestamp * 1000),
-+ GST_TIME_ARGS(aTimeThreshold * 1000));
- gst_buffer_unref(buffer);
- return true;
- }
-@@ -623,61 +707,36 @@ bool GStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip,
- /* no more frames */
- return false;
-
-- int64_t duration = 0;
-- if (GST_CLOCK_TIME_IS_VALID(GST_BUFFER_DURATION(buffer)))
-- duration = GST_TIME_AS_USECONDS(GST_BUFFER_DURATION(buffer));
-- else if (fpsNum && fpsDen)
-- /* 1-frame duration */
-- duration = gst_util_uint64_scale(GST_USECOND, fpsNum, fpsDen);
--
-- nsRefPtr<PlanarYCbCrImage> image;
-- GstMozVideoBufferData* bufferdata = reinterpret_cast<GstMozVideoBufferData*>
-- GST_IS_MOZ_VIDEO_BUFFER(buffer)?gst_moz_video_buffer_get_data(GST_MOZ_VIDEO_BUFFER(buffer)):nullptr;
--
-- if(bufferdata)
-- image = bufferdata->mImage;
-+#if GST_VERSION_MAJOR >= 1
-+ if (mConfigureAlignment && buffer->pool) {
-+ GstStructure *config = gst_buffer_pool_get_config(buffer->pool);
-+ GstVideoAlignment align;
-+ if (gst_buffer_pool_config_get_video_alignment(config, &align))
-+ gst_video_info_align(&mVideoInfo, &align);
-+ gst_structure_free(config);
-+ mConfigureAlignment = false;
-+ }
-+#endif
-
-+ nsRefPtr<PlanarYCbCrImage> image = GetImageFromBuffer(buffer);
- if (!image) {
- /* Ugh, upstream is not calling gst_pad_alloc_buffer(). Fallback to
- * allocating a PlanarYCbCrImage backed GstBuffer here and memcpy.
- */
- GstBuffer* tmp = nullptr;
-- AllocateVideoBufferFull(nullptr, GST_BUFFER_OFFSET(buffer),
-- GST_BUFFER_SIZE(buffer), nullptr, &tmp, image);
--
-- /* copy */
-- gst_buffer_copy_metadata(tmp, buffer, (GstBufferCopyFlags)GST_BUFFER_COPY_ALL);
-- memcpy(GST_BUFFER_DATA(tmp), GST_BUFFER_DATA(buffer),
-- GST_BUFFER_SIZE(tmp));
-+ CopyIntoImageBuffer(buffer, &tmp, image);
- gst_buffer_unref(buffer);
- buffer = tmp;
- }
-
-- guint8* data = GST_BUFFER_DATA(buffer);
--
-- int width = mPicture.width;
-- int height = mPicture.height;
-- GstVideoFormat format = mFormat;
--
-- VideoData::YCbCrBuffer b;
-- for(int i = 0; i < 3; i++) {
-- b.mPlanes[i].mData = data + gst_video_format_get_component_offset(format, i,
-- width, height);
-- b.mPlanes[i].mStride = gst_video_format_get_row_stride(format, i, width);
-- b.mPlanes[i].mHeight = gst_video_format_get_component_height(format,
-- i, height);
-- b.mPlanes[i].mWidth = gst_video_format_get_component_width(format,
-- i, width);
-- b.mPlanes[i].mOffset = 0;
-- b.mPlanes[i].mSkip = 0;
-- }
--
-- isKeyframe = !GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DELTA_UNIT);
- int64_t offset = mDecoder->GetResource()->Tell(); // Estimate location in media.
-- VideoData* video = VideoData::Create(mInfo.mVideo, image, offset,
-- timestamp, duration, b,
-- isKeyframe, -1, mPicture);
-+ VideoData* video = VideoData::CreateFromImage(mInfo.mVideo,
-+ mDecoder->GetImageContainer(),
-+ offset, timestamp, duration,
-+ static_cast<Image*>(image.get()),
-+ isKeyframe, -1, mPicture);
- mVideoQueue.Push(video);
-+
- gst_buffer_unref(buffer);
-
- return true;
-@@ -698,6 +755,10 @@ nsresult GStreamerReader::Seek(int64_t aTarget,
- return NS_ERROR_FAILURE;
- }
- LOG(PR_LOG_DEBUG, "seek succeeded");
-+ GstMessage* message = gst_bus_timed_pop_filtered(mBus, GST_CLOCK_TIME_NONE,
-+ (GstMessageType)(GST_MESSAGE_ASYNC_DONE | GST_MESSAGE_ERROR));
-+ gst_message_unref(message);
-+ LOG(PR_LOG_DEBUG, "seek completed");
-
- return DecodeToTarget(aTarget);
- }
-@@ -709,7 +770,9 @@ nsresult GStreamerReader::GetBuffered(dom::TimeRanges* aBuffered,
- return NS_OK;
- }
-
-+#if GST_VERSION_MAJOR == 0
- GstFormat format = GST_FORMAT_TIME;
-+#endif
- MediaResource* resource = mDecoder->GetResource();
- nsTArray<MediaByteRange> ranges;
- resource->GetCachedRanges(ranges);
-@@ -731,12 +794,21 @@ nsresult GStreamerReader::GetBuffered(dom::TimeRanges* aBuffered,
- int64_t endOffset = ranges[index].mEnd;
- gint64 startTime, endTime;
-
-+#if GST_VERSION_MAJOR >= 1
-+ if (!gst_element_query_convert(GST_ELEMENT(mPlayBin), GST_FORMAT_BYTES,
-+ startOffset, GST_FORMAT_TIME, &startTime))
-+ continue;
-+ if (!gst_element_query_convert(GST_ELEMENT(mPlayBin), GST_FORMAT_BYTES,
-+ endOffset, GST_FORMAT_TIME, &endTime))
-+ continue;
-+#else
- if (!gst_element_query_convert(GST_ELEMENT(mPlayBin), GST_FORMAT_BYTES,
- startOffset, &format, &startTime) || format != GST_FORMAT_TIME)
- continue;
- if (!gst_element_query_convert(GST_ELEMENT(mPlayBin), GST_FORMAT_BYTES,
- endOffset, &format, &endTime) || format != GST_FORMAT_TIME)
- continue;
-+#endif
-
- double start = (double) GST_TIME_AS_USECONDS (startTime) / GST_MSECOND;
- double end = (double) GST_TIME_AS_USECONDS (endTime) / GST_MSECOND;
-@@ -755,7 +827,13 @@ void GStreamerReader::ReadAndPushData(guint aLength)
- nsresult rv = NS_OK;
-
- GstBuffer* buffer = gst_buffer_new_and_alloc(aLength);
-+#if GST_VERSION_MAJOR >= 1
-+ GstMapInfo info;
-+ gst_buffer_map(buffer, &info, GST_MAP_WRITE);
-+ guint8 *data = info.data;
-+#else
- guint8* data = GST_BUFFER_DATA(buffer);
-+#endif
- uint32_t size = 0, bytesRead = 0;
- while(bytesRead < aLength) {
- rv = resource->Read(reinterpret_cast<char*>(data + bytesRead),
-@@ -780,7 +860,12 @@ void GStreamerReader::ReadAndPushData(guint aLength)
- int64_t offset2 = resource->Tell();
- unused << offset2;
-
-+#if GST_VERSION_MAJOR >= 1
-+ gst_buffer_unmap(buffer, &info);
-+ gst_buffer_set_size(buffer, bytesRead);
-+#else
- GST_BUFFER_SIZE(buffer) = bytesRead;
-+#endif
-
- GstFlowReturn ret = gst_app_src_push_buffer(mSource, gst_buffer_ref(buffer));
- if (ret != GST_FLOW_OK) {
-@@ -786,8 +869,13 @@ int64_t GStreamerReader::QueryDuration()
- gint64 duration = 0;
- GstFormat format = GST_FORMAT_TIME;
-
-+#if GST_VERSION_MAJOR >= 1
-+ if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
-+ format, &duration)) {
-+#else
- if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
- &format, &duration)) {
-+#endif
- if (format == GST_FORMAT_TIME) {
- LOG(PR_LOG_DEBUG, "pipeline duration %" GST_TIME_FORMAT,
- GST_TIME_ARGS (duration));
-@@ -893,109 +984,6 @@ gboolean GStreamerReader::SeekData(GstAppSrc* aSrc, guint64 aOffset)
- return NS_SUCCEEDED(rv);
- }
-
--gboolean GStreamerReader::EventProbeCb(GstPad* aPad,
-- GstEvent* aEvent,
-- gpointer aUserData)
--{
-- GStreamerReader* reader = reinterpret_cast<GStreamerReader*>(aUserData);
-- return reader->EventProbe(aPad, aEvent);
--}
--
--gboolean GStreamerReader::EventProbe(GstPad* aPad, GstEvent* aEvent)
--{
-- GstElement* parent = GST_ELEMENT(gst_pad_get_parent(aPad));
-- switch(GST_EVENT_TYPE(aEvent)) {
-- case GST_EVENT_NEWSEGMENT:
-- {
-- gboolean update;
-- gdouble rate;
-- GstFormat format;
-- gint64 start, stop, position;
-- GstSegment* segment;
--
-- /* Store the segments so we can convert timestamps to stream time, which
-- * is what the upper layers sync on.
-- */
-- ReentrantMonitorAutoEnter mon(mGstThreadsMonitor);
-- gst_event_parse_new_segment(aEvent, &update, &rate, &format,
-- &start, &stop, &position);
-- if (parent == GST_ELEMENT(mVideoAppSink))
-- segment = &mVideoSegment;
-- else
-- segment = &mAudioSegment;
-- gst_segment_set_newsegment(segment, update, rate, format,
-- start, stop, position);
-- break;
-- }
-- case GST_EVENT_FLUSH_STOP:
-- /* Reset on seeks */
-- ResetDecode();
-- break;
-- default:
-- break;
-- }
-- gst_object_unref(parent);
--
-- return TRUE;
--}
--
--GstFlowReturn GStreamerReader::AllocateVideoBufferFull(GstPad* aPad,
-- guint64 aOffset,
-- guint aSize,
-- GstCaps* aCaps,
-- GstBuffer** aBuf,
-- nsRefPtr<PlanarYCbCrImage>& aImage)
--{
-- /* allocate an image using the container */
-- ImageContainer* container = mDecoder->GetImageContainer();
-- if (!container) {
-- // We don't have an ImageContainer. We probably belong to an <audio>
-- // element.
-- return GST_FLOW_NOT_SUPPORTED;
-- }
-- PlanarYCbCrImage* img =
-- reinterpret_cast<PlanarYCbCrImage*>(
-- container->CreateImage(ImageFormat::PLANAR_YCBCR).get());
-- nsRefPtr<PlanarYCbCrImage> image = dont_AddRef(img);
--
-- /* prepare a GstBuffer pointing to the underlying PlanarYCbCrImage buffer */
-- GstBuffer* buf = GST_BUFFER(gst_moz_video_buffer_new());
-- GST_BUFFER_SIZE(buf) = aSize;
-- /* allocate the actual YUV buffer */
-- GST_BUFFER_DATA(buf) = image->AllocateAndGetNewBuffer(aSize);
--
-- aImage = image;
--
-- /* create a GstMozVideoBufferData to hold the image */
-- GstMozVideoBufferData* bufferdata = new GstMozVideoBufferData(image);
--
-- /* Attach bufferdata to our GstMozVideoBuffer, it will take care to free it */
-- gst_moz_video_buffer_set_data(GST_MOZ_VIDEO_BUFFER(buf), bufferdata);
--
-- *aBuf = buf;
-- return GST_FLOW_OK;
--}
--
--GstFlowReturn GStreamerReader::AllocateVideoBufferCb(GstPad* aPad,
-- guint64 aOffset,
-- guint aSize,
-- GstCaps* aCaps,
-- GstBuffer** aBuf)
--{
-- GStreamerReader* reader = reinterpret_cast<GStreamerReader*>(gst_pad_get_element_private(aPad));
-- return reader->AllocateVideoBuffer(aPad, aOffset, aSize, aCaps, aBuf);
--}
--
--GstFlowReturn GStreamerReader::AllocateVideoBuffer(GstPad* aPad,
-- guint64 aOffset,
-- guint aSize,
-- GstCaps* aCaps,
-- GstBuffer** aBuf)
--{
-- nsRefPtr<PlanarYCbCrImage> image;
-- return AllocateVideoBufferFull(aPad, aOffset, aSize, aCaps, aBuf, image);
--}
--
- GstFlowReturn GStreamerReader::NewPrerollCb(GstAppSink* aSink,
- gpointer aUserData)
- {
-@@ -979,8 +970,12 @@ void GStreamerReader::AudioPreroll()
- {
- /* The first audio buffer has reached the audio sink. Get rate and channels */
- LOG(PR_LOG_DEBUG, "Audio preroll");
-- GstPad* sinkpad = gst_element_get_pad(GST_ELEMENT(mAudioAppSink), "sink");
-+ GstPad* sinkpad = gst_element_get_static_pad(GST_ELEMENT(mAudioAppSink), "sink");
-+#if GST_VERSION_MAJOR >= 1
-+ GstCaps *caps = gst_pad_get_current_caps(sinkpad);
-+#else
- GstCaps* caps = gst_pad_get_negotiated_caps(sinkpad);
-+#endif
- GstStructure* s = gst_caps_get_structure(caps, 0);
- mInfo.mAudio.mRate = mInfo.mAudio.mChannels = 0;
- gst_structure_get_int(s, "rate", (gint*) &mInfo.mAudio.mRate);
-@@ -998,9 +993,18 @@ void GStreamerReader::VideoPreroll()
- {
- /* The first video buffer has reached the video sink. Get width and height */
- LOG(PR_LOG_DEBUG, "Video preroll");
-- GstPad* sinkpad = gst_element_get_pad(GST_ELEMENT(mVideoAppSink), "sink");
-+ GstPad* sinkpad = gst_element_get_static_pad(GST_ELEMENT(mVideoAppSink), "sink");
-+#if GST_VERSION_MAJOR >= 1
-+ GstCaps* caps = gst_pad_get_current_caps(sinkpad);
-+ memset (&mVideoInfo, 0, sizeof (mVideoInfo));
-+ gst_video_info_from_caps(&mVideoInfo, caps);
-+ mFormat = mVideoInfo.finfo->format;
-+ mPicture.width = mVideoInfo.width;
-+ mPicture.height = mVideoInfo.height;
-+#else
- GstCaps* caps = gst_pad_get_negotiated_caps(sinkpad);
- gst_video_format_parse_caps(caps, &mFormat, &mPicture.width, &mPicture.height);
-+#endif
- GstStructure* structure = gst_caps_get_structure(caps, 0);
- gst_structure_get_fraction(structure, "framerate", &fpsNum, &fpsDen);
- NS_ASSERTION(mPicture.width && mPicture.height, "invalid video resolution");
-@@ -1029,6 +1033,7 @@ void GStreamerReader::NewVideoBuffer()
- /* We have a new video buffer queued in the video sink. Increment the counter
- * and notify the decode thread potentially blocked in DecodeVideoFrame
- */
-+
- mDecoder->NotifyDecodedFrames(1, 0);
- mVideoSinkBufferCount++;
- mon.NotifyAll();
-@@ -1095,5 +1100,199 @@ void GStreamerReader::NotifyDataArrived(const char *aBuffer,
- }
- }
-
-+#if GST_VERSION_MAJOR >= 1
-+GstCaps* GStreamerReader::BuildAudioSinkCaps()
-+{
-+ GstCaps* caps = gst_caps_from_string("audio/x-raw, channels={1,2}");
-+ const char* format;
-+#ifdef MOZ_SAMPLE_TYPE_FLOAT32
-+#ifdef IS_LITTLE_ENDIAN
-+ format = "F32LE";
-+#else
-+ format = "F32BE";
-+#endif
-+#else /* !MOZ_SAMPLE_TYPE_FLOAT32 */
-+#ifdef IS_LITTLE_ENDIAN
-+ format = "S16LE";
-+#else
-+ format = "S16BE";
-+#endif
-+#endif
-+ gst_caps_set_simple(caps, "format", G_TYPE_STRING, format, nullptr);
-+
-+ return caps;
-+}
-+
-+void GStreamerReader::InstallPadCallbacks()
-+{
-+ GstPad* sinkpad = gst_element_get_static_pad(GST_ELEMENT(mVideoAppSink), "sink");
-+
-+ gst_pad_add_probe(sinkpad,
-+ (GstPadProbeType) (GST_PAD_PROBE_TYPE_SCHEDULING |
-+ GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM |
-+ GST_PAD_PROBE_TYPE_EVENT_UPSTREAM |
-+ GST_PAD_PROBE_TYPE_EVENT_FLUSH),
-+ &GStreamerReader::EventProbeCb, this, nullptr);
-+ gst_pad_add_probe(sinkpad, GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM,
-+ GStreamerReader::QueryProbeCb, nullptr, nullptr);
-+
-+ gst_pad_set_element_private(sinkpad, this);
-+ gst_object_unref(sinkpad);
-+
-+ sinkpad = gst_element_get_static_pad(GST_ELEMENT(mAudioAppSink), "sink");
-+ gst_pad_add_probe(sinkpad,
-+ (GstPadProbeType) (GST_PAD_PROBE_TYPE_SCHEDULING |
-+ GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM |
-+ GST_PAD_PROBE_TYPE_EVENT_UPSTREAM |
-+ GST_PAD_PROBE_TYPE_EVENT_FLUSH),
-+ &GStreamerReader::EventProbeCb, this, nullptr);
-+ gst_object_unref(sinkpad);
-+}
-+
-+GstPadProbeReturn GStreamerReader::EventProbeCb(GstPad *aPad,
-+ GstPadProbeInfo *aInfo,
-+ gpointer aUserData)
-+{
-+ GStreamerReader *reader = (GStreamerReader *) aUserData;
-+ GstEvent *aEvent = (GstEvent *)aInfo->data;
-+ return reader->EventProbe(aPad, aEvent);
-+}
-+
-+GstPadProbeReturn GStreamerReader::EventProbe(GstPad *aPad, GstEvent *aEvent)
-+{
-+ GstElement* parent = GST_ELEMENT(gst_pad_get_parent(aPad));
-+
-+ LOG(PR_LOG_DEBUG, "event probe %s", GST_EVENT_TYPE_NAME (aEvent));
-+
-+ switch(GST_EVENT_TYPE(aEvent)) {
-+ case GST_EVENT_SEGMENT:
-+ {
-+ const GstSegment *newSegment;
-+ GstSegment* segment;
-+
-+ /* Store the segments so we can convert timestamps to stream time, which
-+ * is what the upper layers sync on.
-+ */
-+ ReentrantMonitorAutoEnter mon(mGstThreadsMonitor);
-+#if GST_VERSION_MINOR <= 1 && GST_VERSION_MICRO < 1
-+ ResetDecode();
-+#endif
-+ gst_event_parse_segment(aEvent, &newSegment);
-+ if (parent == GST_ELEMENT(mVideoAppSink))
-+ segment = &mVideoSegment;
-+ else
-+ segment = &mAudioSegment;
-+ gst_segment_copy_into (newSegment, segment);
-+ break;
-+ }
-+ case GST_EVENT_FLUSH_STOP:
-+ /* Reset on seeks */
-+ ResetDecode();
-+ break;
-+ default:
-+ break;
-+ }
-+ gst_object_unref(parent);
-+
-+ return GST_PAD_PROBE_OK;
-+}
-+
-+GstPadProbeReturn GStreamerReader::QueryProbeCb(GstPad* aPad, GstPadProbeInfo* aInfo, gpointer aUserData)
-+{
-+ GStreamerReader* reader = reinterpret_cast<GStreamerReader*>(gst_pad_get_element_private(aPad));
-+ return reader->QueryProbe(aPad, aInfo, aUserData);
-+}
-+
-+GstPadProbeReturn GStreamerReader::QueryProbe(GstPad* aPad, GstPadProbeInfo* aInfo, gpointer aUserData)
-+{
-+ GstQuery *query = gst_pad_probe_info_get_query(aInfo);
-+ GstPadProbeReturn ret = GST_PAD_PROBE_OK;
-+
-+ switch (GST_QUERY_TYPE (query)) {
-+ case GST_QUERY_ALLOCATION:
-+ GstCaps *caps;
-+ GstVideoInfo info;
-+ gboolean need_pool;
-+
-+ gst_query_parse_allocation(query, &caps, &need_pool);
-+ gst_video_info_init(&info);
-+ gst_video_info_from_caps(&info, caps);
-+ gst_query_add_allocation_param(query, mAllocator, nullptr);
-+ gst_query_add_allocation_pool(query, mBufferPool, info.size, 0, 0);
-+ gst_query_add_allocation_meta(query, GST_VIDEO_META_API_TYPE, nullptr);
-+ break;
-+ default:
-+ break;
-+ }
-+
-+ return ret;
-+}
-+
-+void GStreamerReader::ImageDataFromVideoFrame(GstVideoFrame *aFrame,
-+ PlanarYCbCrImage::Data *aData)
-+{
-+ NS_ASSERTION(GST_VIDEO_INFO_IS_YUV(&mVideoInfo),
-+ "Non-YUV video frame formats not supported");
-+ NS_ASSERTION(GST_VIDEO_FRAME_N_COMPONENTS(aFrame) == 3,
-+ "Unsupported number of components in video frame");
-+
-+ aData->mPicX = aData->mPicY = 0;
-+ aData->mPicSize = gfx::IntSize(mPicture.width, mPicture.height);
-+ aData->mStereoMode = StereoMode::MONO;
-+
-+ aData->mYChannel = GST_VIDEO_FRAME_COMP_DATA(aFrame, 0);
-+ aData->mYStride = GST_VIDEO_FRAME_COMP_STRIDE(aFrame, 0);
-+ aData->mYSize = gfx::IntSize(GST_VIDEO_FRAME_COMP_WIDTH(aFrame, 0),
-+ GST_VIDEO_FRAME_COMP_HEIGHT(aFrame, 0));
-+ aData->mYSkip = GST_VIDEO_FRAME_COMP_PSTRIDE(aFrame, 0) - 1;
-+ aData->mCbCrStride = GST_VIDEO_FRAME_COMP_STRIDE(aFrame, 1);
-+ aData->mCbCrSize = gfx::IntSize(GST_VIDEO_FRAME_COMP_WIDTH(aFrame, 1),
-+ GST_VIDEO_FRAME_COMP_HEIGHT(aFrame, 1));
-+ aData->mCbChannel = GST_VIDEO_FRAME_COMP_DATA(aFrame, 1);
-+ aData->mCrChannel = GST_VIDEO_FRAME_COMP_DATA(aFrame, 2);
-+ aData->mCbSkip = GST_VIDEO_FRAME_COMP_PSTRIDE(aFrame, 1) - 1;
-+ aData->mCrSkip = GST_VIDEO_FRAME_COMP_PSTRIDE(aFrame, 2) - 1;
-+}
-+
-+nsRefPtr<PlanarYCbCrImage> GStreamerReader::GetImageFromBuffer(GstBuffer* aBuffer)
-+{
-+ nsRefPtr<PlanarYCbCrImage> image = nullptr;
-+
-+ if (gst_buffer_n_memory(aBuffer) == 1) {
-+ GstMemory* mem = gst_buffer_peek_memory(aBuffer, 0);
-+ if (GST_IS_MOZ_GFX_MEMORY_ALLOCATOR(mem->allocator)) {
-+ image = moz_gfx_memory_get_image(mem);
-+
-+ GstVideoFrame frame;
-+ gst_video_frame_map(&frame, &mVideoInfo, aBuffer, GST_MAP_READ);
-+ PlanarYCbCrImage::Data data;
-+ ImageDataFromVideoFrame(&frame, &data);
-+ image->SetDataNoCopy(data);
-+ gst_video_frame_unmap(&frame);
-+ }
-+ }
-+
-+ return image;
-+}
-+
-+void GStreamerReader::CopyIntoImageBuffer(GstBuffer* aBuffer,
-+ GstBuffer** aOutBuffer,
-+ nsRefPtr<PlanarYCbCrImage> &image)
-+{
-+ *aOutBuffer = gst_buffer_new_allocate(mAllocator, gst_buffer_get_size(aBuffer), nullptr);
-+ GstMemory *mem = gst_buffer_peek_memory(*aOutBuffer, 0);
-+ GstMapInfo map_info;
-+ gst_memory_map(mem, &map_info, GST_MAP_WRITE);
-+ gst_buffer_extract(aBuffer, 0, map_info.data, gst_buffer_get_size(aBuffer));
-+ gst_memory_unmap(mem, &map_info);
-+
-+ /* create a new gst buffer with the newly created memory and copy the
-+ * metadata over from the incoming buffer */
-+ gst_buffer_copy_into(*aOutBuffer, aBuffer,
-+ (GstBufferCopyFlags)(GST_BUFFER_COPY_METADATA), 0, -1);
-+ image = GetImageFromBuffer(*aOutBuffer);
-+}
-+#endif
-+
- } // namespace mozilla
-
-diff --git content/media/gstreamer/GStreamerReader.h content/media/gstreamer/GStreamerReader.h
-index 1e30bed..6a90702 100644
---- mozilla/content/media/gstreamer/GStreamerReader.h
-+++ mozilla/content/media/gstreamer/GStreamerReader.h
-@@ -22,6 +22,7 @@
-
- #include "MediaDecoderReader.h"
- #include "MP3FrameParser.h"
-+#include "ImageContainer.h"
- #include "nsRect.h"
-
- namespace mozilla {
-@@ -30,10 +31,6 @@ namespace dom {
- class TimeRanges;
- }
-
--namespace layers {
--class PlanarYCbCrImage;
--}
--
- class AbstractMediaDecoder;
-
- class GStreamerReader : public MediaDecoderReader
-@@ -67,10 +64,20 @@ public:
- return mInfo.HasVideo();
- }
-
-+ layers::ImageContainer* GetImageContainer() { return mDecoder->GetImageContainer(); }
-+
- private:
-
- void ReadAndPushData(guint aLength);
- int64_t QueryDuration();
-+ nsRefPtr<layers::PlanarYCbCrImage> GetImageFromBuffer(GstBuffer* aBuffer);
-+ void CopyIntoImageBuffer(GstBuffer *aBuffer, GstBuffer** aOutBuffer, nsRefPtr<layers::PlanarYCbCrImage> &image);
-+ GstCaps* BuildAudioSinkCaps();
-+ void InstallPadCallbacks();
-+
-+#if GST_VERSION_MAJOR >= 1
-+ void ImageDataFromVideoFrame(GstVideoFrame *aFrame, layers::PlanarYCbCrImage::Data *aData);
-+#endif
-
- /* Called once the pipeline is setup to check that the stream only contains
- * supported formats
-@@ -105,20 +112,31 @@ private:
- gboolean SeekData(GstAppSrc* aSrc, guint64 aOffset);
-
- /* Called when events reach the sinks. See inline comments */
-+#if GST_VERSION_MAJOR == 1
-+ static GstPadProbeReturn EventProbeCb(GstPad *aPad, GstPadProbeInfo *aInfo, gpointer aUserData);
-+ GstPadProbeReturn EventProbe(GstPad *aPad, GstEvent *aEvent);
-+#else
- static gboolean EventProbeCb(GstPad* aPad, GstEvent* aEvent, gpointer aUserData);
- gboolean EventProbe(GstPad* aPad, GstEvent* aEvent);
-+#endif
-
-- /* Called when elements in the video branch of the pipeline call
-- * gst_pad_alloc_buffer(). Used to provide PlanarYCbCrImage backed GstBuffers
-- * to the pipeline so that a memory copy can be avoided when handling YUV
-- * buffers from the pipeline to the gfx side.
-+ /* Called when the video part of the pipeline allocates buffers. Used to
-+ * provide PlanarYCbCrImage backed GstBuffers to the pipeline so that a memory
-+ * copy can be avoided when handling YUV buffers from the pipeline to the gfx
-+ * side.
- */
-+#if GST_VERSION_MAJOR == 1
-+ static GstPadProbeReturn QueryProbeCb(GstPad *aPad, GstPadProbeInfo *aInfo, gpointer aUserData);
-+ GstPadProbeReturn QueryProbe(GstPad *aPad, GstPadProbeInfo *aInfo, gpointer aUserData);
-+#else
- static GstFlowReturn AllocateVideoBufferCb(GstPad* aPad, guint64 aOffset, guint aSize,
- GstCaps* aCaps, GstBuffer** aBuf);
- GstFlowReturn AllocateVideoBufferFull(GstPad* aPad, guint64 aOffset, guint aSize,
- GstCaps* aCaps, GstBuffer** aBuf, nsRefPtr<layers::PlanarYCbCrImage>& aImage);
- GstFlowReturn AllocateVideoBuffer(GstPad* aPad, guint64 aOffset, guint aSize,
- GstCaps* aCaps, GstBuffer** aBuf);
-+#endif
-+
-
- /* Called when the pipeline is prerolled, that is when at start or after a
- * seek, the first audio and video buffers are queued in the sinks.
-@@ -150,6 +168,11 @@ private:
- bool mUseParserDuration;
- int64_t mLastParserDuration;
-
-+#if GST_VERSION_MAJOR >= 1
-+ GstAllocator *mAllocator;
-+ GstBufferPool *mBufferPool;
-+ GstVideoInfo mVideoInfo;
-+#endif
- GstElement* mPlayBin;
- GstBus* mBus;
- GstAppSrc* mSource;
-@@ -180,6 +203,9 @@ private:
- * DecodeAudioData and DecodeVideoFrame should not expect any more data
- */
- bool mReachedEos;
-+#if GST_VERSION_MAJOR >= 1
-+ bool mConfigureAlignment;
-+#endif
- int fpsNum;
- int fpsDen;
- };
-diff --git content/media/gstreamer/moz.build content/media/gstreamer/moz.build
-index 7d51bf5..a3c1856 100644
---- mozilla/content/media/gstreamer/moz.build
-+++ mozilla/content/media/gstreamer/moz.build
-@@ -15,10 +15,19 @@ SOURCES += [
- 'GStreamerDecoder.cpp',
- 'GStreamerFormatHelper.cpp',
- 'GStreamerLoader.cpp',
-- 'GStreamerMozVideoBuffer.cpp',
- 'GStreamerReader.cpp',
- ]
-
-+if CONFIG['GST_API_VERSION'] == '1.0':
-+ SOURCES += [
-+ 'GStreamerAllocator.cpp',
-+ ]
-+else:
-+ SOURCES += [
-+ 'GStreamerMozVideoBuffer.cpp',
-+ 'GStreamerReader-0.10.cpp',
-+ ]
-+
- FAIL_ON_WARNINGS = True
-
- FINAL_LIBRARY = 'gklayout'
-diff --git content/media/test/manifest.js content/media/test/manifest.js
-index 6e39753..3c8c3b9 100644
---- mozilla/content/media/test/manifest.js
-+++ mozilla/content/media/test/manifest.js
-@@ -357,9 +357,9 @@ var gUnseekableTests = [
- { name:"bogus.duh", type:"bogus/duh"}
- ];
- // Unfortunately big-buck-bunny-unseekable.mp4 is doesn't play on Windows 7, so
--// only include it in the unseekable tests if we're on later versions of Windows.
--if (navigator.userAgent.indexOf("Windows") == -1 ||
-- IsWindows8OrLater()) {
-+// only include it in the unseekable tests if we're on later versions of Windows.
-+// This test actually only passes on win8 at the moment.
-+if (navigator.userAgent.indexOf("Windows") != -1 && IsWindows8OrLater()) {
- gUnseekableTests = gUnseekableTests.concat([
- { name:"big-buck-bunny-unseekable.mp4", type:"video/mp4" }
- ]);
Modified: trunk/www/seamonkey/files/patch-bug847568
==============================================================================
--- trunk/www/seamonkey/files/patch-bug847568 Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/www/seamonkey/files/patch-bug847568 Tue Jun 10 04:47:02 2014 (r1595)
@@ -86,21 +86,20 @@
dnl Check for pixman and cairo
dnl ========================================================
-diff --git content/base/src/Makefile.in content/base/src/Makefile.in
-index a618096..596901a 100644
---- mozilla/content/base/src/Makefile.in
-+++ mozilla/content/base/src/Makefile.in
-@@ -5,6 +5,10 @@
-
- include $(topsrcdir)/config/rules.mk
-
-+ifdef MOZ_NATIVE_HARFBUZZ
-+nsContentUtils.$(OBJ_SUFFIX): CXXFLAGS+=$(MOZ_HARFBUZZ_CFLAGS)
-+endif
-+
- # gcc requires -msse2 for this file since it uses SSE2 intrinsics. (See bug
- # 585538 comment 12.)
- ifneq (,$(INTEL_ARCHITECTURE))
+diff --git content/base/src/moz.build content/base/src/moz.build
+index d4f6380..0ee55df 100644
+--- mozilla/content/base/src/moz.build
++++ mozilla/content/base/src/moz.build
+@@ -179,6 +179,9 @@ SOURCES += [
+ 'nsObjectLoadingContent.cpp',
+ ]
+
++if CONFIG['MOZ_NATIVE_HARFBUZZ']:
++ SOURCES['nsContentUtils.cpp'].flags += [CONFIG['MOZ_HARFBUZZ_CFLAGS']]
++
+ EXTRA_COMPONENTS += [
+ 'contentAreaDropListener.js',
+ 'contentAreaDropListener.manifest',
diff --git gfx/moz.build gfx/moz.build
index 519aa46..6929751 100644
--- mozilla/gfx/moz.build
Deleted: trunk/www/seamonkey/files/patch-bug973744
==============================================================================
--- trunk/www/seamonkey/files/patch-bug973744 Tue Jun 10 04:47:02 2014 (r1594)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,38 +0,0 @@
-commit 2506904
-Author: Alessandro Decina <alessandro.d@gmail.com>
-Date: Wed Feb 19 11:30:09 2014 -0500
-
- Bug 973744 - Remove matroska seek hack in the gstreamer media backend. r=edwin
----
- content/media/gstreamer/GStreamerReader.cpp | 21 ---------------------
- 1 file changed, 21 deletions(-)
-
-diff --git content/media/gstreamer/GStreamerReader.cpp content/media/gstreamer/GStreamerReader.cpp
-index e21ffdd..82dadeb 100644
---- mozilla/content/media/gstreamer/GStreamerReader.cpp
-+++ mozilla/content/media/gstreamer/GStreamerReader.cpp
-@@ -381,24 +381,6 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
- /* we couldn't get this to play */
- return ret;
-
-- /* FIXME: workaround for a bug in matroskademux. This seek makes matroskademux
-- * parse the index */
-- LOG(PR_LOG_DEBUG, "doing matroskademux seek hack");
-- if (gst_element_seek_simple(mPlayBin, GST_FORMAT_TIME,
-- GST_SEEK_FLAG_FLUSH, 0)) {
-- /* after a seek we need to wait again for ASYNC_DONE */
-- message = gst_bus_timed_pop_filtered(mBus, 5 * GST_SECOND,
-- (GstMessageType)(GST_MESSAGE_ASYNC_DONE | GST_MESSAGE_ERROR));
-- LOG(PR_LOG_DEBUG, "matroskademux seek hack done");
-- if (GST_MESSAGE_TYPE(message) != GST_MESSAGE_ASYNC_DONE) {
-- gst_element_set_state(mPlayBin, GST_STATE_NULL);
-- gst_message_unref(message);
-- return NS_ERROR_FAILURE;
-- }
-- } else {
-- LOG(PR_LOG_DEBUG, "matroskademux seek hack failed (non fatal)");
-- }
--
- /* report the duration */
- gint64 duration;
-
Modified: trunk/www/seamonkey/files/patch-bug975397
==============================================================================
--- trunk/www/seamonkey/files/patch-bug975397 Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/www/seamonkey/files/patch-bug975397 Tue Jun 10 04:47:02 2014 (r1595)
@@ -66,8 +66,8 @@
index e414f28..acd709c3 100644
--- mozilla/layout/style/crashtests/crashtests.list
+++ mozilla/layout/style/crashtests/crashtests.list
-@@ -102,3 +102,4 @@ load 930270-1.html
- load 930270-2.html
- load 945048-1.html
+@@ -104,3 +104,4 @@ load 945048-1.html
+ load 972199-1.html
load 989965-1.html
+ load large_border_image_width.html
+load border-image-visited-link.html
Deleted: trunk/www/seamonkey/files/patch-bug975634
==============================================================================
--- trunk/www/seamonkey/files/patch-bug975634 Tue Jun 10 04:47:02 2014 (r1594)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,63 +0,0 @@
-diff --git configure.in configure.in
-index 0d9236a..0447104 100644
---- mozilla/configure.in
-+++ mozilla/configure.in
-@@ -8670,6 +8670,20 @@ fi
- AC_SUBST(MOZ_EM_DEBUG)
-
- if test -n "$COMPILE_ENVIRONMENT"; then
-+AC_MSG_CHECKING([for posix_fadvise])
-+AC_TRY_LINK([#define _XOPEN_SOURCE 600
-+ #include <fcntl.h>],
-+ [posix_fadvise(0, 0, 0, 0);],
-+ [ac_cv___posix_fadvise=true],
-+ [ac_cv___posix_fadvise=false])
-+
-+if test "$ac_cv___posix_fadvise" = true ; then
-+ AC_DEFINE(HAVE_POSIX_FADVISE)
-+ AC_MSG_RESULT(yes)
-+else
-+ AC_MSG_RESULT(no)
-+fi
-+
- AC_MSG_CHECKING([for posix_fallocate])
- AC_TRY_LINK([#define _XOPEN_SOURCE 600
- #include <fcntl.h>],
-diff --git js/src/configure.in js/src/configure.in
-index da9767c..352ba14 100644
---- mozilla/js/src/configure.in
-+++ mozilla/js/src/configure.in
-@@ -4025,6 +4025,20 @@ AC_SUBST(CXX_VERSION)
- AC_SUBST(MSMANIFEST_TOOL)
- AC_SUBST(MOZ_LINKER)
-
-+AC_MSG_CHECKING([for posix_fadvise])
-+AC_TRY_LINK([#define _XOPEN_SOURCE 600
-+ #include <fcntl.h>],
-+ [posix_fadvise(0, 0, 0, 0);],
-+ [ac_cv___posix_fadvise=true],
-+ [ac_cv___posix_fadvise=false])
-+
-+if test "$ac_cv___posix_fadvise" = true ; then
-+ AC_DEFINE(HAVE_POSIX_FADVISE)
-+ AC_MSG_RESULT(yes)
-+else
-+ AC_MSG_RESULT(no)
-+fi
-+
- AC_MSG_CHECKING([for posix_fallocate])
- AC_TRY_LINK([#define _XOPEN_SOURCE 600
- #include <fcntl.h>],
-diff --git xpcom/io/nsLocalFileUnix.cpp xpcom/io/nsLocalFileUnix.cpp
-index bacf06c..0e46e4a 100644
---- mozilla/xpcom/io/nsLocalFileUnix.cpp
-+++ mozilla/xpcom/io/nsLocalFileUnix.cpp
-@@ -382,7 +382,7 @@ nsLocalFile::OpenNSPRFileDesc(int32_t flags, int32_t mode, PRFileDesc **_retval)
- PR_Delete(mPath.get());
- }
-
--#if defined(LINUX) && !defined(ANDROID)
-+#if defined(HAVE_POSIX_FADVISE)
- if (flags & OS_READAHEAD) {
- posix_fadvise(PR_FileDesc2NativeHandle(*_retval), 0, 0,
- POSIX_FADV_SEQUENTIAL);
Deleted: trunk/www/seamonkey/files/patch-bug977457
==============================================================================
--- trunk/www/seamonkey/files/patch-bug977457 Tue Jun 10 04:47:02 2014 (r1594)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,27 +0,0 @@
-diff --git xpcom/base/nsStackWalk.cpp xpcom/base/nsStackWalk.cpp
-index bb0e15b..7641267 100644
---- mozilla/xpcom/base/nsStackWalk.cpp
-+++ mozilla/xpcom/base/nsStackWalk.cpp
-@@ -23,6 +23,12 @@ struct CriticalAddress {
- };
- static CriticalAddress gCriticalAddress;
-
-+// for _Unwind_Backtrace from libcxxrt or libunwind
-+// cxxabi.h from libcxxrt implicitly includes unwind.h first
-+#if defined(HAVE__UNWIND_BACKTRACE) && !defined(_GNU_SOURCE)
-+#define _GNU_SOURCE
-+#endif
-+
- #if defined(HAVE_DLOPEN) || defined(XP_MACOSX)
- #include <dlfcn.h>
- #endif
-@@ -1222,9 +1228,6 @@ NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames,
- #elif defined(HAVE__UNWIND_BACKTRACE)
-
- // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0
--#ifndef _GNU_SOURCE
--#define _GNU_SOURCE
--#endif
- #include <unwind.h>
-
- struct unwind_info {
Added: trunk/www/seamonkey/files/patch-bug981348
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-bug981348 Tue Jun 10 04:47:02 2014 (r1595)
@@ -0,0 +1,41 @@
+diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp
+index 4b21361..cb3be32 100644
+--- mozilla/dom/system/OSFileConstants.cpp
++++ mozilla/dom/system/OSFileConstants.cpp
+@@ -596,7 +596,7 @@ static const dom::ConstantSpec gLibcProperties[] =
+
+ { "OSFILE_SIZEOF_STATVFS", INT_TO_JSVAL(sizeof (struct statvfs)) },
+
+- { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_bsize)) },
++ { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_frsize)) },
+ { "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", INT_TO_JSVAL(offsetof (struct statvfs, f_bavail)) },
+
+ #endif // defined(XP_UNIX)
+diff --git toolkit/components/osfile/modules/osfile_unix_back.jsm toolkit/components/osfile/modules/osfile_unix_back.jsm
+index b59fca4..0cf220b 100644
+--- mozilla/toolkit/components/osfile/modules/osfile_unix_back.jsm
++++ mozilla/toolkit/components/osfile/modules/osfile_unix_back.jsm
+@@ -228,8 +228,8 @@
+ let statvfs = new SharedAll.HollowStructure("statvfs",
+ Const.OSFILE_SIZEOF_STATVFS);
+
+- statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BSIZE,
+- "f_bsize", Type.unsigned_long.implementation);
++ statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_FRSIZE,
++ "f_frsize", Type.unsigned_long.implementation);
+ statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BAVAIL,
+ "f_bavail", Type.fsblkcnt_t.implementation);
+
+diff --git toolkit/components/osfile/modules/osfile_unix_front.jsm toolkit/components/osfile/modules/osfile_unix_front.jsm
+index 99e5e9b..de642c5 100644
+--- mozilla/toolkit/components/osfile/modules/osfile_unix_front.jsm
++++ mozilla/toolkit/components/osfile/modules/osfile_unix_front.jsm
+@@ -373,7 +373,7 @@
+ throw_on_negative("statvfs", UnixFile.statvfs(sourcePath, fileSystemInfoPtr));
+
+ let bytes = new Type.uint64_t.implementation(
+- fileSystemInfo.f_bsize * fileSystemInfo.f_bavail);
++ fileSystemInfo.f_frsize * fileSystemInfo.f_bavail);
+
+ return bytes.value;
+ };
Deleted: trunk/www/seamonkey/files/patch-bug985848
==============================================================================
--- trunk/www/seamonkey/files/patch-bug985848 Tue Jun 10 04:47:02 2014 (r1594)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,22 +0,0 @@
---- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
-+++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
-@@ -19,7 +19,7 @@
- #include <stdlib.h>
-
- //v4l includes
--#if defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
- #include <sys/videoio.h>
- #elif defined(__sun)
- #include <sys/videodev2.h>
---- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
-+++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
-@@ -18,7 +18,7 @@
- #include <string.h>
-
- //v4l includes
--#if defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
- #include <sys/videoio.h>
- #elif defined(__sun)
- #include <sys/videodev2.h>
Deleted: trunk/www/seamonkey/files/patch-bug989112
==============================================================================
--- trunk/www/seamonkey/files/patch-bug989112 Tue Jun 10 04:47:02 2014 (r1594)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- mozilla/content/media/gstreamer/GStreamerFunctionList.h~
-+++ mozilla/content/media/gstreamer/GStreamerFunctionList.h
-@@ -122,6 +122,7 @@ GST_FUNC(LIBGSTREAMER, gst_buffer_set_size)
- GST_FUNC(LIBGSTREAMER, gst_buffer_unmap)
- GST_FUNC(LIBGSTREAMER, gst_element_factory_get_metadata)
- GST_FUNC(LIBGSTREAMER, gst_event_parse_segment)
-+GST_FUNC(LIBGSTREAMER, gst_event_type_get_name)
- GST_FUNC(LIBGSTREAMER, gst_memory_init)
- GST_FUNC(LIBGSTREAMER, gst_memory_map)
- GST_FUNC(LIBGSTREAMER, gst_memory_unmap)
Modified: trunk/www/seamonkey/files/patch-clang34-disable-stdcall
==============================================================================
--- trunk/www/seamonkey/files/patch-clang34-disable-stdcall Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/www/seamonkey/files/patch-clang34-disable-stdcall Tue Jun 10 04:47:02 2014 (r1595)
@@ -6,8 +6,8 @@
* NS_HIDDEN_(int) NS_FASTCALL func2(char *foo);
*/
--#if defined(__i386__) && defined(__GNUC__) && !defined(XP_OS2)
-+#if defined(__i386__) && defined(__GNUC__) && !defined(XP_OS2) && !(defined(__clang__) && __clang_major__ == 3 && __clang_minor__ == 4 && __clang_patchlevel__ == 0)
+-#if defined(__i386__) && defined(__GNUC__)
++#if defined(__i386__) && defined(__GNUC__) && !(defined(__clang__) && __clang_major__ == 3 && __clang_minor__ == 4 && __clang_patchlevel__ == 0)
#define NS_FASTCALL __attribute__ ((regparm (3), stdcall))
#define NS_CONSTRUCTOR_FASTCALL __attribute__ ((regparm (3), stdcall))
#elif defined(XP_WIN) && !defined(_WIN64)
Modified: trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in
==============================================================================
--- trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in Tue Jun 10 04:47:02 2014 (r1595)
@@ -1,13 +1,11 @@
--- mozilla/ipc/chromium/Makefile.in~
+++ mozilla/ipc/chromium/Makefile.in
-@@ -55,9 +60,7 @@ vpath %.c \
- $(srcdir)/src/third_party/libevent \
- $(NULL)
- else # } else {
--# message_pump_libevent.cc includes third_party/libevent/event.h,
--# which we put in $(DIST), see export rule below
--LOCAL_INCLUDES += -I$(DIST)
-+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS))
- endif # }
+@@ -28,6 +28,8 @@ include $(topsrcdir)/config/rules.mk
+
+ ifdef MOZ_NATIVE_LIBEVENT # {
- vpath %.cc \
++OS_CPPFLAGS += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS))
++
+ export-preqs = \
+ $(call mkdir_deps,$(CURDIR)/third_party/libevent) \
+ $(NULL)
Deleted: trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
==============================================================================
--- trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Tue Jun 10 04:47:02 2014 (r1594)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~
-+++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc
-@@ -16,7 +16,7 @@
- #include "base/scoped_ptr.h"
- #include "base/time.h"
- #include "nsDependentSubstring.h"
--#include "third_party/libevent/event.h"
-+#include "event.h"
-
- // Lifecycle of struct event
- // Libevent uses two main data structures:
Modified: trunk/www/seamonkey/files/patch-z-bug517422
==============================================================================
--- trunk/www/seamonkey/files/patch-z-bug517422 Mon Jun 9 22:12:02 2014 (r1594)
+++ trunk/www/seamonkey/files/patch-z-bug517422 Tue Jun 10 04:47:02 2014 (r1595)
@@ -22,11 +22,17 @@
index f67c5c7..eb909ce 100644
--- mozilla/config/external/moz.build
+++ mozilla/config/external/moz.build
-@@ -15,13 +15,13 @@ if CONFIG['MOZ_UPDATER']:
+@@ -15,13 +15,19 @@ if CONFIG['MOZ_UPDATER']:
if not CONFIG['MOZ_NATIVE_BZ2']:
external_dirs += ['modules/libbz2']
-if CONFIG['MOZ_VORBIS']:
++if not CONFIG['MOZ_NATIVE_OGG']:
++ external_dirs += ['media/libogg']
++
++if not CONFIG['MOZ_NATIVE_THEORA']:
++ external_dirs += ['media/libtheora']
++
+if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_NATIVE_VORBIS']:
external_dirs += ['media/libvorbis']
@@ -39,16 +45,7 @@
external_dirs += ['media/libopus']
if CONFIG['MOZ_WEBM']:
-@@ -34,16 +34,23 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ
- external_dirs += ['media/libvpx']
-
- if CONFIG['MOZ_OGG']:
-- external_dirs += ['media/libogg', 'media/libtheora']
-+ if not CONFIG['MOZ_NATIVE_OGG']:
-+ external_dirs += ['media/libogg']
-+ if not CONFIG['MOZ_NATIVE_THEORA']:
-+ external_dirs += ['media/libtheora']
-
+@@ -36,13 +42,15 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ_NATIVE_LIBVPX']:
if not CONFIG['MOZ_NATIVE_PNG']:
external_dirs += ['media/libpng']
@@ -61,6 +58,8 @@
external_dirs += [
'media/kiss_fft',
'media/libcubeb',
+- 'media/libogg',
+- 'media/libtheora',
- 'media/libspeex_resampler',
- 'media/libsoundtouch',
]
@@ -122,7 +121,7 @@
index 87db361..7947626 100644
--- mozilla/configure.in
+++ mozilla/configure.in
-@@ -5211,6 +5211,57 @@ if test "${ac_cv_c_attribute_aligned}" != "0"; then
+@@ -5211,6 +5211,63 @@ if test "${ac_cv_c_attribute_aligned}" != "0"; then
fi
dnl ========================================================
@@ -136,6 +135,12 @@
+
+if test -n "$MOZ_NATIVE_OGG"; then
+ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1)
++
++ _SAVE_LIBS=$LIBS
++ LIBS="$LIBS $MOZ_OGG_LIBS"
++ AC_CHECK_FUNC(ogg_set_mem_functions, [],
++ [AC_DEFINE(MOZ_OGG_NO_MEM_REPORTING)])
++ LIBS=$_SAVE_LIBS
+fi
+
+AC_SUBST(MOZ_NATIVE_OGG)
@@ -278,30 +283,19 @@
dnl = Disable VP8 decoder support
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(webm,
-diff --git content/media/AudioStream.cpp content/media/AudioStream.cpp
-index 88c8aa6..6b03288 100644
---- mozilla/content/media/AudioStream.cpp
-+++ mozilla/content/media/AudioStream.cpp
-@@ -13,7 +13,6 @@
- #include "mozilla/Mutex.h"
- #include <algorithm>
- #include "mozilla/Preferences.h"
--#include "soundtouch/SoundTouch.h"
- #include "Latency.h"
-
- namespace mozilla {
diff --git content/media/AudioStream.h content/media/AudioStream.h
index 085676d..00c54fb 100644
--- mozilla/content/media/AudioStream.h
+++ mozilla/content/media/AudioStream.h
-@@ -15,6 +15,7 @@
- #include "mozilla/StaticMutex.h"
+@@ -26,7 +26,7 @@ public:
+ };
- #include "cubeb/cubeb.h"
-+#include "soundtouch/SoundTouch.h"
+ namespace soundtouch {
+-class SoundTouch;
++class MOZ_IMPORT_API SoundTouch;
+ }
- template <>
- class nsAutoRefTraits<cubeb_stream> : public nsPointerRefTraits<cubeb_stream>
+ namespace mozilla {
diff --git content/media/Makefile.in content/media/Makefile.in
index fd34449..c6c42c8 100644
--- mozilla/content/media/Makefile.in
@@ -468,3 +462,31 @@
ifdef MOZ_NATIVE_LIBEVENT
EXTRA_DSO_LDOPTS += $(MOZ_LIBEVENT_LIBS)
endif
+diff --git xpcom/build/nsXPComInit.cpp xpcom/build/nsXPComInit.cpp
+index 2cf281e..6d7af0e 100644
+--- mozilla/xpcom/build/nsXPComInit.cpp
++++ mozilla/xpcom/build/nsXPComInit.cpp
+@@ -130,7 +130,9 @@ extern nsresult nsStringInputStreamConstructor(nsISupports *, REFNSIID, void **)
+ #include "mozilla/VisualEventTracer.h"
+ #endif
+
++#ifndef MOZ_OGG_NO_MEM_REPORTING
+ #include "ogg/ogg.h"
++#endif
+ #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING)
+ #include "vpx_mem/vpx_mem.h"
+ #endif
+@@ -571,11 +573,13 @@ NS_InitXPCOM2(nsIServiceManager* *result,
+ // this oddness.
+ mozilla::SetICUMemoryFunctions();
+
++#ifndef MOZ_OGG_NO_MEM_REPORTING
+ // Do the same for libogg.
+ ogg_set_mem_functions(OggReporter::CountingMalloc,
+ OggReporter::CountingCalloc,
+ OggReporter::CountingRealloc,
+ OggReporter::CountingFree);
++#endif
+
+ #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING)
+ // And for VPX.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406100447.s5A4l2uq054294>