svn commit: r377575 - in branches/2015Q1/www: firefox/files seamonkey/files

[Jan Beich]

Author: jbeich
Date: Wed Jan 21 04:47:48 2015
New Revision: 377575
URL: https://svnweb.freebsd.org/changeset/ports/377575
QAT: https://qat.redports.org/buildarchive/r377575/

Log:
  MFH: r377551
  
  Unbreak build with base libstdc++ on i386 and powerpc
  
  std::abs(int64_t) for 32bit archs or std::llabs are not available in
  base libstdc++ from forked GCC 4.2.1 or before 10.0-RELEASE (r255294)
  for libstdc++ in lang/gcc47 and earlier (upstream PR libstdc++/54686).
  To avoid the build error use mozilla::Abs which implements overloads
  for all signed natural types but has unsigned return value.
  
  This change won't be requried for Firefox 36 et al.
  
  PR:		196772
  Reported by:	many
  Submitted by:	bar (initial version)
  Obtained from:	https://github.com/mozilla/gecko-dev/commit/e664fe8
  Differential Revision:	https://reviews.freebsd.org/D1569
  Approved by:	bapt, flo (mentors)
  Approved by:	portmgr (bapt)

Added:
  branches/2015Q1/www/firefox/files/patch-bug1122586
     - copied unchanged from r377551, head/www/firefox/files/patch-bug1122586
  branches/2015Q1/www/seamonkey/files/patch-bug1122586
     - copied unchanged from r377551, head/www/seamonkey/files/patch-bug1122586
Modified:
Directory Properties:
  branches/2015Q1/   (props changed)

Copied: branches/2015Q1/www/firefox/files/patch-bug1122586 (from r377551, head/www/firefox/files/patch-bug1122586)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q1/www/firefox/files/patch-bug1122586	Wed Jan 21 04:47:48 2015	(r377575, copy of r377551, head/www/firefox/files/patch-bug1122586)
@@ -0,0 +1,30 @@
+diff --git content/media/MediaDecoderStateMachine.cpp content/media/MediaDecoderStateMachine.cpp
+index 36a6ccf..96d3bd0 100644
+--- content/media/MediaDecoderStateMachine.cpp
++++ content/media/MediaDecoderStateMachine.cpp
+@@ -18,6 +18,7 @@
+ #include "nsTArray.h"
+ #include "MediaDecoder.h"
+ #include "MediaDecoderReader.h"
++#include "mozilla/MathAlgorithms.h"
+ #include "mozilla/mozalloc.h"
+ #include "VideoUtils.h"
+ #include "mozilla/dom/TimeRanges.h"
+@@ -165,7 +166,7 @@ static_assert(QUICK_BUFFERING_LOW_DATA_USECS <= AMPLE_AUDIO_USECS,
+ // MediaDecoderStateMachine::UpdateEstimatedDuration(); changes of duration
+ // less than this are ignored, as they're assumed to be the result of
+ // instability in the duration estimation.
+-static const int64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2;
++static const uint64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2;
+ 
+ static TimeDuration UsecsToDuration(int64_t aUsecs) {
+   return TimeDuration::FromMicroseconds(aUsecs);
+@@ -1447,7 +1448,7 @@ void MediaDecoderStateMachine::UpdateEstimatedDuration(int64_t aDuration)
+   AssertCurrentThreadInMonitor();
+   int64_t duration = GetDuration();
+   if (aDuration != duration &&
+-      std::abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) {
++      mozilla::Abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) {
+     SetDuration(aDuration);
+     nsCOMPtr<nsIRunnable> event =
+       NS_NewRunnableMethod(mDecoder, &MediaDecoder::DurationChanged);

Copied: branches/2015Q1/www/seamonkey/files/patch-bug1122586 (from r377551, head/www/seamonkey/files/patch-bug1122586)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q1/www/seamonkey/files/patch-bug1122586	Wed Jan 21 04:47:48 2015	(r377575, copy of r377551, head/www/seamonkey/files/patch-bug1122586)
@@ -0,0 +1,30 @@
+diff --git content/media/MediaDecoderStateMachine.cpp content/media/MediaDecoderStateMachine.cpp
+index 36a6ccf..96d3bd0 100644
+--- mozilla/content/media/MediaDecoderStateMachine.cpp
++++ mozilla/content/media/MediaDecoderStateMachine.cpp
+@@ -18,6 +18,7 @@
+ #include "nsTArray.h"
+ #include "MediaDecoder.h"
+ #include "MediaDecoderReader.h"
++#include "mozilla/MathAlgorithms.h"
+ #include "mozilla/mozalloc.h"
+ #include "VideoUtils.h"
+ #include "mozilla/dom/TimeRanges.h"
+@@ -165,7 +166,7 @@ static_assert(QUICK_BUFFERING_LOW_DATA_USECS <= AMPLE_AUDIO_USECS,
+ // MediaDecoderStateMachine::UpdateEstimatedDuration(); changes of duration
+ // less than this are ignored, as they're assumed to be the result of
+ // instability in the duration estimation.
+-static const int64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2;
++static const uint64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2;
+ 
+ static TimeDuration UsecsToDuration(int64_t aUsecs) {
+   return TimeDuration::FromMicroseconds(aUsecs);
+@@ -1447,7 +1448,7 @@ void MediaDecoderStateMachine::UpdateEstimatedDuration(int64_t aDuration)
+   AssertCurrentThreadInMonitor();
+   int64_t duration = GetDuration();
+   if (aDuration != duration &&
+-      std::abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) {
++      mozilla::Abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) {
+     SetDuration(aDuration);
+     nsCOMPtr<nsIRunnable> event =
+       NS_NewRunnableMethod(mDecoder, &MediaDecoder::DurationChanged);