packages: chromium-browser/chromium-browser.spec - add system_vpx bcond

[glen]

Author: glen                         Date: Mon Nov 14 13:09:47 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add system_vpx bcond

---- Files affected:
packages/chromium-browser:
   chromium-browser.spec (1.151 -> 1.152) 

---- Diffs:

================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.151 packages/chromium-browser/chromium-browser.spec:1.152
--- packages/chromium-browser/chromium-browser.spec:1.151	Mon Nov 14 14:09:07 2011
+++ packages/chromium-browser/chromium-browser.spec	Mon Nov 14 14:09:42 2011
@@ -13,12 +13,13 @@
 %bcond_with		selinux			# with SELinux (need policy first)
 %bcond_with		shared_libs		# with shared libs
 %bcond_with		sse2			# use SSE2 instructions
-%bcond_without	system_speex	# with system speex
 %bcond_with		system_sqlite	# with system sqlite
+%bcond_without	system_flac		# with system flac
+%bcond_without	system_speex	# with system speex
 %bcond_without	system_v8		# with system v8
+%bcond_without	system_vpx		# with system vpx
 %bcond_without	system_yasm		# with system yasm
 %bcond_without	system_zlib		# with system zlib
-%bcond_without	system_flac		# with system flac
 %bcond_with		verbose			# verbose build (V=1)
 
 # TODO
@@ -26,9 +27,9 @@
 # - find system deps: find -name '*.gyp*' | xargs grep 'use_system.*=='
 # - use_system_libwebp
 # - use_system_ssl (use_openssl: http://crbug.com/62803)
-# - use_system_ffmpeg
+# - use_system_ffmpeg && build_ffmpegsumo
 # - use_system_hunspell
-# - use_system_vpx
+# - use_system_stlport
 # - other defaults: src/build/common.gypi
 
 # build broken on x86-64 due 32bit exe:
@@ -100,7 +101,7 @@
 BuildRequires:	libpng-devel
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	libstdc++-devel
-BuildRequires:	libvpx-devel >= 0.9.5-2
+%{?with_system_vpx:BuildRequires:	libvpx-devel >= 0.9.5-2}
 BuildRequires:	libxml2-devel
 BuildRequires:	libxslt-devel
 BuildRequires:	lzma
@@ -130,7 +131,7 @@
 %{?with_system_zlib:BuildRequires:	zlib-devel}
 Requires:	browser-plugins >= 2.0
 Requires:	desktop-file-utils
-Requires:	libvpx >= 0.9.5-2
+%{?with_system_vpx:Requires:	libvpx >= 0.9.5-2}
 Requires:	xdg-utils >= 1.0.2-4
 Provides:	wwwbrowser
 Obsoletes:	chromium-browser-bookmark_manager < 5.0.388.0
@@ -282,6 +283,7 @@
 	%{gyp_with system_speex} \
 	%{gyp_with system_sqlite} \
 	%{gyp_with system_v8} \
+	%{gyp_with system_vpx} \
 	%{gyp_with system_yasm} \
 	%{gyp_with system_zlib} \
 	-Duse_system_bzip2=1 \
@@ -291,7 +293,6 @@
 	-Duse_system_libpng=1 \
 	-Duse_system_libxml=1 \
 	-Duse_system_libxslt=1 \
-	-Duse_system_vpx=1 \
 	-Duse_system_xdg_utils=1 \
 
 %{__make} chrome %{?with_sandboxing:chrome_sandbox} \
@@ -381,6 +382,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.152  2011/11/14 13:09:42  glen
+- add system_vpx bcond
+
 Revision 1.151  2011/11/14 13:09:07  glen
 - with kerberos builds now, so enabled
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.151&r2=1.152&f=u