Dev channel bump. Make it possible to compile against system libav (bug #464676 by Nikos Chantziaras). Fix build with system ffmpeg (bug #466866 by jlec). Remove old.

(Portage version: 2.1.11.55/cvs/Linux i686, signed Manifest commit with key 30427902)

4 files changed, 106 insertions, 10 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 6b96dfe46869..81bdcc6c0bea 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.878 2013/05/09 00:42:41 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.879 2013/05/09 20:59:28 phajdan.jr Exp $
+
+*chromium-28.0.1500.5 (09 May 2013)
+
+  09 May 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-system-ffmpeg-r5.patch, -chromium-28.0.1496.0.ebuild,
+  +chromium-28.0.1500.5.ebuild, chromium-9999-r1.ebuild:
+  Dev channel bump. Make it possible to compile against system libav (bug
+  #464676 by Nikos Chantziaras). Fix build with system ffmpeg (bug #466866 by
+  jlec). Remove old.
 
   09 May 2013; Mike Gilbert <floppym@gentoo.org>
   -files/chromium-icu50-tests-r0.patch, -files/chromium-mesa-r0.patch,
diff --git a/www-client/chromium/chromium-28.0.1496.0.ebuild b/www-client/chromium/chromium-28.0.1500.5.ebuild
index f11d09f58fbe..5457d2e49d94 100644
--- a/www-client/chromium/chromium-28.0.1496.0.ebuild
+++ b/www-client/chromium/chromium-28.0.1500.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-28.0.1496.0.ebuild,v 1.1 2013/05/03 16:54:01 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-28.0.1500.5.ebuild,v 1.1 2013/05/09 20:59:28 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -27,6 +27,7 @@ QA_FLAGS_IGNORED=".*\.nexe"
 
 RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	app-arch/bzip2:=
+	app-arch/snappy:=
 	system-sqlite? ( dev-db/sqlite:3 )
 	cups? (
 		dev-libs/libgcrypt:=
@@ -59,7 +60,10 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	media-libs/opus:=
 	media-libs/speex:=
 	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( >=media-video/ffmpeg-1.0:=[opus] )
+	system-ffmpeg? ( || (
+		>=media-video/ffmpeg-1.0:=[opus]
+		>=media-video/libav-9.5:=[opus]
+	) )
 	sys-apps/dbus:=
 	sys-apps/pciutils:=
 	sys-libs/zlib:=[minizip]
@@ -127,10 +131,13 @@ src_prepare() {
 	fi
 
 	epatch "${FILESDIR}/${PN}-gpsd-r0.patch"
-	epatch "${FILESDIR}/${PN}-system-ffmpeg-r4.patch"
+	epatch "${FILESDIR}/${PN}-system-ffmpeg-r5.patch"
 
-	# Fix build with system libraries, to be upstreamed.
-	epatch "${FILESDIR}/${PN}-shim-headers-r0.patch"
+	# Fix build with system libraries. To be upstreamed.
+	epatch "${FILESDIR}/${PN}-system-icu-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-libvpx-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-v8-r1.patch"
+	epatch "${FILESDIR}/${PN}-system-zlib-r0.patch"
 
 	epatch_user
 
@@ -168,7 +175,6 @@ src_prepare() {
 		\! -path 'third_party/sfntly/*' \
 		\! -path 'third_party/skia/*' \
 		\! -path 'third_party/smhasher/*' \
-		\! -path 'third_party/snappy/*' \
 		\! -path 'third_party/sqlite/*' \
 		\! -path 'third_party/tcmalloc/*' \
 		\! -path 'third_party/tlslite/*' \
@@ -179,6 +185,7 @@ src_prepare() {
 		\! -path 'third_party/webrtc/*' \
 		\! -path 'third_party/widevine/*' \
 		\! -path 'third_party/x86inc/*' \
+		\! -path 'third_party/zlib/google/*' \
 		-delete || die
 
 	# Remove bundled v8.
@@ -228,11 +235,13 @@ src_configure() {
 		-Duse_system_libvpx=1
 		-Duse_system_libwebp=1
 		-Duse_system_libxml=1
+		-Duse_system_libxslt=1
 		-Duse_system_minizip=1
 		-Duse_system_nspr=1
 		-Duse_system_opus=1
 		-Duse_system_protobuf=1
 		-Duse_system_re2=1
+		-Duse_system_snappy=1
 		-Duse_system_speex=1
 		-Duse_system_v8=1
 		-Duse_system_xdg_utils=1
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 145df740e028..9a4cd1a7ed63 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.193 2013/05/08 19:17:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.194 2013/05/09 20:59:28 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -59,7 +59,10 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	media-libs/opus:=
 	media-libs/speex:=
 	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( >=media-video/ffmpeg-1.0:=[opus] )
+	system-ffmpeg? ( || (
+		>=media-video/ffmpeg-1.0:=[opus]
+		>=media-video/libav-9.5:=[opus]
+	) )
 	sys-apps/dbus:=
 	sys-apps/pciutils:=
 	sys-libs/zlib:=[minizip]
@@ -184,7 +187,7 @@ src_prepare() {
 		touch out/Release/obj/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
 	fi
 
-	epatch "${FILESDIR}/${PN}-system-ffmpeg-r4.patch"
+	epatch "${FILESDIR}/${PN}-system-ffmpeg-r5.patch"
 
 	epatch_user
 
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r5.patch b/www-client/chromium/files/chromium-system-ffmpeg-r5.patch
new file mode 100644
index 000000000000..be625ad67e9a
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-ffmpeg-r5.patch
@@ -0,0 +1,75 @@
+diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h
+index 17241b9..8a92312 100644
+--- a/media/filters/ffmpeg_glue.h
++++ b/media/filters/ffmpeg_glue.h
+@@ -28,9 +28,9 @@
+ #include "base/basictypes.h"
+ #include "base/memory/scoped_ptr.h"
+ #include "media/base/media_export.h"
++#include "media/ffmpeg/ffmpeg_common.h"
+ 
+ struct AVFormatContext;
+-struct AVIOContext;
+ 
+ namespace media {
+ 
+diff --git a/media/media.gyp b/media/media.gyp
+index df217d2..fde3830 100644
+--- a/media/media.gyp
++++ b/media/media.gyp
+@@ -363,6 +363,9 @@
+           'dependencies': [
+             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+           ],
++          'export_dependent_settings': [
++            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++          ],
+         }, {  # media_use_ffmpeg == 0
+           # Exclude the sources that depend on ffmpeg.
+           'sources!': [
+--- a/media/ffmpeg/ffmpeg_common.cc.orig	2013-01-17 00:07:51.635057013 +0000
++++ b/media/ffmpeg/ffmpeg_common.cc	2013-01-17 00:15:50.867406811 +0000
+@@ -10,6 +10,8 @@
+ #include "media/base/video_frame.h"
+ #include "media/base/video_util.h"
+ 
++#undef SampleFormat
++
+ namespace media {
+ 
+ // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are
+--- a/media/media.gyp.orig	2013-05-09 18:02:50.958682676 +0000
++++ b/media/media.gyp	2013-05-09 18:03:45.009023680 +0000
+@@ -530,6 +530,12 @@
+             '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
+                 '--code "#define __STDC_CONSTANT_MACROS\n'
+                 '#include <libavcodec/avcodec.h>\n'
++                'int test() { return AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL; }" '
++                '--on-failure -DCHROMIUM_OMIT_AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL=1)',
++
++            '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
++                '--code "#define __STDC_CONSTANT_MACROS\n'
++                '#include <libavcodec/avcodec.h>\n'
+                 'int test() { struct AVFrame frame;\n'
+                 'return av_frame_get_channels(&frame); }" '
+                 '--on-failure -DCHROMIUM_NO_AVFRAME_CHANNELS=1)',
+--- a/media/filters/ffmpeg_demuxer.cc.orig	2013-05-09 18:04:25.089276403 +0000
++++ b/media/filters/ffmpeg_demuxer.cc	2013-05-09 18:05:16.289599070 +0000
+@@ -111,12 +111,15 @@
+   // Get side data if any. For now, the only type of side_data is VP8 Alpha. We
+   // keep this generic so that other side_data types in the future can be
+   // handled the same way as well.
+-  av_packet_split_side_data(packet.get());
+   int side_data_size = 0;
+-  uint8* side_data = av_packet_get_side_data(
++  uint8* side_data = NULL;
++#ifndef CHROMIUM_OMIT_AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL
++  av_packet_split_side_data(packet.get());
++  side_data = av_packet_get_side_data(
+       packet.get(),
+       AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
+       &side_data_size);
++#endif
+ 
+   // If a packet is returned by FFmpeg's av_parser_parse2() the packet will
+   // reference inner memory of FFmpeg.  As such we should transfer the packet