Merge branch 'master' into f26

.gitignore

@@ -34,3 +34,4 @@
 /chromium-62.0.3202.75-clean.tar.xz
 /chromium-62.0.3202.89-clean.tar.xz
 /chromium-63.0.3239.84-clean.tar.xz
+/chromium-63.0.3239.108-clean.tar.xz

chromium-63.0.3289.84-aarch64-glibc-2.26.90.patch

@@ -0,0 +1,12 @@
+diff -up chromium-63.0.3239.84/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.aarch64glibc chromium-63.0.3239.84/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+--- chromium-63.0.3239.84/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.aarch64glibc	2017-12-12 09:56:24.469343868 -0500
++++ chromium-63.0.3239.84/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc	2017-12-12 09:56:38.468071095 -0500
+@@ -461,7 +461,7 @@ bool ExceptionHandler::HandleSignal(int
+ #if defined(__aarch64__)
+   ucontext_t* uc_ptr = (ucontext_t*)uc;
+   struct fpsimd_context* fp_ptr =
+-      (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved;
++      (struct fpsimd_context*)&uc_ptr->uc_mcontext.__glibc_reserved1;
+   if (fp_ptr->head.magic == FPSIMD_MAGIC) {
+     memcpy(&g_crash_context_.float_state, fp_ptr,
+            sizeof(g_crash_context_.float_state));

chromium.spec

@@ -116,7 +116,7 @@ Name:		chromium%{chromium_channel}%{?freeworld:-freeworld}
 %else
 Name:		chromium%{chromium_channel}
 %endif
-Version:	%{majorversion}.0.3239.84
+Version:	%{majorversion}.0.3239.108
 Release:	1%{?dist}
 Summary:	A WebKit (Blink) powered web browser
 Url:		http://www.chromium.org/Home
@@ -196,7 +196,7 @@ Patch50:	chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch
 # from gentoo
 Patch53:	chromium-61.0.3163.79-gcc-no-opt-safe-math.patch
 # Only needed when glibc 2.26.90 or later is used
-Patch57:	chromium-61.0.3163.79-aarch64-glibc-2.26.90.patch
+Patch57:	chromium-63.0.3289.84-aarch64-glibc-2.26.90.patch
 # More gcc fixes for epel
 Patch58:	chromium-62.0.3202.62-dde535-gcc-fix.patch
 Patch59:	chromium-62.0.3202.62-gcc-nc.patch
@@ -254,9 +254,6 @@ BuildRequires:	fontconfig-devel
 BuildRequires:	GConf2-devel
 BuildRequires:	glib2-devel
 BuildRequires:	gnome-keyring-devel
-BuildRequires:	gtk2-devel
-# Yes. This too.
-# BuildRequires:	gtk3-devel
 BuildRequires:	glibc-devel
 BuildRequires:	gperf
 BuildRequires:	libatomic
@@ -353,6 +350,8 @@ BuildRequires:	opus-devel
 BuildRequires:	perl(Switch)
 %if 0%{gtk3}
 BuildRequires:	pkgconfig(gtk+-3.0)
+%else
+BuildRequires:	pkgconfig(gtk+-2.0)
 %endif
 BuildRequires:	pulseaudio-libs-devel
 BuildRequires:	python-beautifulsoup4
@@ -386,7 +385,11 @@ Requires:	nss%{_isa} >= 3.26
 Requires:	nss-mdns%{_isa}
 
 # GTK modules it expects to find for some reason.
+%if 0%{gtk3}
+Requires:	libcanberra-gtk3%{_isa}
+%else
 Requires:	libcanberra-gtk2%{_isa}
+%endif
 
 %if 0%{?fedora}
 # This enables support for u2f tokens
@@ -438,7 +441,6 @@ Provides: bundled(ffmpeg) = 3.2git
 Provides: bundled(fips181) = 2.2.3
 Provides: bundled(fontconfig) = 2.11.0
 Provides: bundled(gperftools) = svn144
-Provides: bundled(gtk3) = 3.1.4
 %if 0%{?bundleharfbuzz}
 Provides: bundled(harfbuzz) = 1.4.2
 %endif
@@ -1508,6 +1510,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 
 
 %changelog
+* Fri Dec 15 2017 Tomas Popela <tpopela@redhat.com> 63.0.3239.108-1
+- Update to 63.0.3239.108
+
 * Thu Dec  7 2017 Tom Callaway <spot@fedoraproject.org> 63.0.3239.84-1
 - update to 63.0.3239.84
 

clean_ffmpeg.sh

@@ -238,8 +238,14 @@ manual_files="	libavcodec/aarch64/fft_neon.S \
 		libavutil/x86/x86inc.asm \
 		libavutil/x86/x86util.asm "
 
-mp3_files="	libavcodec/aarch64/mpegaudiodsp_init.c \
+mp3_files="	libavcodec/aarch64/aacpsdsp_init_aarch64.c \
+		libavcodec/aarch64/aacpsdsp_neon.S \
+		libavcodec/aarch64/autorename_libavcodec_aarch64_aacpsdsp_neon.S \
+		libavcodec/aarch64/autorename_libavcodec_aarch64_sbrdsp_neon.S \
+		libavcodec/aarch64/mpegaudiodsp_init.c \
 		libavcodec/aarch64/mpegaudiodsp_neon.S \
+		libavcodec/aarch64/sbrdsp_init_aarch64.c \
+		libavcodec/aarch64/sbrdsp_neon.S \
 		libavcodec/aac_ac3_parser.c \
 		libavcodec/aac_parser.c \
 		libavcodec/aacadtsdec.c \

sources

@@ -1,2 +1,2 @@
 SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
-SHA512 (chromium-63.0.3239.84-clean.tar.xz) = 1b2551b8dcaf8eecd0a5fb69a458034f30a73bb22f8c7521cbac14d9c2621c9468a7b7f6cb17b2715adee491d10510958bf08f8aa6277d8829e149906903b7be
+SHA512 (chromium-63.0.3239.108-clean.tar.xz) = 565c0e6c94ceae506a69d7d14b2ebbffcab72635b4168e35a433dcc726ab768a46667705b9e25c02500e3b5a1aa11e19730ae4985b1ef292e8ff976286c5094a