From 721a5a8cc914db8bce3423c9230cb1ed287a3aa1 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Mon, 21 Nov 2016 19:31:15 +1000 Subject: [PATCH] Try to build with system ffmpeg --- chromium-browser-stable.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index 751c105..f215d0f 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -9,7 +9,7 @@ %define _src %{_topdir}/SOURCES %define chromium_system_libs 1 -%define ffmpeg 0 +%define ffmpeg 1 %define icu 0 %define libva 0 # disable gtk3 support to avoid @@ -26,7 +26,7 @@ Summary: A fast web browser based on the Blink engine Name: chromium-browser-stable Version: 54.0.2840.100 -Release: 4 +Release: 5 License: BSD, LGPL Group: Networking/WWW Source0: https://commondatastorage.googleapis.com/chromium-browser-official/chromium-%{version}.tar.xz @@ -328,8 +328,10 @@ rm -rf ppapi/native_client/tests/ rm -rf third_party/apache-win32/ rm -rf third_party/binutils/ rm -rf third_party/expat/files/ -#rm -rf third_party/ffmpeg/*/* -#rm -rf third_party/ffmpeg/*.[ch] +%if 0%{?ffmpeg} +rm -rf third_party/ffmpeg/*/* +rm -rf third_party/ffmpeg/*.[ch] +%endif rm -rf third_party/flac/{include,src} #rm -rf third_party/icu/{android,linux,mac,patches,public,source,windows} rm -rf third_party/lcov @@ -390,9 +392,8 @@ sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"%{product_vendor} %{product_ve cmp $FILE $FILE.orig && exit 1 %build -%define system_gn_list flac libxml libxslt snappy yasm libpng zlib jsoncpp opus +%define system_gn_list ffmpeg flac libxml libxslt snappy yasm libpng zlib jsoncpp opus # icu -# ffmpeg # libevent # libvpx # libwebp