Dev channel bump. Use system libvpx. Remove old.

(Portage version: 2.2.14/cvs/Linux i686, signed Manifest commit with key 0x4F1A2555EA71991D!)

3 files changed, 22 insertions, 5 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 53d13276a6ad..381c491826d6 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1220 2015/04/08 18:30:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1221 2015/04/09 07:11:22 phajdan.jr Exp $
+
+*chromium-43.0.2357.2 (09 Apr 2015)
+
+  09 Apr 2015; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-43.0.2342.2.ebuild, +chromium-43.0.2357.2.ebuild,
+  +files/chromium-system-libvpx-r0.patch:
+  Dev channel bump. Use system libvpx. Remove old.
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> chromium-41.0.2272.118.ebuild,
   chromium-42.0.2311.50.ebuild, chromium-42.0.2311.60.ebuild,
diff --git a/www-client/chromium/chromium-43.0.2342.2.ebuild b/www-client/chromium/chromium-43.0.2357.2.ebuild
index a2effbd009ce..4618f3604ae6 100644
--- a/www-client/chromium/chromium-43.0.2342.2.ebuild
+++ b/www-client/chromium/chromium-43.0.2357.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-43.0.2342.2.ebuild,v 1.2 2015/04/08 18:30:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-43.0.2357.2.ebuild,v 1.1 2015/04/09 07:11:22 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -59,6 +59,7 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	>=media-libs/libjpeg-turbo-1.2.0-r1:=
 	media-libs/libpng:0=
 	>=media-libs/libwebp-0.4.0:=
+	>=media-libs/libvpx-1.4.0:=
 	media-libs/speex:=
 	pulseaudio? ( media-sound/pulseaudio:= )
 	sys-apps/dbus:=
@@ -194,6 +195,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
 	epatch "${FILESDIR}/${PN}-libsecret-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-libvpx-r0.patch"
 
 	if use widevine; then
 		local WIDEVINE_VERSION="$(< "${ROOT}/usr/$(get_libdir)/chromium-browser/widevine.version")"
@@ -255,8 +257,6 @@ src_prepare() {
 		'third_party/libsrtp' \
 		'third_party/libudev' \
 		'third_party/libusb' \
-		'third_party/libvpx' \
-		'third_party/libvpx/source/libvpx/third_party/x86inc' \
 		'third_party/libxml/chromium' \
 		'third_party/libXNVCtrl' \
 		'third_party/libyuv' \
@@ -332,7 +332,6 @@ src_configure() {
 	# Use system-provided libraries.
 	# TODO: use_system_hunspell (upstream changes needed).
 	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libvpx (http://crbug.com/347823).
 	# TODO: use_system_libusb (http://crbug.com/266149).
 	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
 	# TODO: use_system_protobuf (bug #525560).
@@ -348,6 +347,7 @@ src_configure() {
 		-Duse_system_libjpeg=1
 		-Duse_system_libpng=1
 		-Duse_system_libwebp=1
+		-Duse_system_libvpx=1
 		-Duse_system_libxml=1
 		-Duse_system_libxslt=1
 		-Duse_system_minizip=1
diff --git a/www-client/chromium/files/chromium-system-libvpx-r0.patch b/www-client/chromium/files/chromium-system-libvpx-r0.patch
new file mode 100644
index 000000000000..d9a3425508e2
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-libvpx-r0.patch
@@ -0,0 +1,10 @@
+--- build/linux/unbundle/libvpx.gyp.orig	2015-04-08 09:25:29.605925761 +0000
++++ build/linux/unbundle/libvpx.gyp	2015-04-08 09:27:19.932142216 +0000
+@@ -24,6 +24,7 @@
+           'vpx/vpx_integer.h',
+           'vpx/vp8dx.h',
+           'vpx/vpx_encoder.h',
++          'vpx/vpx_frame_buffer.h',
+         ],
+       },
+       'includes': [