commit 74ea286241de725e6704ed0592180e6e10f2cc83 Author: Tom Callaway <spot(a)fedoraproject.org&gt; Date: Tue Mar 21 11:23:01 2017 -0400 57.0.2987.110 chromium-57.0.2987.110-enable-mp3.patch | 101 ++++++++++++++++++++++++++++++++ chromium.spec | 23 ++++---- clean_ffmpeg.sh | 44 +++++++++++++- 3 files changed, 156 insertions(+), 12 deletions(-) --- diff --git a/chromium-57.0.2987.110-enable-mp3.patch b/chromium-57.0.2987.110-enable-mp3.patch new file mode 100644 index 0000000..676ade1 --- /dev/null +++ b/chromium-57.0.2987.110-enable-mp3.patch @@ -0,0 +1,101 @@ +diff -up chromium-57.0.2987.110/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chromium-57.0.2987.110/third_party/ffmpeg/ffmpeg_generated.gni +--- chromium-57.0.2987.110/third_party/ffmpeg/ffmpeg_generated.gni.mp3 2017-03-20 13:53:24.000000000 -0400 ++++ chromium-57.0.2987.110/third_party/ffmpeg/ffmpeg_generated.gni 2017-03-20 13:59:11.214419428 -0400 +@@ -176,19 +176,12 @@ 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/ac3tab.c", + "libavcodec/cbrt_data.c", + "libavcodec/dct.c", + "libavcodec/dct32_fixed.c", +@@ -204,7 +197,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", +@@ -213,6 +205,21 @@ 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/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", +@@ -312,21 +319,31 @@ if ((is_linux && current_cpu == "x64") | + if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (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/x86/aacpsdsp_init.c", ++ ] ++} ++ ++if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win)) { ++ ffmpeg_c_sources += [ + "libavcodec/x86/dct_init.c", + "libavcodec/x86/mpegaudiodsp.c", + "libavcodec/x86/sbrdsp_init.c", + ] + } + +-if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (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 == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win)) { + ffmpeg_yasm_sources += [ +- "libavcodec/x86/aacpsdsp.asm", + "libavcodec/x86/dct32.asm", + "libavcodec/x86/imdct36.asm", + "libavcodec/x86/sbrdsp.asm", + ] + } + ++if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (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_yasm_sources += [ ++ "libavcodec/x86/aacpsdsp.asm", ++ ] ++} ++ + if ((is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm")) { + ffmpeg_c_sources += [ + "libavcodec/arm/h264pred_init_arm.c", +diff -up chromium-57.0.2987.110/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chromium-57.0.2987.110/third_party/ffmpeg/libavcodec/sbrdsp.c +--- chromium-57.0.2987.110/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 2017-03-20 14:15:22.068309439 -0400 ++++ chromium-57.0.2987.110/third_party/ffmpeg/libavcodec/sbrdsp.c 2017-03-20 14:15:47.826802603 -0400 +@@ -23,6 +23,7 @@ + #define USE_FIXED 0 + + #include "aac.h" ++#include "aacsbrdata.h" + #include "config.h" + #include "libavutil/attributes.h" + #include "libavutil/intfloat.h" diff --git a/chromium.spec b/chromium.spec index fa94812..1529937 100644 --- a/chromium.spec +++ b/chromium.spec @@ -93,11 +93,11 @@ BuildRequires: libicu-devel >= 5.4 %global default_client_secret miEreAep8nuvTdvLums6qyLK %global chromoting_client_id 449907151817-8vnlfih032ni8c4jjps9int9t86k546t.apps.googleusercontent.com -%global majorversion 56 +%global majorversion 57 Name: chromium%{chromium_channel} -Version: %{majorversion}.0.2924.87 -Release: 8%{?dist} +Version: %{majorversion}.0.2987.110 +Release: 1%{?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) @@ -148,9 +148,6 @@ Patch26: chromium-54.0.2840.59-i686-ld-memory-tricks.patch # obj/content/renderer/renderer/child_frame_compositing_helper.o: In function `content::ChildFrameCompositingHelper::OnSetSurface(cc::SurfaceId const&, gfx::Size const&, float, cc::SurfaceSequence const&)': # /builddir/build/BUILD/chromium-54.0.2840.90/out/Release/../../content/renderer/child_frame_compositing_helper.cc:214: undefined reference to `cc_blink::WebLayerImpl::setOpaque(bool)' Patch27: chromium-54.0.2840.90-setopaque.patch -# Fix rvalue issue in remoting code -# https://chromium.googlesource.com/chromium/src.git/+/29bfbecb49572b61264d... -Patch29: chromium-55.0.2883.87-rvalue-fix.patch # Fix compiler issue with gcc 4.9 # https://chromium.googlesource.com/external/webrtc/trunk/webrtc/+/69556b1c... Patch30: chromium-56.0.2924.87-gcc-49.patch @@ -162,8 +159,7 @@ Patch32: chromium-56.0.2924.87-unique-ptr-fix.patch # Thanks to Ben Noordhuis Patch33: chromium-56.0.2924.87-gcc7.patch # Enable mp3 support -Patch34: chromium-56.0.2924.87-enable-mp3.patch - +Patch34: chromium-57.0.2987.110-enable-mp3.patch ### Chromium Tests Patches ### Patch100: chromium-46.0.2490.86-use_system_opus.patch @@ -531,7 +527,7 @@ members of the Chromium and WebDriver teams. %patch15 -p1 -b .sandboxpie %patch16 -p1 -b .armwebrtc %patch18 -p1 -b .etc -%patch19 -p1 -b .madv_free +# %%patch19 -p1 -b .madv_free %patch20 -p1 -b .gnsystem %patch21 -p1 -b .lastcommit %patch22 -p1 -b .timefix @@ -539,7 +535,6 @@ members of the Chromium and WebDriver teams. %patch25 -p1 -b .jpegfix %patch26 -p1 -b .ldmemory %patch27 -p1 -b .setopaque -%patch29 -p1 -b .rvalue %patch30 -p1 -b .gcc49 %patch31 -p1 -b .permissive %patch32 -p1 -b .unique-ptr-fix @@ -678,7 +673,7 @@ CHROMIUM_BROWSER_GN_DEFINES+=' is_component_ffmpeg=false is_component_build=fals CHROMIUM_BROWSER_GN_DEFINES+=' remove_webcore_debug_symbols=true enable_hangout_services_extension=true' CHROMIUM_BROWSER_GN_DEFINES+=' enable_hotwording=false use_aura=true' CHROMIUM_BROWSER_GN_DEFINES+=' enable_webrtc=true enable_widevine=true' -CHROMIUM_BROWSER_GN_DEFINES+=' use_gold=false' +CHROMIUM_BROWSER_GN_DEFINES+=' use_gold=false fieldtrial_testing_like_official_build=true' %if 0%{gtk3} CHROMIUM_BROWSER_GN_DEFINES+=' use_gtk3=true' %else @@ -1580,6 +1575,12 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %{chromium_path}/chromedriver %changelog +* Mon Mar 20 2017 Tom Callaway <spot(a)fedoraproject.org&gt; 57.0.2987.110-1 +- update to 57.0.2987.110 + +* Tue Mar 14 2017 Tom Callaway <spot(a)fedoraproject.org&gt; 57.0.2987.98-1 +- update to 57.0.2987.98 + * Sun Mar 5 2017 Tom Callaway <spot(a)fedoraproject.org&gt; 56.0.2924.87-8 - enable mp3 support diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh index f425538..39e68f7 100644 --- a/clean_ffmpeg.sh +++ b/clean_ffmpeg.sh @@ -57,6 +57,12 @@ header_files=" libavcodec/x86/inline_asm.h \ libavcodec/x86/mathops.h \ libavcodec/x86/vp56_arith.h \ libavcodec/aac.h \ + libavcodec/aacps.h \ + libavcodec/aacpsdsp.h \ + libavcodec/aacsbrdata.h \ + libavcodec/aac_defines.h \ + libavcodec/ac3.h \ + libavcodec/ac3tab.h \ libavcodec/avcodec.h \ libavcodec/blockdsp.h \ libavcodec/bytestream.h \ @@ -77,17 +83,25 @@ header_files=" libavcodec/x86/inline_asm.h \ libavcodec/h264chroma.h \ libavcodec/hpeldsp.h \ libavcodec/idctdsp.h \ + libavcodec/imdct15.h \ libavcodec/internal.h \ + libavcodec/kbdwin.h \ libavcodec/mathops.h \ libavcodec/me_cmp.h \ libavcodec/motion_est.h \ + libavcodec/mpeg12data.h \ + libavcodec/mpegaudio.h \ + libavcodec/mpegaudiodecheader.h \ + libavcodec/mpegaudiodectab.h \ libavcodec/mpegaudiodsp.h \ + libavcodec/mpegaudio_tablegen.h \ libavcodec/mpegpicture.h \ libavcodec/mpegutils.h \ libavcodec/mpegvideo.h \ libavcodec/mpegvideodsp.h \ libavcodec/mpegvideoencdsp.h \ libavcodec/options_table.h \ + libavcodec/opus_rc.h \ libavcodec/pcm_tablegen.h \ libavcodec/pixblockdsp.h \ libavcodec/pixels.h \ @@ -97,6 +111,10 @@ header_files=" libavcodec/x86/inline_asm.h \ libavcodec/rectangle.h \ libavcodec/rl.h \ libavcodec/rnd_avg.h \ + libavcodec/sbr.h \ + libavcodec/sbrdsp.h \ + libavcodec/sinewin.h \ + libavcodec/sinewin_tablegen.h \ libavcodec/thread.h \ libavcodec/unary.h \ libavcodec/version.h \ @@ -109,10 +127,13 @@ header_files=" libavcodec/x86/inline_asm.h \ libavcodec/vp56dsp.h \ libavcodec/vp8data.h \ libavcodec/vp8dsp.h \ + libavformat/apetag.h \ libavformat/audiointerleave.h \ libavformat/avformat.h \ libavformat/dv.h \ + libavformat/img2.h \ libavformat/internal.h \ + libavformat/mov_chan.h \ libavformat/pcm.h \ libavformat/rdt.h \ libavformat/rtp.h \ @@ -153,6 +174,8 @@ header_files=" libavcodec/x86/inline_asm.h \ libavutil/pixfmt.h \ libavutil/qsort.h \ libavutil/replaygain.h \ + libavutil/softfloat.h \ + libavutil/softfloat_tables.h \ libavutil/thread.h \ libavutil/timer.h \ libavutil/timestamp.h \ @@ -194,7 +217,16 @@ manual_files=" libavcodec/x86/hpeldsp_rnd_template.c \ libavutil/x86/x86inc.asm \ libavutil/x86/x86util.asm " -mp3_files=" libavcodec/autorename_libavcodec_mpegaudiodsp.c \ +mp3_files=" 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 \ libavcodec/dct.c \ @@ -206,14 +238,24 @@ mp3_files=" libavcodec/autorename_libavcodec_mpegaudiodsp.c \ libavcodec/mpegaudio.c \ libavcodec/mpegaudio_parser.c \ libavcodec/mpegaudiodec_fixed.c \ + libavcodec/mpegaudiodec_template.c \ libavcodec/mpegaudiodecheader.c \ libavcodec/mpegaudiodsp.c \ libavcodec/mpegaudiodsp_data.c \ libavcodec/mpegaudiodsp_fixed.c \ libavcodec/mpegaudiodsp_float.c \ + libavcodec/mpegaudiodsp_template.c \ libavcodec/sbrdsp.c \ + libavcodec/sbrdsp_template.c \ libavcodec/sinewin.c \ libavcodec/sinewin_fixed.c \ + libavcodec/x86/dct_init.c \ + libavcodec/x86/dct32.asm \ + libavcodec/x86/imdct36.asm \ + libavcodec/x86/mpegaudiodsp.c \ + libavcodec/x86/sbrdsp_init.c \ + libavcodec/x86/sbrdsp.asm \ + libavformat/aacdec.c \ libavformat/apetag.c \ libavformat/img2.c \ libavformat/mov.c \