svn commit: r454976 - in branches/2017Q4: mail/thunderbird mail/thunderbird/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox/files www/seamonkey www/seamonkey/files

Jan Beich jbeich at FreeBSD.org
Mon Nov 27 17:36:42 UTC 2017 

Author: jbeich
Date: Mon Nov 27 17:36:39 2017
New Revision: 454976
URL: https://svnweb.freebsd.org/changeset/ports/454976

Log:
  MFH: r453085 r453211
  
  gecko: speed up VP9 decoding on i386
  
  Disable bundled FFmpeg decoders for VP* and FLAC on i386 as those don't
  support SIMD optimizations due to build issues upstream. More recent
  versions of those are already provided by multimedia/ffmpeg, anyway.
  
  Approved by:	ports-secteam (feld)

Added:
  branches/2017Q4/mail/thunderbird/files/patch-bug1412558
     - copied, changed from r453085, head/mail/thunderbird/files/patch-bug1412558
  branches/2017Q4/www/firefox-esr/files/patch-bug1412558
     - copied, changed from r453085, head/www/firefox-esr/files/patch-bug1412558
  branches/2017Q4/www/firefox/files/patch-bug1412558
     - copied, changed from r453085, head/www/firefox/files/patch-bug1412558
  branches/2017Q4/www/seamonkey/files/patch-bug1412558
     - copied, changed from r453085, head/www/seamonkey/files/patch-bug1412558
Modified:
  branches/2017Q4/mail/thunderbird/Makefile
  branches/2017Q4/www/firefox-esr/Makefile
  branches/2017Q4/www/firefox/Makefile
  branches/2017Q4/www/seamonkey/Makefile
Directory Properties:
  branches/2017Q4/   (props changed)

Modified: branches/2017Q4/mail/thunderbird/Makefile
==============================================================================
--- branches/2017Q4/mail/thunderbird/Makefile	Mon Nov 27 17:33:28 2017	(r454975)
+++ branches/2017Q4/mail/thunderbird/Makefile	Mon Nov 27 17:36:39 2017	(r454976)
@@ -3,7 +3,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	52.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source

Copied and modified: branches/2017Q4/mail/thunderbird/files/patch-bug1412558 (from r453085, head/mail/thunderbird/files/patch-bug1412558)
==============================================================================
--- head/mail/thunderbird/files/patch-bug1412558	Sat Oct 28 23:47:31 2017	(r453085, copy source)
+++ branches/2017Q4/mail/thunderbird/files/patch-bug1412558	Mon Nov 27 17:36:39 2017	(r454976)
@@ -2,15 +2,25 @@ diff --git dom/media/flac/FlacDecoder.cpp dom/media/fl
 index 53fc3c9937f7..b23771ab80fa 100644
 --- mozilla/dom/media/flac/FlacDecoder.cpp
 +++ mozilla/dom/media/flac/FlacDecoder.cpp
