mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-22 04:17:44 +00:00
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. MFH: 2017Q4
This commit is contained in:
Jan Beich
parent
a9e0dfb648
commit
81dcc5c369
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=453085
@ -3,7 +3,7 @@
|
||||
|
||||
PORTNAME= thunderbird
|
||||
DISTVERSION= 52.4.0
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= mail news net-im ipv6
|
||||
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
|
||||
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source
|
||||
|
||||
73
mail/thunderbird/files/patch-bug1412558
Normal file
73
mail/thunderbird/files/patch-bug1412558
Normal file
@ -0,0 +1,73 @@
|
||||
diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp
|
||||
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()
|
||||
{
|
||||
-#ifdef MOZ_FFVPX
|
||||
+#if defined(MOZ_FFMPEG) || defined(MOZ_FFVPX)
|
||||
return MediaPrefs::FlacEnabled();
|
||||
#else
|
||||
// Until bug 1295886 is fixed.
|
||||
diff --git media/ffvpx/README_MOZILLA media/ffvpx/README_MOZILLA
|
||||
index 5d3a6037efe0..43144b726a92 100644
|
||||
--- mozilla/media/ffvpx/README_MOZILLA
|
||||
+++ mozilla/media/ffvpx/README_MOZILLA
|
||||
@@ -17,14 +17,6 @@ configuration files were generated as follow using the configure script:
|
||||
config*:
|
||||
replace: /HAVE_(MALLOC_H|ARC4RANDOM|LOCALTIME_R|MEMALIGN|POSIX_MEMALIGN)/d
|
||||
|
||||
-config_darwin32.h:
|
||||
-add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
|
||||
-
|
||||
-config_unix32.h:
|
||||
-add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
|
||||
-replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0/ and s/HAVE_MEMALIGN 1/HAVE_MEMALIGN 0/ and s/HAVE_POSIX_MEMALIGN 1/HAVE_POSIX_MEMALIGN 0/
|
||||
-
|
||||
-
|
||||
config_unix64.h/config_unix64.asm:
|
||||
replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0
|
||||
|
||||
diff --git media/ffvpx/config.h media/ffvpx/config.h
|
||||
index dab01e05cd65..26ebe529bd98 100644
|
||||
--- mozilla/media/ffvpx/config.h
|
||||
+++ mozilla/media/ffvpx/config.h
|
||||
@@ -27,17 +27,9 @@
|
||||
#define HAVE_LIBC_MSVCRT 0
|
||||
#endif
|
||||
#elif defined(XP_DARWIN)
|
||||
-#if defined(HAVE_64BIT_BUILD)
|
||||
#include "config_darwin64.h"
|
||||
-#else
|
||||
-#include "config_darwin32.h"
|
||||
-#endif
|
||||
#elif defined(XP_UNIX)
|
||||
-#if defined(HAVE_64BIT_BUILD)
|
||||
#include "config_unix64.h"
|
||||
-#else
|
||||
-#include "config_unix32.h"
|
||||
-#endif
|
||||
#endif
|
||||
#include "config_common.h"
|
||||
#endif // MOZ_FFVPX_CONFIG_H
|
||||
diff --git old-configure.in old-configure.in
|
||||
index b8ce71278548..410be683c2f6 100644
|
||||
--- mozilla/old-configure.in
|
||||
+++ mozilla/old-configure.in
|
||||
@@ -3279,11 +3279,11 @@ dnl = FFmpeg's ffvpx configuration
|
||||
dnl ========================================================
|
||||
|
||||
MOZ_FFVPX=
|
||||
-case "$CPU_ARCH" in
|
||||
- x86)
|
||||
+case "$OS_ARCH:$CPU_ARCH" in
|
||||
+ WINNT:x86)
|
||||
MOZ_FFVPX=1
|
||||
;;
|
||||
- x86_64)
|
||||
+ *:x86_64)
|
||||
MOZ_FFVPX=1
|
||||
;;
|
||||
esac
|
||||
@ -4,7 +4,7 @@
|
||||
PORTNAME= firefox
|
||||
DISTVERSION= 52.4.1
|
||||
DISTVERSIONSUFFIX=esr.source
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= www ipv6
|
||||
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
|
||||
|
||||
73
www/firefox-esr/files/patch-bug1412558
Normal file
73
www/firefox-esr/files/patch-bug1412558
Normal file
@ -0,0 +1,73 @@
|
||||
diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp
|
||||
index 53fc3c9937f7..b23771ab80fa 100644
|
||||
--- dom/media/flac/FlacDecoder.cpp
|
||||
+++ dom/media/flac/FlacDecoder.cpp
|
||||
@@ -36,7 +36,7 @@ FlacDecoder::CreateStateMachine()
|
||||
/* static */ bool
|
||||
FlacDecoder::IsEnabled()
|
||||
{
|
||||
-#ifdef MOZ_FFVPX
|
||||
+#if defined(MOZ_FFMPEG) || defined(MOZ_FFVPX)
|
||||
return MediaPrefs::FlacEnabled();
|
||||
#else
|
||||
// Until bug 1295886 is fixed.
|
||||
diff --git media/ffvpx/README_MOZILLA media/ffvpx/README_MOZILLA
|
||||
index 5d3a6037efe0..43144b726a92 100644
|
||||
--- media/ffvpx/README_MOZILLA
|
||||
+++ media/ffvpx/README_MOZILLA
|
||||
@@ -17,14 +17,6 @@ configuration files were generated as follow using the configure script:
|
||||
config*:
|
||||
replace: /HAVE_(MALLOC_H|ARC4RANDOM|LOCALTIME_R|MEMALIGN|POSIX_MEMALIGN)/d
|
||||
|
||||
-config_darwin32.h:
|
||||
-add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
|
||||
-
|
||||
-config_unix32.h:
|
||||
-add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
|
||||
-replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0/ and s/HAVE_MEMALIGN 1/HAVE_MEMALIGN 0/ and s/HAVE_POSIX_MEMALIGN 1/HAVE_POSIX_MEMALIGN 0/
|
||||
-
|
||||
-
|
||||
config_unix64.h/config_unix64.asm:
|
||||
replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0
|
||||
|
||||
diff --git media/ffvpx/config.h media/ffvpx/config.h
|
||||
index dab01e05cd65..26ebe529bd98 100644
|
||||
--- media/ffvpx/config.h
|
||||
+++ media/ffvpx/config.h
|
||||
@@ -27,17 +27,9 @@
|
||||
#define HAVE_LIBC_MSVCRT 0
|
||||
#endif
|
||||
#elif defined(XP_DARWIN)
|
||||
-#if defined(HAVE_64BIT_BUILD)
|
||||
#include "config_darwin64.h"
|
||||
-#else
|
||||
-#include "config_darwin32.h"
|
||||
-#endif
|
||||
#elif defined(XP_UNIX)
|
||||
-#if defined(HAVE_64BIT_BUILD)
|
||||
#include "config_unix64.h"
|
||||
-#else
|
||||
-#include "config_unix32.h"
|
||||
-#endif
|
||||
#endif
|
||||
#include "config_common.h"
|
||||
#endif // MOZ_FFVPX_CONFIG_H
|
||||
diff --git old-configure.in old-configure.in
|
||||
index b8ce71278548..410be683c2f6 100644
|
||||
--- old-configure.in
|
||||
+++ old-configure.in
|
||||
@@ -3279,11 +3279,11 @@ dnl = FFmpeg's ffvpx configuration
|
||||
dnl ========================================================
|
||||
|
||||
MOZ_FFVPX=
|
||||
-case "$CPU_ARCH" in
|
||||
- x86)
|
||||
+case "$OS_ARCH:$CPU_ARCH" in
|
||||
+ WINNT:x86)
|
||||
MOZ_FFVPX=1
|
||||
;;
|
||||
- x86_64)
|
||||
+ *:x86_64)
|
||||
MOZ_FFVPX=1
|
||||
;;
|
||||
esac
|
||||
@ -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 \
|
||||
|
||||
73
www/firefox/files/patch-bug1412558
Normal file
73
www/firefox/files/patch-bug1412558
Normal file
@ -0,0 +1,73 @@
|
||||
diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp
|
||||
index 53fc3c9937f7..b23771ab80fa 100644
|
||||
--- dom/media/flac/FlacDecoder.cpp
|
||||
+++ dom/media/flac/FlacDecoder.cpp
|
||||
@@ -36,7 +36,7 @@ FlacDecoder::CreateStateMachine()
|
||||
/* static */ bool
|
||||
FlacDecoder::IsEnabled()
|
||||
{
|
||||
-#ifdef MOZ_FFVPX
|
||||
+#if defined(MOZ_FFMPEG) || defined(MOZ_FFVPX)
|
||||
return MediaPrefs::FlacEnabled();
|
||||
#else
|
||||
// Until bug 1295886 is fixed.
|
||||
diff --git media/ffvpx/README_MOZILLA media/ffvpx/README_MOZILLA
|
||||
index 5d3a6037efe0..43144b726a92 100644
|
||||
--- media/ffvpx/README_MOZILLA
|
||||
+++ media/ffvpx/README_MOZILLA
|
||||
@@ -17,14 +17,6 @@ configuration files were generated as follow using the configure script:
|
||||
config*:
|
||||
replace: /HAVE_(MALLOC_H|ARC4RANDOM|LOCALTIME_R|MEMALIGN|POSIX_MEMALIGN)/d
|
||||
|
||||
-config_darwin32.h:
|
||||
-add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
|
||||
-
|
||||
-config_unix32.h:
|
||||
-add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
|
||||
-replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0/ and s/HAVE_MEMALIGN 1/HAVE_MEMALIGN 0/ and s/HAVE_POSIX_MEMALIGN 1/HAVE_POSIX_MEMALIGN 0/
|
||||
-
|
||||
-
|
||||
config_unix64.h/config_unix64.asm:
|
||||
replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0
|
||||
|
||||
diff --git media/ffvpx/config.h media/ffvpx/config.h
|
||||
index dab01e05cd65..26ebe529bd98 100644
|
||||
--- media/ffvpx/config.h
|
||||
+++ media/ffvpx/config.h
|
||||
@@ -27,17 +27,9 @@
|
||||
#define HAVE_LIBC_MSVCRT 0
|
||||
#endif
|
||||
#elif defined(XP_DARWIN)
|
||||
-#if defined(HAVE_64BIT_BUILD)
|
||||
#include "config_darwin64.h"
|
||||
-#else
|
||||
-#include "config_darwin32.h"
|
||||
-#endif
|
||||
#elif defined(XP_UNIX)
|
||||
-#if defined(HAVE_64BIT_BUILD)
|
||||
#include "config_unix64.h"
|
||||
-#else
|
||||
-#include "config_unix32.h"
|
||||
-#endif
|
||||
#endif
|
||||
#include "config_common.h"
|
||||
#endif // MOZ_FFVPX_CONFIG_H
|
||||
diff --git old-configure.in old-configure.in
|
||||
index b8ce71278548..410be683c2f6 100644
|
||||
--- old-configure.in
|
||||
+++ old-configure.in
|
||||
@@ -3279,11 +3279,11 @@ dnl = FFmpeg's ffvpx configuration
|
||||
dnl ========================================================
|
||||
|
||||
MOZ_FFVPX=
|
||||
-case "$CPU_ARCH" in
|
||||
- x86)
|
||||
+case "$OS_ARCH:$CPU_ARCH" in
|
||||
+ WINNT:x86)
|
||||
MOZ_FFVPX=1
|
||||
;;
|
||||
- x86_64)
|
||||
+ *:x86_64)
|
||||
MOZ_FFVPX=1
|
||||
;;
|
||||
esac
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
PORTNAME= seamonkey
|
||||
DISTVERSION= 2.49.1
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
MOZILLA_VER= 52 # above + 3
|
||||
CATEGORIES?= www mail news editors irc ipv6
|
||||
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
|
||||
|
||||
73
www/seamonkey/files/patch-bug1412558
Normal file
73
www/seamonkey/files/patch-bug1412558
Normal file
@ -0,0 +1,73 @@
|
||||
diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp
|
||||
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()
|
||||
{
|
||||
-#ifdef MOZ_FFVPX
|
||||
+#if defined(MOZ_FFMPEG) || defined(MOZ_FFVPX)
|
||||
return MediaPrefs::FlacEnabled();
|
||||
#else
|
||||
// Until bug 1295886 is fixed.
|
||||
diff --git media/ffvpx/README_MOZILLA media/ffvpx/README_MOZILLA
|
||||
index 5d3a6037efe0..43144b726a92 100644
|
||||
--- mozilla/media/ffvpx/README_MOZILLA
|
||||
+++ mozilla/media/ffvpx/README_MOZILLA
|
||||
@@ -17,14 +17,6 @@ configuration files were generated as follow using the configure script:
|
||||
config*:
|
||||
replace: /HAVE_(MALLOC_H|ARC4RANDOM|LOCALTIME_R|MEMALIGN|POSIX_MEMALIGN)/d
|
||||
|
||||
-config_darwin32.h:
|
||||
-add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
|
||||
-
|
||||
-config_unix32.h:
|
||||
-add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
|
||||
-replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0/ and s/HAVE_MEMALIGN 1/HAVE_MEMALIGN 0/ and s/HAVE_POSIX_MEMALIGN 1/HAVE_POSIX_MEMALIGN 0/
|
||||
-
|
||||
-
|
||||
config_unix64.h/config_unix64.asm:
|
||||
replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0
|
||||
|
||||
diff --git media/ffvpx/config.h media/ffvpx/config.h
|
||||
index dab01e05cd65..26ebe529bd98 100644
|
||||
--- mozilla/media/ffvpx/config.h
|
||||
+++ mozilla/media/ffvpx/config.h
|
||||
@@ -27,17 +27,9 @@
|
||||
#define HAVE_LIBC_MSVCRT 0
|
||||
#endif
|
||||
#elif defined(XP_DARWIN)
|
||||
-#if defined(HAVE_64BIT_BUILD)
|
||||
#include "config_darwin64.h"
|
||||
-#else
|
||||
-#include "config_darwin32.h"
|
||||
-#endif
|
||||
#elif defined(XP_UNIX)
|
||||
-#if defined(HAVE_64BIT_BUILD)
|
||||
#include "config_unix64.h"
|
||||
-#else
|
||||
-#include "config_unix32.h"
|
||||
-#endif
|
||||
#endif
|
||||
#include "config_common.h"
|
||||
#endif // MOZ_FFVPX_CONFIG_H
|
||||
diff --git old-configure.in old-configure.in
|
||||
index b8ce71278548..410be683c2f6 100644
|
||||
--- mozilla/old-configure.in
|
||||
+++ mozilla/old-configure.in
|
||||
@@ -3279,11 +3279,11 @@ dnl = FFmpeg's ffvpx configuration
|
||||
dnl ========================================================
|
||||
|
||||
MOZ_FFVPX=
|
||||
-case "$CPU_ARCH" in
|
||||
- x86)
|
||||
+case "$OS_ARCH:$CPU_ARCH" in
|
||||
+ WINNT:x86)
|
||||
MOZ_FFVPX=1
|
||||
;;
|
||||
- x86_64)
|
||||
+ *:x86_64)
|
||||
MOZ_FFVPX=1
|
||||
;;
|
||||
esac
|
||||
Loading…
Reference in New Issue
Block a user