commit 9debcb008eb215404d6496c97f1db6766d4010ad Author: Tom Callaway <spot(a)fedoraproject.org&gt; Date: Mon Sep 11 11:16:31 2017 -0400 61.0.3163.79 .gitignore | 1 + chromium-61.0.3163.79-MOAR-GCC-FIXES.patch | 35 ++ chromium-61.0.3163.79-enable-mp3.patch | 473 +++++++++++++++++++++++ chromium-61.0.3163.79-fix-atk-compile.patch | 12 + chromium-61.0.3163.79-fix-ffmpeg-aarch64.patch | 12 + chromium-61.0.3163.79-fix-gn-again.patch | 20 + chromium-61.0.3163.79-gcc-no-opt-safe-math.patch | 13 + chromium-61.0.3163.79-gcc5-r1.patch | 67 ++++ chromium-61.0.3163.79-gcc7.patch | 12 + chromium-61.0.3163.79-gtk2fix.patch | 23 ++ chromium-61.0.3163.79-setopaque.patch | 12 + chromium.spec | 66 ++-- clean_ffmpeg.sh | 39 +- get_free_ffmpeg_source_files.py | 6 +- sources | 4 +- 15 files changed, 751 insertions(+), 44 deletions(-) --- diff --git a/.gitignore b/.gitignore index 4364688..b3e1d00 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /chromium-60.0.3112.101-clean.tar.xz /chromium-60.0.3112.113-clean.tar.xz /chromium-60.0.3112.113.tar.xz +/chromium-61.0.3163.79-clean.tar.xz diff --git a/chromium-61.0.3163.79-MOAR-GCC-FIXES.patch b/chromium-61.0.3163.79-MOAR-GCC-FIXES.patch new file mode 100644 index 0000000..c5999de --- /dev/null +++ b/chromium-61.0.3163.79-MOAR-GCC-FIXES.patch @@ -0,0 +1,35 @@ +diff -up chromium-61.0.3163.79/base/numerics/safe_math_clang_gcc_impl.h.fixgccagain chromium-61.0.3163.79/base/numerics/safe_math_clang_gcc_impl.h +--- chromium-61.0.3163.79/base/numerics/safe_math_clang_gcc_impl.h.fixgccagain 2017-09-06 15:48:27.560803028 -0400 ++++ chromium-61.0.3163.79/base/numerics/safe_math_clang_gcc_impl.h 2017-09-06 15:50:08.715853695 -0400 +@@ -126,6 +126,7 @@ struct ClampedAddFastOp { + } + }; + ++#if defined(__clang__) // Not supported on GCC. + // This is the fastest negation on Intel, and a decent fallback on arm. + __attribute__((always_inline)) inline int8_t ClampedNegate(uint8_t value) { + uint8_t carry; +@@ -169,6 +170,7 @@ __attribute__((always_inline)) inline in + __attribute__((always_inline)) inline int64_t ClampedNegate(int64_t value) { + return ClampedNegate(static_cast<uint64_t>(value)); + } ++#endif + + template <typename T, typename U> + struct ClampedSubFastOp { +@@ -180,6 +182,7 @@ struct ClampedSubFastOp { + return ClampedSubFastAsmOp<T, U>::template Do<V>(x, y); + } + ++#if defined(__clang__) // Not supported on GCC. + // Fast path for generic clamped negation. + if (std::is_same<T, U>::value && std::is_same<U, V>::value && + IsCompileTimeConstant(x) && x == 0 && !IsCompileTimeConstant(y)) { +@@ -190,6 +193,7 @@ struct ClampedSubFastOp { + IntegerBitsPlusSign<T>::value, std::is_signed<T>::value>::type>( + y)); + } ++#endif + + V result; + return !__builtin_sub_overflow(x, y, &result) diff --git a/chromium-61.0.3163.79-enable-mp3.patch b/chromium-61.0.3163.79-enable-mp3.patch new file mode 100644 index 0000000..375214b --- /dev/null +++ b/chromium-61.0.3163.79-enable-mp3.patch @@ -0,0 +1,473 @@ +diff -up chromium-61.0.3163.79/components/neterror/resources/sounds/button-press.mp3 chromium-61.0.3163.79/components/neterror/resources/sounds/button-press +diff -up chromium-61.0.3163.79/components/neterror/resources/sounds/hit.mp3 chromium-61.0.3163.79/components/neterror/resources/sounds/hit +diff -up chromium-61.0.3163.79/components/neterror/resources/sounds/score-reached.mp3 chromium-61.0.3163.79/components/neterror/resources/sounds/score-reached +diff -up chromium-61.0.3163.79/media/base/mime_util_internal.cc.mp3 chromium-61.0.3163.79/media/base/mime_util_internal.cc +--- chromium-61.0.3163.79/media/base/mime_util_internal.cc.mp3 2017-09-05 15:05:21.000000000 -0400 ++++ chromium-61.0.3163.79/media/base/mime_util_internal.cc 2017-09-06 14:11:44.426683599 -0400 +@@ -278,10 +278,10 @@ void MimeUtil::AddSupportedMediaFormats( + CodecSet webm_codecs(webm_audio_codecs); + webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end()); + +-#if BUILDFLAG(USE_PROPRIETARY_CODECS) + CodecSet mp3_codecs; + mp3_codecs.insert(MP3); + ++#if BUILDFLAG(USE_PROPRIETARY_CODECS) + CodecSet aac; + aac.insert(MPEG2_AAC); + aac.insert(MPEG4_AAC); +@@ -325,10 +325,10 @@ void MimeUtil::AddSupportedMediaFormats( + AddContainerWithCodecs("application/ogg", ogg_codecs, false); + AddContainerWithCodecs("audio/flac", implicit_codec, false); + +-#if BUILDFLAG(USE_PROPRIETARY_CODECS) + AddContainerWithCodecs("audio/mpeg", mp3_codecs, true); // Allow "mp3". + AddContainerWithCodecs("audio/mp3", implicit_codec, true); + AddContainerWithCodecs("audio/x-mp3", implicit_codec, true); ++#if BUILDFLAG(USE_PROPRIETARY_CODECS) + AddContainerWithCodecs("audio/aac", implicit_codec, true); // AAC / ADTS. + AddContainerWithCodecs("audio/mp4", mp4_audio_codecs, true); + DCHECK(!mp4_video_codecs.empty()); +@@ -933,7 +933,6 @@ bool MimeUtil::IsCodecProprietary(Codec + case INVALID_CODEC: + case AC3: + case EAC3: +- case MP3: + case MPEG2_AAC: + case MPEG4_AAC: + case H264: +@@ -941,6 +940,7 @@ bool MimeUtil::IsCodecProprietary(Codec + case DOLBY_VISION: + return true; + ++ case MP3: + case PCM: + case VORBIS: + case OPUS: +diff -up chromium-61.0.3163.79/media/formats/BUILD.gn.mp3 chromium-61.0.3163.79/media/formats/BUILD.gn +--- chromium-61.0.3163.79/media/formats/BUILD.gn.mp3 2017-09-05 15:05:21.000000000 -0400 ++++ chromium-61.0.3163.79/media/formats/BUILD.gn 2017-09-06 14:11:44.427683579 -0400 +@@ -12,6 +12,14 @@ source_set("formats") { + "ac3/ac3_util.h", + "common/offset_byte_queue.cc", + "common/offset_byte_queue.h", ++ "mpeg/adts_constants.cc", ++ "mpeg/adts_constants.h", ++ "mpeg/adts_stream_parser.cc", ++ "mpeg/adts_stream_parser.h", ++ "mpeg/mpeg1_audio_stream_parser.cc", ++ "mpeg/mpeg1_audio_stream_parser.h", ++ "mpeg/mpeg_audio_stream_parser_base.cc", ++ "mpeg/mpeg_audio_stream_parser_base.h", + "webm/webm_audio_client.cc", + "webm/webm_audio_client.h", + "webm/webm_cluster_parser.cc", +@@ -76,14 +84,6 @@ source_set("formats") { + "mp4/sample_to_group_iterator.h", + "mp4/track_run_iterator.cc", + "mp4/track_run_iterator.h", +- "mpeg/adts_constants.cc", +- "mpeg/adts_constants.h", +- "mpeg/adts_stream_parser.cc", +- "mpeg/adts_stream_parser.h", +- "mpeg/mpeg1_audio_stream_parser.cc", +- "mpeg/mpeg1_audio_stream_parser.h", +- "mpeg/mpeg_audio_stream_parser_base.cc", +- "mpeg/mpeg_audio_stream_parser_base.h", + ] + } + +diff -up chromium-61.0.3163.79/third_party/catapult/third_party/gsutil/gslib/tests/test_data/test.mp3 chromium-61.0.3163.79/third_party/catapult/third_party/gsutil/gslib/tests/test_data/test +diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3 chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h +--- chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3 2017-09-06 10:13:19.000000000 -0400 ++++ chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h 2017-09-06 14:16:00.576744161 -0400 +@@ -1,7 +1,7 @@ + /* Automatically generated by configure - do not modify! */ + #ifndef FFMPEG_CONFIG_H + #define FFMPEG_CONFIG_H +-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-pars er='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic" ++#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-pars er='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'" + #define FFMPEG_LICENSE "LGPL version 2.1 or later" + #define CONFIG_THIS_YEAR 2017 + #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" +@@ -542,7 +542,7 @@ + #define CONFIG_FFPROBE 0 + #define CONFIG_FFSERVER 0 + #define CONFIG_FFMPEG 0 +-#define CONFIG_DCT 0 ++#define CONFIG_DCT 1 + #define CONFIG_DWT 0 + #define CONFIG_ERROR_RESILIENCE 0 + #define CONFIG_FAAN 1 +@@ -620,9 +620,9 @@ + #define CONFIG_LZF 0 + #define CONFIG_ME_CMP 0 + #define CONFIG_MPEG_ER 0 +-#define CONFIG_MPEGAUDIO 0 +-#define CONFIG_MPEGAUDIODSP 0 +-#define CONFIG_MPEGAUDIOHEADER 0 ++#define CONFIG_MPEGAUDIO 1 ++#define CONFIG_MPEGAUDIODSP 1 ++#define CONFIG_MPEGAUDIOHEADER 1 + #define CONFIG_MPEGVIDEO 0 + #define CONFIG_MPEGVIDEOENC 0 + #define CONFIG_MSS34DSP 0 +@@ -968,7 +968,7 @@ + #define CONFIG_MP1FLOAT_DECODER 0 + #define CONFIG_MP2_DECODER 0 + #define CONFIG_MP2FLOAT_DECODER 0 +-#define CONFIG_MP3_DECODER 0 ++#define CONFIG_MP3_DECODER 1 + #define CONFIG_MP3FLOAT_DECODER 0 + #define CONFIG_MP3ADU_DECODER 0 + #define CONFIG_MP3ADUFLOAT_DECODER 0 +@@ -1275,7 +1275,7 @@ + #define CONFIG_MM_DEMUXER 0 + #define CONFIG_MMF_DEMUXER 0 + #define CONFIG_MOV_DEMUXER 0 +-#define CONFIG_MP3_DEMUXER 0 ++#define CONFIG_MP3_DEMUXER 1 + #define CONFIG_MPC_DEMUXER 0 + #define CONFIG_MPC8_DEMUXER 0 + #define CONFIG_MPEGPS_DEMUXER 0 +@@ -2217,7 +2217,7 @@ + #define CONFIG_MJPEG_PARSER 0 + #define CONFIG_MLP_PARSER 0 + #define CONFIG_MPEG4VIDEO_PARSER 0 +-#define CONFIG_MPEGAUDIO_PARSER 0 ++#define CONFIG_MPEGAUDIO_PARSER 1 + #define CONFIG_MPEGVIDEO_PARSER 0 + #define CONFIG_OPUS_PARSER 1 + #define CONFIG_PNG_PARSER 0 +diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3 chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h +--- chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3 2017-09-06 10:13:19.000000000 -0400 ++++ chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h 2017-09-06 14:17:14.964310036 -0400 +@@ -1,7 +1,7 @@ + /* Automatically generated by configure - do not modify! */ + #ifndef FFMPEG_CONFIG_H + #define FFMPEG_CONFIG_H +-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/jrummell/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8 ' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic" ++#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/jrummell/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8 ' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'" + #define FFMPEG_LICENSE "LGPL version 2.1 or later" + #define CONFIG_THIS_YEAR 2017 + #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" +@@ -542,7 +542,7 @@ + #define CONFIG_FFPROBE 0 + #define CONFIG_FFSERVER 0 + #define CONFIG_FFMPEG 0 +-#define CONFIG_DCT 0 ++#define CONFIG_DCT 1 + #define CONFIG_DWT 0 + #define CONFIG_ERROR_RESILIENCE 0 + #define CONFIG_FAAN 1 +@@ -620,9 +620,9 @@ + #define CONFIG_LZF 0 + #define CONFIG_ME_CMP 0 + #define CONFIG_MPEG_ER 0 +-#define CONFIG_MPEGAUDIO 0 +-#define CONFIG_MPEGAUDIODSP 0 +-#define CONFIG_MPEGAUDIOHEADER 0 ++#define CONFIG_MPEGAUDIO 1 ++#define CONFIG_MPEGAUDIODSP 1 ++#define CONFIG_MPEGAUDIOHEADER 1 + #define CONFIG_MPEGVIDEO 0 + #define CONFIG_MPEGVIDEOENC 0 + #define CONFIG_MSS34DSP 0 +@@ -968,7 +968,7 @@ + #define CONFIG_MP1FLOAT_DECODER 0 + #define CONFIG_MP2_DECODER 0 + #define CONFIG_MP2FLOAT_DECODER 0 +-#define CONFIG_MP3_DECODER 0 ++#define CONFIG_MP3_DECODER 1 + #define CONFIG_MP3FLOAT_DECODER 0 + #define CONFIG_MP3ADU_DECODER 0 + #define CONFIG_MP3ADUFLOAT_DECODER 0 +@@ -1275,7 +1275,7 @@ + #define CONFIG_MM_DEMUXER 0 + #define CONFIG_MMF_DEMUXER 0 + #define CONFIG_MOV_DEMUXER 0 +-#define CONFIG_MP3_DEMUXER 0 ++#define CONFIG_MP3_DEMUXER 1 + #define CONFIG_MPC_DEMUXER 0 + #define CONFIG_MPC8_DEMUXER 0 + #define CONFIG_MPEGPS_DEMUXER 0 +@@ -2217,7 +2217,7 @@ + #define CONFIG_MJPEG_PARSER 0 + #define CONFIG_MLP_PARSER 0 + #define CONFIG_MPEG4VIDEO_PARSER 0 +-#define CONFIG_MPEGAUDIO_PARSER 0 ++#define CONFIG_MPEGAUDIO_PARSER 1 + #define CONFIG_MPEGVIDEO_PARSER 0 + #define CONFIG_OPUS_PARSER 1 + #define CONFIG_PNG_PARSER 0 +diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3 chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h +--- chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3 2017-09-06 10:13:19.000000000 -0400 ++++ chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h 2017-09-06 14:17:45.634718576 -0400 +@@ -1,7 +1,7 @@ + /* Automatically generated by configure - do not modify! */ + #ifndef FFMPEG_CONFIG_H + #define FFMPEG_CONFIG_H +-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/jrummell/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8 ' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --enable-neon --extra-cflags='-mfpu=neon' --enable-pic" ++#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/jrummell/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8 ' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --enable-neon --extra-cflags='-mfpu=neon' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'" + #define FFMPEG_LICENSE "LGPL version 2.1 or later" + #define CONFIG_THIS_YEAR 2017 + #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" +@@ -542,7 +542,7 @@ + #define CONFIG_FFPROBE 0 + #define CONFIG_FFSERVER 0 + #define CONFIG_FFMPEG 0 +-#define CONFIG_DCT 0 ++#define CONFIG_DCT 1 + #define CONFIG_DWT 0 + #define CONFIG_ERROR_RESILIENCE 0 + #define CONFIG_FAAN 1 +@@ -620,9 +620,9 @@ + #define CONFIG_LZF 0 + #define CONFIG_ME_CMP 0 + #define CONFIG_MPEG_ER 0 +-#define CONFIG_MPEGAUDIO 0 +-#define CONFIG_MPEGAUDIODSP 0 +-#define CONFIG_MPEGAUDIOHEADER 0 ++#define CONFIG_MPEGAUDIO 1 ++#define CONFIG_MPEGAUDIODSP 1 ++#define CONFIG_MPEGAUDIOHEADER 1 + #define CONFIG_MPEGVIDEO 0 + #define CONFIG_MPEGVIDEOENC 0 + #define CONFIG_MSS34DSP 0 +@@ -968,7 +968,7 @@ + #define CONFIG_MP1FLOAT_DECODER 0 + #define CONFIG_MP2_DECODER 0 + #define CONFIG_MP2FLOAT_DECODER 0 +-#define CONFIG_MP3_DECODER 0 ++#define CONFIG_MP3_DECODER 1 + #define CONFIG_MP3FLOAT_DECODER 0 + #define CONFIG_MP3ADU_DECODER 0 + #define CONFIG_MP3ADUFLOAT_DECODER 0 +@@ -1275,7 +1275,7 @@ + #define CONFIG_MM_DEMUXER 0 + #define CONFIG_MMF_DEMUXER 0 + #define CONFIG_MOV_DEMUXER 0 +-#define CONFIG_MP3_DEMUXER 0 ++#define CONFIG_MP3_DEMUXER 1 + #define CONFIG_MPC_DEMUXER 0 + #define CONFIG_MPC8_DEMUXER 0 + #define CONFIG_MPEGPS_DEMUXER 0 +@@ -2217,7 +2217,7 @@ + #define CONFIG_MJPEG_PARSER 0 + #define CONFIG_MLP_PARSER 0 + #define CONFIG_MPEG4VIDEO_PARSER 0 +-#define CONFIG_MPEGAUDIO_PARSER 0 ++#define CONFIG_MPEGAUDIO_PARSER 1 + #define CONFIG_MPEGVIDEO_PARSER 0 + #define CONFIG_OPUS_PARSER 1 + #define CONFIG_PNG_PARSER 0 +diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3 chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h +--- chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3 2017-09-06 10:13:19.000000000 -0400 ++++ chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h 2017-09-06 14:18:10.890232136 -0400 +@@ -1,7 +1,7 @@ + /* Automatically generated by configure - do not modify! */ + #ifndef FFMPEG_CONFIG_H + #define FFMPEG_CONFIG_H +-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-pars er='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-yasm --enable-pic" ++#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-pars er='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-yasm --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'" + #define FFMPEG_LICENSE "LGPL version 2.1 or later" + #define CONFIG_THIS_YEAR 2017 + #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" +@@ -542,7 +542,7 @@ + #define CONFIG_FFPROBE 0 + #define CONFIG_FFSERVER 0 + #define CONFIG_FFMPEG 0 +-#define CONFIG_DCT 0 ++#define CONFIG_DCT 1 + #define CONFIG_DWT 0 + #define CONFIG_ERROR_RESILIENCE 0 + #define CONFIG_FAAN 1 +@@ -620,9 +620,9 @@ + #define CONFIG_LZF 0 + #define CONFIG_ME_CMP 0 + #define CONFIG_MPEG_ER 0 +-#define CONFIG_MPEGAUDIO 0 +-#define CONFIG_MPEGAUDIODSP 0 +-#define CONFIG_MPEGAUDIOHEADER 0 ++#define CONFIG_MPEGAUDIO 1 ++#define CONFIG_MPEGAUDIODSP 1 ++#define CONFIG_MPEGAUDIOHEADER 1 + #define CONFIG_MPEGVIDEO 0 + #define CONFIG_MPEGVIDEOENC 0 + #define CONFIG_MSS34DSP 0 +@@ -968,7 +968,7 @@ + #define CONFIG_MP1FLOAT_DECODER 0 + #define CONFIG_MP2_DECODER 0 + #define CONFIG_MP2FLOAT_DECODER 0 +-#define CONFIG_MP3_DECODER 0 ++#define CONFIG_MP3_DECODER 1 + #define CONFIG_MP3FLOAT_DECODER 0 + #define CONFIG_MP3ADU_DECODER 0 + #define CONFIG_MP3ADUFLOAT_DECODER 0 +@@ -1275,7 +1275,7 @@ + #define CONFIG_MM_DEMUXER 0 + #define CONFIG_MMF_DEMUXER 0 + #define CONFIG_MOV_DEMUXER 0 +-#define CONFIG_MP3_DEMUXER 0 ++#define CONFIG_MP3_DEMUXER 1 + #define CONFIG_MPC_DEMUXER 0 + #define CONFIG_MPC8_DEMUXER 0 + #define CONFIG_MPEGPS_DEMUXER 0 +@@ -2217,7 +2217,7 @@ + #define CONFIG_MJPEG_PARSER 0 + #define CONFIG_MLP_PARSER 0 + #define CONFIG_MPEG4VIDEO_PARSER 0 +-#define CONFIG_MPEGAUDIO_PARSER 0 ++#define CONFIG_MPEGAUDIO_PARSER 1 + #define CONFIG_MPEGVIDEO_PARSER 0 + #define CONFIG_OPUS_PARSER 1 + #define CONFIG_PNG_PARSER 0 +diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3 chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h +--- chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3 2017-09-06 10:13:19.000000000 -0400 ++++ chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h 2017-09-06 14:18:34.578774933 -0400 +@@ -1,7 +1,7 @@ + /* Automatically generated by configure - do not modify! */ + #ifndef FFMPEG_CONFIG_H + #define FFMPEG_CONFIG_H +-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-pars er='vp3,vp8' --enable-lto --enable-pic" ++#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-pars er='vp3,vp8' --enable-lto --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'" + #define FFMPEG_LICENSE "LGPL version 2.1 or later" + #define CONFIG_THIS_YEAR 2017 + #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" +@@ -542,7 +542,7 @@ + #define CONFIG_FFPROBE 0 + #define CONFIG_FFSERVER 0 + #define CONFIG_FFMPEG 0 +-#define CONFIG_DCT 0 ++#define CONFIG_DCT 1 + #define CONFIG_DWT 0 + #define CONFIG_ERROR_RESILIENCE 0 + #define CONFIG_FAAN 1 +@@ -620,9 +620,9 @@ + #define CONFIG_LZF 0 + #define CONFIG_ME_CMP 0 + #define CONFIG_MPEG_ER 0 +-#define CONFIG_MPEGAUDIO 0 +-#define CONFIG_MPEGAUDIODSP 0 +-#define CONFIG_MPEGAUDIOHEADER 0 ++#define CONFIG_MPEGAUDIO 1 ++#define CONFIG_MPEGAUDIODSP 1 ++#define CONFIG_MPEGAUDIOHEADER 1 + #define CONFIG_MPEGVIDEO 0 + #define CONFIG_MPEGVIDEOENC 0 + #define CONFIG_MSS34DSP 0 +@@ -968,7 +968,7 @@ + #define CONFIG_MP1FLOAT_DECODER 0 + #define CONFIG_MP2_DECODER 0 + #define CONFIG_MP2FLOAT_DECODER 0 +-#define CONFIG_MP3_DECODER 0 ++#define CONFIG_MP3_DECODER 1 + #define CONFIG_MP3FLOAT_DECODER 0 + #define CONFIG_MP3ADU_DECODER 0 + #define CONFIG_MP3ADUFLOAT_DECODER 0 +@@ -1275,7 +1275,7 @@ + #define CONFIG_MM_DEMUXER 0 + #define CONFIG_MMF_DEMUXER 0 + #define CONFIG_MOV_DEMUXER 0 +-#define CONFIG_MP3_DEMUXER 0 ++#define CONFIG_MP3_DEMUXER 1 + #define CONFIG_MPC_DEMUXER 0 + #define CONFIG_MPC8_DEMUXER 0 + #define CONFIG_MPEGPS_DEMUXER 0 +@@ -2217,7 +2217,7 @@ + #define CONFIG_MJPEG_PARSER 0 + #define CONFIG_MLP_PARSER 0 + #define CONFIG_MPEG4VIDEO_PARSER 0 +-#define CONFIG_MPEGAUDIO_PARSER 0 ++#define CONFIG_MPEGAUDIO_PARSER 1 + #define CONFIG_MPEGVIDEO_PARSER 0 + #define CONFIG_OPUS_PARSER 1 + #define CONFIG_PNG_PARSER 0 +diff -up chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni +--- chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni.mp3 2017-09-06 10:13:18.000000000 -0400 ++++ chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni 2017-09-06 14:29:27.051194188 -0400 +@@ -182,17 +182,9 @@ if ((is_mac) || (is_win) || (use_linux_c + ] + } + +-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_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (use_li nux_config && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { ++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_win) || (use_linux_config && current_cpu == "arm" && arm_use_neon) || (use_linux_config && current_cpu == "arm" && arm_use_neon) || (use_linux_config && current_cpu == "arm") || (use_linux_config && current_cpu == "arm") || (use_linux_config && current_cpu == "arm64") || (use_linux_config && current_cpu == "mipsel") || (use_linux_config && current_cpu == "x64") || (use_linux_config && current_cpu == "x86")) { + 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", +@@ -210,7 +202,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", +@@ -219,6 +210,20 @@ 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_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (use_li nux_config && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { ++ 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_mac) || (is_win) || (use_linux_config && current_cpu == "x64") || (use_linux_config && current_cpu == "x86")) { + ffmpeg_c_sources += [ + "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c", +@@ -322,15 +327,19 @@ if ((is_mac) || (is_win) || (use_linux_c + if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { + ffmpeg_c_sources += [ + "libavcodec/x86/aacpsdsp_init.c", ++ ] ++ ffmpeg_yasm_sources += [ ++ "libavcodec/x86/aacpsdsp.asm", ++ ] ++} ++ ++if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (use_linux_config && current_cpu == "x64") || (use_linux_config && 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_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { + ffmpeg_yasm_sources += [ +- "libavcodec/x86/aacpsdsp.asm", + "libavcodec/x86/dct32.asm", + "libavcodec/x86/imdct36.asm", + "libavcodec/x86/sbrdsp.asm", +diff -up chromium-61.0.3163.79/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chromium-61.0.3163.79/third_party/ffmpeg/libavcodec/sbrdsp.c +--- chromium-61.0.3163.79/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 2017-09-06 10:13:19.000000000 -0400 ++++ chromium-61.0.3163.79/third_party/ffmpeg/libavcodec/sbrdsp.c 2017-09-06 14:11:44.495682217 -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 -up chromium-61.0.3163.79/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart.mp3 chromium-61.0.3163.79/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart +diff -up chromium-61.0.3163.79/tools/android/audio_focus_grabber/java/res/raw/ping.mp3 chromium-61.0.3163.79/tools/android/audio_focus_grabber/java/res/raw/ping diff --git a/chromium-61.0.3163.79-fix-atk-compile.patch b/chromium-61.0.3163.79-fix-atk-compile.patch new file mode 100644 index 0000000..fcbe042 --- /dev/null +++ b/chromium-61.0.3163.79-fix-atk-compile.patch @@ -0,0 +1,12 @@ +diff -up chromium-61.0.3163.79/content/browser/accessibility/browser_accessibility_auralinux.cc.fixvarname chromium-61.0.3163.79/content/browser/accessibility/browser_accessibility_auralinux.cc +--- chromium-61.0.3163.79/content/browser/accessibility/browser_accessibility_auralinux.cc.fixvarname 2017-09-08 13:36:14.985804754 -0400 ++++ chromium-61.0.3163.79/content/browser/accessibility/browser_accessibility_auralinux.cc 2017-09-08 13:36:25.050611274 -0400 +@@ -571,7 +571,7 @@ static AtkStateSet* browser_accessibilit + // it's best to leave this out rather than break people's builds: + #if defined(ATK_CHECK_VERSION) + #if ATK_CHECK_VERSION(2, 16, 0) +- atk_state_set_add_state(atk_state_set, ATK_STATE_READ_ONLY); ++ atk_state_set_add_state(state_set, ATK_STATE_READ_ONLY); + #endif + #endif + break; diff --git a/chromium-61.0.3163.79-fix-ffmpeg-aarch64.patch b/chromium-61.0.3163.79-fix-ffmpeg-aarch64.patch new file mode 100644 index 0000000..a8c7260 --- /dev/null +++ b/chromium-61.0.3163.79-fix-ffmpeg-aarch64.patch @@ -0,0 +1,12 @@ +diff -up chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni.aarch64 chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni +--- chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni.aarch64 2017-09-06 14:34:36.247232957 -0400 ++++ chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni 2017-09-06 14:36:37.632892363 -0400 +@@ -537,7 +537,7 @@ if (use_linux_config && current_cpu == " + ] + } + +-if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) { ++if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chromium")) { + ffmpeg_c_sources += [ + "libavcodec/aarch64/mpegaudiodsp_init.c", + ] diff --git a/chromium-61.0.3163.79-fix-gn-again.patch b/chromium-61.0.3163.79-fix-gn-again.patch new file mode 100644 index 0000000..ecdaeca --- /dev/null +++ b/chromium-61.0.3163.79-fix-gn-again.patch @@ -0,0 +1,20 @@ +diff -up chromium-61.0.3163.79/tools/gn/bootstrap/bootstrap.py.fixit chromium-61.0.3163.79/tools/gn/bootstrap/bootstrap.py +--- chromium-61.0.3163.79/tools/gn/bootstrap/bootstrap.py.fixit 2017-09-06 15:30:19.199783450 -0400 ++++ chromium-61.0.3163.79/tools/gn/bootstrap/bootstrap.py 2017-09-06 15:31:17.781654042 -0400 +@@ -449,6 +449,7 @@ def write_gn_ninja(path, root_gen_dir, o + 'base/metrics/histogram_base.cc', + 'base/metrics/histogram_functions.cc', + 'base/metrics/histogram_samples.cc', ++ 'base/metrics/histogram_snapshot_manager.cc', + 'base/metrics/metrics_hashes.cc', + 'base/metrics/persistent_histogram_allocator.cc', + 'base/metrics/persistent_memory_allocator.cc', +@@ -534,7 +535,7 @@ def write_gn_ninja(path, root_gen_dir, o + 'base/trace_event/heap_profiler_allocation_context_tracker.cc', + 'base/trace_event/heap_profiler_allocation_register.cc', + 'base/trace_event/heap_profiler_event_filter.cc', +- 'base/trace_event/heap_profiler_event_writer.cc', ++ 'base/trace_event/heap_profiler_heap_dump_writer.cc', + 'base/trace_event/heap_profiler_serialization_state.cc', + 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc', + 'base/trace_event/heap_profiler_type_name_deduplicator.cc', diff --git a/chromium-61.0.3163.79-gcc-no-opt-safe-math.patch b/chromium-61.0.3163.79-gcc-no-opt-safe-math.patch new file mode 100644 index 0000000..183b5ab --- /dev/null +++ b/chromium-61.0.3163.79-gcc-no-opt-safe-math.patch @@ -0,0 +1,13 @@ +diff -up chromium-61.0.3163.79/base/numerics/safe_math_shared_impl.h.fixgcc3 chromium-61.0.3163.79/base/numerics/safe_math_shared_impl.h +--- chromium-61.0.3163.79/base/numerics/safe_math_shared_impl.h.fixgcc3 2017-09-06 16:30:15.898454585 -0400 ++++ chromium-61.0.3163.79/base/numerics/safe_math_shared_impl.h 2017-09-06 16:30:27.570229539 -0400 +@@ -21,8 +21,7 @@ + #if !defined(__native_client__) && \ + ((defined(__clang__) && \ + ((__clang_major__ > 3) || \ +- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \ +- (defined(__GNUC__) && __GNUC__ >= 5)) ++ (__clang_major__ == 3 && __clang_minor__ >= 4)))) + #include "base/numerics/safe_math_clang_gcc_impl.h" + #define BASE_HAS_OPTIMIZED_SAFE_MATH (1) + #else diff --git a/chromium-61.0.3163.79-gcc5-r1.patch b/chromium-61.0.3163.79-gcc5-r1.patch new file mode 100644 index 0000000..4119850 --- /dev/null +++ b/chromium-61.0.3163.79-gcc5-r1.patch @@ -0,0 +1,67 @@ +diff -up chromium-61.0.3163.79/chrome/browser/devtools/devtools_file_system_indexer.cc.gcc5fix chromium-61.0.3163.79/chrome/browser/devtools/devtools_file_system_indexer.cc +--- chromium-61.0.3163.79/chrome/browser/devtools/devtools_file_system_indexer.cc.gcc5fix 2017-09-06 16:32:34.496782451 -0400 ++++ chromium-61.0.3163.79/chrome/browser/devtools/devtools_file_system_indexer.cc 2017-09-06 16:33:22.053865242 -0400 +@@ -34,7 +34,6 @@ using base::TimeDelta; + using base::TimeTicks; + using content::BrowserThread; + using std::map; +-using std::set; + using std::string; + using std::vector; + +@@ -191,7 +190,7 @@ vector<FilePath> Index::Search(const str + if (trigram != kUndefinedTrigram) + trigrams.push_back(trigram); + } +- set<FileId> file_ids; ++ std::set<FileId> file_ids; + bool first = true; + vector<Trigram>::const_iterator it = trigrams.begin(); + for (; it != trigrams.end(); ++it) { +@@ -203,7 +202,7 @@ vector<FilePath> Index::Search(const str + first = false; + continue; + } +- set<FileId> intersection = base::STLSetIntersection<set<FileId> >( ++ std::set<FileId> intersection = base::STLSetIntersection<std::set<FileId> >( + file_ids, index_[trigram]); + file_ids.swap(intersection); + } +diff -up chromium-61.0.3163.79/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h.gcc5fix chromium-61.0.3163.79/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h +--- chromium-61.0.3163.79/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h.gcc5fix 2017-09-06 16:33:35.213611900 -0400 ++++ chromium-61.0.3163.79/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h 2017-09-06 16:34:34.471469606 -0400 +@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { + allocation_length_(0), + data_(data), + data_length_(0), +- kind_(AllocationKind::kNormal), ++ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), + deleter_(deleter) {} + DataHandle(void* allocation_base, + size_t allocation_length, +@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { + reinterpret_cast<uintptr_t>(allocation_base_) + + allocation_length_); + switch (kind_) { +- case AllocationKind::kNormal: ++ case WTF::ArrayBufferContents::AllocationKind::kNormal: + DCHECK(deleter_); + deleter_(data_); + return; +- case AllocationKind::kReservation: ++ case WTF::ArrayBufferContents::AllocationKind::kReservation: + ReleaseReservedMemory(allocation_base_, allocation_length_); + return; + } +diff -up chromium-61.0.3163.79/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5fix chromium-61.0.3163.79/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc +--- chromium-61.0.3163.79/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5fix 2017-09-06 16:34:51.959131969 -0400 ++++ chromium-61.0.3163.79/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-09-06 16:35:03.027919336 -0400 +@@ -10,7 +10,7 @@ + + #include "webrtc/modules/audio_processing/aec3/aec_state.h" + +-#include <math.h> ++#include <cmath> + #include <numeric> + #include <vector> + diff --git a/chromium-61.0.3163.79-gcc7.patch b/chromium-61.0.3163.79-gcc7.patch new file mode 100644 index 0000000..44ab0ce --- /dev/null +++ b/chromium-61.0.3163.79-gcc7.patch @@ -0,0 +1,12 @@ +diff -up chromium-61.0.3163.79/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7 chromium-61.0.3163.79/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h +--- chromium-61.0.3163.79/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7 2017-09-05 15:05:41.000000000 -0400 ++++ chromium-61.0.3163.79/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h 2017-09-06 14:01:52.461097821 -0400 +@@ -8,6 +8,7 @@ + #include "platform/PlatformExport.h" + #include "platform/wtf/ThreadSpecific.h" + ++#include <functional> + #include <memory> + + namespace gpu { +diff -up chromium-61.0.3163.79/v8/src/objects/hash-table.h.gcc7 chromium-61.0.3163.79/v8/src/objects/hash-table.h diff --git a/chromium-61.0.3163.79-gtk2fix.patch b/chromium-61.0.3163.79-gtk2fix.patch new file mode 100644 index 0000000..e22cb6f --- /dev/null +++ b/chromium-61.0.3163.79-gtk2fix.patch @@ -0,0 +1,23 @@ +diff -up chromium-61.0.3163.79/chrome/browser/ui/libgtkui/gtk_ui.cc.gtk2fix chromium-61.0.3163.79/chrome/browser/ui/libgtkui/gtk_ui.cc +--- chromium-61.0.3163.79/chrome/browser/ui/libgtkui/gtk_ui.cc.gtk2fix 2017-09-07 15:40:40.904966476 -0400 ++++ chromium-61.0.3163.79/chrome/browser/ui/libgtkui/gtk_ui.cc 2017-09-07 15:42:23.829987464 -0400 +@@ -1052,11 +1052,19 @@ float GtkUi::GetRawDeviceScaleFactor() { + if (display::Display::HasForceDeviceScaleFactor()) + return display::Display::GetForcedDeviceScaleFactor(); + ++#if GTK_MAJOR_VERSION == 2 ++ GtkSettings* gtk_settings = gtk_settings_get_default(); ++ gint gtk_dpi = -1; ++ g_object_get(gtk_settings, "gtk-xft-dpi", &gtk_dpi, nullptr); ++ const float scale_factor = gtk_dpi / (1024 * kDefaultDPI); ++#else + GdkScreen* screen = gdk_screen_get_default(); + gint scale = gtk_widget_get_scale_factor(fake_window_); + gdouble resolution = gdk_screen_get_resolution(screen); + const float scale_factor = + resolution <= 0 ? scale : resolution * scale / kDefaultDPI; ++#endif ++ + // Blacklist scaling factors <120% (crbug.com/484400) and round + // to 1 decimal to prevent rendering problems (crbug.com/485183). + return scale_factor < 1.2f ? 1.0f : roundf(scale_factor * 10) / 10; diff --git a/chromium-61.0.3163.79-setopaque.patch b/chromium-61.0.3163.79-setopaque.patch new file mode 100644 index 0000000..b797d10 --- /dev/null +++ b/chromium-61.0.3163.79-setopaque.patch @@ -0,0 +1,12 @@ +diff -up chromium-61.0.3163.79/cc/blink/web_layer_impl.h.setopaque chromium-61.0.3163.79/cc/blink/web_layer_impl.h +--- chromium-61.0.3163.79/cc/blink/web_layer_impl.h.setopaque 2017-09-06 13:55:45.454175023 -0400 ++++ chromium-61.0.3163.79/cc/blink/web_layer_impl.h 2017-09-06 13:58:02.395533936 -0400 +@@ -71,7 +71,7 @@ class CC_BLINK_EXPORT WebLayerImpl : pub + bool IsRootForIsolatedGroup() override; + void SetShouldHitTest(bool should_hit_test) override; + bool ShouldHitTest() override; +- void SetOpaque(bool opaque) override; ++ CC_BLINK_EXPORT void SetOpaque(bool opaque) override; + bool Opaque() const override; + void SetPosition(const blink::WebFloatPoint& position) override; + blink::WebFloatPoint GetPosition() const override; diff --git a/chromium.spec b/chromium.spec index 788c7d8..08a5bd2 100644 --- a/chromium.spec +++ b/chromium.spec @@ -26,7 +26,7 @@ # Requires is trickier. %global __provides_exclude_from %{chromium_path}/.*\\.so|%{chromium_path}/lib/.*\\.so -%global privlibs libaccessibility|libanimation|libaura_extra|libaura|libbase_i18n|libbase|libbindings|libblink_android_mojo_bindings_shared|libblink_core|libblink_modules|libblink_mojo_bindings_shared|libblink_offscreen_canvas_mojo_bindings_shared|libblink_platform|libblink_web|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture_base|libcapture_lib|libcc_animation|libcc_base|libcc_blink|libcc_debug|libcc_ipc|libcc_paint|libcc|libcc_surfaces|libcdm_manager|libchromium_sqlite3|libclearkeycdm|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent_common_mojo_bindings_shared|libcontent|libcpp|libcrcrypto|libdbus|libdevice_base|libdevice_event_log|libdevice_gamepad|libdevices|libdevice_vr_mojo_bindings_blink|libdevice_vr_mojo_bindings_shared|libdevice_vr_mojo_bindings|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay_compositor|libdisplay|libdisplay_types|libdisplay_util|li bdomain_reliability|libEGL|libembedder|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents|libevents_x|libffmpeg|libfingerprint|libframe_sinks|libgcm|libgeneric_sensor_public_interfaces_shared|libgeneric_sensor|libgeolocation|libgeometry_skia|libgeometry|libgesture_detection|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx|libgfx_x11|libgin_features|libgin|libgles2_c_lib|libgles2_implementation|libgles2_utils|libGLESv2|libgl_init|libgl_in_process_context|libgl_wrapper|libgpu|libgtk2ui|libheadless|libicui18n|libicuuc|libipc_mojom_shared|libipc_mojom|libipc|libjs|libkeyboard|libkeyboard_with_content|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libmanager|libmedia_blink|libmedia_gpu|libmedia_mojo_services|libmedia|libmessage_center|libmidi|libmirclient.9|libmojo_common_lib|libmojo_ime_lib|libmojo_public_system_cpp|libmojo_public_system|libmojo_system_impl|libnative_theme|libnet|libnet_with_v8|libonc|libosmesa|libplatform|libpoli cy_component|libpolicy_proto|libpower_save_blocker|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|libpublic|librange|libresource_coordinator_cpp|libresource_coordinator_public_interfaces_internal_shared|libsandbox_services|libseccomp_bpf|libsensors|libservice_manager_cpp|libservice_manager_cpp_types|libservice_manager_mojom_blink|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_constants|libservice_manager_mojom_shared|libservice_manager_mojom|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtracing|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_touch_selection|libui_views_mus_lib|liburl_ipc|liburl_matcher|liburl|libuser_manager|libuser_prefs|libv8_libbase|libv8_libplatform|libv8|libviews|libVkLayer_core_validation|libVkLa yer_object_tracker|libVkLayer_parameter_validation|libVkLayer_swapchain|libVkLayer_threading|libVkLayer_unique_objects|libwebdata_common|libweb_dialogs|libwebview|libwidevinecdmadapter|libwidevinecdm|libwm|libwtf|libx11_events_platform|libx11_window +%global privlibs libaccessibility|libanimation|libaura_extra|libaura|libbase_i18n|libbase|libbindings|libblink_android_mojo_bindings_shared|libblink_controller|libblink_core|libblink_modules|libblink_mojo_bindings_shared|libblink_offscreen_canvas_mojo_bindings_shared|libblink_platform|libblink_web|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture_base|libcapture_lib|libcc_animation|libcc_base|libcc_blink|libcc_debug|libcc_ipc|libcc_paint|libcc|libcc_surfaces|libcdm_manager|libchromium_sqlite3|libclearkeycdm|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent_common_mojo_bindings_shared|libcontent_public_common_mojo_bindings_shared|libcontent|libcrcrypto|libdbus|libdevice_base|libdevice_event_log|libdevice_gamepad|libdevices|libdevice_vr_mojo_bindings_blink|libdevice_vr_mojo_bindings_shared|libdevice_vr_mojo_bindings|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdispla y|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libembedder|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents|libevents_x|libffmpeg|libfingerprint|libgcm|libgeolocation|libgeometry_skia|libgeometry|libgesture_detection|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx|libgfx_switches|libgfx_x11|libgin|libgles2_c_lib|libgles2_implementation|libgles2_utils|libGLESv2|libgl_init|libgl_in_process_context|libgl_wrapper|libgpu|libgtk2ui|libheadless|libhost|libicui18n|libicuuc|libinterfaces_shared|libipc_mojom_shared|libipc_mojom|libipc|libjs|libkeyboard|libkeyboard_with_content|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libmanager|libmedia_blink|libmedia_gpu|libmedia_mojo_services|libmedia|libmessage_center|libmetrics_cpp|libmidi|libmojo_common_lib|libmojo_ime_lib|libmojo_public_system_cpp|libmojo_public_system|libmojo_system_impl|libnative_theme|libnet|libnet_with_v8|libonc|libplatform|libpolicy_component|libpoli cy_proto|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|librange|libresource_coordinator_cpp|libresource_coordinator_public_interfaces_internal_shared|libsandbox_services|libseccomp_bpf|libsensors|libservice_manager_cpp|libservice_manager_cpp_types|libservice_manager_mojom_blink|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_constants|libservice_manager_mojom_shared|libservice_manager_mojom|libservice|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtracing|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_devtools|libui_touch_selection|libui_views_mus_lib|liburl_ipc|liburl_matcher|liburl|libuser_manager|libuser_prefs|libv8_libbase|libv8_libplatform|libv8|libviews|libviz_common|libVkLayer_core_validation|libVkLayer_object_t racker|libVkLayer_parameter_validation|libVkLayer_swapchain|libVkLayer_threading|libVkLayer_unique_objects|libwebdata_common|libweb_dialogs|libwebview|libwidevinecdmadapter|libwidevinecdm|libwm_public|libwm|libwtf|libx11_events_platform|libx11_window %global __requires_exclude ^(%{privlibs})\\.so # Try to not use the Xvfb as it is slow.. @@ -108,15 +108,15 @@ BuildRequires: libicu-devel >= 5.4 %global default_client_secret miEreAep8nuvTdvLums6qyLK %global chromoting_client_id 449907151817-8vnlfih032ni8c4jjps9int9t86k546t.apps.googleusercontent.com -%global majorversion 60 +%global majorversion 61 %if %{freeworld} Name: chromium%{chromium_channel}%{?freeworld:-freeworld} %else Name: chromium%{chromium_channel} %endif -Version: %{majorversion}.0.3112.113 -Release: 2%{?dist} +Version: %{majorversion}.0.3163.79 +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) @@ -164,14 +164,14 @@ Patch25: chromium-54.0.2840.59-jpeg-include-dir.patch Patch26: chromium-59.0.3071.86-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-59.0.3071.86-setopaque.patch +Patch27: chromium-61.0.3163.79-setopaque.patch # Use -fpermissive to build WebKit Patch31: chromium-56.0.2924.87-fpermissive.patch # Fix issue with compilation on gcc7 # Thanks to Ben Noordhuis -Patch33: chromium-60.0.3112.78-gcc7.patch +Patch33: chromium-61.0.3163.79-gcc7.patch # Enable mp3 support -Patch34: chromium-60.0.3112.78-enable-mp3.patch +Patch34: chromium-61.0.3163.79-enable-mp3.patch # Revert https://chromium.googlesource.com/chromium/src/+/b794998819088f76b4cf44c8... # https://bugs.chromium.org/p/chromium/issues/detail?id=712737 # https://bugzilla.redhat.com/show_bug.cgi?id=1446851 @@ -183,18 +183,10 @@ Patch39: chromium-59.0.3071.86-system-clang.patch # Change struct ucontext to ucontext_t in breakpad # https://patchwork.openembedded.org/patch/141358/ Patch40: chromium-59.0.3071.115-ucontext-fix.patch -# Fix gn bootstrap. Not convinced anyone at Google ever tries to build Chromium from source. -Patch41: chromium-60.0.3112.78-fix-gn-bootstrap.patch # Do not prefix libpng functions Patch42: chromium-60.0.3112.78-no-libpng-prefix.patch # Do not mangle libjpeg Patch43: chromium-60.0.3112.78-jpeg-nomangle.patch -# Fix gtk2 build by applying these changes -# https://chromium.googlesource.com/chromium/src.git/+/804fd4ab5e41584d61c4... -# https://chromium.googlesource.com/chromium/src.git/+/4313334bead373b139ee... -# https://chromium.googlesource.com/chromium/src.git/+/ca407201886875966db9... -# This probably will not be needed with 61+ -Patch44: chromium-60.0.3112.78-gtk2fix.patch # Do not mangle zlib Patch45: chromium-60.0.3112.78-no-zlib-mangle.patch # Apply these changes to work around EPEL7 compiler issues @@ -203,10 +195,25 @@ Patch47: chromium-60.0.3112.90-vulkan-force-c99.patch # https://chromium.googlesource.com/chromium/src/+/9c77470ff34bac937ceb765a... Patch48: chromium-60.0.3112.101-camfix.patch # Fix mp3 for aarch64 -Patch49: chromium-60.0.3112.101-fix-ffmpeg-aarch64.patch +Patch49: chromium-61.0.3163.79-fix-ffmpeg-aarch64.patch # Fix libavutil include pathing to find arch specific timer.h # For some reason, this only fails on aarch64. No idea why. Patch50: chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch +# Fix gn again +# https://chromium.googlesource.com/chromium/src.git/+/84d9cc2d5491706d638a... +Patch51: chromium-61.0.3163.79-fix-gn-again.patch +# more gcc fixes +# https://chromium.googlesource.com/chromium/src.git/+/cbe6845263215e0f3981... +Patch52: chromium-61.0.3163.79-MOAR-GCC-FIXES.patch +# from gentoo +Patch53: chromium-61.0.3163.79-gcc-no-opt-safe-math.patch +Patch54: chromium-61.0.3163.79-gcc5-r1.patch +# Fix gtk2 build (patch from later release) +# Should be able to drop this in 62+ +Patch55: chromium-61.0.3163.79-gtk2fix.patch +# Fix atk compile +# https://chromium-review.googlesource.com/c/chromium/src/+/580927 +Patch56: chromium-61.0.3163.79-fix-atk-compile.patch ### Chromium Tests Patches ### Patch100: chromium-46.0.2490.86-use_system_opus.patch @@ -641,10 +648,8 @@ udev. %patch37 -p1 -b .ffmpeg-stdatomic %patch39 -p1 -b .system-clang %patch40 -p1 -b .ucontextfix -%patch41 -p1 -b .fixgnbootstrap %patch42 -p1 -b .noprefix %patch43 -p1 -b .nomangle -%patch44 -p1 -b .gtk2fix %patch45 -p1 -b .nozmangle %if 0%{?rhel} == 7 %patch46 -p1 -b .oldgcc @@ -652,7 +657,12 @@ udev. %endif %patch48 -p1 -b .camfix %patch50 -p1 -b .pathfix - +%patch51 -p1 -b .fixit +%patch52 -p1 -b .fixgccagain +%patch53 -p1 -b .nogccoptmath +%patch54 -p1 -b .gcc5fix +%patch55 -p1 -b .gtk2fix +%patch56 -p1 -b .atkfix ### Chromium Tests Patches ### %patch100 -p1 -b .use_system_opus @@ -668,6 +678,9 @@ export CXX="g++" export AR="ar" export RANLIB="ranlib" +# NUKE FROM ORBIT +rm -rf buildtools/third_party/libc++/BUILD.gn + %if 0%{?nacl} # prep the nacl tree mkdir -p out/Release/gen/sdk/linux_x86/nacl_x86_newlib @@ -771,12 +784,13 @@ CHROMIUM_CORE_GN_DEFINES+=' system_libdir="lib64"' %endif CHROMIUM_CORE_GN_DEFINES+=' google_api_key="%{api_key}" google_default_client_id="%{default_client_id}" google_default_client_secret="%{default_client_secret}"' CHROMIUM_CORE_GN_DEFINES+=' is_clang=false use_sysroot=false use_gold=false fieldtrial_testing_like_official_build=true' +CHROMIUM_CORE_GN_DEFINES+=' enable_pepper_cdms=1' %if %{freeworld} CHROMIUM_CORE_GN_DEFINES+=' ffmpeg_branding="ChromeOS" proprietary_codecs=true' %else CHROMIUM_CORE_GN_DEFINES+=' ffmpeg_branding="Chromium" proprietary_codecs=false' %endif -CHROMIUM_CORE_GN_DEFINES+=' treat_warnings_as_errors=false' +CHROMIUM_CORE_GN_DEFINES+=' treat_warnings_as_errors=false use_custom_libcxx=false' %ifarch aarch64 CHROMIUM_CORE_GN_DEFINES+=' target_cpu="arm64"' %endif @@ -871,10 +885,10 @@ build/linux/unbundle/remove_bundled_libraries.py \ 'third_party/WebKit' \ 'third_party/analytics' \ 'third_party/angle' \ - 'third_party/angle/src/common/third_party/numerics' \ + 'third_party/angle/src/common/third_party/murmurhash' \ + 'third_party/angle/src/common/third_party/base' \ 'third_party/angle/src/third_party/compiler' \ 'third_party/angle/src/third_party/libXNVCtrl' \ - 'third_party/angle/src/third_party/murmurhash' \ 'third_party/angle/src/third_party/trace_event' \ 'third_party/blanketjs' \ 'third_party/boringssl' \ @@ -1034,6 +1048,7 @@ sed -i 's|aarch64-linux-gnu-||g' build/toolchain/linux/BUILD.gn sed -i '/${LONG_BIT}/ a \ aarch64)\' ../depot_tools/ninja sed -i '/aarch64)/ a \ exec "/usr/bin/ninja-build" "$@";;\' ../depot_tools/ninja %endif +sed -i 's|exec "${THIS_DIR}/ninja-linux${LONG_BIT}"|exec "/usr/bin/ninja-build"|g' ../depot_tools/ninja tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES" %{target}/gn gen --args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES" %{target} @@ -1724,7 +1739,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %doc chrome_policy_list.html *.json %license LICENSE %config %{_sysconfdir}/%{name}/ -%dir %{_sysconfdir}/%{name}/native-messaging-hosts +# %%dir %{_sysconfdir}/%{name}/native-messaging-hosts # This is chrome-remote-desktop stuff %exclude %{_sysconfdir}/%{name}/native-messaging-hosts/* %{_bindir}/%{chromium_browser_channel} @@ -1757,7 +1772,6 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %files common %{chromium_path}/headless_lib.pak -%{chromium_path}/libosmesa.so %{chromium_path}/mus_app_resources_*.pak %{chromium_path}/pyproto/ %{chromium_path}/resources/ @@ -1821,7 +1835,6 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %if 0%{?shared} %files libs -%exclude %{chromium_path}/libosmesa.so %exclude %{chromium_path}/libffmpeg.so* %exclude %{chromium_path}/libmedia.so* %exclude %{chromium_path}/libwidevinecdm.so @@ -1872,6 +1885,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %changelog +* Wed Sep 6 2017 Tom Callaway <spot(a)fedoraproject.org&gt; 61.0.3163.79-1 +- update to 61.0.3163.79 + * Mon Aug 28 2017 Tom Callaway <spot(a)fedoraproject.org&gt; 60.0.3112.113-2 - disable aarch64 on rhel7, missing libatomic.so for some reason diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh index e68c589..3ee3bf8 100755 --- a/clean_ffmpeg.sh +++ b/clean_ffmpeg.sh @@ -24,25 +24,27 @@ function copy_files() { for file in $1 do - dir_name=`echo $file | sed 's%/[^/]*$%/%'` + dir_name=$(echo "$file" | sed 's%/[^/]*$%/%') if [[ $dir_name == */* ]]; then tmp_dir_name="tmp_"$dir_name - mkdir -p ../tmp_ffmpeg/$tmp_dir_name + mkdir -p "../tmp_ffmpeg/$tmp_dir_name" else tmp_dir_name=$file fi if [ "$2" -eq 1 ]; then - cp $file ../tmp_ffmpeg/$tmp_dir_name + cp "$file" "../tmp_ffmpeg/$tmp_dir_name" else - cp $file ../tmp_ffmpeg/$tmp_dir_name > /dev/null 2>&1 + cp "$file" "../tmp_ffmpeg/$tmp_dir_name" > /dev/null 2>&1 fi done } -where=`pwd` +where=$(pwd) -generated_files=`./get_free_ffmpeg_source_files.py $1 $2` +if ! generated_files=$(./get_free_ffmpeg_source_files.py "$1" "$2"); then + exit 1 +fi # As the build system files does not contain the header files, cheat here # and generate the header files names from source files. These that does not # exist will be later skipped while copying. @@ -82,6 +84,7 @@ header_files=" libavcodec/x86/inline_asm.h \ libavcodec/h263dsp.h \ libavcodec/h264chroma.h \ libavcodec/hpeldsp.h \ + libavcodec/hwaccel.h \ libavcodec/idctdsp.h \ libavcodec/internal.h \ libavcodec/kbdwin.h \ @@ -166,6 +169,8 @@ header_files=" libavcodec/x86/inline_asm.h \ libavutil/ffmath.h \ libavutil/fixed_dsp.h \ libavutil/float_dsp.h \ + libavutil/imgutils.h \ + libavutil/imgutils_internal.h \ libavutil/internal.h \ libavutil/intfloat.h \ libavutil/intreadwrite.h \ @@ -223,6 +228,7 @@ manual_files=" libavcodec/aarch64/fft_neon.S \ libavutil/cpu.c \ libavutil/fixed_dsp.c \ libavutil/float_dsp.c \ + libavutil/imgutils.c \ libavutil/x86/cpu.c \ libavutil/x86/float_dsp_init.c \ libavutil/x86/x86inc.asm \ @@ -294,7 +300,7 @@ other_files=" BUILD.gn \ RELEASE \ xcode_hack.c " -cd $1/third_party/ffmpeg +cd "$1/third_party/ffmpeg" || exit 1 copy_files "$generated_files" 0 copy_files "$generated_files_headers" 0 @@ -306,14 +312,15 @@ copy_files "$mp3_files" 1 mkdir -p ../tmp_ffmpeg/tmp_chromium/config cp -r chromium/config ../tmp_ffmpeg/tmp_chromium -cd ../tmp_ffmpeg -for tmp_directory in $(find . -type d -name 'tmp_*') - do - new_name=`echo $tmp_directory | sed 's/tmp_//'` - mv $tmp_directory $new_name - done +cd ../tmp_ffmpeg || exit 1 + +while IFS= read -r -d '' tmp_directory +do + new_name=${tmp_directory//tmp_/} + mv "$tmp_directory" "$new_name" +done < <(find . -type d -name 'tmp_*' -print0) -cd $where +cd "$where" || exit 1 -rm -rf $1/third_party/ffmpeg -mv $1/third_party/tmp_ffmpeg $1/third_party/ffmpeg +rm -rf "$1/third_party/ffmpeg" +mv "$1/third_party/tmp_ffmpeg" "$1/third_party/ffmpeg" diff --git a/get_free_ffmpeg_source_files.py b/get_free_ffmpeg_source_files.py index 5a0e421..76c73ae 100755 --- a/get_free_ffmpeg_source_files.py +++ b/get_free_ffmpeg_source_files.py @@ -60,7 +60,7 @@ def parse_ffmpeg_gyni_file(gyni_path, arch_not_arm): if inserted: break limitations = ['ffmpeg_branding == "Chrome"', 'ffmpeg_branding == "ChromeOS"'] - if ('is_linux' in condition) and not any(limitation in condition for limitation in limitations): + if ('use_linux_config' in condition) and not any(limitation in condition for limitation in limitations): if (arch_not_arm): if ('x64' in condition) or ('x86' in condition): parse_sources (block[1], output_sources, arch_not_arm) @@ -69,6 +69,10 @@ def parse_ffmpeg_gyni_file(gyni_path, arch_not_arm): parse_sources (block[1], output_sources, arch_not_arm) inserted = True + if len(output_sources) == 0: + sys.stderr.write("Something went wrong, no sources parsed!\n") + sys.exit(1) + print ' '.join(output_sources) diff --git a/sources b/sources index c901ac2..fadaf7c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03 -SHA512 (policy_templates.zip) = 4d2a7162adb3ca224f3e1bf1d2936ae395603e8ffa3fda7753e666a16c42c7ba54c7acfcfdc742e22978ace37e471ed099d222063708d4d8a299da3daf135f15 -SHA512 (chromium-60.0.3112.113-clean.tar.xz) = 3fbcdf47485a9d655cf43f05b24f0e22e6d2662d155f54039668673b21616d2941a0620db74c3788288af91fcb0ded1d2f45497c51a8799ddcf70f7420aee2c5 +SHA512 (chromium-61.0.3163.79-clean.tar.xz) = 9d3bfb24a71af6332e30cb5a5d40581eab166bf550c48019b6ac6ed37ead52eac4a09af41e056207f5ded91f4c420560ebd886ae3ae23e05602c755e334dbe02 +SHA512 (policy_templates.zip) = 39e9ccbeda8499acb81e5455e34ece44e72f065d139e718b38803c907b4ecca9f179f2eb84b10953a307087ed9586a5de30bbfb933eb9f6b77a682ea82164be7