summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-01-13 19:23:37 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-01-13 19:23:37 +0000
commit94d64ad5406a5c303b2fd338467d93241b5a7b8d (patch)
tree1ce5e9c2bd7d0d0718c12840d4ec4c7dbe89da84 /media-video/ffmpeg
parentversion bump, thanks Pavel (diff)
downloadhistorical-94d64ad5406a5c303b2fd338467d93241b5a7b8d.tar.gz
historical-94d64ad5406a5c303b2fd338467d93241b5a7b8d.tar.bz2
historical-94d64ad5406a5c303b2fd338467d93241b5a7b8d.zip
Improve documentation installation and add an examples useflag
Package-Manager: portage-2.2.0_alpha151/cvs/Linux x86_64 Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ChangeLog7
-rw-r--r--media-video/ffmpeg/Manifest10
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild22
3 files changed, 23 insertions, 16 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 807af8b98824..4ee8a06a0dbb 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/ffmpeg
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.591 2012/12/19 00:39:42 aballier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.592 2013/01/13 19:23:29 aballier Exp $
+
+ 13 Jan 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
+ Improve documentation installation and add an examples useflag
19 Dec 2012; Alexis Ballier <aballier@gentoo.org> -ffmpeg-0.10.2.ebuild,
-ffmpeg-0.10.4.ebuild, -ffmpeg-0.10.5.ebuild, -ffmpeg-0.11.1.ebuild,
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 19fd05a14c74..b83aa71c4cbf 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -9,13 +9,13 @@ DIST ffmpeg-1.0.1.tar.bz2 6446587 SHA256 758840dcfc94eb7fd6263718d26408658a59422
EBUILD ffmpeg-0.10.3.ebuild 8635 SHA256 7a93b57018947a7c57d3829c092aac4ee8e3b554c1116fd2fc41f4b4582bc7c3 SHA512 0a64ec7ef72af03d3997bc48191a4b8cf34ecc79d8cc4648a46e0ea303c38ba0bfe5877937328e7eec32950a6371288c7d4613eb14914bbe0f26f961cbda2d25 WHIRLPOOL 1e65a3790fa9c111c2266d5a2c5f6333ed3b37518dbd2a96d0ac7f6d969feb793430c7a79ee79de485d4c2e3d1b6da103936f22125ec87b061f319ab7bed4fc0
EBUILD ffmpeg-0.10.6.ebuild 8683 SHA256 1e050fd8dcc1b56bc6b9fa7eaeeff0a859ec7345958974c38304202c473db4f9 SHA512 ca505e9600edec8b829556997836f44fa2689c722966ec25921dc7175e45e9e5fdbde885272c492f2cdbf1f80ec4419f1dd6704f27efc41810ce415d6f400763 WHIRLPOOL 9b1a35247a6744ecf8c44eba0948bf7658bb6e1cd288193b9d878e9954e64aab75d0e24e97a04c916030382228d81b40376c8a5e85259cc41af89e8461eb3365
EBUILD ffmpeg-1.0.1.ebuild 9137 SHA256 b75c28b00740862528278f2479af7261e66847f59aa9d099565a15f2c1a167e0 SHA512 c8964a3073d72d3b585254d74079afe940a9cf07e32909fd529cd1c983391e34322d1da58d63413e289e1025f7582845ec3e536d124bd7dd5ac1889c467d1889 WHIRLPOOL a201eb71c8e4ad9981325b4e9fca2a890ecce064f4be379c08026b144bf3044e205861eb3245ed9dfd18bb68781f398ebf9a26489f069b234bf3e49624391c93
-EBUILD ffmpeg-9999.ebuild 9153 SHA256 78c2d1ba2f6704d1a27f779c72279f8bed48bce482fd91e5e7ee1e6e147a31fe SHA512 fdb9e27f133da9006b8435923e56edb274e985c7555688fb9b16891285fa586c9d9f6fcdb648933d3e936b7f95fec495ea3001b8ae8c2be39e823989808cfc69 WHIRLPOOL 03348da08b3e9cc8669dee00390d3ed7187c4affd2ffc6e267be033a9b0a6c9cf7c938d344d220b444cb231bde27904a75c647f24f2ab8f61157c54395be5303
-MISC ChangeLog 83650 SHA256 9f99db4183b4b9465115a390f9ff73036061a08dd7645367539384bb1f9055d7 SHA512 38656ca1c1e89912f7d617b8f2317d150384611d581323f298aa19da5526a27259f615e820093b1f5738aed8f1b36eeae105b5f2ca81838b18b83155e60e09df WHIRLPOOL 57b2f708e07b55d5be59af35a023869e2e57d54da0ca32146d6783fca9ecb868210d430f117ca6a9a0cdba3fd78009266d516e296bbbea8c5a5fd2eb4e1193c6
+EBUILD ffmpeg-9999.ebuild 9313 SHA256 165f0c58e531d6c578bbd52a3cb6354f83f49eba5c3d8ceed2b68769a12349d4 SHA512 8a64bb4d2401d2a9bbcb6e679a9de576ec9ca9e4989abce0fb7bcb9e00b95e674c32f57dfad907c27e6f9a7f081fcc389cc4798d0975e294c4ecd05e120ef219 WHIRLPOOL 213670b37d339a72b793825f584a7d5dd13cfe1eb7780f3c16645f4bd1c64f1fca495f53522d00292e440531624af87350d8fa243deeda4a2b28219cead4a032
+MISC ChangeLog 83788 SHA256 12bc1a2550aab88fcda322659db75aa4161a387c728976e220b93be7cdaa1d23 SHA512 8f08e0b0abbf5a07cb41685ae737f582c45b2383888b61a134a3f424332866f1aa261e6f42838e11d09df7ea8393190a49ef7aa65214f2d4a46d166481ca5e0c WHIRLPOOL 02a4274d12824baaea13e09d3bdbf0c428989a886613f44d76491aae3c24ca92c596af83105c089fd8449bc92cb969b2226e824952ad252ac88119c990dba078
MISC metadata.xml 3545 SHA256 71ea800494ce0b5c59dd2407f322e16d9416bf089ac3f9a45f2e70626a51de77 SHA512 e6f525b1b1a9ce95b9695b7b8ab42cb72f7cbf24633b061fe52e8a8b7570ba44f721ede5e1017b236ba26bbb21e7d9f6db6ed3f7b078a239dd15a828ba917e96 WHIRLPOOL e95c57c55d99cf57ac8e25bd4bee4e9fd4e6d2a027e2c29f1dc9b86195bf2c102fb32605415baf5201d315493966c30ea7f5b7a55f538629dc74d810080991fc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlDRDNAACgkQvFcC4BYPU0oi1gCfTMTAsWNCTZCvBWF6oKlnEuGq
-gOUAoKQn9RhFtLZTU3zJ4xI40HBEVeti
-=DQqJ
+iEYEAREIAAYFAlDzCbMACgkQvFcC4BYPU0of8ACfZg0Lr1jZ9NZC4KcRsJ1Dz6sh
+/UwAoLHWxauYquYA/pkkMxOI3UB37KEV
+=n0x8
-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 0b371a2d177e..8aefda4deb71 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.109 2012/12/08 12:06:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.110 2013/01/13 19:23:29 aballier Exp $
EAPI="4"
@@ -30,11 +30,11 @@ if [ "${PV#9999}" = "${PV}" ] ; then
fi
IUSE="
aac aacplus alsa amr avresample bindist bluray +bzip2 cdio celt
- cpudetection debug doc +encode faac fdk flite fontconfig frei0r gnutls
- gsm +hardcoded-tables iec61883 ieee1394 jack jpeg2k libass libcaca libv4l
- modplug mp3 network openal openssl opus oss pic pulseaudio rtmp schroedinger
- sdl speex static-libs test theora threads truetype twolame v4l vaapi vdpau
- vorbis vpx X x264 xvid +zlib
+ cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
+ gnutls gsm +hardcoded-tables iec61883 ieee1394 jack jpeg2k libass libcaca
+ libv4l modplug mp3 network openal openssl opus oss pic pulseaudio rtmp
+ schroedinger sdl speex static-libs test theora threads truetype twolame v4l
+ vaapi vdpau vorbis vpx X x264 xvid +zlib
"
# String for CPU features in the useflag[:configure_option] form
@@ -282,8 +282,12 @@ src_compile() {
src_install() {
emake V=1 DESTDIR="${D}" install install-man
- dodoc Changelog README INSTALL
- dodoc -r doc/*
+ dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES
+ use doc && dohtml -r doc/*
+ if use examples ; then
+ insinto "/usr/share/doc/${PF}/examples"
+ doins -r doc/examples/*
+ fi
for i in ${FFTOOLS} ; do
if use fftools_$i ; then