Dev channel bump. Fix bug #513048 by mgorny. Remove old.

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

4 files changed, 86 insertions, 10 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index fa8b30fcda2b..2f72dcb5831c 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1111 2014/07/30 01:01:37 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1112 2014/07/30 17:46:54 phajdan.jr Exp $
+
+*chromium-38.0.2107.2 (30 Jul 2014)
+
+  30 Jul 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-37.0.2062.44.ebuild, -chromium-38.0.2096.0.ebuild,
+  +chromium-38.0.2107.2.ebuild, +files/chromium-ffmpeg-r3.patch:
+  Dev channel bump. Fix bug #513048 by mgorny. Remove old.
 
 *chromium-37.0.2062.44 (30 Jul 2014)
 
diff --git a/www-client/chromium/chromium-37.0.2062.44.ebuild b/www-client/chromium/chromium-37.0.2062.44.ebuild
index 4939b87ecc1b..ec00be6d0e00 100644
--- a/www-client/chromium/chromium-37.0.2062.44.ebuild
+++ b/www-client/chromium/chromium-37.0.2062.44.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-37.0.2062.44.ebuild,v 1.1 2014/07/30 01:01:37 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-37.0.2062.44.ebuild,v 1.2 2014/07/30 17:46:54 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -171,6 +171,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${PN}-angle-r0.patch"
 	epatch "${FILESDIR}/${PN}-ffmpeg-r2.patch"
+	epatch "${FILESDIR}/${PN}-ffmpeg-r3.patch"
 
 	epatch_user
 
@@ -358,10 +359,12 @@ src_configure() {
 		-Dpython_ver=${EPYTHON#python}
 		-Dsystem_libdir=$(get_libdir)"
 
+	ffmpeg_branding="Chromium"
 	if ! use bindist; then
 		# Enable H.264 support in bundled ffmpeg.
-		myconf+=" -Dffmpeg_branding=Chrome"
+		ffmpeg_branding="Chrome"
 	fi
+	myconf+=" -Dffmpeg_branding=${ffmpeg_branding}"
 
 	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
 	# Note: these are for Gentoo use ONLY. For your own distribution,
@@ -444,7 +447,8 @@ src_configure() {
 	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
 	einfo "Configuring bundled ffmpeg..."
 	pushd third_party/ffmpeg > /dev/null || die
-	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} -- ${build_ffmpeg_args} || die
+	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+		--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
 	chromium/scripts/copy_config.sh || die
 	chromium/scripts/generate_gyp.py || die
 	popd > /dev/null || die
diff --git a/www-client/chromium/chromium-38.0.2096.0.ebuild b/www-client/chromium/chromium-38.0.2107.2.ebuild
index 5af7bc9a31e8..6750214eb6fa 100644
--- a/www-client/chromium/chromium-38.0.2096.0.ebuild
+++ b/www-client/chromium/chromium-38.0.2107.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-38.0.2096.0.ebuild,v 1.1 2014/07/21 16:22:08 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-38.0.2107.2.ebuild,v 1.1 2014/07/30 17:46:54 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -100,6 +100,7 @@ RDEPEND+="
 	!=www-client/chromium-9999
 	!<www-plugins/chrome-binary-plugins-37
 	x11-misc/xdg-utils
+	virtual/opengl
 	virtual/ttf-fonts
 	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
 
@@ -169,9 +170,7 @@ src_prepare() {
 	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
 	# fi
 
-	epatch "${FILESDIR}/${PN}-libaddressinput-r0.patch"
-	epatch "${FILESDIR}/${PN}-nacl-r0.patch"
-	epatch "${FILESDIR}/${PN}-pnacl-r0.patch"
+	epatch "${FILESDIR}/${PN}-ffmpeg-r3.patch"
 
 	epatch_user
 
@@ -361,10 +360,12 @@ src_configure() {
 		-Dpython_ver=${EPYTHON#python}
 		-Dsystem_libdir=$(get_libdir)"
 
+	ffmpeg_branding="Chromium"
 	if ! use bindist; then
 		# Enable H.264 support in bundled ffmpeg.
-		myconf+=" -Dffmpeg_branding=Chrome"
+		ffmpeg_branding="Chrome"
 	fi
+	myconf+=" -Dffmpeg_branding=${ffmpeg_branding}"
 
 	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
 	# Note: these are for Gentoo use ONLY. For your own distribution,
@@ -447,7 +448,8 @@ src_configure() {
 	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
 	einfo "Configuring bundled ffmpeg..."
 	pushd third_party/ffmpeg > /dev/null || die
-	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} -- ${build_ffmpeg_args} || die
+	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+		--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
 	chromium/scripts/copy_config.sh || die
 	chromium/scripts/generate_gyp.py || die
 	popd > /dev/null || die
diff --git a/www-client/chromium/files/chromium-ffmpeg-r3.patch b/www-client/chromium/files/chromium-ffmpeg-r3.patch
new file mode 100644
index 000000000000..aa2699fde0f6
--- /dev/null
+++ b/www-client/chromium/files/chromium-ffmpeg-r3.patch
@@ -0,0 +1,63 @@
+--- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
++++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
+@@ -7,7 +7,6 @@
+ from __future__ import print_function
+ 
+ import collections
+-import functools
+ import multiprocessing
+ import optparse
+ import os
+@@ -22,6 +21,14 @@ SCRIPTS_DIR = os.path.abspath(os.path.dirname(__file__))
+ FFMPEG_DIR = os.path.abspath(os.path.join(SCRIPTS_DIR, '..', '..'))
+ 
+ 
++BRANDINGS = [
++  'Chrome',
++  'ChromeOS',
++  'Chromium',
++  'ChromiumOS',
++]
++
++
+ USAGE = """Usage: %prog TARGET_OS TARGET_ARCH [options] -- [configure_args]
+ 
+ Valid combinations are linux       [ia32|x64|mipsel|arm|arm-neon]
+@@ -113,8 +120,6 @@ def RewriteFile(path, search, replace):
+ 
+ def BuildFFmpeg(target_os, target_arch, host_os, host_arch, parallel_jobs,
+                 config_only, config, configure_flags):
+-  print('%s configure/build:' % config)
+-
+   config_dir = 'build.%s.%s/%s' % (target_arch, target_os, config)
+   shutil.rmtree(config_dir, ignore_errors=True)
+   os.makedirs(os.path.join(config_dir, 'out'))
+@@ -165,6 +170,9 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_arch, parallel_jobs,
+ 
+ def main(argv):
+   parser = optparse.OptionParser(usage=USAGE)
++  parser.add_option('--branding', action='append', dest='brandings',
++                    choices=BRANDINGS,
++                    help='Branding to build; determines e.g. supported codecs')
+   parser.add_option('--config-only', action='store_true',
+                     help='Skip the build step. Useful when a given platform '
+                     'is not necessary for generate_gyp.py')
+@@ -426,9 +434,15 @@ def main(argv):
+       '--enable-parser=gsm',
+   ])
+ 
+-  do_build_ffmpeg = functools.partial(
+-      BuildFFmpeg, target_os, target_arch, host_os, host_arch, parallel_jobs,
+-      options.config_only)
++  def do_build_ffmpeg(branding, configure_flags):
++    if options.brandings and branding not in options.brandings:
++      print('%s skipped' % branding)
++      return
++
++    print('%s configure/build:' % branding)
++    BuildFFmpeg(target_os, target_arch, host_os, host_arch, parallel_jobs,
++                options.config_only, branding, configure_flags)
++
+   do_build_ffmpeg('Chromium',
+                   configure_flags['Common'] +
+                   configure_flags['Chromium'] +