[fuse-exfat] Update to 1.2.7.
by Vasiliy Glazov
commit 1b40ef0595d1d0a03d2546bc200903fd0c1ca130
Author: Vascom <vascom2(a)gmail.com>
Date: Wed Jun 21 14:32:29 2017 +0300
Update to 1.2.7.
.gitignore | 1 +
fuse-exfat.spec | 8 ++++++--
sources | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1ca9ea9..d78ef5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
fuse-exfat-1.1.0.tar.gz
/fuse-exfat-1.2.4.tar.gz
/fuse-exfat-1.2.5.tar.gz
+/fuse-exfat-1.2.7.tar.gz
diff --git a/fuse-exfat.spec b/fuse-exfat.spec
index 270aff5..428fcef 100644
--- a/fuse-exfat.spec
+++ b/fuse-exfat.spec
@@ -1,7 +1,7 @@
Name: fuse-exfat
Summary: Free exFAT file system implementation
-Version: 1.2.5
-Release: 2%{?dist}
+Version: 1.2.7
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Base
Source0: https://github.com/relan/exfat/releases/download/v%{version}/fuse-exfat-%...
@@ -26,12 +26,16 @@ for SDXC memory cards.
ln -s %{_mandir}/man8/mount.exfat-fuse.8.gz %{buildroot}%{_mandir}/man8/mount.exfat.8.gz
%files
+%doc ChangeLog
%license COPYING
%{_sbindir}/mount.exfat-fuse
%{_sbindir}/mount.exfat
%{_mandir}/man8/*
%changelog
+* Wed Jun 21 2017 Vasiliy N. Glazov <vascom2(a)gmail.com> - 1.2.7-1
+- Update to 1.2.7
+
* Sun Mar 19 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1.2.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/sources b/sources
index a62b02f..1475705 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-540c5f5ad5ebe7c2afb3c93c4c9ef31f fuse-exfat-1.2.5.tar.gz
+afeed70fa0528ebd9fae28fac282a524 fuse-exfat-1.2.7.tar.gz
7 years, 1 month
[qt5-qtwebengine-freeworld/f26] (6 commits) ...Fix FTBFS on F26 (and lower) due to debugedit failure
by Kevin Kofler
Summary of changes:
d76f539... Update to 5.9.0 (*)
12df33e... arm-fpu-fix patch: Also build the host tools (i.e., GN) wit (*)
58ba5a5... Omit debuginfo for webcore and v8base on ARM to avoid runni (*)
6803365... Bump changelog date (*)
772cfdf... Omit all Chromium debuginfo on ARM to avoid running out of (*)
b084962... Fix FTBFS on F26 (and lower) due to debugedit failure (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 1 month
[qt5-qtwebengine-freeworld] Fix FTBFS on F26 (and lower) due to debugedit failure
by Kevin Kofler
commit b084962674e49bbe50de450d0998f76600f8c1b2
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Wed Jun 21 05:38:01 2017 +0200
Fix FTBFS on F26 (and lower) due to debugedit failure
Remove the double slashes from #include lines in 2 files in WebRTC.
qt5-qtwebengine-freeworld.spec | 4 ++++
1 file changed, 4 insertions(+)
---
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index b4489bc..2ef9dec 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -334,6 +334,10 @@ This version is compiled with support for patent-encumbered codecs enabled.
# fix // in #include in content/renderer/gpu to avoid debugedit failure
sed -i -e 's!gpu//!gpu/!g' \
src/3rdparty/chromium/content/renderer/gpu/compositor_forwarding_message_filter.cc
+# and another one in 2 files in WebRTC
+sed -i -e 's!audio_processing//!audio_processing/!g' \
+ src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/utility/ooura_fft.cc \
+ src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc
# remove ./ from #line commands in ANGLE to avoid debugedit failure (?)
sed -i -e 's!\./!!g' \
src/3rdparty/chromium/third_party/angle/src/compiler/preprocessor/Tokenizer.cpp \
7 years, 1 month
[chromium-libs-media-freeworld: 3/3] Merge 'fedora/master' c68232b, 59.0.3071.104-1
by Miro Hrončok
commit e6d028440f69d7cb4dff7ed7e7d6651bf4c06c3b
Merge: 4410ae3 c68232b
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Tue Jun 20 13:43:35 2017 +0200
Merge 'fedora/master' c68232b, 59.0.3071.104-1
.gitignore | 2 +
chromium-59.0.3071.86-enable-mp3.patch | 477 +++++++++++++++++++++++++++++++++
chromium-libs-media-freeworld.spec | 7 +-
clean_ffmpeg.sh | 1 -
get_free_ffmpeg_source_files.py | 0
sources | 4 +-
6 files changed, 486 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index 09b2a4b,53aaae1..5fa2a6f
--- a/.gitignore
+++ b/.gitignore
@@@ -20,6 -20,5 +20,8 @@@
/chromium-57.0.2987.133-clean.tar.xz
/chromium-58.0.3029.81-clean.tar.xz
/chromium-58.0.3029.110-clean.tar.xz
+/chromium-58.0.3029.110.tar.xz
/chromium-59.0.3071.86-clean.tar.xz
+/chromium-59.0.3071.86.tar.xz
+ /chromium-59.0.3071.104-clean.tar.xz
++/chromium-59.0.3071.104.tar.xz
diff --cc chromium-libs-media-freeworld.spec
index 22e25b5,0000000..c539f30
mode 100644,000000..100644
--- a/chromium-libs-media-freeworld.spec
+++ b/chromium-libs-media-freeworld.spec
@@@ -1,720 -1,0 +1,723 @@@
+# gn is the new new new buildtool. *sigh*
+%global use_gn 1
+
+# Leave this alone, please.
+%global target out/Release
+
+# Debuginfo packages aren't very useful here. If you need to debug
+# you should do a proper debug build (not implemented in this spec yet)
+%global debug_package %{nil}
+
+# %%{nil} for Stable; -beta for Beta; -dev for Devel
+# dash in -beta and -dev is intentional !
+%global chromium_channel %{nil}
+%global chromium_browser_channel chromium-browser%{chromium_channel}
+%global chromium_path %{_libdir}/chromium-browser%{chromium_channel}
+%global crd_path %{_libdir}/chrome-remote-desktop
+%global tests 0
+
+# Chromium Package name
+%global cname chromium%{chromium_channel}
+
+# We don't want any libs in these directories to generate Provides
+# Requires is trickier.
+
+%global __provides_exclude_from %{chromium_path}/.*\\.so|%{chromium_path}/lib/.*\\.so
+%global privlibs libEGL|libGLESv2|libaccessibility|libanimation|libaura|libaura_extra|libbase|libbase_i18n|libbindings|libblink_core|libblink_modules|libblink_platform|libblink_web|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture_base|libcapture_lib|libcc|libcc_animation|libcc_base|libcc_blink|libcc_debug|libcc_ipc|libcc_paint|libcc_surfaces|libchromium_sqlite3|libclearkeycdm|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent|libcpp|libcrcrypto|libdbus|libdevice_base|libdevice_battery|libdevice_event_log|libdevice_gamepad|libdevice_vibration|libdevice_vr|libdevices|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay|libdisplay_compositor|libdisplay_types|libdisplay_util|libdomain_reliability|libembedder|libevents|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents_x|libffmpeg|libfingerprint|libgcm|libgeneric_sensor|libgeolocation|libgeometry|lib
geometry_skia|libgesture_detection|libgfx|libgfx_ipc|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_x11|libgin|libgin_features|libgl_in_process_context|libgl_init|libgl_wrapper|libgles2_c_lib|libgles2_implementation|libgles2_utils|libgpu|libgtk2ui|libicui18n|libicuuc|libipc|libjs|libkeyboard|libkeyboard_with_content|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libmanager|libmedia|libmedia_blink|libmedia_gpu|libmedia_mojo_services|libmessage_center|libmidi|libmojo_common_lib|libmojo_ime_lib|libmojo_public_system|libmojo_public_system_cpp|libmojo_system_impl|libnative_theme|libnet|libnet_with_v8|libonc|libosmesa|libplatform|libplatform_wtf|libpolicy_component|libpolicy_proto|libpower_save_blocker|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_globals|libproxy_config|librange|libsandbox_services|libseccomp_bpf|libsensors|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libst
orage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtracing|libui_base|libui_base_ime|libui_base_x|libui_data_pack|libui_touch_selection|libui_views_mus_lib|liburl|liburl_ipc|liburl_matcher|libuser_manager|libuser_prefs|libv8|libv8_libbase|libv8_libplatform|libviews|libweb_dialogs|libwebdata_common|libwebview|libwidevinecdm|libwidevinecdmadapter|libwm|libwtf|libx11_events_platform|libx11_window
+%global __requires_exclude ^(%{privlibs})\\.so
+
+# Try to not use the Xvfb as it is slow..
+%global tests_force_display 0
+
+# AddressSanitizer mode
+# https://www.chromium.org/developers/testing/addresssanitizer
+%global asan 0
+
+# We don't need this to compile only the codecs
+%global killnacl 1
+
+%if 0%{?killnacl}
+ %global nacl 0
+ %global nonacl 1
+%else
+# TODO: Try arm (nacl disabled)
+%if 0%{?fedora}
+ %ifarch i686
+ %global nacl 0
+ %global nonacl 1
+ %else
+ %global nacl 1
+ %global nonacl 0
+ %endif
+%endif
+%endif
+
+%if 0
+# Chromium's fork of ICU is now something we can't unbundle.
+# This is left here to ease the change if that ever switches.
+BuildRequires: libicu-devel >= 5.4
+%global bundleicu 0
+%else
+%global bundleicu 1
+%endif
+
+%global bundlere2 1
+
+%if 0%{?rhel} == 7
+%global bundleopus 1
+%global bundlelibusbx 1
+%global bundleharfbuzz 1
+%else
+%global bundleharfbuzz 0
+%global bundleopus 1
+%global bundlelibusbx 0
+%endif
+
+# Needs at least harfbuzz 1.4.2 now.
+# 2017-06-12
+%if 0%{?fedora} < 26
+%global bundleharfbuzz 1
+%else
+%global bundleharfbuzz 0
+%endif
+
+### Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+### Note: These are for Fedora use ONLY.
+### For your own distribution, please get your own set of keys.
+### http://lists.debian.org/debian-legal/2013/11/msg00006.html
+%global api_key AIzaSyDUIXvzVrt5OkVsgXhQ6NFfvWlA44by-aw
+%global default_client_id 449907151817.apps.googleusercontent.com
+%global default_client_secret miEreAep8nuvTdvLums6qyLK
+%global chromoting_client_id 449907151817-8vnlfih032ni8c4jjps9int9t86k546t.apps.googleusercontent.com
+
+%global majorversion 59
+
+Name: %{cname}-libs-media-freeworld
- Version: %{majorversion}.0.3071.86
- Release: 3%{?dist}
++Version: %{majorversion}.0.3071.104
++Release: 1%{?dist}
+Summary: Chromium media libraries built with all possible codecs
+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)
+
+### Chromium Fedora Patches ###
+Patch0: chromium-56.0.2924.87-gcc5.patch
+Patch1: chromium-45.0.2454.101-linux-path-max.patch
+Patch2: chromium-55.0.2883.75-addrfix.patch
+Patch4: chromium-46.0.2490.71-notest.patch
+# In file included from ../linux/directory.c:21:
+# In file included from ../../../../native_client/src/nonsfi/linux/abi_conversion.h:20:
+# ../../../../native_client/src/nonsfi/linux/linux_syscall_structs.h:44:13: error: GNU-style inline assembly is disabled
+# __asm__ __volatile__("mov %%gs, %0" : "=r"(gs));
+# ^
+# 1 error generated.
+Patch6: chromium-47.0.2526.80-pnacl-fgnu-inline-asm.patch
+# Ignore broken nacl open fd counter
+Patch7: chromium-47.0.2526.80-nacl-ignore-broken-fd-counter.patch
+# Use libusb_interrupt_event_handler from current libusbx (1.0.21-0.1.git448584a)
+Patch9: chromium-48.0.2564.116-libusb_interrupt_event_handler.patch
+# Ignore deprecations in cups 2.2
+# https://bugs.chromium.org/p/chromium/issues/detail?id=622493
+Patch12: chromium-55.0.2883.75-cups22.patch
+# Use PIE in the Linux sandbox (from openSUSE via Russian Fedora)
+Patch15: chromium-55.0.2883.75-sandbox-pie.patch
+# Enable ARM CPU detection for webrtc (from archlinux via Russian Fedora)
+Patch16: chromium-52.0.2743.82-arm-webrtc.patch
+# Use /etc/chromium for master_prefs
+Patch18: chromium-52.0.2743.82-master-prefs-path.patch
+# Disable MADV_FREE (if set by glibc)
+# https://bugzilla.redhat.com/show_bug.cgi?id=1361157
+Patch19: chromium-52.0.2743.116-unset-madv_free.patch
+# Use gn system files
+Patch20: chromium-54.0.2840.59-gn-system.patch
+# Fix last commit position issue
+# https://groups.google.com/a/chromium.org/forum/#!topic/gn-dev/7nlJv486bD4
+Patch21: chromium-53.0.2785.92-last-commit-position.patch
+# Fix issue where timespec is not defined when sys/stat.h is included.
+Patch22: chromium-53.0.2785.92-boringssl-time-fix.patch
+# I wouldn't have to do this if there was a standard way to append extra compiler flags
+Patch24: chromium-59.0.3071.86-nullfix.patch
+# Add explicit includedir for jpeglib.h
+Patch25: chromium-54.0.2840.59-jpeg-include-dir.patch
+# On i686, pass --no-keep-memory --reduce-memory-overheads to ld.
+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
+# 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-59.0.3071.86-gcc7.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
+Patch36: chromium-58.0.3029.96-revert-b794998819088f76b4cf44c8db6940240c563cf4.patch
+# Correctly compile the stdatomic.h in ffmpeg with gcc 4.8
+Patch37: chromium-59.0.3071.86-ffmpeg-stdatomic.patch
+# RHEL is too old to have this header in kernel-headers
+# and some Fedora versions do not contain what Chromium expects to find
+# so just use the hardcoded values instead
+Patch38: chromium-59.0.3071.86-dma-buf-header-hack.patch
+# Nacl can't die soon enough
+Patch39: chromium-59.0.3071.86-system-clang.patch
+
+### Chromium Tests Patches ###
+Patch100: chromium-46.0.2490.86-use_system_opus.patch
+Patch101: chromium-58.0.3029.81-use_system_harfbuzz.patch
+
+# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
+# http://build.chromium.org/buildbot/official/
+# For Chromium Fedora use chromium-latest.py --stable --ffmpegclean --ffmpegarm
+# If you want to include the ffmpeg arm sources append the --ffmpegarm switch
+# https://commondatastorage.googleapis.com/chromium-browser-official/chromi...
+Source0: https://commondatastorage.googleapis.com/chromium-browser-official/chromi...
+%if 0%{tests}
+Source1: https://commondatastorage.googleapis.com/chromium-browser-official/chromi...
+%endif
+# https://chromium.googlesource.com/chromium/tools/depot_tools.git/+archive...
+Source2: depot_tools.git-master.tar.gz
+
+# We can assume gcc and binutils.
+BuildRequires: gcc-c++
+
+BuildRequires: alsa-lib-devel
+BuildRequires: atk-devel
+BuildRequires: bison
+BuildRequires: cups-devel
+BuildRequires: dbus-devel
+BuildRequires: desktop-file-utils
+BuildRequires: expat-devel
+BuildRequires: flex
+BuildRequires: fontconfig-devel
+BuildRequires: GConf2-devel
+BuildRequires: glib2-devel
+BuildRequires: gnome-keyring-devel
+BuildRequires: gtk2-devel
+BuildRequires: glibc-devel
+BuildRequires: gperf
+BuildRequires: libatomic
+BuildRequires: libcap-devel
+BuildRequires: libdrm-devel
+BuildRequires: libgcrypt-devel
+BuildRequires: libudev-devel
+BuildRequires: libusb-devel
+BuildRequires: libXdamage-devel
+BuildRequires: libXScrnSaver-devel
+BuildRequires: libXtst-devel
+BuildRequires: nss-devel
+BuildRequires: pciutils-devel
+BuildRequires: pulseaudio-libs-devel
+%if 0%{?tests}
+BuildRequires: pam-devel
+# Tests needs X
+BuildRequires: Xvfb
+BuildRequires: liberation-sans-fonts
+# For sandbox initialization
+BuildRequires: sudo
+%endif
+
+# Fedora turns on NaCl
+# NaCl needs these
+BuildRequires: libstdc++-devel, openssl-devel
+%if 0%{?nacl}
+BuildRequires: nacl-gcc, nacl-binutils, nacl-newlib
+BuildRequires: nacl-arm-gcc, nacl-arm-binutils, nacl-arm-newlib
+# pNaCl needs this monster
+# It's possible that someday this dep will stabilize, but
+# right now, it needs to be updated everytime chromium bumps
+# a major version.
+BuildRequires: chromium-native_client >= 52.0.2743.82
+BuildRequires: clang
+%ifarch x86_64
+# Really, this is what we want:
+# BuildRequires: glibc-devel(x86-32) libgcc(x86-32)
+# But, koji only offers glibc32. Maybe that's enough.
+# This BR will pull in either glibc.i686 or glibc32.
+BuildRequires: /lib/libc.so.6 /usr/lib/libc.so
+%endif
+%endif
+# Fedora tries to use system libs whenever it can.
+BuildRequires: bzip2-devel
+BuildRequires: dbus-glib-devel
+BuildRequires: elfutils-libelf-devel
+BuildRequires: flac-devel
+BuildRequires: hwdata
+BuildRequires: kernel-headers
+BuildRequires: libevent-devel
+BuildRequires: libffi-devel
+%if 0%{?bundleicu}
+# If this is true, we're using the bundled icu.
+# We'd like to use the system icu every time, but we cannot always do that.
+%else
+# Not newer than 54 (at least not right now)
+BuildRequires: libicu-devel = 54.1
+%endif
+BuildRequires: libjpeg-devel
+# BuildRequires: libpng-devel
+%if 0
+# see https://code.google.com/p/chromium/issues/detail?id=501318
+BuildRequires: libsrtp-devel >= 1.4.4
+%endif
+BuildRequires: libudev-devel
+%if %{bundlelibusbx}
+# Do nothing
+%else
+BuildRequires: libusbx-devel >= 1.0.21-0.1.git448584a
+%endif
+# We don't use libvpx anymore because Chromium loves to
+# use bleeding edge revisions here that break other things
+# ... so we just use the bundled libvpx.
+# Same is true for libwebp.
+BuildRequires: libxslt-devel
+# Same here, it seems.
+# BuildRequires: libyuv-devel
+%if %{bundleopus}
+# Do nothing
+%else
+BuildRequires: opus-devel
+%endif
+BuildRequires: perl(Switch)
+BuildRequires: pulseaudio-libs-devel
+BuildRequires: python-beautifulsoup4
+BuildRequires: python-BeautifulSoup
+BuildRequires: python-html5lib
+BuildRequires: python-jinja2
+BuildRequires: python-markupsafe
+BuildRequires: python-ply
+BuildRequires: python-simplejson
+%if 0%{?bundlere2}
+# Using bundled bits, do nothing.
+%else
+BuildRequires: re2-devel >= 20160401
+%endif
+BuildRequires: speech-dispatcher-devel
+BuildRequires: yasm
+BuildRequires: pkgconfig(gnome-keyring-1)
+# remote desktop needs this
+BuildRequires: pam-devel
+BuildRequires: systemd
+
+ExclusiveArch: x86_64 i686
+
+Provides: %{cname}-libs-media = %{version}-%{release}
+Provides: %{cname}-libs-media%{_isa} = %{version}-%{release}
+Obsoletes: %{cname}-libs-media
+
+%description
+Chromium media libraries built with all possible codecs. Chromium is an
+open-source web browser, powered by WebKit (Blink). This package replaces
+the default chromium-libs-media package, which is limited in what it
+can include.
+
+
+%prep
+%setup -q -T -c -n depot_tools -a 2
+%if 0%{tests}
+%setup -q -n chromium-%{version} -b 1
+%else
+%setup -q -n chromium-%{version}
+%endif
+
+### Chromium Fedora Patches ###
+%patch0 -p1 -b .gcc5
+%patch1 -p1 -b .pathmax
+%patch2 -p1 -b .addrfix
+%patch4 -p1 -b .notest
+# %%patch6 -p1 -b .gnu-inline
+%patch7 -p1 -b .ignore-fd-count
+%patch9 -p1 -b .modern-libusbx
+%patch12 -p1 -b .cups22
+%patch15 -p1 -b .sandboxpie
+%patch16 -p1 -b .armwebrtc
+%patch18 -p1 -b .etc
+# %%patch19 -p1 -b .madv_free
+%patch20 -p1 -b .gnsystem
+%patch21 -p1 -b .lastcommit
+%patch22 -p1 -b .timefix
+%patch24 -p1 -b .nullfix
+%patch25 -p1 -b .jpegfix
+%patch26 -p1 -b .ldmemory
+%patch27 -p1 -b .setopaque
+%patch31 -p1 -b .permissive
+%patch33 -p1 -b .gcc7
+%patch36 -p1 -b .revert
+%patch37 -p1 -b .ffmpeg-stdatomic
+%patch38 -p1 -b .headerhack
+%patch39 -p1 -b .system-clang
+
+### Chromium Tests Patches ###
+%patch100 -p1 -b .use_system_opus
+%patch101 -p1 -b .use_system_harfbuzz
+
+%if 0%{?asan}
+export CC="clang"
+export CXX="clang++"
+%else
+export CC="gcc"
+export CXX="g++"
+%endif
+export AR="ar"
+export RANLIB="ranlib"
+
+%if 0%{?nacl}
+# prep the nacl tree
+mkdir -p out/Release/gen/sdk/linux_x86/nacl_x86_newlib
+cp -a --no-preserve=context /usr/%{_arch}-nacl/* out/Release/gen/sdk/linux_x86/nacl_x86_newlib
+
+mkdir -p out/Release/gen/sdk/linux_x86/nacl_arm_newlib
+cp -a --no-preserve=context /usr/arm-nacl/* out/Release/gen/sdk/linux_x86/nacl_arm_newlib
+
+# Not sure if we need this or not, but better safe than sorry.
+pushd out/Release/gen/sdk/linux_x86
+ln -s nacl_x86_newlib nacl_x86_newlib_raw
+ln -s nacl_arm_newlib nacl_arm_newlib_raw
+popd
+
+mkdir -p out/Release/gen/sdk/linux_x86/nacl_x86_newlib/bin
+pushd out/Release/gen/sdk/linux_x86/nacl_x86_newlib/bin
+ln -s /usr/bin/x86_64-nacl-gcc gcc
+ln -s /usr/bin/x86_64-nacl-gcc x86_64-nacl-gcc
+ln -s /usr/bin/x86_64-nacl-g++ g++
+ln -s /usr/bin/x86_64-nacl-g++ x86_64-nacl-g++
+# ln -s /usr/bin/x86_64-nacl-ar ar
+ln -s /usr/bin/x86_64-nacl-ar x86_64-nacl-ar
+# ln -s /usr/bin/x86_64-nacl-as as
+ln -s /usr/bin/x86_64-nacl-as x86_64-nacl-as
+# ln -s /usr/bin/x86_64-nacl-ranlib ranlib
+ln -s /usr/bin/x86_64-nacl-ranlib x86_64-nacl-ranlib
+# Cleanups
+rm addr2line
+ln -s /usr/bin/x86_64-nacl-addr2line addr2line
+rm c++filt
+ln -s /usr/bin/x86_64-nacl-c++filt c++filt
+rm gprof
+ln -s /usr/bin/x86_64-nacl-gprof gprof
+rm readelf
+ln -s /usr/bin/x86_64-nacl-readelf readelf
+rm size
+ln -s /usr/bin/x86_64-nacl-size size
+rm strings
+ln -s /usr/bin/x86_64-nacl-strings strings
+popd
+
+mkdir -p out/Release/gen/sdk/linux_x86/nacl_arm_newlib/bin
+pushd out/Release/gen/sdk/linux_x86/nacl_arm_newlib/bin
+ln -s /usr/bin/arm-nacl-gcc gcc
+ln -s /usr/bin/arm-nacl-gcc arm-nacl-gcc
+ln -s /usr/bin/arm-nacl-g++ g++
+ln -s /usr/bin/arm-nacl-g++ arm-nacl-g++
+ln -s /usr/bin/arm-nacl-ar arm-nacl-ar
+ln -s /usr/bin/arm-nacl-as arm-nacl-as
+ln -s /usr/bin/arm-nacl-ranlib arm-nacl-ranlib
+popd
+
+touch out/Release/gen/sdk/linux_x86/nacl_x86_newlib/stamp.untar out/Release/gen/sdk/linux_x86/nacl_x86_newlib/stamp.prep
+touch out/Release/gen/sdk/linux_x86/nacl_x86_newlib/nacl_x86_newlib.json
+touch out/Release/gen/sdk/linux_x86/nacl_arm_newlib/stamp.untar out/Release/gen/sdk/linux_x86/nacl_arm_newlib/stamp.prep
+touch out/Release/gen/sdk/linux_x86/nacl_arm_newlib/nacl_arm_newlib.json
+
+pushd out/Release/gen/sdk/linux_x86/
+mkdir -p pnacl_newlib pnacl_translator
+# Might be able to do symlinks here, but eh.
+cp -a --no-preserve=context /usr/pnacl_newlib/* pnacl_newlib/
+cp -a --no-preserve=context /usr/pnacl_translator/* pnacl_translator/
+for i in lib/libc.a lib/libc++.a lib/libg.a lib/libm.a; do
+ /usr/pnacl_newlib/bin/pnacl-ranlib pnacl_newlib/x86_64_bc-nacl/$i
+ /usr/pnacl_newlib/bin/pnacl-ranlib pnacl_newlib/i686_bc-nacl/$i
+ /usr/pnacl_newlib/bin/pnacl-ranlib pnacl_newlib/le32-nacl/$i
+done
+
+for i in lib/libpthread.a lib/libnacl.a; do
+ /usr/pnacl_newlib/bin/pnacl-ranlib pnacl_newlib/le32-nacl/$i
+done
+
+for i in lib/clang/3.7.0/lib/x86_64_bc-nacl/libpnaclmm.a lib/clang/3.7.0/lib/i686_bc-nacl/libpnaclmm.a; do
+ /usr/pnacl_newlib/bin/pnacl-ranlib pnacl_newlib/$i
+done
+
+for i in lib/clang/3.7.0/lib/le32-nacl/libpnaclmm.a lib/clang/3.7.0/lib/le32-nacl/libgcc.a; do
+ /usr/pnacl_newlib/bin/pnacl-ranlib pnacl_newlib/$i
+done
+
+popd
+
+mkdir -p native_client/toolchain/.tars/linux_x86
+touch native_client/toolchain/.tars/linux_x86/pnacl_translator.json
+
+pushd native_client/toolchain
+ln -s ../../out/Release/gen/sdk/linux_x86 linux_x86
+popd
+
+mkdir -p third_party/llvm-build/Release+Asserts/bin
+pushd third_party/llvm-build/Release+Asserts/bin
+ln -s /usr/bin/clang clang
+popd
+%endif
+
+CHROMIUM_BROWSER_GN_DEFINES=""
+CHROMIUM_BROWSER_GN_DEFINES+=' is_debug=false'
+%ifarch x86_64
+CHROMIUM_BROWSER_GN_DEFINES+=' system_libdir="lib64"'
+%endif
+CHROMIUM_BROWSER_GN_DEFINES+=' google_api_key="%{api_key}" google_default_client_id="%{default_client_id}" google_default_client_secret="%{default_client_secret}"'
+CHROMIUM_BROWSER_GN_DEFINES+=' is_clang=false use_sysroot=false use_gio=true use_pulseaudio=true icu_use_data_file=true'
+%if 0%{?nonacl}
+CHROMIUM_BROWSER_GN_DEFINES+=' enable_nacl=false'
+%endif
+CHROMIUM_BROWSER_GN_DEFINES+=' ffmpeg_branding="ChromeOS" proprietary_codecs=true'
+CHROMIUM_BROWSER_GN_DEFINES+=' is_component_ffmpeg=true is_component_build=true'
+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_gtk3=false'
+# CHROMIUM_BROWSER_GN_DEFINES+=' use_system_libjpeg=true'
+CHROMIUM_BROWSER_GN_DEFINES+=' treat_warnings_as_errors=false'
+export CHROMIUM_BROWSER_GN_DEFINES
+
+export CHROMIUM_BROWSER_GYP_DEFINES="\
+%ifarch x86_64
+ -Dtarget_arch=x64 \
+ -Dsystem_libdir=lib64 \
+%endif
+ -Dgoogle_api_key="%{api_key}" \
+ -Dgoogle_default_client_id="%{default_client_id}" \
+ -Dgoogle_default_client_secret="%{default_client_secret}" \
+%if 0%{?asan}
+ -Dasan=1 \
+ -Dclang=1 \
+ -Dhost_clang=1 \
+ -Dclang_dynlib_flags="" \
+ -Dclang_plugin_args="" \
+ -Dclang_chrome_plugins_flags="" \
+%else
+ -Dclang=0 \
+ -Dhost_clang=0 \
+%endif
+ -Ddisable_glibc=1 \
+ -Dlinux_fpic=1 \
+ -Ddisable_sse2=1 \
+%if 0%{?nonacl}
+ -Ddisable_nacl=1 \
+%else
+ -Ddisable_newlib_untar=1 \
+ -Ddisable_pnacl_untar=1 \
+ -Dpnacl_newlib_toolchain=out/Release/gen/sdk/linux_x86/pnacl_newlib/ \
+ -Dpnacl_translator_dir=/usr/pnacl_translator \
+%endif
+ \
+ -Duse_gconf=0 \
+ -Duse_gio=1 \
+ -Duse_gnome_keyring=1 \
+ -Duse_pulseaudio=1 \
+ -Duse_system_bzip2=1 \
+ -Duse_system_flac=1 \
+%if 0%{?bundleharfbuzz}
+ -Duse_system_harfbuzz=0 \
+%else
+ -Duse_system_harfbuzz=1 \
+%endif
+%if 0%{?bundleicu}
+ -Duse_system_icu=0 \
+%else
+ -Duse_system_icu=1 \
+%endif
+ -Dicu_use_data_file_flag=1 \
+ -Duse_system_libevent=0 \
+ -Duse_system_libjpeg=1 \
+ -Duse_system_libpng=1 \
+%if %{bundlelibusbx}
+ -Duse_system_libusb=0 \
+%else
+ -Duse_system_libusb=1 \
+%endif
+ -Duse_system_libxml=1 \
+ -Duse_system_libxslt=1 \
+%if %{bundleopus}
+ -Duse_system_opus=0 \
+%else
+ -Duse_system_opus=1 \
+%endif
+ -Duse_system_protobuf=0 \
+%if 0%{?bundlere2}
+%else
+ -Duse_system_re2=1 \
+%endif
+ -Duse_system_libsrtp=0 \
+ -Duse_system_xdg_utils=1 \
+ -Duse_system_yasm=1 \
+ -Duse_system_zlib=0 \
+ \
+ -Dlinux_link_libspeechd=1 \
+ -Dlinux_link_gnome_keyring=1 \
+ -Dlinux_link_gsettings=1 \
+ -Dlinux_link_libpci=1 \
+ -Dlinux_link_libgps=0 \
+ -Dlinux_sandbox_path=%{chromium_path}/chrome-sandbox \
+ -Dlinux_sandbox_chrome_path=%{chromium_path}/chromium-browser \
+ -Dlinux_strip_binary=1 \
+ -Dlinux_use_bundled_binutils=0 \
+ -Dlinux_use_bundled_gold=0 \
+ -Dlinux_use_gold_binary=0 \
+ -Dlinux_use_gold_flags=0 \
+ -Dlinux_use_libgps=0 \
+ \
+ -Dusb_ids_path=/usr/share/hwdata/usb.ids \
+%if 0%{?fedora}
+ -Dlibspeechd_h_prefix=speech-dispatcher/ \
+%endif
+ \
+ -Dffmpeg_branding=ChromeOS \
+ -Dproprietary_codecs=1 \
+ -Dbuild_ffmpegsumo=1 \
+ -Dffmpeg_component=shared_library \
+ \
+ -Dno_strict_aliasing=1 \
+ -Dv8_no_strict_aliasing=1 \
+ \
+ -Dremove_webcore_debug_symbols=1 \
+ -Dlogging_like_official_build=1 \
+ -Denable_hotwording=0 \
+ -Duse_aura=1 \
+ -Denable_hidpi=1 \
+ -Denable_touch_ui=1 \
+ -Denable_pepper_cdms=1 \
+ -Denable_webrtc=1 \
+ -Denable_widevine=1 \
+ -Dtoolkit_uses_gtk=0 \
+ \
+ -Dcomponent=shared_library \
+ -Duse_sysroot=0 \
+ -Drelease_extra_cflags="-fno-delete-null-pointer-checks" \
+ -Dwerror= -Dsysroot="
+
+export PATH=$PATH:%{_builddir}/depot_tools
+
+%if %{use_gn}
+build/linux/unbundle/replace_gn_files.py --system-libraries \
+ flac \
+%if 0%{?bundleharfbuzz}
+%else
+ harfbuzz-ng \
+%endif
+%if 0%{?bundleicu}
+%else
+ icu \
+%endif
+%if 0
+ libevent \
+%endif
+%if %{bundlelibusbx}
+%else
+ libusb \
+%endif
+ libxml \
+ libxslt \
+%if %{bundleopus}
+%else
+ opus \
+%endif
+%if 0%{?bundlere2}
+%else
+ re2 \
+%endif
+ yasm
+
+tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "$CHROMIUM_BROWSER_GN_DEFINES"
+%{target}/gn gen --args="$CHROMIUM_BROWSER_GN_DEFINES" %{target}
+%else
+# Update gyp files according to our configuration
+# If you will change something in the configuration please update it
+# for build/gyp_chromium as well (and vice versa).
+build/linux/unbundle/replace_gyp_files.py $CHROMIUM_BROWSER_GYP_DEFINES
+
+build/gyp_chromium \
+ --depth . \
+%if 0%{?asan}
+ -Drelease_extra_cflags="-O1 -fno-inline-functions -fno-inline" \
+%endif
+ $CHROMIUM_BROWSER_GYP_DEFINES
+%endif
+
+# fix arm gcc
+sed -i 's|arm-linux-gnueabihf-|arm-linux-gnu-|g' build/toolchain/linux/BUILD.gn
+
+%build
+
+%if %{?tests}
+export CHROMIUM_BROWSER_UNIT_TESTS="\
+ media_unittests \
+ "
+%else
+export CHROMIUM_BROWSER_UNIT_TESTS=
+%endif
+
+
+%global target out/Release
+
+../depot_tools/ninja -C %{target} -vvv media $CHROMIUM_BROWSER_UNIT_TESTS
+
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{chromium_path}
+
+pushd %{target}
+cp -a libffmpeg.so* %{buildroot}%{chromium_path}
+cp -a libmedia.so* %{buildroot}%{chromium_path}
+popd
+
+%check
+%if 0%{tests}
+%if 0%{?tests_force_display}
+ export DISPLAY=:0
+%else
+ Xvfb :9 -screen 0 1024x768x24 &
+
+ export XVFB_PID=$!
+ export DISPLAY=:9
+%endif
+ export LC_ALL="en_US.utf8"
+
+ sleep 5
+
+ # Run tests and disable the failed ones
+ pushd %{target}
+ (
+
+ ./media_unittests \
+ )
+ popd
+
+ if [ -n "$XVFB_PID" ]; then
+ kill $XVFB_PID
+ unset XVFB_PID
+ unset DISPLAY
+ fi
+%endif
+
+%files
+%doc AUTHORS
+%license LICENSE
+%{chromium_path}/libffmpeg.so*
+%{chromium_path}/libmedia.so*
+
+%changelog
++* Tue Jun 20 2017 Miro Hrončok <mhroncok(a)redhat.com> - 59.0.3071.104-1
++- update to 59.0.3071.104
++
+* Tue Jun 13 2017 No One <noone AT nowhere DOT com> 59.0.3071.86-3
+- update to 59.0.3071.86
+
+* Fri Mar 3 2017 No One <noone AT nowhere DOT com> 58.0.3029.110-2
+- update to 58.0.3029.110
+
+* Fri Mar 3 2017 No One <noone AT nowhere DOT com> 56.0.2924.87-1
+- update to 56.0.2924.87
+
+* Fri Dec 2 2016 Jeremy Newton <alexjnewt AT hotmail DOT com> 54.0.2840.100-1
+- Trimming out all unnecessary builds and tests
+- Update to 54.0.2840.100
+
+* Mon Nov 28 2016 Jeremy Newton <alexjnewt AT hotmail DOT com> 54.0.2840.90-1
+- Initial package
diff --cc sources
index 7104c02,c84b1a0..e289c4d
--- a/sources
+++ b/sources
@@@ -1,3 -1,3 +1,3 @@@
- 3a2ad41fc23a569255f18ccacaf744e4 chromium-59.0.3071.86.tar.xz
- e3b580196d31ba2fe66ad12f17974a1e policy_templates.zip
-SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
-SHA512 (policy_templates.zip) = a997bd5d410cf8f0f104fb5b69b60699c9e60eb3f99b42e0aff167843f3a45923a9a99c881cac9cd4472a60ca9c7d1ba897e15d485fbfd66c996419e7fadd3f8
-oSHA512 (chromium-59.0.3071.104-clean.tar.xz) = 956158dd4a975678ba097a983bb456a186b881962ff27abd1149b78d0c0ceea2903846424f6e854ea524498512afc83871d38148845ba0114a8b415b06358b29
++4a315c89d6fc567b5982316767a8faef chromium-59.0.3071.104.tar.xz
+49a7f897775cce21d2b69968b8af1cea depot_tools.git-master.tar.gz
++e3b580196d31ba2fe66ad12f17974a1e policy_templates.zip
7 years, 1 month
[chromium-libs-media-freeworld: 2/3] actually fix mp3, update to .104
by Miro Hrončok
commit c68232bc2de6159fd88ba3947dd46795dd9c6e65
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Fri Jun 16 16:43:48 2017 -0400
actually fix mp3, update to .104
.gitignore | 1 +
chromium.spec | 7 +++++--
clean_ffmpeg.sh | 1 -
get_free_ffmpeg_source_files.py | 0
sources | 2 +-
5 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5fdffca..53aaae1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
/chromium-58.0.3029.81-clean.tar.xz
/chromium-58.0.3029.110-clean.tar.xz
/chromium-59.0.3071.86-clean.tar.xz
+/chromium-59.0.3071.104-clean.tar.xz
diff --git a/chromium.spec b/chromium.spec
index 27f27e0..2be406c 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -109,8 +109,8 @@ BuildRequires: libicu-devel >= 5.4
%global majorversion 59
Name: chromium%{chromium_channel}
-Version: %{majorversion}.0.3071.86
-Release: 4%{?dist}
+Version: %{majorversion}.0.3071.104
+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)
@@ -1627,6 +1627,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/chromedriver
%changelog
+* Fri Jun 16 2017 Tom Callaway <spot(a)fedoraproject.org> 59.0.3071.104-1
+- update to .104
+
* Fri Jun 16 2017 Tom Callaway <spot(a)fedoraproject.org> 59.0.3071.86-4
- actually fix mp3 playback support
diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh
old mode 100644
new mode 100755
index e703fa3..755ce8a
--- a/clean_ffmpeg.sh
+++ b/clean_ffmpeg.sh
@@ -235,7 +235,6 @@ mp3_files=" libavcodec/aac_ac3_parser.c \
libavcodec/dct32_fixed.c \
libavcodec/dct32_float.c \
libavcodec/dct32_template.c \
- libavcodec/imdct15.c \
libavcodec/kbdwin.c \
libavcodec/mpegaudio.c \
libavcodec/mpegaudio_parser.c \
diff --git a/get_free_ffmpeg_source_files.py b/get_free_ffmpeg_source_files.py
old mode 100644
new mode 100755
diff --git a/sources b/sources
index 16f137c..c84b1a0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
SHA512 (policy_templates.zip) = a997bd5d410cf8f0f104fb5b69b60699c9e60eb3f99b42e0aff167843f3a45923a9a99c881cac9cd4472a60ca9c7d1ba897e15d485fbfd66c996419e7fadd3f8
-SHA512 (chromium-59.0.3071.86-clean.tar.xz) = d9e1e1f4757b48ffc21708be9cf313677d52a46ebed222edd3851e533500b426b7fd6330463a030b1f273882ebd2f300f557f628c3f4da0a010f18b3dfc0f8f4
+oSHA512 (chromium-59.0.3071.104-clean.tar.xz) = 956158dd4a975678ba097a983bb456a186b881962ff27abd1149b78d0c0ceea2903846424f6e854ea524498512afc83871d38148845ba0114a8b415b06358b29
7 years, 1 month
[chromium-libs-media-freeworld: 1/3] actually fix mp3 playback support
by Miro Hrončok
commit 74ee2445dae5312b3cacf8970b1a7a0b369c6632
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Fri Jun 16 15:40:59 2017 -0400
actually fix mp3 playback support
chromium-59.0.3071.86-enable-mp3.patch | 477 +++++++++++++++++++++++++++++++++
chromium.spec | 7 +-
2 files changed, 482 insertions(+), 2 deletions(-)
---
diff --git a/chromium-59.0.3071.86-enable-mp3.patch b/chromium-59.0.3071.86-enable-mp3.patch
new file mode 100644
index 0000000..d727324
--- /dev/null
+++ b/chromium-59.0.3071.86-enable-mp3.patch
@@ -0,0 +1,477 @@
+diff -up chromium-59.0.3071.86/components/neterror/resources/sounds/button-press.mp3 chromium-59.0.3071.86/components/neterror/resources/sounds/button-press
+diff -up chromium-59.0.3071.86/components/neterror/resources/sounds/hit.mp3 chromium-59.0.3071.86/components/neterror/resources/sounds/hit
+diff -up chromium-59.0.3071.86/components/neterror/resources/sounds/score-reached.mp3 chromium-59.0.3071.86/components/neterror/resources/sounds/score-reached
+diff -up chromium-59.0.3071.86/media/base/mime_util_internal.cc.mp3 chromium-59.0.3071.86/media/base/mime_util_internal.cc
+--- chromium-59.0.3071.86/media/base/mime_util_internal.cc.mp3 2017-06-05 15:03:08.000000000 -0400
++++ chromium-59.0.3071.86/media/base/mime_util_internal.cc 2017-06-15 12:37:05.162650032 -0400
+@@ -286,10 +286,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);
+@@ -333,10 +333,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());
+@@ -789,7 +789,6 @@ bool MimeUtil::IsCodecProprietary(Codec
+ case INVALID_CODEC:
+ case AC3:
+ case EAC3:
+- case MP3:
+ case MPEG2_AAC:
+ case MPEG4_AAC:
+ case H264:
+@@ -797,6 +796,7 @@ bool MimeUtil::IsCodecProprietary(Codec
+ case DOLBY_VISION:
+ return true;
+
++ case MP3:
+ case PCM:
+ case VORBIS:
+ case OPUS:
+diff -up chromium-59.0.3071.86/media/BUILD.gn.mp3 chromium-59.0.3071.86/media/BUILD.gn
+--- chromium-59.0.3071.86/media/BUILD.gn.mp3 2017-06-15 12:48:07.277772389 -0400
++++ chromium-59.0.3071.86/media/BUILD.gn 2017-06-15 12:50:34.342911710 -0400
+@@ -229,6 +229,14 @@ component("media") {
+ "formats/webm/webm_video_client.h",
+ "formats/webm/webm_webvtt_parser.cc",
+ "formats/webm/webm_webvtt_parser.h",
++ "formats/mpeg/adts_constants.cc",
++ "formats/mpeg/adts_constants.h",
++ "formats/mpeg/adts_stream_parser.cc",
++ "formats/mpeg/adts_stream_parser.h",
++ "formats/mpeg/mpeg1_audio_stream_parser.cc",
++ "formats/mpeg/mpeg1_audio_stream_parser.h",
++ "formats/mpeg/mpeg_audio_stream_parser_base.cc",
++ "formats/mpeg/mpeg_audio_stream_parser_base.h",
+ "muxers/webm_muxer.cc",
+ "muxers/webm_muxer.h",
+ "renderers/audio_renderer_impl.cc",
+@@ -442,14 +450,6 @@ component("media") {
+ "formats/mp4/sample_to_group_iterator.h",
+ "formats/mp4/track_run_iterator.cc",
+ "formats/mp4/track_run_iterator.h",
+- "formats/mpeg/adts_constants.cc",
+- "formats/mpeg/adts_constants.h",
+- "formats/mpeg/adts_stream_parser.cc",
+- "formats/mpeg/adts_stream_parser.h",
+- "formats/mpeg/mpeg1_audio_stream_parser.cc",
+- "formats/mpeg/mpeg1_audio_stream_parser.h",
+- "formats/mpeg/mpeg_audio_stream_parser_base.cc",
+- "formats/mpeg/mpeg_audio_stream_parser_base.h",
+ ]
+ if (enable_mse_mpeg2ts_stream_parser) {
+ sources += [
+diff -up chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3 chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h
+--- chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3 2017-06-16 14:34:19.233333696 -0400
++++ chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h 2017-06-16 14:35:36.235836034 -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/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable
-decoder='theora,vp8' --enable-parser='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/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable
-decoder='theora,vp8' --enable-parser='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"
+@@ -550,7 +550,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
+@@ -617,8 +617,8 @@
+ #define CONFIG_LZF 0
+ #define CONFIG_ME_CMP 0
+ #define CONFIG_MPEG_ER 0
+-#define CONFIG_MPEGAUDIO 0
+-#define CONFIG_MPEGAUDIODSP 0
++#define CONFIG_MPEGAUDIO 1
++#define CONFIG_MPEGAUDIODSP 1
+ #define CONFIG_MPEGVIDEO 0
+ #define CONFIG_MPEGVIDEOENC 0
+ #define CONFIG_MSS34DSP 0
+@@ -957,7 +957,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
+@@ -1263,7 +1263,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
+@@ -2196,7 +2196,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-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3 chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h
+--- chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3 2017-06-16 14:33:03.565804834 -0400
++++ chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h 2017-06-16 14:34:00.538697021 -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/tguilbert/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp
8' --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/tguilbert/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp
8' --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"
+@@ -550,7 +550,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
+@@ -617,8 +617,8 @@
+ #define CONFIG_LZF 0
+ #define CONFIG_ME_CMP 0
+ #define CONFIG_MPEG_ER 0
+-#define CONFIG_MPEGAUDIO 0
+-#define CONFIG_MPEGAUDIODSP 0
++#define CONFIG_MPEGAUDIO 1
++#define CONFIG_MPEGAUDIODSP 1
+ #define CONFIG_MPEGVIDEO 0
+ #define CONFIG_MPEGVIDEOENC 0
+ #define CONFIG_MSS34DSP 0
+@@ -957,7 +957,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
+@@ -1263,7 +1263,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
+@@ -2196,7 +2196,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-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3 chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h
+--- chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3 2017-06-16 14:35:50.558558013 -0400
++++ chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h 2017-06-16 14:36:34.140710462 -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/tguilbert/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp
8' --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/tguilbert/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp
8' --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"
+@@ -550,7 +550,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
+@@ -617,8 +617,8 @@
+ #define CONFIG_LZF 0
+ #define CONFIG_ME_CMP 0
+ #define CONFIG_MPEG_ER 0
+-#define CONFIG_MPEGAUDIO 0
+-#define CONFIG_MPEGAUDIODSP 0
++#define CONFIG_MPEGAUDIO 1
++#define CONFIG_MPEGAUDIODSP 1
+ #define CONFIG_MPEGVIDEO 0
+ #define CONFIG_MPEGVIDEOENC 0
+ #define CONFIG_MSS34DSP 0
+@@ -957,7 +957,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
+@@ -1263,7 +1263,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
+@@ -2196,7 +2196,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-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3 chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h
+--- chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3 2017-06-16 14:31:10.694999531 -0400
++++ chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h 2017-06-16 14:32:48.921089988 -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/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable
-decoder='theora,vp8' --enable-parser='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/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable
-decoder='theora,vp8' --enable-parser='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"
+@@ -550,7 +550,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
+@@ -617,8 +617,8 @@
+ #define CONFIG_LZF 0
+ #define CONFIG_ME_CMP 0
+ #define CONFIG_MPEG_ER 0
+-#define CONFIG_MPEGAUDIO 0
+-#define CONFIG_MPEGAUDIODSP 0
++#define CONFIG_MPEGAUDIO 1
++#define CONFIG_MPEGAUDIODSP 1
+ #define CONFIG_MPEGVIDEO 0
+ #define CONFIG_MPEGVIDEOENC 0
+ #define CONFIG_MSS34DSP 0
+@@ -957,7 +957,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
+@@ -1263,7 +1263,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
+@@ -2196,7 +2196,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-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3 chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h
+--- chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3 2017-06-16 14:27:17.782528334 -0400
++++ chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h 2017-06-16 14:29:24.962054946 -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/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable
-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-pic --enable-lto"
++#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/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable
-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-pic --enable-lto --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"
+@@ -550,7 +550,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
+@@ -617,8 +617,8 @@
+ #define CONFIG_LZF 0
+ #define CONFIG_ME_CMP 0
+ #define CONFIG_MPEG_ER 0
+-#define CONFIG_MPEGAUDIO 0
+-#define CONFIG_MPEGAUDIODSP 0
++#define CONFIG_MPEGAUDIO 1
++#define CONFIG_MPEGAUDIODSP 1
+ #define CONFIG_MPEGVIDEO 0
+ #define CONFIG_MPEGVIDEOENC 0
+ #define CONFIG_MSS34DSP 0
+@@ -957,7 +957,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
+@@ -1263,7 +1263,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
+@@ -2196,7 +2196,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-59.0.3071.86/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chromium-59.0.3071.86/third_party/ffmpeg/ffmpeg_generated.gni
+--- chromium-59.0.3071.86/third_party/ffmpeg/ffmpeg_generated.gni.mp3 2017-06-08 11:40:39.000000000 -0400
++++ chromium-59.0.3071.86/third_party/ffmpeg/ffmpeg_generated.gni 2017-06-15 12:37:05.163650012 -0400
+@@ -177,19 +177,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",
+@@ -205,7 +198,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",
+@@ -214,6 +206,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",
+@@ -315,21 +322,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-59.0.3071.86/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chromium-59.0.3071.86/third_party/ffmpeg/libavcodec/sbrdsp.c
+--- chromium-59.0.3071.86/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 2017-06-08 11:40:41.000000000 -0400
++++ chromium-59.0.3071.86/third_party/ffmpeg/libavcodec/sbrdsp.c 2017-06-15 12:37:05.163650012 -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-59.0.3071.86/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart.mp3 chromium-59.0.3071.86/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart
+diff -up chromium-59.0.3071.86/tools/android/audio_focus_grabber/java/res/raw/ping.mp3 chromium-59.0.3071.86/tools/android/audio_focus_grabber/java/res/raw/ping
diff --git a/chromium.spec b/chromium.spec
index 9d618e9..27f27e0 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -110,7 +110,7 @@ BuildRequires: libicu-devel >= 5.4
Name: chromium%{chromium_channel}
Version: %{majorversion}.0.3071.86
-Release: 3%{?dist}
+Release: 4%{?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)
@@ -165,7 +165,7 @@ Patch31: chromium-56.0.2924.87-fpermissive.patch
# Thanks to Ben Noordhuis
Patch33: chromium-59.0.3071.86-gcc7.patch
# Enable mp3 support
-Patch34: chromium-58.0.3029.81-enable-mp3.patch
+Patch34: chromium-59.0.3071.86-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
@@ -1627,6 +1627,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/chromedriver
%changelog
+* Fri Jun 16 2017 Tom Callaway <spot(a)fedoraproject.org> 59.0.3071.86-4
+- actually fix mp3 playback support
+
* Tue Jun 13 2017 Tom Callaway <spot(a)fedoraproject.org> 59.0.3071.86-3
- fix filtering
7 years, 1 month