Enable H.264 support in bundled ffmpeg; bug 382029 by Sylvain Bertrand. Add bindist...

Package-Manager: portage-2.2.0_alpha57_p7/cvs/Linux x86_64

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index c4bdbaae6edb3177dea274d7b968f9253d2e5c3f..5be393fe3bc10c94d0de927a85116e01fcbbe2df 100644 (file)
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.443 2011/09/15 06:19:48 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.444 2011/09/15 21:33:59 floppym Exp $
+
+  15 Sep 2011; Mike Gilbert <floppym@gentoo.org> chromium-14.0.835.163.ebuild,
+  chromium-15.0.874.12.ebuild, chromium-9999-r1.ebuild:
+  Enable H.264 support in bundled ffmpeg; bug 382029 by Sylvain Bertrand. Add
+  bindist use flag.
 
   15 Sep 2011; Mike Gilbert <floppym@gentoo.org> chromium-9999-r1.ebuild:
   Keep third_party/smhasher, bug 382941 by Julien Sanchez.

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 91db3d4ef40a9157e001e354edd90786f3e962ae..6a7edd8775886578a3b5479f83ebda4b700885c6 100644 (file)
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -30,16 +30,16 @@ DIST chromium-15.0.874.5.tar.bz2 150744444 RMD160 cd23c93ee7c8ee1c37eefe73caf63f
 EBUILD chromium-13.0.782.215.ebuild 13227 RMD160 12c182f7a8075fd11f178e3453554c2ec622531a SHA1 e8b346b5fb66361d46226192bdbdffdc601498f5 SHA256 254756e4d874889efb4d46d712dd821d28fb816b117cf574031fa3ebd3dc66a0
 EBUILD chromium-13.0.782.220.ebuild 13227 RMD160 4a50e648c6d826f76e75d97e8422a771f2f77b68 SHA1 d08d6027fa2f381d9e7b6507831e5a836c708835 SHA256 d4f3703ee8ad6c814fc2648fdc649442875b7c85b6ebf4f1b7c371fd06aa40a5
 EBUILD chromium-14.0.835.162.ebuild 13179 RMD160 953ee6bd24599f27194859050fe65ad34211a347 SHA1 1d1afeee082a5eeac1ecc5104cf5720f0d58742d SHA256 dd2330d7a2befef68637810bdbc1549d04e890a35118416fa801d6a3fab4ed88
-EBUILD chromium-14.0.835.163.ebuild 13193 RMD160 91d78009eddf4f4149420d95350f4d22863fa8ab SHA1 17610e753548bf2f3643ba6ac41a91b0c4366096 SHA256 909154f3199695bd912d6ac5e3ac9cf726c6bfcb210abe96fd8ddcf0c33705ea
-EBUILD chromium-15.0.874.12.ebuild 13564 RMD160 c5625ac4580905770e3108fddb3afc5cabd63245 SHA1 5958207921faf35cdf4f541085d9fc59eb546638 SHA256 6ee2cc26e572b0675791837bef7b19defd540324dbd4df9915152539c79448b0
+EBUILD chromium-14.0.835.163.ebuild 13513 RMD160 cede77da61eb15c2b1b5bd4a6ed923fc7a75dc14 SHA1 14be5c0ed2c85b49c0b7a9a9dfbd5d03bf11fbc6 SHA256 7dfe3ede6cc7abfc7826a5ca888427f082a968d48539f28622997436b66e6708
+EBUILD chromium-15.0.874.12.ebuild 13884 RMD160 b97d6ab78ad3feeb2f9dd6ae13f70fe33f43f3c0 SHA1 fc0f75346af9931e533f009511239e6e12eb7606 SHA256 5d9b16edc4a89b5b277e84466e06e3b47c9ef24025a415a1d04d46a3e21ac810
 EBUILD chromium-15.0.874.5.ebuild 13552 RMD160 15f1a04a5da4805cc4ca9786bb49e28ba3ea7288 SHA1 ea408155a8f0892b41ab20b8370903677adc9b17 SHA256 3d2aeaa23a2ad41836947356379fbd7b81535307dc4ffad7a46f6bb12badaa26
-EBUILD chromium-9999-r1.ebuild 16149 RMD160 a312f63119081040137af223684e7d3454cd769b SHA1 55e7336d4eb492d4abf13ed6d1cc8e3f75de8d20 SHA256 ad2bb21fa5a1be5354c32ab6936a6cc0a68cf2baf91044863290aa7e34bc8800
-MISC ChangeLog 98121 RMD160 d5197061b949e9e4c673ab3a46daa18a69b64da9 SHA1 9b96d5e7dec09bbad7354dd6c15758d4e04c0fec SHA256 fb456af9e80f0947a3c8f383411b20f4f5c6a2f4a91157e3195e910b2d789f23
+EBUILD chromium-9999-r1.ebuild 16469 RMD160 b1aaf4e721b8a9bc567c11a81cae62debe04f46d SHA1 6bb6113f799761a8176849c84740950e8649cdcb SHA256 4904a9f49fd9311e2b3f6c94451a649f734737377dff256b89c550f813d2752c
+MISC ChangeLog 98355 RMD160 75ccceb71d047c068e94f39980d8fb5878c91424 SHA1 2b4709e9efbe842e9e99aed5599afdcd33d70564 SHA256 be7f06db217139d42fe990c5b0bc4ef2cb50cdfa9fb83f6cc62ea4fa3e50516f
 MISC metadata.xml 495 RMD160 91f2c4344cde85374523c8c16f5987ad0320b607 SHA1 5e97c7979fac0de374958532e38fcbca1191963b SHA256 375fb24d5d647728a58b3a7d0d552bf7d8eb5f26eef3c249dcf9a2dcb9e5bb37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5xmQ0ACgkQC77qH+pIQ6RvdAEAtDyWOOasVS8T96FLUQjEhbg7
