summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2013-04-11 22:30:33 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2013-04-11 22:30:33 +0000
commit1dd615e935b3d16ff53d5e86ebb1e2e35e194e1f (patch)
tree4233942bed7ccb675282f888258a179c735ea7b9 /www-client/chromium
parentxf86-video-intel/xf86-video-intel: Bump to 2.21.6 (diff)
downloadhistorical-1dd615e935b3d16ff53d5e86ebb1e2e35e194e1f.tar.gz
historical-1dd615e935b3d16ff53d5e86ebb1e2e35e194e1f.tar.bz2
historical-1dd615e935b3d16ff53d5e86ebb1e2e35e194e1f.zip
Restore system-ffmpeg USE flag, bug #464676 by Nikos Chantziaras .
Package-Manager: portage-2.1.11.55/cvs/Linux i686 Manifest-Sign-Key: 0x30427902
Diffstat (limited to 'www-client/chromium')
-rw-r--r--www-client/chromium/ChangeLog6
-rw-r--r--www-client/chromium/Manifest14
-rw-r--r--www-client/chromium/chromium-27.0.1453.12.ebuild36
-rw-r--r--www-client/chromium/chromium-9999-r1.ebuild36
4 files changed, 49 insertions, 43 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 5d67b4b6b997..7b98fc75eb3a 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
# 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.865 2013/04/11 02:01:23 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.866 2013/04/11 22:30:22 phajdan.jr Exp $
+
+ 11 Apr 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ chromium-27.0.1453.12.ebuild, chromium-9999-r1.ebuild:
+ Restore system-ffmpeg USE flag, bug #464676 by Nikos Chantziaras .
*chromium-26.0.1410.63 (11 Apr 2013)
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 8ea1e5e1190e..4d6198e08174 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -33,16 +33,18 @@ DIST chromium-27.0.1453.3-lite.tar.xz 108216336 SHA256 df163337d5e095a21dcf8f0b4
DIST chromium-27.0.1453.3-testdata.tar.xz 138714444 SHA256 b8bf5355a92167cfe1204325d85c8703e7899b09f8872d6f22945a12fc023d55 SHA512 feaad7ad810e6b0d297018ea36683dd3081052ff837b9f698d334f1ffe04bd6f5cb08be6121ea6b28143655bca407e62bf203ec07b7deaf765810b61483b828f WHIRLPOOL d8cd062dd4fdbab5e5b2551cdfd47d461d9955ca3a0a02a33c76b06ebbaf34a48b3f2220a5e32249c1ba7f3fca83036f89b73792ab9c2e508b9a838d13157e9d
EBUILD chromium-26.0.1410.43.ebuild 16049 SHA256 f49f9ed4a82964f84e51f5ce9832e2cdb492a56db24203b466f0303a6df1cbc7 SHA512 e4dbfa9a35657136a9128c9895d37278d801430ee7f2548e2b95792c5485b76a25a229fe2351e01f35378bad1b13bdcb037da18d2349f10bfd2b249fc2b545e4 WHIRLPOOL 7fc8f4fc871c60d02e1b7dba8ca4344a07c5c661e029217c0c2dae9ef4764588e5aa98ff22946d94eeef9fbb53cbf6fac0363b8b268e6e84df151ee8e8ab94ce
EBUILD chromium-26.0.1410.63.ebuild 16166 SHA256 a01a9e49f044e3dd7194eee0127b267b72581771271bf86f19d8236523069b67 SHA512 415c50c72c5270dc4e80486b4dd328995269e3e48dbb5e74603aed5f2a9cddcf341b52d5fa2a8825c20691146617395c0900c886731f9927683a5dd6763d0a85 WHIRLPOOL 3fa509516c609ea34da827491fa6dfbcd10f7dbdca68fc58331403bf2bc9f80f36db8ec13f6e74a5e7ddc32ee5c795c9a0b31a1760922de08404a95410155dcc
-EBUILD chromium-27.0.1453.12.ebuild 17222 SHA256 25a3ed9d082a598467bdfb2cfbdbec6d372f35717d8eeb56918d35049760d46a SHA512 b234739858f5635070ab6889adddf18d85963fc74ee1150b543da8eab09d137a538d752f39ae7418946bbb19290787fac2d566805f25eec541c0c18ca211843e WHIRLPOOL a070fe3654c982d94813dbd4d8e338fb0905ffb869df953a1f2cb6aa97acce095a1fe5f006d0d18aff932e98d45a7f7f46f999a6ffaee4f8b2e74a101da167cd
+EBUILD chromium-27.0.1453.12.ebuild 17264 SHA256 0306b207f39c4ef85925dad9bc72abb462f84f8990c5c0227ab4f722aab55fad SHA512 c006b1b2e4ed76a086a354b085a1b3309c649725d6da2c8f394dee4762d051fac10968e7867dec430deaab9348a6f5b2190aec0fbef5ae613ddb2deec3ce206c WHIRLPOOL eab8a448c72490c7a010b4ea6611213a766765963211d5d98bb8abda2e145b6b2053c8a4c06307a2c1eb87b689fbdf6145a6554de7ecedd08ca93a01d6dc986d
EBUILD chromium-27.0.1453.3.ebuild 16592 SHA256 35b679df242fb6b83c6d0855c9a2922a7b069e865267f4c5fa51c72b38ef2d2a SHA512 fa12e384f7c2894b1d1ae388d608b28aa41f319373280a71db79fc5779ecf3fdf6ede406fde9ce323b39500111d12101e2f156e18ab1426956320520697302d3 WHIRLPOOL b0840b7939569607200cce68ac26df035021a1d95ae132faa9a4eb955e600f75b6ff30bce31e0e0f9f57874bcee1e8d3567a57c31a048e48ae8177047372d025
-EBUILD chromium-9999-r1.ebuild 18510 SHA256 8d6fcf00e1ebd28b82d0edde6ec2042681147fa10d495838712bb51949e8a44d SHA512 50d4eeba079ca921d23a5c2bd32a93547f6e53a149e065f487d4ad488decc43d5a473f0494b001ca4f416f8f41e3ca64a59c24cfd1b54139eeea4adc8437f1e9 WHIRLPOOL 40a3a2356e805411aba9d9ef74a96767e1f1c92a3d1979309c3735f89606be21654bd95bef8b6523c5a84a2f0cad1fb487efe8cd4440c28d0d5d106910edfbd8
-MISC ChangeLog 65367 SHA256 0321b3b6f5788bde52a23167db36a11b4b205f82a51abf743ab86ad8243428ef SHA512 08aa780a549d659f3cdba9da03c3e40fd76f587e343c465c9cf28f468c6f89fdb0e7da5fa4448c905eedf3f1afab03c179e954c9c7ebc47a4a32dbfd6d478756 WHIRLPOOL 3c36dfbfc9819c23ffe16e5bcf2bf13bbbdc5ee1763e1b138a264bc82c2dd37ce2568842c72368749c42a968b024929b3f91a93d155202ca35208af90038db37
+EBUILD chromium-9999-r1.ebuild 18552 SHA256 359fcd6a25aee2c28d10319e80c082a9b3283186eb7e61533f4659b5f7d8ce51 SHA512 981c62aae1f2582ff38347422d9a47bc695b07dcf98a6fd7ebbdc6ec075e6771a7a8be798e834a1c46d11f529900c6e7755d2e36b54e17cdcbff247b50e579ab WHIRLPOOL 207ba7f804e22b5c6e30d13532e9fb9520b39508bd0c9308697d654a497457cd87a3c0bf13c899293495ec3043fdcc5ab7953cff92e77bba142322d75fb758b9
+MISC ChangeLog 65552 SHA256 5ceaf0e9813f44a93a764f250d413fd53539dc904e4c4c128df4d17f851cb744 SHA512 1ad493f3c0b5d4047fb0fc12f86ef80143ff96c5477bf80736554cfe8ea59c5b639cc7f5edbe5a5dbc20a7bd32c05d1f499189884a2caba7ad7aae93a219e8f7 WHIRLPOOL 5e6f6fb74e0a4cddf242ca0d160cfc71e55ce6b73399f7604f7fb57ea5b6ad7a25b7360ba6294bd20c28c978a8badc8807becfca5e99af32f0bade76bfa93e27
MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
+MISC chromium-9999-r1.ebuild.orig 18510 SHA256 8d6fcf00e1ebd28b82d0edde6ec2042681147fa10d495838712bb51949e8a44d SHA512 50d4eeba079ca921d23a5c2bd32a93547f6e53a149e065f487d4ad488decc43d5a473f0494b001ca4f416f8f41e3ca64a59c24cfd1b54139eeea4adc8437f1e9 WHIRLPOOL 40a3a2356e805411aba9d9ef74a96767e1f1c92a3d1979309c3735f89606be21654bd95bef8b6523c5a84a2f0cad1fb487efe8cd4440c28d0d5d106910edfbd8
+MISC chromium-9999-r1.ebuild.rej 538 SHA256 d33910598e47be58ec781ec6c6fdcbb1ba4af0f1ccc20c29d9a68d792f58e37d SHA512 1351ef3e1de1d1c7c0369e9c21a9af8f7d688bba7b2e24dd115c3a477a9c0070bc35da5dc68575471aad39eecc3bde41ef497994ca16e83b844b9d249d37bb28 WHIRLPOOL 18d6b8257b5fb46db3e79c94e8f79b0a74cc4bd660ce8eca752e771d12df4f26da4770d3e87f6ccdbb7bc72ce02dbfdd5acd179b3a017e3cabbb96f6f1fb29e5
MISC metadata.xml 703 SHA256 ab48e17b94dc6a8e77b4ef786b60e1518ec079a6b79a733586ac4f39c316ea7e SHA512 4e96d1190cc6d3f1bba5dfcae6bd5699cf9710b8c4c75a1ce66974824cb4f86fe0917f81838c9fb254f0be064e07ce9060d4677938a3a819cff7d1b24e33df1f WHIRLPOOL 4705ddaaecaf5dfd1c611ceabb905991495105078afcacf71b6f389cd3a0649ce46f954ce600ab9e6f66f05d55b4727f856e6c469b0995c2457c8c3715eba8b8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iF4EAREIAAYFAlFmGXgACgkQC77qH+pIQ6RnrwD/QyhrFcTBhO6pIQJmft15CVXw
-Vgi4MLmSqxerR6uGoJ4BAJQgBu7+5URICwq3oSl3Q1x+g1HpNXRKDGNfU34KnAtQ
-=TJDs
+iEYEAREIAAYFAlFnOYcACgkQuUQtlDBCeQIligCdHG+siNHvG7LGNmz0HmTEieAM
+m9gAnR6+qP7/LLX2NyDeQHRADNpgmvVV
+=qBu4
-----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-27.0.1453.12.ebuild b/www-client/chromium/chromium-27.0.1453.12.ebuild
index 59dd9fdb399b..2e0ae099a2e4 100644
--- a/www-client/chromium/chromium-27.0.1453.12.ebuild
+++ b/www-client/chromium/chromium-27.0.1453.12.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-27.0.1453.12.ebuild,v 1.4 2013/04/10 23:32:50 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-27.0.1453.12.ebuild,v 1.5 2013/04/11 22:30:22 phajdan.jr Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -20,7 +20,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="cups gnome gnome-keyring gps kerberos pulseaudio selinux system-sqlite tcmalloc"
+IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux +system-ffmpeg system-sqlite tcmalloc"
# Native Client binaries are compiled with different set of flags, bug #452066.
QA_FLAGS_IGNORED=".*\.nexe"
@@ -59,7 +59,7 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
media-libs/opus:=
media-libs/speex:=
pulseaudio? ( media-sound/pulseaudio:= )
- >=media-video/ffmpeg-1.0:=[opus]
+ system-ffmpeg? ( >=media-video/ffmpeg-1.0:=[opus] )
sys-apps/dbus:=
sys-apps/pciutils:=
sys-libs/zlib:=[minizip]
@@ -114,12 +114,12 @@ pkg_setup() {
chromium_suid_sandbox_check_kernel_config
fi
- # if use bindist && ! use system-ffmpeg; then
- # elog "bindist enabled: H.264 video support will be disabled."
- # fi
- # if ! use bindist; then
- # elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
- # fi
+ if use bindist && ! use system-ffmpeg; then
+ elog "bindist enabled: H.264 video support will be disabled."
+ fi
+ if ! use bindist; then
+ elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
+ fi
}
src_prepare() {
@@ -231,7 +231,6 @@ src_configure() {
myconf+="
-Duse_system_bzip2=1
-Duse_system_flac=1
- -Duse_system_ffmpeg=1
-Duse_system_harfbuzz=1
-Duse_system_icu=1
-Duse_system_jsoncpp=1
@@ -250,7 +249,8 @@ src_configure() {
-Duse_system_speex=1
-Duse_system_v8=1
-Duse_system_xdg_utils=1
- -Duse_system_zlib=1"
+ -Duse_system_zlib=1
+ $(gyp_use system-ffmpeg use_system_ffmpeg)"
# TODO: Use system mesa on x86, bug #457130 .
if ! use x86 && ! use arm; then
@@ -316,10 +316,10 @@ src_configure() {
# Always support proprietary codecs.
myconf+=" -Dproprietary_codecs=1"
- # if ! use bindist && ! use system-ffmpeg; then
- # # Enable H.624 support in bundled ffmpeg.
- # myconf+=" -Dffmpeg_branding=Chrome"
- # fi
+ if ! use bindist && ! use system-ffmpeg; then
+ # Enable H.624 support in bundled ffmpeg.
+ myconf+=" -Dffmpeg_branding=Chrome"
+ fi
# 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,
@@ -515,9 +515,9 @@ src_install() {
newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
- # if ! use system-ffmpeg; then
- # doexe out/Release/libffmpegsumo.so || die
- # fi
+ if ! use system-ffmpeg; then
+ doexe out/Release/libffmpegsumo.so || die
+ fi
# Install icons and desktop entry.
local branding size
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 3d2028047c19..7171aacfca12 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.187 2013/04/10 23:32:50 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.188 2013/04/11 22:30:22 phajdan.jr Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -19,7 +19,7 @@ ESVN_REPO_URI="http://src.chromium.org/svn/trunk/src"
LICENSE="BSD"
SLOT="live"
KEYWORDS=""
-IUSE="cups gnome gnome-keyring gps kerberos pulseaudio selinux system-sqlite tcmalloc"
+IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux +system-ffmpeg system-sqlite tcmalloc"
# Native Client binaries are compiled with different set of flags, bug #452066.
QA_FLAGS_IGNORED=".*\.nexe"
@@ -57,7 +57,7 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
media-libs/opus:=
media-libs/speex:=
pulseaudio? ( media-sound/pulseaudio:= )
- >=media-video/ffmpeg-1.0:=[opus]
+ system-ffmpeg? ( >=media-video/ffmpeg-1.0:=[opus] )
sys-apps/dbus:=
sys-apps/pciutils:=
sys-libs/zlib:=[minizip]
@@ -170,12 +170,12 @@ pkg_setup() {
chromium_suid_sandbox_check_kernel_config
fi
- # if use bindist && ! use system-ffmpeg; then
- # elog "bindist enabled: H.264 video support will be disabled."
- # fi
- # if ! use bindist; then
- # elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
- # fi
+ if use bindist && ! use system-ffmpeg; then
+ elog "bindist enabled: H.264 video support will be disabled."
+ fi
+ if ! use bindist; then
+ elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
+ fi
}
src_prepare() {
@@ -278,7 +278,6 @@ src_configure() {
myconf+="
-Duse_system_bzip2=1
-Duse_system_flac=1
- -Duse_system_ffmpeg=1
-Duse_system_harfbuzz=1
-Duse_system_icu=1
-Duse_system_jsoncpp=1
@@ -297,7 +296,8 @@ src_configure() {
-Duse_system_speex=1
-Duse_system_v8=1
-Duse_system_xdg_utils=1
- -Duse_system_zlib=1"
+ -Duse_system_zlib=1
+ $(gyp_use system-ffmpeg use_system_ffmpeg)"
# TODO: Use system mesa on x86, bug #457130 .
if ! use x86 && ! use arm; then
@@ -363,10 +363,10 @@ src_configure() {
# Always support proprietary codecs.
myconf+=" -Dproprietary_codecs=1"
- # if ! use bindist && ! use system-ffmpeg; then
- # # Enable H.624 support in bundled ffmpeg.
- # myconf+=" -Dffmpeg_branding=Chrome"
- # fi
+ if ! use bindist && ! use system-ffmpeg; then
+ # Enable H.624 support in bundled ffmpeg.
+ myconf+=" -Dffmpeg_branding=Chrome"
+ fi
# 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,
@@ -562,9 +562,9 @@ src_install() {
newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
- # if ! use system-ffmpeg; then
- # doexe out/Release/libffmpegsumo.so || die
- # fi
+ if ! use system-ffmpeg; then
+ doexe out/Release/libffmpegsumo.so || die
+ fi
# Install icons and desktop entry.
local branding size