-@@ -36,7 +36,7 @@ FlacDecoder::CreateStateMachine()
- /* static */ bool
- FlacDecoder::IsEnabled()
+@@ -7,6 +7,7 @@
+ #include "FlacDecoder.h"
+ #include "MediaContainerType.h"
+ #include "MediaPrefs.h"
++#include "PDMFactory.h"
+ 
+ namespace mozilla {
+ 
+@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled()
  {
--#ifdef MOZ_FFVPX
-+#if defined(MOZ_FFMPEG) || defined(MOZ_FFVPX)
+ #ifdef MOZ_FFVPX
    return MediaPrefs::FlacEnabled();
++#elif defined(MOZ_FFMPEG)
++  RefPtr<PDMFactory> platform = new PDMFactory();
++  return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"),
++                                    /* DecoderDoctorDiagnostics* */ nullptr);
  #else
    // Until bug 1295886 is fixed.
+   return false;
 diff --git media/ffvpx/README_MOZILLA media/ffvpx/README_MOZILLA
 index 5d3a6037efe0..43144b726a92 100644
 --- mozilla/media/ffvpx/README_MOZILLA

Modified: branches/2017Q4/www/firefox-esr/Makefile
==============================================================================
--- branches/2017Q4/www/firefox-esr/Makefile	Mon Nov 27 17:33:28 2017	(r454975)
+++ branches/2017Q4/www/firefox-esr/Makefile	Mon Nov 27 17:36:39 2017	(r454976)
@@ -4,7 +4,7 @@
 PORTNAME=	firefox
 DISTVERSION=	52.4.1
 DISTVERSIONSUFFIX=esr.source
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \

Copied and modified: branches/2017Q4/www/firefox-esr/files/patch-bug1412558 (from r453085, head/www/firefox-esr/files/patch-bug1412558)
==============================================================================
--- head/www/firefox-esr/files/patch-bug1412558	Sat Oct 28 23:47:31 2017	(r453085, copy source)
+++ branches/2017Q4/www/firefox-esr/files/patch-bug1412558	Mon Nov 27 17:36:39 2017	(r454976)
@@ -2,15 +2,25 @@ diff --git dom/media/flac/FlacDecoder.cpp dom/media/fl
 index 53fc3c9937f7..b23771ab80fa 100644
 --- dom/media/flac/FlacDecoder.cpp
 +++ dom/media/flac/FlacDecoder.cpp
-@@ -36,7 +36,7 @@ FlacDecoder::CreateStateMachine()
- /* static */ bool
- FlacDecoder::IsEnabled()
+@@ -7,6 +7,7 @@
+ #include "FlacDecoder.h"
+ #include "MediaContainerType.h"
+ #include "MediaPrefs.h"
++#include "PDMFactory.h"
+ 
+ namespace mozilla {
+ 
+@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled()
  {
--#ifdef MOZ_FFVPX
-+#if defined(MOZ_FFMPEG) || defined(MOZ_FFVPX)
+ #ifdef MOZ_FFVPX
    return MediaPrefs::FlacEnabled();
++#elif defined(MOZ_FFMPEG)
++  RefPtr<PDMFactory> platform = new PDMFactory();
++  return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"),
++                                    /* DecoderDoctorDiagnostics* */ nullptr);
  #else
    // Until bug 1295886 is fixed.
+   return false;
 diff --git media/ffvpx/README_MOZILLA media/ffvpx/README_MOZILLA
 index 5d3a6037efe0..43144b726a92 100644
 --- media/ffvpx/README_MOZILLA

Modified: branches/2017Q4/www/firefox/Makefile
==============================================================================
--- branches/2017Q4/www/firefox/Makefile	Mon Nov 27 17:33:28 2017	(r454975)
+++ branches/2017Q4/www/firefox/Makefile	Mon Nov 27 17:36:39 2017	(r454976)
@@ -4,7 +4,7 @@
 PORTNAME=	firefox
 DISTVERSION=	56.0.2
 DISTVERSIONSUFFIX=.source
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \

Copied and modified: branches/2017Q4/www/firefox/files/patch-bug1412558 (from r453085, head/www/firefox/files/patch-bug1412558)
==============================================================================
--- head/www/firefox/files/patch-bug1412558	Sat Oct 28 23:47:31 2017	(r453085, copy source)
+++ branches/2017Q4/www/firefox/files/patch-bug1412558	Mon Nov 27 17:36:39 2017	(r454976)
@@ -2,15 +2,25 @@ diff --git dom/media/flac/FlacDecoder.cpp dom/media/fl
 index 53fc3c9937f7..b23771ab80fa 100644
 --- dom/media/flac/FlacDecoder.cpp
 +++ dom/media/flac/FlacDecoder.cpp
-@@ -36,7 +36,7 @@ FlacDecoder::CreateStateMachine()
- /* static */ bool
- FlacDecoder::IsEnabled()
+@@ -7,6 +7,7 @@
+ #include "FlacDecoder.h"
+ #include "MediaContainerType.h"
+ #include "MediaPrefs.h"
++#include "PDMFactory.h"
+ 
+ namespace mozilla {
+ 
+@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled()
  {
--#ifdef MOZ_FFVPX
-+#if defined(MOZ_FFMPEG) || defined(MOZ_FFVPX)
+ #ifdef MOZ_FFVPX
    return MediaPrefs::FlacEnabled();
++#elif defined(MOZ_FFMPEG)
++  RefPtr<PDMFactory> platform = new PDMFactory();
++  return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"),
++                                    /* DecoderDoctorDiagnostics* */ nullptr);
  #else
    // Until bug 1295886 is fixed.
+   return false;
 diff --git media/ffvpx/README_MOZILLA media/ffvpx/README_MOZILLA
 index 5d3a6037efe0..43144b726a92 100644
 --- media/ffvpx/README_MOZILLA

Modified: branches/2017Q4/www/seamonkey/Makefile
==============================================================================
--- branches/2017Q4/www/seamonkey/Makefile	Mon Nov 27 17:33:28 2017	(r454975)
+++ branches/2017Q4/www/seamonkey/Makefile	Mon Nov 27 17:36:39 2017	(r454976)
@@ -3,7 +3,7 @@
 
 PORTNAME=	seamonkey
 DISTVERSION=	2.49.1
-PORTREVISION=	1
+PORTREVISION=	2
 MOZILLA_VER=	52 # above + 3
 CATEGORIES?=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \

Copied and modified: branches/2017Q4/www/seamonkey/files/patch-bug1412558 (from r453085, head/www/seamonkey/files/patch-bug1412558)
==============================================================================
--- head/www/seamonkey/files/patch-bug1412558	Sat Oct 28 23:47:31 2017	(r453085, copy source)
+++ branches/2017Q4/www/seamonkey/files/patch-bug1412558	Mon Nov 27 17:36:39 2017	(r454976)
@@ -2,15 +2,25 @@ diff --git dom/media/flac/FlacDecoder.cpp dom/media/fl
 index 53fc3c9937f7..b23771ab80fa 100644
 --- mozilla/dom/media/flac/FlacDecoder.cpp
 +++ mozilla/dom/media/flac/FlacDecoder.cpp
-@@ -36,7 +36,7 @@ FlacDecoder::CreateStateMachine()
- /* static */ bool
- FlacDecoder::IsEnabled()
+@@ -7,6 +7,7 @@
+ #include "FlacDecoder.h"
+ #include "MediaContainerType.h"
+ #include "MediaPrefs.h"
++#include "PDMFactory.h"
+ 
+ namespace mozilla {
+ 
+@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled()
  {
--#ifdef MOZ_FFVPX
-+#if defined(MOZ_FFMPEG) || defined(MOZ_FFVPX)
+ #ifdef MOZ_FFVPX
    return MediaPrefs::FlacEnabled();
++#elif defined(MOZ_FFMPEG)
++  RefPtr<PDMFactory> platform = new PDMFactory();
++  return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"),
++                                    /* DecoderDoctorDiagnostics* */ nullptr);
  #else
    // Until bug 1295886 is fixed.
+   return false;
 diff --git media/ffvpx/README_MOZILLA media/ffvpx/README_MOZILLA
 index 5d3a6037efe0..43144b726a92 100644
 --- mozilla/media/ffvpx/README_MOZILLA

More information about the svn-ports-branches mailing list