8:09 p.m.
commit 2a5a52f0fc54b66e11364e558c2de30f12751a6f
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Sun Mar 5 12:12:09 2017 -0800
enable mp3 support
chromium-56.0.2924.87-enable-mp3.patch | 54 ++++++++++++++++++++++++++++++++++
chromium.spec | 8 ++++-
clean_ffmpeg.sh | 24 +++++++++++++++
3 files changed, 85 insertions(+), 1 deletion(-)
---
diff --git a/chromium-56.0.2924.87-enable-mp3.patch
b/chromium-56.0.2924.87-enable-mp3.patch
new file mode 100644
index 0000000..f05bec3
--- /dev/null
+++ b/chromium-56.0.2924.87-enable-mp3.patch
@@ -0,0 +1,54 @@
+diff -up chromium-56.0.2924.87/third_party/ffmpeg/ffmpeg_generated.gni.mp3condit
chromium-56.0.2924.87/third_party/ffmpeg/ffmpeg_generated.gni
+--- chromium-56.0.2924.87/third_party/ffmpeg/ffmpeg_generated.gni.mp3condit 2017-03-05
14:42:04.720461152 -0500
++++ chromium-56.0.2924.87/third_party/ffmpeg/ffmpeg_generated.gni 2017-03-05
14:42:12.659306127 -0500
+@@ -175,17 +175,9 @@ if ((is_linux && current_cpu == "arm" &&
+ ]
+ }
+
+-if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") ||
(is_android && current_cpu == "arm" && arm_use_neon &&
ffmpeg_branding == "Chrome") || (is_android && current_cpu ==
"arm64" && ffmpeg_branding == "Chrome") || (is_android
&& current_cpu == "mips64el" && ffmpeg_branding ==
"Chrome") || (is_android && current_cpu == "mipsel" &&
ffmpeg_branding == "Chrome") || (is_android && current_cpu ==
"x86" && ffmpeg_branding == "Chrome") || (is_linux &&
current_cpu == "arm" && arm_use_neon && ffmpeg_branding ==
"Chrome") || (is_linux && current_cpu == "arm" &&
arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux &&
current_cpu == "arm" && ffmpeg_branding == "Chrome") ||
(is_linux && current_cpu == "arm" && ffmpeg_branding ==
"ChromeOS") || (is_linux && current_cpu == "arm64" &&
ffmpeg_branding == "Chrome") || (is_linux && current_cpu ==
"arm64" && ffmpeg_branding == "ChromeOS") || (is_linux
&& current_cpu == "mipsel" && ffmpeg_branding ==
"Chrome") || (is_linux && current_cpu =
= "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux
&& current_cpu == "x64" && ffmpeg_branding ==
"ChromeOS") || (is_linux && current_cpu == "x86" &&
ffmpeg_branding == "Chrome") || (is_linux && current_cpu ==
"x86" && ffmpeg_branding == "ChromeOS") || (is_win &&
ffmpeg_branding == "Chrome")) {
++if ((current_cpu == "x64") || (is_android && current_cpu ==
"arm" && arm_use_neon) || (is_android && current_cpu ==
"arm64") || (is_android && current_cpu == "mips64el") ||
(is_android && current_cpu == "mipsel") || (is_android &&
current_cpu == "x86") || (is_linux && current_cpu == "arm"
&& arm_use_neon) || (is_linux && current_cpu == "arm" &&
arm_use_neon) || (is_linux && current_cpu == "arm") || (is_linux
&& current_cpu == "arm64") || (is_linux && current_cpu ==
"mipsel") || (is_linux && current_cpu == "x64") || (is_linux
&& current_cpu == "x86") || (is_win))
++{
+ ffmpeg_c_sources += [
+- "libavcodec/aac_ac3_parser.c",
+- "libavcodec/aac_parser.c",
+- "libavcodec/aacadtsdec.c",
+- "libavcodec/aacps_float.c",
+- "libavcodec/aacpsdsp_float.c",
+- "libavcodec/aacsbr.c",
+- "libavcodec/aactab.c",
+- "libavcodec/ac3tab.c",
+- "libavcodec/autorename_libavcodec_aacdec.c",
+ "libavcodec/autorename_libavcodec_mpegaudiodsp.c",
+ "libavcodec/autorename_libavcodec_sbrdsp.c",
+ "libavcodec/cbrt_data.c",
+@@ -203,7 +195,6 @@ if ((current_cpu == "x64" && ffmpeg_bran
+ "libavcodec/mpegaudiodsp_float.c",
+ "libavcodec/sinewin.c",
+ "libavcodec/sinewin_fixed.c",
+- "libavformat/aacdec.c",
+ "libavformat/apetag.c",
+ "libavformat/img2.c",
+ "libavformat/mov.c",
+@@ -212,6 +203,22 @@ if ((current_cpu == "x64" && ffmpeg_bran
+ ]
+ }
+
++if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") ||
(is_android && current_cpu == "arm" && arm_use_neon &&
ffmpeg_branding == "Chrome") || (is_android && current_cpu ==
"arm64" && ffmpeg_branding == "Chrome") || (is_android
&& current_cpu == "mips64el" && ffmpeg_branding ==
"Chrome") || (is_android && current_cpu == "mipsel" &&
ffmpeg_branding == "Chrome") || (is_android && current_cpu ==
"x86" && ffmpeg_branding == "Chrome") || (is_linux &&
current_cpu == "arm" && arm_use_neon && ffmpeg_branding ==
"Chrome") || (is_linux && current_cpu == "arm" &&
arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux &&
current_cpu == "arm" && ffmpeg_branding == "Chrome") ||
(is_linux && current_cpu == "arm" && ffmpeg_branding ==
"ChromeOS") || (is_linux && current_cpu == "arm64" &&
ffmpeg_branding == "Chrome") || (is_linux && current_cpu ==
"arm64" && ffmpeg_branding == "ChromeOS") || (is_linux
&& current_cpu == "mipsel" && ffmpeg_branding ==
"Chrome") || (is_linux && current_cpu =
= "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux
&& current_cpu == "x64" && ffmpeg_branding ==
"ChromeOS") || (is_linux && current_cpu == "x86" &&
ffmpeg_branding == "Chrome") || (is_linux && current_cpu ==
"x86" && ffmpeg_branding == "ChromeOS") || (is_win &&
ffmpeg_branding == "Chrome"))
++{
++ ffmpeg_c_sources += [
++ "libavcodec/aac_ac3_parser.c",
++ "libavcodec/aac_parser.c",
++ "libavcodec/aacadtsdec.c",
++ "libavcodec/aacps_float.c",
++ "libavcodec/aacpsdsp_float.c",
++ "libavcodec/aacsbr.c",
++ "libavcodec/aactab.c",
++ "libavcodec/ac3tab.c",
++ "libavcodec/autorename_libavcodec_aacdec.c",
++ "libavformat/aacdec.c",
++ ]
++}
++
+ if ((is_android && current_cpu == "x64") || (is_android &&
current_cpu == "x86") || (is_linux && current_cpu == "x64") ||
(is_linux && current_cpu == "x86") || (is_mac) || (is_win)) {
+ ffmpeg_c_sources += [
+ "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c",
diff --git a/chromium.spec b/chromium.spec
index f175974..fa94812 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -97,7 +97,7 @@ BuildRequires: libicu-devel >= 5.4
Name: chromium%{chromium_channel}
Version: %{majorversion}.0.2924.87
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and
(MPLv1.1 or GPLv2 or LGPLv2)
@@ -161,6 +161,8 @@ Patch32: chromium-56.0.2924.87-unique-ptr-fix.patch
# Fix issue with compilation on gcc7
# Thanks to Ben Noordhuis
Patch33: chromium-56.0.2924.87-gcc7.patch
+# Enable mp3 support
+Patch34: chromium-56.0.2924.87-enable-mp3.patch
### Chromium Tests Patches ###
@@ -542,6 +544,7 @@ members of the Chromium and WebDriver teams.
%patch31 -p1 -b .permissive
%patch32 -p1 -b .unique-ptr-fix
%patch33 -p1 -b .gcc7
+%patch34 -p1 -b .mp3
### Chromium Tests Patches ###
%patch100 -p1 -b .use_system_opus
@@ -1577,6 +1580,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r
chrome-remote-deskt
%{chromium_path}/chromedriver
%changelog
+* Sun Mar 5 2017 Tom Callaway <spot(a)fedoraproject.org> 56.0.2924.87-8
+- enable mp3 support
+
* Sat Mar 4 2017 Tom Callaway <spot(a)fedoraproject.org> 56.0.2924.87-7
- fix desktop file to have "new window" and "new private window"
actions
diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh
index 1643cdd..5a86c24 100644
--- a/clean_ffmpeg.sh
+++ b/clean_ffmpeg.sh
@@ -189,6 +189,29 @@ manual_files=" libavcodec/x86/hpeldsp_rnd_template.c \
libavutil/x86/x86inc.asm \
libavutil/x86/x86util.asm "
+mp3_files=" libavcodec/autorename_libavcodec_mpegaudiodsp.c \
+ libavcodec/autorename_libavcodec_sbrdsp.c \
+ libavcodec/cbrt_data.c \
+ libavcodec/dct.c \
+ libavcodec/dct32_fixed.c \
+ libavcodec/dct32_float.c \
+ libavcodec/imdct15.c \
+ libavcodec/kbdwin.c \
+ libavcodec/mpegaudio.c \
+ libavcodec/mpegaudio_parser.c \
+ libavcodec/mpegaudiodec_fixed.c \
+ libavcodec/mpegaudiodecheader.c \
+ libavcodec/mpegaudiodsp_data.c \
+ libavcodec/mpegaudiodsp_fixed.c \
+ libavcodec/mpegaudiodsp_float.c \
+ libavcodec/sinewin.c \
+ libavcodec/sinewin_fixed.c \
+ libavformat/apetag.c \
+ libavformat/img2.c \
+ libavformat/mov.c \
+ libavformat/mov_chan.c \
+ libavformat/mp3dec.c "
+
other_files=" BUILD.gn \
Changelog \
COPYING.GPLv2 \
@@ -216,6 +239,7 @@ copy_files "$generated_files_headers" 0
copy_files "$manual_files" 1
copy_files "$other_files" 1
copy_files "$header_files" 1
+copy_files "$mp3_files" 1
mkdir -p ../tmp_ffmpeg/tmp_chromium/config
cp -r chromium/config ../tmp_ffmpeg/tmp_chromium