Raymond Wooninck
2013-09-21 12:36:15 +00:00
committed by Git OBS Bridge
parent 4e9a4c8b7e
commit 83533e56f2

View File

@@ -119,17 +119,18 @@ BuildRequires: pkgconfig(xt)
BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(xtst)
%if 0%{?chromium_system_libs} %if 0%{?chromium_system_libs}
BuildRequires: hwdata BuildRequires: hwdata
BuildRequires: libjpeg62-devel
BuildRequires: yasm BuildRequires: yasm
BuildRequires: pkgconfig(bzip2)
BuildRequires: pkgconfig(libevent) BuildRequires: pkgconfig(libevent)
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libmtp) BuildRequires: pkgconfig(libmtp)
BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libwebp)
BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(libxslt)
BuildRequires: pkgconfig(opus) BuildRequires: pkgconfig(opus)
BuildRequires: pkgconfig(protobuf)
BuildRequires: pkgconfig(speex) BuildRequires: pkgconfig(speex)
BuildRequires: pkgcongig(bzip2)
%endif %endif
# For NaCl # For NaCl
@@ -239,6 +240,7 @@ WebDriver is an open source tool for automated testing of webapps across many br
# apply vendor patch after substitution # apply vendor patch after substitution
sed "s:RPM_VERSION:%{version}:" %{SOURCE20} | patch -p0 sed "s:RPM_VERSION:%{version}:" %{SOURCE20} | patch -p0
%if 0%{?chromium_system_libs}
# Remove most bundled libraries. Some are still needed. # Remove most bundled libraries. Some are still needed.
build/linux/unbundle/remove_bundled_libraries.py \ build/linux/unbundle/remove_bundled_libraries.py \
'base/third_party/dmg_fp' \ 'base/third_party/dmg_fp' \
@@ -300,13 +302,13 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/zlib/google' \ 'third_party/zlib/google' \
'url/third_party/mozilla' \ 'url/third_party/mozilla' \
--do-remove --do-remove
%endif
%build %build
PARSED_OPT_FLAGS=`echo \'%{optflags} -D_GNU_SOURCE\' | sed "s/ /',/g" | sed "s/',/', '/g"` PARSED_OPT_FLAGS=`echo \'%{optflags} -D_GNU_SOURCE\' | sed "s/ /',/g" | sed "s/',/', '/g"`
for i in build/common.gypi; do for i in build/common.gypi; do
sed -i "s|'-O<(release_optimize)'|$PARSED_OPT_FLAGS|g" $i sed -i "s|'-O<(release_optimize)'|$PARSED_OPT_FLAGS|g" $i
# sed -i "s|'-Werror'|'-Wno-error'|g" $i
done done
# ' # '