[packages/chromium-browser/DEVEL] fix vpx bcond. now builds with system libvpx

[glen]

commit 4b411ffecb444fbfffcc9de34caaf4ceac4147dd
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Jan 3 01:57:43 2013 +0200

    fix vpx bcond. now builds with system libvpx

 chromium-browser.spec | 10 +++++-----
 clean-source.sh       | 11 +++--------
 2 files changed, 8 insertions(+), 13 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 8db9dba..863954e 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -25,7 +25,7 @@
 %bcond_with		system_sqlite	# system sqlite
 %bcond_without	system_srtp		# system srtp (can be used if using bundled libjingle)
 %bcond_with		system_v8		# system v8
-%bcond_without	system_vpx		# system vpx
+%bcond_without	system_libvpx	# system libvpx
 %bcond_without	system_yasm		# system yasm
 # system zlib disabled because of mixed-source.patch
 # https://code.google.com/p/chromium/issues/detail?id=143623
@@ -74,7 +74,7 @@
 Summary:	A WebKit powered web browser
 Name:		chromium-browser
 Version:	24.0.1312.45
-Release:	0.6
+Release:	0.8
 License:	BSD, LGPL v2+ (ffmpeg)
 Group:		X11/Applications/Networking
 Source0:	http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{version}.tar.xz
@@ -141,7 +141,7 @@ BuildRequires:	libpng-devel
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	libstdc++-devel
 %{?with_system_libusb:BuildRequires:	libusb-devel >= 1.0}
-%{?with_system_vpx:BuildRequires:	libvpx-devel >= 0.9.5-2}
+%{?with_system_libvpx:BuildRequires:	libvpx-devel >= 0.9.5-2}
 %{?with_system_libwebp:BuildRequires:	libwebp-devel >= 0.1.99}
 BuildRequires:	libxml2-devel
 BuildRequires:	libxslt-devel
@@ -182,7 +182,7 @@ Requires:	desktop-file-utils
 %{?with_system_flac:Requires:	flac >= 1.2.1-7}
 Requires:	hicolor-icon-theme
 %{?with_libjpegturbo:Requires:	libjpeg-turbo >= 1.2.0}
-%{?with_system_vpx:Requires:	libvpx >= 0.9.5-2}
+%{?with_system_libvpx:Requires:	libvpx >= 0.9.5-2}
 Requires:	xdg-utils >= 1.0.2-4
 Provides:	wwwbrowser
 Obsoletes:	chromium-browser-bookmark_manager < 5.0.388.0
@@ -386,13 +386,13 @@ test -e Makefile || %{__python} build/gyp_chromium \
 	%{gyp_with system_libexif} \
 	%{gyp_with system_libmtp} \
 	%{gyp_with system_libusb} \
+	%{gyp_with system_libvpx} \
 	%{gyp_with system_libwebp} \
 	%{gyp_with system_minizip} \
 	%{gyp_with system_opus} \
 	%{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 \
diff --git a/clean-source.sh b/clean-source.sh
index 5b1ec43..0348875 100755
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -466,7 +466,7 @@ strip_system_dirs \
 	third_party/libpng \
 	third_party/libsrtp \
 	third_party/libusb \
-	_third_party/libvpx \
+	third_party/libvpx \
 	third_party/libwebp \
 	third_party/libxml \
 	third_party/libxslt \
@@ -476,13 +476,8 @@ strip_system_dirs \
 	v8 \
 | tee -a REMOVED-stripped.txt
 
-# vpx can't be cleaned:
-#make: *** No rule to make target `out/Release/obj.target/libvpx_asm_offsets/third_party/libvpx/source/libvpx/vp8/common/asm_com_offsets.o',
-#needed by `out/Release/obj.target/third_party/libvpx/libvpx_asm_offsets.a'.  Stop.
-
-# third_party/yasm/source/patched-yasm/modules/arch/x86/gen_x86_insn.py', needed by `out/Release/obj/gen/third_party/yasm/x86insns.c'. Stop.
-#gyp_clean \
-#	_third_party/yasm \
+gyp_clean \
+	third_party/yasm \
 
 # clean third party
 # list based from archlinux PKGBUILD
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/1c00315ba1b9a7e3807f16be63b5ef119effb362