diff options
| -rwxr-xr-x | chromium/chromium/chromium-ffmpeg-clean.sh | 6 | ||||
| -rwxr-xr-x | chromium/chromium/chromium-ffmpeg-free-sources.py | 27 | ||||
| -rw-r--r-- | chromium/chromium/chromium-unset-madv_free.patch | 15 | ||||
| -rw-r--r-- | chromium/chromium/chromium.spec | 26 |
4 files changed, 45 insertions, 29 deletions
diff --git a/chromium/chromium/chromium-ffmpeg-clean.sh b/chromium/chromium/chromium-ffmpeg-clean.sh index 890be68..42b1730 100755 --- a/chromium/chromium/chromium-ffmpeg-clean.sh +++ b/chromium/chromium/chromium-ffmpeg-clean.sh @@ -29,6 +29,7 @@ # * Rename: clean_ffmpeg.sh -> chromium-ffmpeg-clean.sh. # * The shebang line no longer hardcodes the path to bash. # * Delete gyp* from other_files because GYP support has been removed. +# * Add new header_files and manual_files required by Chromium 56. # $1 files # $2 verbose @@ -102,7 +103,9 @@ header_files=" libavcodec/x86/inline_asm.h \ libavcodec/rl.h \ libavcodec/rnd_avg.h \ libavcodec/thread.h \ + libavcodec/unary.h \ libavcodec/version.h \ + libavcodec/vlc.h \ libavcodec/vp3data.h \ libavcodec/vp56.h \ libavcodec/vp56dsp.h \ @@ -139,6 +142,7 @@ header_files=" libavcodec/x86/inline_asm.h \ libavutil/cpu.h \ libavutil/cpu_internal.h \ libavutil/dynarray.h \ + libavutil/ffmath.h \ libavutil/internal.h \ libavutil/intfloat.h \ libavutil/intreadwrite.h \ @@ -162,6 +166,8 @@ manual_files=" libavcodec/x86/hpeldsp_rnd_template.c \ libavcodec/x86/vorbisdsp_init.c \ libavcodec/bit_depth_template.c \ libavcodec/fft_template.c \ + libavcodec/flacdsp_lpc_template.c \ + libavcodec/flacdsp_template.c \ libavcodec/h264pred_template.c \ libavcodec/hpel_template.c \ libavcodec/mdct_template.c \ diff --git a/chromium/chromium/chromium-ffmpeg-free-sources.py b/chromium/chromium/chromium-ffmpeg-free-sources.py index 1b66713..d80920d 100755 --- a/chromium/chromium/chromium-ffmpeg-free-sources.py +++ b/chromium/chromium/chromium-ffmpeg-free-sources.py @@ -28,14 +28,26 @@ # List of changes: # * Rename: get_free_ffmpeg_source_files.py -> chromium-ffmpeg-free-sources.py. # * The shebang line no longer hardcodes the path to python2. +# * Allow conditions without 'ffmpeg_branding == "Chromium"'. +# * Add files included by files named with 'autorename_' prefix. import sys +import os import re def append_sources (input_sources, output_sources): # Get the source files. source_files = re.findall(r"\"(.*?)\"", input_sources) + for source_file in source_files: + source_file_basename = os.path.basename(source_file) + if source_file_basename.startswith('autorename_'): + possible_include_underscore = source_file_basename[11:] + possible_include_underscore_count = possible_include_underscore.count('_') + possible_includes = [ + possible_include_underscore.replace('_', '/', i) for i in range(1, + possible_include_underscore_count + 1) ] + output_sources += possible_includes output_sources += source_files @@ -66,13 +78,16 @@ def parse_ffmpeg_gyni_file(gyni_path, arch_not_arm): for block in blocks: conditions = re.findall(r"\(?\((.*?)\)", block[0]) for condition in conditions: - limitations = ['is_linux', 'ffmpeg_branding == "Chromium"'] - if all(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) - else: + if not 'is_linux' in condition: + continue + if 'ffmpeg_branding' in condition and \ + 'ffmpeg_branding == "Chromium"' not in condition: + continue + if (arch_not_arm): + if ('x64' in condition) or ('x86' in condition): parse_sources (block[1], output_sources, arch_not_arm) + else: + parse_sources (block[1], output_sources, arch_not_arm) print ' '.join(output_sources) diff --git a/chromium/chromium/chromium-unset-madv_free.patch b/chromium/chromium/chromium-unset-madv_free.patch deleted file mode 100644 index 2867c79..0000000 --- a/chromium/chromium/chromium-unset-madv_free.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp.madv_free chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp ---- chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp.madv_free 2016-08-15 13:07:29.279655676 -0400 -+++ chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-15 13:08:38.447317416 -0400 -@@ -41,6 +41,11 @@ - #include <errno.h> - #include <sys/mman.h> - -+#if OS(LINUX) && defined(MADV_FREE) -+// Added in Linux 4.5, but it breaks the sandbox. -+#undef MADV_FREE -+#endif -+ - #ifndef MADV_FREE - #define MADV_FREE MADV_DONTNEED - #endif diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec index d6842d5..71384a7 100644 --- a/chromium/chromium/chromium.spec +++ b/chromium/chromium/chromium.spec @@ -35,7 +35,7 @@ %bcond_without require_clang Name: chromium -Version: 55.0.2883.87 +Version: 56.0.2924.76 Release: 100%{?dist} Summary: An open-source project that aims to build a safer, faster, and more stable browser @@ -72,11 +72,6 @@ Source11: chromium-browser.desktop Source12: chromium-browser.xml Source13: chromium-browser.appdata.xml -# Add a patch from Fedora to fix crash -# https://bugzilla.redhat.com/show_bug.cgi?id=1361157 -# http://pkgs.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=ed93147 -Patch0: chromium-unset-madv_free.patch - # Add a patch from Fedora to fix GN build # http://pkgs.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=0df9641 Patch1: chromium-last-commit-position.patch @@ -108,7 +103,8 @@ BuildRequires: clang BuildRequires: ninja-build, bison, gperf, hwdata BuildRequires: libgcc(x86-32), glibc(x86-32), libatomic BuildRequires: libcap-devel, cups-devel, minizip-devel, alsa-lib-devel -BuildRequires: pkgconfig(gtk+-2.0), pkgconfig(libexif), pkgconfig(nss) +BuildRequires: pkgconfig(gtk+-2.0), pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libexif), pkgconfig(nss) BuildRequires: pkgconfig(xtst), pkgconfig(xscrnsaver) BuildRequires: pkgconfig(dbus-1), pkgconfig(libudev) BuildRequires: pkgconfig(gnome-keyring-1) @@ -222,6 +218,7 @@ Provides: chromium-libs, chromium-libs-media, chromedriver third_party/google_input_tools/third_party/closure_library/third_party/closure \ third_party/hunspell \ third_party/iccjpeg \ + third_party/inspector_protocol \ %if !%{with system_libicu} third_party/icu \ %endif @@ -292,7 +289,8 @@ Provides: chromium-libs, chromium-libs-media, chromedriver third_party/yasm/run_yasm.py \ third_party/zlib/google \ url/third_party/mozilla \ - v8/src/third_party/valgrind + v8/src/third_party/valgrind \ + v8/third_party/inspector_protocol ./build/linux/unbundle/replace_gn_files.py --system-libraries \ flac \ @@ -319,6 +317,13 @@ Provides: chromium-libs, chromium-libs-media, chromedriver sed -i "s|'ninja'|'ninja-build'|" tools/gn/bootstrap/bootstrap.py sed -i 's|//third_party/usb_ids|/usr/share/hwdata|g' device/usb/BUILD.gn +# Workaround build error caused by debugedit +# https://bugzilla.redhat.com/show_bug.cgi?id=304121 +sed -i '/^#include/s|//|/|' \ + content/renderer/gpu/compositor_forwarding_message_filter.cc \ + third_party/webrtc/modules/audio_processing/utility/ooura_fft.cc \ + third_party/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc + rmdir third_party/jinja2 third_party/markupsafe ln -s %{python2_sitelib}/jinja2 third_party/jinja2 ln -s %{python2_sitearch}/markupsafe third_party/markupsafe @@ -482,6 +487,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Fri Jan 27 2017 - Ting-Wei Lan <lantw44@gmail.com> - 56.0.2924.76-100 +- Update to 56.0.2924.76 +- Update repackaging scripts +- Avoid build error when symbol condition is enabled (#304121) + * Tue Dec 13 2016 - Ting-Wei Lan <lantw44@gmail.com> - 55.0.2883.87-100 - Update to 55.0.2883.87 |