Hello community,
here is the log from the commit of package chromium for openSUSE:Factory
checked in at 2016-12-05 16:33:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chromium (Old)
and /work/SRC/openSUSE:Factory/.chromium.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromium"
Changes:
--------
--- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2016-10-22
13:23:48.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes 2016-12-05
16:33:39.000000000 +0100
@@ -1,0 +2,42 @@
+Sat Dec 3 09:59:21 UTC 2016 - tchva...@suse.com
+
+- Chromium 55.0.2883.75 bnc#1013236:
+ CVE-2016-9651 CVE-2016-5208 CVE-2016-5207 CVE-2016-5206 CVE-2016-5205
+ CVE-2016-5204 CVE-2016-5209 CVE-2016-5203 CVE-2016-5210 CVE-2016-5212
+ CVE-2016-5211 CVE-2016-5213 CVE-2016-5214 CVE-2016-5216 CVE-2016-5215
+ CVE-2016-5217 CVE-2016-5218 CVE-2016-5219 CVE-2016-5221 CVE-2016-5220
+ CVE-2016-5222 CVE-2016-9650 CVE-2016-5223 CVE-2016-5226 CVE-2016-5225
+ CVE-2016-5224 CVE-2016-9652
+- Switch to system libraries: harfbuzz, zlib, ffmpeg, ...
+- Refreshed patches:
+ * chromium-system-ffmpeg-r3.patch
+ * chromium-system-jinja-r13.patch
+- Use system ffmpeg unless on 13.2 that didn't include it
+ * chromium-54-ffmpeg2compat.patch
+ * Remove upstreamed chromium-more-codec-aliases.patch
+
+
+-------------------------------------------------------------------
+Sat Nov 12 08:20:05 UTC 2016 - astie...@suse.com
+
+- Chromium 54.0.2840.100:
+ * CVE-2016-5199: Heap corruption in FFmpeg (boo#1009892)
+ * CVE-2016-5200: out of bounds memory access in v8 (boo#1009893)
+ * CVE-2016-5201: info leak in extensions (boo#1009894)
+ * CVE-2016-5202: various fixes from internal audits (boo#1009895)
+
+-------------------------------------------------------------------
+Mon Nov 7 20:02:46 UTC 2016 - tchva...@suse.com
+
+- Add patch chromium-prop-codecs.patch and set properly the codecs
+ variable in main scope to allow ffmpeg passthrough
+ bnc#1008725
+
+-------------------------------------------------------------------
+Wed Nov 2 07:32:27 UTC 2016 - tchva...@suse.com
+
+- Update to 54.0.2840.90:
+ * Few fixes and tweaks
+ * Fixes CVE-2016-5198 bsc#1008274
+
+-------------------------------------------------------------------
Old:
----
chrome-wrapper
chromium-54.0.2840.71.tar.xz
chromium-more-codec-aliases.patch
chromium-rpmlintrc
default_bookmarks.html
New:
----
chromium-54-ffmpeg2compat.patch
chromium-55.0.2883.75.tar.xz
chromium-browser.appdata.xml
chromium-prop-codecs.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chromium.spec ++++++
--- /var/tmp/diff_new_pack.kklOeG/_old 2016-12-05 16:33:58.000000000 +0100
+++ /var/tmp/diff_new_pack.kklOeG/_new 2016-12-05 16:33:58.000000000 +0100
@@ -17,30 +17,54 @@
%define rname chromium
+%if %{?suse_version} != 1320
+# 1320 didn't contain ffmpeg YET
+%bcond_without system_ffmpeg
+%else
+%bcond_with system_ffmpeg
+%endif
+%if %{?suse_version} <= 1320
+%bcond_with system_vpx
+%else
+%bcond_without system_vpx
+%endif
+%if %{?suse_version} < 1330
+%bcond_with system_icu
+%else
+%bcond_without system_icu
+%endif
+%if %{?suse_version} >= 1320 || (%{?suse_version} == 1315 && 0%{?leap_version}
>= 420200)
+%bcond_without system_minizip
+%else
+%bcond_with system_mnizip
+%endif
+# This is just overall condition to contain everything we can't provide on
SLE12
+%if 0%{?suse_version} >= 1320 || 0%{?is_opensuse}
+%bcond_with sle_bundles
+%else
+%bcond_without sle_bundles
+%endif
%bcond_with clang
Name: chromium
-Version: 54.0.2840.71
+Version: 55.0.2883.75
Release: 0
Summary: Google's opens source browser project
License: BSD-3-Clause and LGPL-2.1+
Group: Productivity/Networking/Web/Browsers
Url: http://code.google.com/p/chromium/
Source0:
http://commondatastorage.googleapis.com/chromium-browser-official/%{rname}-%{version}.tar.xz
-Source2: %{rname}-rpmlintrc
Source30: master_preferences
-Source31: default_bookmarks.html
-Source99: chrome-wrapper
Source100: chromium-browser.sh
Source101: chromium-browser.desktop
Source102: chromium-browser.xml
Source103: chromium.default
Source104: chromium-icons.tar.bz2
+# PATCH-FEATURE-UPSTREAM
https://bugs.chromium.org/p/chromium/issues/detail?id=654190
+Source105: chromium-browser.appdata.xml
# PATCH-FIX-OPENSUSE Make the 1-click-install ymp file always download
[bnc#836059]
Patch1: exclude_ymp.diff
# PATCH-FIX-OPENSUSE enables reading of the master preference
Patch2: chromium-master-prefs-path.patch
-# PATCH-FIX-UPSTREAM Add more charset aliases
-Patch3: chromium-more-codec-aliases.patch
# PATCH-FIX-OPENSUSE Compile the sandbox with -fPIE settings
Patch4: chromium-sandbox-pie.patch
# PATCH-FIX-OPENSUSE
chromium-46.0.2490.71-fix-missing-i18n_process_css_test.patch - file was removed
@@ -55,15 +79,19 @@
# Gcc fix
Patch10: gcc60-fixes.diff
# PATCH-FIX-UPSTREAM correctly build sandbox
-Patch11: chromium-sandbox.patch
+Patch12: chromium-sandbox.patch
# PATCH-FIX-SUSE make ld use less memory by tweaking compiler flags
Patch13: chromium-linker-memory.patch
+# PATCH-FIX-UPSTREAM use system ffmpeg even in 2.x series version
+Patch14: chromium-54-ffmpeg2compat.patch
# archlinux arm enhancement patches
Patch100: arm-webrtc-fix.patch
Patch101: arm_use_right_compiler.patch
# GN buildsystem related patches
Patch200: chromium-last-commit-position-r0.patch
Patch201: fix-gn-bootstrap.diff
+# PATCH-FIX-SUSE: allow proprietary codecs to be set with chromium branding
+Patch202: chromium-prop-codecs.patch
BuildRequires: SDL-devel
BuildRequires: binutils-gold
BuildRequires: bison
@@ -87,10 +115,7 @@
BuildRequires: pkgconfig
BuildRequires: procps
BuildRequires: python
-BuildRequires: python-Jinja2
-BuildRequires: python-ply
-BuildRequires: python-simplejson
-BuildRequires: python-xml
+BuildRequires: re2-devel
BuildRequires: snappy-devel
BuildRequires: update-desktop-files
BuildRequires: util-linux
@@ -143,7 +168,6 @@
BuildRequires: pkgconfig(valgrind)
BuildRequires: pkgconfig(vdpau)
BuildRequires: pkgconfig(vorbis)
-BuildRequires: pkgconfig(vpx)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcomposite)
BuildRequires: pkgconfig(xcursor)
@@ -157,8 +181,6 @@
BuildRequires: pkgconfig(xt)
BuildRequires: pkgconfig(xtst)
BuildRequires: pkgconfig(zlib)
-#Requirements to build a fully functional ffmpeg
-Requires: alsa
Requires: hicolor-icon-theme
Requires: xdg-utils
Requires(pre): permissions
@@ -175,12 +197,40 @@
Obsoletes: chromium-desktop-kde
Obsoletes: chromium-dev-desktop-gnome
Obsoletes: chromium-dev-desktop-kde
-# There is no v8 for ppc and thus chromium won't run on ppc. For aarch64
certain buildrequires are missing (e.g. valgrind)
+# There is no v8 for ppc and thus chromium won't run on ppc. For aarch64
+# certain buildrequires are missing (e.g. valgrind)
# while it would build for %arm, we exclude it as it takes forever to build
-ExcludeArch: %arm aarch64 ppc ppc64 ppc64le
+ExcludeArch: %{arm} aarch64 ppc ppc64 ppc64le
+%if !%{with sle_bundles}
+BuildRequires: python-Jinja2
+BuildRequires: python-beautifulsoup4
+BuildRequires: python-html5lib
+BuildRequires: python-ply
+BuildRequires: python-simplejson
+BuildRequires: python-xml
+BuildRequires: yasm-devel
+%endif
+%if %{with system_minizip}
+BuildRequires: pkgconfig(minizip)
+%endif
+%if %{with system_icu}
+BuildRequires: pkgconfig(icu-i18n) >= 54.0
+%endif
+%if %{with system_vpx}
+BuildRequires: pkgconfig(vpx) >= 1.4.0
+%endif
+%if %{with system_ffmpeg}
+BuildRequires: pkgconfig(libavcodec)
+BuildRequires: pkgconfig(libavfilter)
+BuildRequires: pkgconfig(libavformat)
+BuildRequires: pkgconfig(libavutil)
+Conflicts: otherproviders(ffmpegsumo)
+Provides: ffmpegsumo = %{version}
+%else
Requires: ffmpegsumo
# Recommends the chromium-ffmpeg library (available from packman)
Recommends: %{name}-ffmpeg
+%endif
%if %{with clang}
BuildRequires: clang >= 3.9.0
%else
@@ -200,6 +250,7 @@
%description
Chromium is the open-source project behind Google Chrome. We invite you to
join us in our effort to help build a safer, faster, and more stable way for
all Internet users to experience the web, and to create a powerful platform for
developing a new generation of web applications.
+%if !%{with system_ffmpeg}
%package ffmpegsumo
Summary: Library to provide partial ffmpeg support to Chromium
License: BSD-3-Clause and LGPL-2.1+
@@ -210,12 +261,14 @@
%description ffmpegsumo
The is the multimedia codec library for Chromium. It is based on the internal
ffmpeg source code and contains only the open source codecs from ffmpeg.
Proprietary codecs (e.g. H.264) are not part of this library, but are provided
in an external package
+%endif
%package -n chromedriver
Summary: WebDriver for Google Chrome/Chromium
License: BSD-3-Clause
Group: Development/Tools/Other
Url: http://code.google.com/p/chromedriver/
+Requires: %{name} = %{version}
%description -n chromedriver
WebDriver is an open source tool for automated testing of webapps across many
browsers. It provides capabilities for navigating to web pages, user input,
JavaScript execution, and more. ChromeDriver is a standalone server which
implements WebDriver's wire protocol for Chromium. It is being developed by
members of the Chromium and WebDriver teams.
@@ -239,25 +292,167 @@
#GN Buildsystem fixes
%patch200 -p1
%patch201 -p1
+%patch202 -p1
#Standard patches
%patch1
%patch2
-%patch3
%patch4
%patch5 -p1
%patch6 -p1
%patch7
%patch8 -p1
+%if !%{with sle_bundles}
%patch9 -p1
+%endif
%patch10
-%patch11 -p1
+%patch12 -p1
%patch13 -p1
+%patch14 -p1
# archlinux arm enhancements
%patch100
%patch101
+# Remove bundled libs
+keeplibs=(
+ base/third_party/dmg_fp
+ base/third_party/dynamic_annotations
+ base/third_party/nspr
+ base/third_party/icu
+ base/third_party/superfasthash
+ base/third_party/symbolize
+ base/third_party/valgrind
+ base/third_party/xdg_mime
+ base/third_party/xdg_user_dirs
+ breakpad/src/third_party/curl
+ chrome/third_party/mozilla_security_manager
+ courgette/third_party
+ net/third_party/mozilla_security_manager
+ net/third_party/nss
+ third_party/WebKit
+ third_party/analytics
+ third_party/angle
+ third_party/angle/src/common/third_party/numerics
+ 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/boringssl
+ third_party/brotli
+ third_party/cacheinvalidation
+ third_party/catapult
+ third_party/catapult/third_party/polymer
+ third_party/catapult/third_party/py_vulcanize
+ third_party/catapult/third_party/py_vulcanize/third_party/rcssmin
+ third_party/catapult/third_party/py_vulcanize/third_party/rjsmin
+ third_party/catapult/tracing/third_party/d3
+ third_party/catapult/tracing/third_party/gl-matrix
+ third_party/catapult/tracing/third_party/jszip
+ third_party/catapult/tracing/third_party/mannwhitneyu
+ third_party/ced
+ third_party/cld_2
+ third_party/cld_3
+ third_party/cros_system_api
+ third_party/devscripts
+ third_party/dom_distiller_js
+ third_party/fips181
+ third_party/flatbuffers
+ third_party/flot
+ third_party/google_input_tools
+ third_party/google_input_tools/third_party/closure_library
+
third_party/google_input_tools/third_party/closure_library/third_party/closure
+ third_party/hunspell
+ third_party/iccjpeg
+ third_party/icu
+ third_party/jstemplate
+ third_party/khronos
+ third_party/leveldatabase
+ third_party/libXNVCtrl
+ third_party/libaddressinput
+ third_party/libjingle
+ third_party/libphonenumber
+ third_party/libsecret
+ third_party/libsrtp
+ third_party/libudev
+ third_party/libusb
+ third_party/libwebm
+ third_party/libxml/chromium
+ third_party/libyuv
+ third_party/lss
+ third_party/lzma_sdk
+ third_party/mesa
+ third_party/modp_b64
+ third_party/mt19937ar
+ third_party/openh264
+ third_party/openmax_dl
+ third_party/opus
+ third_party/ots
+ third_party/pdfium
+ third_party/pdfium/third_party/agg23
+ third_party/pdfium/third_party/base
+ third_party/pdfium/third_party/bigint
+ third_party/pdfium/third_party/freetype
+ third_party/pdfium/third_party/lcms2-2.6
+ third_party/pdfium/third_party/libjpeg
+ third_party/pdfium/third_party/libopenjpeg20
+ third_party/pdfium/third_party/libpng16
+ third_party/pdfium/third_party/libtiff
+ third_party/pdfium/third_party/zlib_v128
+ third_party/polymer
+ third_party/protobuf
+ third_party/protobuf/third_party/six
+ third_party/qcms
+ third_party/sfntly
+ third_party/skia
+ third_party/smhasher
+ third_party/sqlite
+ third_party/tcmalloc
+ third_party/usrsctp
+ third_party/web-animations-js
+ third_party/webdriver
+ third_party/webrtc
+ third_party/widevine
+ third_party/woff2
+ third_party/x86inc
+ third_party/zlib/google
+ url/third_party/mozilla
+ v8/src/third_party/valgrind
+)
+%if %{with sle_bundles}
+keeplibs+=(
+ third_party/yasm
+ third_party/jinja2
+ third_party/markupsafe
+ third_party/simplejson
+ third_party/ply
+ third_party/catapult/third_party/beautifulsoup4
+ third_party/catapult/third_party/html5lib-python
+)
+%endif
+%if !%{with system_minizip}
+keeplibs+=( third_party/zlib )
+%endif
+%if !%{with system_vpx}
+keeplibs+=(
+ third_party/libvpx
+ third_party/libvpx/source/libvpx/third_party/x86inc
+)
+%endif
+%if !%{with system_ffmpeg}
+keeplibs+=( third_party/ffmpeg )
+%endif
+# needed due to bugs in GN
+keeplibs+=(
+ base/third_party/libevent
+ third_party/adobe
+ third_party/speech-dispatcher
+ third_party/usb_ids
+ third_party/xdg-utils
+ third_party/yasm/run_yasm.py
+)
+build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove
+
%build
# do not eat all memory
ninjaproc="%{?jobs:%{jobs}}"
@@ -273,9 +468,39 @@
test "$ninjaproc" -le 0 && ninjaproc=1 && echo "Warning: Do not use the
parallel build at all becuse of memory limits"
fi
+# Set system libraries to be used
+gn_system_libraries="
+ flac
+ harfbuzz-ng
+ libjpeg
+ libpng
+ libwebp
+ libxml
+ libxslt
+ re2
+ snappy
+"
+%if !%{with sle_bundles}
+gn_system_libraries+=" yasm"
+%endif
+%if %{with system_minizip}
+gn_system_libraries+=" zlib"
+%endif
+%if %{with system_icu}
+gn_system_libraries+=" icu"
+%endif
+%if %{with system_vpx}
+gn_system_libraries+=" libvpx"
+%endif
+%if %{with system_ffmpeg}
+gn_system_libraries+=" ffmpeg"
+%endif
+build/linux/unbundle/replace_gn_files.py --system-libraries
${gn_system_libraries}
+
# Create the configuration for GN
# Available options: out/Release/gn args --list out/Release/
myconf_gn=""
+myconf_gn+=" linux_use_bundled_binutils=false"
myconf_gn+=" is_debug=false"
myconf_gn+=" enable_nacl=false"
myconf_gn+=" is_component_ffmpeg=true"
@@ -288,10 +513,11 @@
myconf_gn+=" remove_webcore_debug_symbols=true"
myconf_gn+=" use_kerberos=true"
myconf_gn+=" use_pulseaudio=true link_pulseaudio=true"
+myconf_gn+=" is_component_build=false"
myconf_gn+=" use_sysroot=false"
myconf_gn+=" treat_warnings_as_errors=false"
myconf_gn+=" fatal_linker_warnings=false"
-myconf_gn+=" use_allocator=\"none\""
+myconf_gn+=" use_allocator=\"tcmalloc\""
myconf_gn+=" fieldtrial_testing_like_official_build=true"
myconf_gn+=" use_gold=true"
myconf_gn+=" use_sysroot=false"
@@ -304,8 +530,11 @@
%endif
# Define the Chrome branding in order to get libffmpeg on packman that
supports all codecs
-%if 0%{?packman_bs}
+# The proprietary codecs just force the chromium to say they can use it and
+# offload the actual computation to the split ffmpeg.so, otherwise the chromium
+# won't be able to load the codec even if the library can handle it
myconf_gn+=" proprietary_codecs=true"
+%if 0%{?packman_bs} || %{with system_ffmpeg}
myconf_gn+=" ffmpeg_branding=\"Chrome\""
%endif
@@ -315,13 +544,11 @@
myconf_gn+=" arm_use_neon=false"
myconf_gn+=" arm_optionally_use_neon=false"
myconf_gn+=" arm_use_thumb=true"
-myconf_gn+=" is_component_build=true"
%endif
# Set up Google API keys, see
http://www.chromium.org/developers/how-tos/api-keys
# Note: these are for the openSUSE Chromium builds ONLY. For your own
distribution,
# please get your own set of keys.
-
google_api_key="AIzaSyD1hTe85_a14kr1Ks8T3Ce75rvbR1_Dx7Q"
google_default_client_id="4139804441.apps.googleusercontent.com"
google_default_client_secret="KDTRKEZk2jwT_7CDpcmMA--P"
@@ -381,12 +608,18 @@
cp -a chrome_sandbox %{buildroot}%{_libexecdir}/
ln -s -f %{_libexecdir}/chrome_sandbox
%{buildroot}/%{_libdir}/chromium/chrome-sandbox
- cp -a *.bin *.pak locales xdg-mime icudtl.dat
%{buildroot}%{_libdir}/chromium/
+ cp -a *.bin *.pak locales xdg-mime %{buildroot}%{_libdir}/chromium/
+ %if !%{with system_icu}
+ cp -a icudtl.dat %{buildroot}%{_libdir}/chromium/
+ %endif
+
+ # chromedriver
cp -a chromedriver %{buildroot}%{_libdir}/chromium/
- # chromium components
# ffmpeg
- cp -av libffmpeg.so %{buildroot}%{_libdir}/chromium/
+ %if !%{with system_ffmpeg}
+ cp -a libffmpeg.so %{buildroot}%{_libdir}/chromium/
+ %endif
# Patch xdg-settings to use the chromium version of xdg-mime as that the
system one is not KDE4 compatible
sed "s|xdg-mime|%{_libdir}/chromium/xdg-mime|g" xdg-settings >
%{buildroot}%{_libdir}/chromium/xdg-settings
@@ -408,6 +641,9 @@
mkdir -p %{buildroot}%{_datadir}/applications/
desktop-file-install --dir %{buildroot}%{_datadir}/applications
%{SOURCE101}
+ mkdir -p %{buildroot}%{_datadir}/appdata/
+ cp -a %{SOURCE105} %{buildroot}%{_datadir}/appdata/
+
mkdir -p %{buildroot}%{_datadir}/gnome-control-center/default-apps/
cp -a %{SOURCE102}
%{buildroot}%{_datadir}/gnome-control-center/default-apps/
@@ -419,7 +655,6 @@
# Install the master_preferences file
mkdir -p %{buildroot}%{_sysconfdir}/chromium
install -m 0644 %{SOURCE30} %{buildroot}%{_sysconfdir}/chromium
- install -m 0644 %{SOURCE31} %{buildroot}%{_sysconfdir}/chromium
# Set the right attributes
chmod 755 %{buildroot}%{_libdir}/chromium/xdg-settings
@@ -468,16 +703,22 @@
%{_libdir}/chromium/
%{_mandir}/man1/chrom*
%{_datadir}/applications/*.desktop
+%dir %{_datadir}/appdata/
+%{_datadir}/appdata/chromium-browser.appdata.xml
%{_datadir}/gnome-control-center/default-apps/chromium-browser.xml
%{_datadir}/icons/hicolor/
%{_libexecdir}/chrome_sandbox
+%if !%{with system_ffmpeg}
%exclude %{_libdir}/chromium/libffmpeg.so
+%endif
%exclude %{_libdir}/chromium/chromedriver
%{_bindir}/chromium
+%if !%{with system_ffmpeg}
%files ffmpegsumo
%defattr(-,root,root,-)
%{_libdir}/chromium/libffmpeg.so
+%endif
%files -n chromedriver
%defattr(-,root,root,-)
++++++ chromium-54-ffmpeg2compat.patch ++++++
Disable checks against macros that do not exist in ffmpeg-2.x
Patch by aballier.
--- a/media/ffmpeg/ffmpeg_common.cc
+++ b/media/ffmpeg/ffmpeg_common.cc
@@ -786,7 +786,9 @@ TEST_PRIMARY(SMPTE170M);
TEST_PRIMARY(SMPTE240M);
TEST_PRIMARY(FILM);
TEST_PRIMARY(BT2020);
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(55,5,0)
TEST_PRIMARY(SMPTEST428_1);
+#endif
TEST_TRANSFER(RESERVED0);
TEST_TRANSFER(BT709);
@@ -804,8 +806,10 @@ TEST_TRANSFER(BT1361_ECG);
TEST_TRANSFER(IEC61966_2_1);
TEST_TRANSFER(BT2020_10);
TEST_TRANSFER(BT2020_12);
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(55,5,0)
TEST_TRANSFER(SMPTEST2084);
TEST_TRANSFER(SMPTEST428_1);
+#endif
TEST_COLORSPACE(RGB);
TEST_COLORSPACE(BT709);
++++++ chromium-54.0.2840.71.tar.xz -> chromium-55.0.2883.75.tar.xz ++++++
/work/SRC/openSUSE:Factory/chromium/chromium-54.0.2840.71.tar.xz
/work/SRC/openSUSE:Factory/.chromium.new/chromium-55.0.2883.75.tar.xz differ:
char 25, line 1
++++++ chromium-browser.sh ++++++
--- /var/tmp/diff_new_pack.kklOeG/_old 2016-12-05 16:33:58.000000000 +0100
+++ /var/tmp/diff_new_pack.kklOeG/_new 2016-12-05 16:33:58.000000000 +0100
@@ -57,12 +57,6 @@
cp /etc/chromium/master_preferences ~/.config/chromium/Default/Preferences
fi
-if [ ! -u $CHROME_SANDBOX ] ; then
- echo "The chrome_sandbox binary does not have the SETUID set."
- echo
- echo "This is most likely caused by the permission state (Secure/Paranoid)
of the system. Therefore running Chromium is not possible."
-fi
-
# Allow users to override command-line options
# Based on Gentoo's chromium package (and by extension, Debian's)
if [ -f /etc/default/chromium ]; then
++++++ chromium-prop-codecs.patch ++++++
reverted:
--- b/media/BUILD.gn
+++ a/media/BUILD.gn
@@ -23,12 +22,6 @@
]
}
-if (proprietary_codecs && media_use_ffmpeg) {
- assert(
- ffmpeg_branding != "Chromium",
- "proprietary codecs and ffmpeg_branding set to Chromium are
incompatible")
-}
-
# Common configuration for targets in the media directory.
# NOT for exporting.
config("media_config") {
++++++ chromium-system-ffmpeg-r3.patch ++++++
--- /var/tmp/diff_new_pack.kklOeG/_old 2016-12-05 16:33:58.000000000 +0100
+++ /var/tmp/diff_new_pack.kklOeG/_new 2016-12-05 16:33:58.000000000 +0100
@@ -1,17 +1,17 @@
---- a/media/ffmpeg/ffmpeg_common.h 2015-11-27 12:01:56.155462264 +0000
-+++ b/media/ffmpeg/ffmpeg_common.h 2015-11-27 12:03:03.348846300 +0000
-@@ -19,10 +19,6 @@
+--- a/media/ffmpeg/ffmpeg_common.h.orig 2016-09-09 13:16:07.757294768
+0000
++++ b/media/ffmpeg/ffmpeg_common.h 2016-09-09 13:16:41.705989273 +0000
+@@ -22,10 +22,6 @@
// Include FFmpeg header files.
extern "C" {
-// Disable deprecated features which result in spammy compile warnings. This
--// list of defines must mirror those in the 'defines' section of BUILD.gn
file &
--// ffmpeg.gyp file or the headers below will generate different structures!
+-// list of defines must mirror those in the 'defines' section of FFmpeg's
+-// BUILD.gn file or the headers below will generate different structures!
-#define FF_API_CONVERGENCE_DURATION 0
// Upstream libavcodec/utils.c still uses the deprecated
// av_dup_packet(), causing deprecation warnings.
// The normal fix for such things is to disable the feature as below,
-@@ -36,7 +32,6 @@
+@@ -35,7 +35,6 @@
MSVC_PUSH_DISABLE_WARNING(4244);
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
@@ -19,9 +19,9 @@
#include <libavformat/avio.h>
#include <libavutil/avutil.h>
#include <libavutil/imgutils.h>
---- a/media/filters/ffmpeg_demuxer.cc.orig 2016-08-01 10:52:01.528177808
+0000
-+++ b/media/filters/ffmpeg_demuxer.cc 2016-08-01 10:52:27.160707694 +0000
-@@ -1150,24 +1150,6 @@
+--- a/media/filters/ffmpeg_demuxer.cc.orig 2016-09-09 14:21:40.185828912
+0000
++++ b/media/filters/ffmpeg_demuxer.cc 2016-09-09 14:21:52.894089352 +0000
+@@ -1185,24 +1185,6 @@
// If no estimate is found, the stream entry will be kInfiniteDuration.
std::vector<base::TimeDelta>
start_time_estimates(format_context->nb_streams,
kInfiniteDuration);
@@ -45,4 +45,4 @@
- }
std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
- AVStream* audio_stream = NULL;
+
++++++ chromium-system-jinja-r13.patch ++++++
--- /var/tmp/diff_new_pack.kklOeG/_old 2016-12-05 16:33:58.000000000 +0100
+++ /var/tmp/diff_new_pack.kklOeG/_new 2016-12-05 16:33:58.000000000 +0100
@@ -1,38 +1,3 @@
---- a/third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig
2014-08-19 09:55:10.330972228 +0000
-+++ b/third_party/WebKit/Source/bindings/scripts/scripts.gyp 2014-08-19
09:55:26.387286232 +0000
-@@ -54,7 +54,6 @@
- 'actions': [{
- 'action_name': 'cache_jinja_templates',
- 'inputs': [
-- '<@(jinja_module_files)',
- 'code_generator_v8.py',
- '<@(code_generator_template_files)',
- ],
---- a/third_party/WebKit/Source/build/scripts/scripts.gypi.orig
2014-08-19 10:00:00.216521733 +0000
-+++ b/third_party/WebKit/Source/build/scripts/scripts.gypi 2014-08-19
10:00:11.464735099 +0000
-@@ -2,10 +2,6 @@
- {
- 'variables': {
- 'scripts_for_in_files': [
-- # jinja2/__init__.py contains version string, so sufficient as
-- # dependency for whole jinja2 package
-- '<(DEPTH)/third_party/jinja2/__init__.py',
-- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
- 'hasher.py',
- 'in_file.py',
- 'in_generator.py',
---- a/third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig
2014-08-19 10:53:02.824618979 +0000
-+++ b/third_party/WebKit/Source/bindings/scripts/scripts.gypi 2014-08-19
10:53:20.784957370 +0000
-@@ -12,9 +12,6 @@
- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
- ],
- 'idl_lexer_parser_files': [
-- # PLY (Python Lex-Yacc)
-- '<(DEPTH)/third_party/ply/lex.py',
-- '<(DEPTH)/third_party/ply/yacc.py',
- # Web IDL lexer/parser (base parser)
- '<(DEPTH)/tools/idl_parser/idl_lexer.py',
- '<(DEPTH)/tools/idl_parser/idl_node.py',
--- a/third_party/WebKit/Source/build/scripts/scripts.gni.orig 2016-06-02
09:54:28.510152077 +0000
+++ b/third_party/WebKit/Source/build/scripts/scripts.gni 2016-06-02
09:54:50.966612510 +0000
@@ -9,10 +9,6 @@
@@ -46,14 +11,21 @@
"$_scripts_dir/hasher.py",
"$_scripts_dir/in_file.py",
"$_scripts_dir/in_generator.py",
---- a/third_party/WebKit/Source/bindings/scripts/BUILD.gn.orig 2016-06-02
10:03:01.100658943 +0000
-+++ b/third_party/WebKit/Source/bindings/scripts/BUILD.gn 2016-06-02
10:03:13.240907715 +0000
-@@ -36,7 +36,7 @@
- action("cached_jinja_templates") {
- script = "code_generator_v8.py"
+--- a/third_party/WebKit/Source/bindings/scripts/scripts.gni.orig
2016-09-09 13:40:51.971660406 +0000
++++ b/third_party/WebKit/Source/bindings/scripts/scripts.gni 2016-09-09
13:41:15.472141236 +0000
+@@ -9,15 +9,9 @@
+ bindings_scripts_output_dir = "$root_gen_dir/blink/bindings/scripts"
-- inputs = jinja_module_files + [ "code_generator_v8.py" ] +
-+ inputs = [ "code_generator_v8.py" ] +
- code_generator_template_files
+ jinja_module_files = [
+- "//third_party/jinja2/__init__.py",
+- "//third_party/markupsafe/__init__.py", # jinja2 dep
+ ]
- # Dummy file to track dependency.
+ idl_lexer_parser_files = get_path_info([
+- # PLY (Python Lex-Yacc)
+- "//third_party/ply/lex.py",
+- "//third_party/ply/yacc.py",
+-
+ # Web IDL lexer/parser (base parser)
+ "//tools/idl_parser/idl_lexer.py",
+ "//tools/idl_parser/idl_node.py",
++++++ chromium.default ++++++
--- /var/tmp/diff_new_pack.kklOeG/_old 2016-12-05 16:33:58.000000000 +0100
+++ /var/tmp/diff_new_pack.kklOeG/_new 2016-12-05 16:33:58.000000000 +0100
@@ -1,4 +1,5 @@
# Default settings for chromium. This file is sourced by /usr/bin/chromium
# Options to pass to chromium
+# Ie. debugging: --enable-logging=stderr --v=2
CHROMIUM_FLAGS=""
++++++ fix-gn-bootstrap.diff ++++++
--- /var/tmp/diff_new_pack.kklOeG/_old 2016-12-05 16:33:58.000000000 +0100
+++ /var/tmp/diff_new_pack.kklOeG/_new 2016-12-05 16:33:58.000000000 +0100
@@ -1,6 +0,0 @@
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index fa81d10..aab92c2 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-
-
++++++ master_preferences ++++++
--- /var/tmp/diff_new_pack.kklOeG/_old 2016-12-05 16:33:58.000000000 +0100
+++ /var/tmp/diff_new_pack.kklOeG/_new 2016-12-05 16:33:58.000000000 +0100
@@ -1,7 +1,6 @@
{
"distribution": {
"skip_first_run_ui": true,
- "import_bookmarks_from_file": "/etc/chromium/default_bookmarks.html",
"alternate_shortcut_text": false,
"oem_bubble": true,
"chrome_shortcut_icon_index": 0,
