Changes of Revision 3

chromium-ffmpeg-extra.changes Changed
x
 
1
@@ -1,7 +1,8 @@
2
 -------------------------------------------------------------------
3
 Wed Apr  5 17:08:12 UTC 2017 - avvissu@yandex.by
4
 
5
-- Remove --verbose flag and reduce number of jobs
6
+- Remove --verbose flag
7
+- Add chromium-fix-gn-bootstrap.patch
8
 
9
 -------------------------------------------------------------------
10
 Wed Mar 29 14:01:10 UTC 2017 - avvissu@yandex.by
11
chromium-ffmpeg-extra.spec Changed
26
 
1
@@ -28,6 +28,7 @@
2
 Source1:        BUILD.gn
3
 Patch0:         chromium-last-commit-position-r0.patch
4
 Patch1:         chromium-fix-build-with-gcc4.8.patch
5
+Patch2:         chromium-fix-gn-bootstrap.patch
6
 BuildRequires:  gcc
7
 BuildRequires:  gcc-c++
8
 BuildRequires:  ninja
9
@@ -52,6 +53,7 @@
10
 %setup -q -n %{srcname}-%{version}
11
 %patch0 -p1
12
 %patch1 -p1
13
+%patch2 -p1
14
 
15
 mkdir toolchain
16
 cp %{SOURCE1} toolchain/BUILD.gn
17
@@ -89,7 +91,7 @@
18
 
19
 tools/gn/bootstrap/bootstrap.py --gn-gen-args "${myconf_gn}"
20
 out/Release/gn gen --args="${myconf_gn}" out/Release
21
-ninja -j 2 -C out/Release media/ffmpeg
22
+ninja -C out/Release media/ffmpeg
23
 
24
 %install
25
 install -Dm0644 out/Release/libffmpeg.so %{buildroot}%{_libdir}/%{name}/libffmpeg.so
26
chromium-fix-gn-bootstrap.patch Added
15
 
1
@@ -0,0 +1,13 @@
2
+Index: chromium-57.0.2970.0/tools/gn/err.cc
3
+===================================================================
4
+--- chromium-57.0.2970.0.orig/tools/gn/err.cc
5
++++ chromium-57.0.2970.0/tools/gn/err.cc
6
+@@ -158,8 +158,6 @@ void Err::AppendSubErr(const Err& err) {
7
+ }
8
+ 
9
+ void Err::InternalPrintToStdout(bool is_sub_err) const {
10
+-  DCHECK(has_error_);
11
+-
12
+   if (!is_sub_err)
13
+     OutputString("ERROR ", DECORATION_RED);
14
+ 
15