-0BccOIo7oS4dChewyakBAIfZ0vmR4CZrdrVSq3cTuiMTCbRu1mrgpT6fdxzcGh47
-=sHeu
+iF4EAREIAAYFAk5yb1EACgkQC77qH+pIQ6TmZgD+Ks/FbFtdzFHcFXFfZ1C9kPAC
+RtIAVFWMxpHAtdVYsNwA/19RWwteRsF7R/oNt2ohoQa2VVprMSVzVqVH13KrPUr0
+=mMh/
 -----END PGP SIGNATURE-----

diff --git a/www-client/chromium/chromium-14.0.835.163.ebuild b/www-client/chromium/chromium-14.0.835.163.ebuild
index 2972e952feca50d50d595a48cb2eea5b6bd5879b..1880636344ac33726f7d26c4fc7b934a694b70cd 100644 (file)
--- a/www-client/chromium/chromium-14.0.835.163.ebuild
+++ b/www-client/chromium/chromium-14.0.835.163.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-14.0.835.163.ebuild,v 1.2 2011/09/15 00:27:18 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-14.0.835.163.ebuild,v 1.3 2011/09/15 21:33:59 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ SRC_URI="http://build.chromium.org/official/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cups gnome gnome-keyring kerberos"
+IUSE="bindist cups gnome gnome-keyring kerberos"
 
 # en_US is ommitted on purpose from the list below. It must always be available.
 LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
@@ -113,6 +113,12 @@ pkg_setup() {
        # bug #363907.
        CONFIG_CHECK="~PID_NS ~NET_NS"
        check_extra_config
+
+       if use bindist; then
+               elog "bindist enabled: H.264 video support will be disabled."
+       else
+               elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
+       fi
 }
 
 src_prepare() {
@@ -221,6 +227,11 @@ src_configure() {
        # for Chromium.
        # myconf+=" -Dproprietary_codecs=1"
 
+       if ! use bindist; then
+               # Enable H.624 support in bundled ffmpeg.
+               myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
+       fi
+
        local myarch="$(tc-arch)"
        if [[ $myarch = amd64 ]] ; then
                myconf+=" -Dtarget_arch=x64"

diff --git a/www-client/chromium/chromium-15.0.874.12.ebuild b/www-client/chromium/chromium-15.0.874.12.ebuild
index 3a5091ab40be17171c887e943220676a892e3771..41a1874d79829e962ef9a5b708eebeaf998bf2f7 100644 (file)
--- a/www-client/chromium/chromium-15.0.874.12.ebuild
+++ b/www-client/chromium/chromium-15.0.874.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-15.0.874.12.ebuild,v 1.2 2011/09/15 00:27:18 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-15.0.874.12.ebuild,v 1.3 2011/09/15 21:33:59 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ SRC_URI="http://build.chromium.org/official/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="chromedriver cups gnome gnome-keyring kerberos pulseaudio"
+IUSE="bindist chromedriver cups gnome gnome-keyring kerberos pulseaudio"
 
 # en_US is ommitted on purpose from the list below. It must always be available.
 LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
@@ -113,6 +113,12 @@ pkg_setup() {
        # bug #363907.
        CONFIG_CHECK="~PID_NS ~NET_NS"
        check_extra_config
+
+       if use bindist; then
+               elog "bindist enabled: H.264 video support will be disabled."
+       else
+               elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
+       fi
 }
 
 src_prepare() {
@@ -224,6 +230,11 @@ src_configure() {
        # for Chromium.
        # myconf+=" -Dproprietary_codecs=1"
 
+       if ! use bindist; then
+               # Enable H.624 support in bundled ffmpeg.
+               myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
+       fi
+
        local myarch="$(tc-arch)"
        if [[ $myarch = amd64 ]] ; then
                myconf+=" -Dtarget_arch=x64"

diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 20e2d7d6be60cbacdef76afcff136e1a158dbdb3..eba29060a8f3fb659e2c2ee7b0db546066c60856 100644 (file)
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.52 2011/09/15 06:19:48 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.53 2011/09/15 21:33:59 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ ESVN_REPO_URI="http://src.chromium.org/svn/trunk/src"
 LICENSE="BSD"
 SLOT="live"
 KEYWORDS=""
-IUSE="chromedriver cups gnome gnome-keyring kerberos pulseaudio"
+IUSE="bindist chromedriver cups gnome gnome-keyring kerberos pulseaudio"
 
 # en_US is ommitted on purpose from the list below. It must always be available.
 LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
@@ -165,6 +165,12 @@ pkg_setup() {
        # bug #363907.
        CONFIG_CHECK="~PID_NS ~NET_NS"
        check_extra_config
+
+       if use bindist; then
+               elog "bindist enabled: H.264 video support will be disabled."
+       else
+               elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
+       fi
 }
 
 src_prepare() {
@@ -275,6 +281,11 @@ src_configure() {
        # for Chromium.
        # myconf+=" -Dproprietary_codecs=1"
 
+       if ! use bindist; then
+               # Enable H.624 support in bundled ffmpeg.
+               myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
+       fi
+
        local myarch="$(tc-arch)"
        if [[ $myarch = amd64 ]] ; then
                myconf+=" -Dtarget_arch=x64"