Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--media-video/libav/ChangeLog8
-rw-r--r--media-video/libav/Manifest22
-rw-r--r--media-video/libav/libav-0.7.4.ebuild4
-rw-r--r--media-video/libav/libav-0.7.9999.ebuild4
-rw-r--r--media-video/libav/libav-0.8.1.ebuild4
-rw-r--r--media-video/libav/libav-0.8.9999.ebuild4
-rw-r--r--media-video/libav/libav-0.8.ebuild4
-rw-r--r--media-video/libav/libav-9999.ebuild30
-rw-r--r--media-video/libav/metadata.xml1
9 files changed, 48 insertions, 33 deletions
diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 852fcd2db88c..89e4c50b245d 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-video/libav
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.60 2012/03/16 20:18:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.61 2012/03/20 22:58:59 lu_zero Exp $
+
+ 20 Mar 2012; Luca Barbato <lu_zero@gentoo.org> libav-0.7.4.ebuild,
+ libav-0.7.9999.ebuild, libav-0.8.ebuild, libav-0.8.1.ebuild,
+ libav-0.8.9999.ebuild, libav-9999.ebuild, metadata.xml:
+ Small update, mark proper license and introduce tools useflag in the
+ live ebuild
*libav-0.8.1 (16 Mar 2012)
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index c6dc3342ee80..0cfaf48375eb 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -6,18 +6,18 @@ DIST libav-0.7.4.tar.xz 3613872 RMD160 d6f07bb8889f69fdd282fbeb689bee9e3b7463d5
DIST libav-0.8.1.tar.xz 3806536 RMD160 eb81841dc5845d4ba74006980e9fac4edbb23a19 SHA1 318b1fa68366b6074a70a39c485b61327539da92 SHA256 96325bb5c54c59968cb0f7498e542806836ea4e310eb9099c68dc0b0d72b5e75
DIST libav-0.8.tar.xz 3802608 RMD160 3a37ade904fea59f1e28fe1d51f09d37f4dde50f SHA1 be662d222dd7e53243257165a6aff2274d603072 SHA256 293e8b8037d5c7cc32478f57e4b81f733b9431d538a7d48c4ba91cb8b9c9c930
EBUILD libav-0.6.5.ebuild 7540 RMD160 a44cf312424486cfed22c19db6248c8ca095ffc1 SHA1 5f9d6e9a6aba4a01d460a39139be875ba9c6f824 SHA256 ba25e0441bc9ac01d16b5d038df4e42821417d388b09fe944e9c7ffb04c10aca
-EBUILD libav-0.7.4.ebuild 7945 RMD160 d11d4439bb4338e04d5e8c10583eba824db6270c SHA1 5552936ca2109a3462b07fe477d6672120802855 SHA256 502a23eebb04ad21fb6ce491d6423933d4dde265d6f7964558a718233ee7ba97
-EBUILD libav-0.7.9999.ebuild 7962 RMD160 56987c877505b2140922d66b84f9ab8a16e1dd0d SHA1 faeeb7828ad50832dea9000812496244aa0ca468 SHA256 ab4971d99252dea5fc4fb31b86e8a1281848e4186b49de49029386e1064bf56c
-EBUILD libav-0.8.1.ebuild 8964 RMD160 67c726ace2e7a3078bcbb0c902e4faa61f395e60 SHA1 37fb9fcff9e9619377cc9836cadaeef81e5cbf5b SHA256 84e90ba4fbd5d5fd9f9ad1631f8a3c2fc33e81570008e3e98520698f24328b04
-EBUILD libav-0.8.9999.ebuild 8967 RMD160 8f5804aa3102e7e81608f7a1ca41ccdebf7381cc SHA1 493d9be482c69e9802222936fa54686fdcac172f SHA256 364d13e74a7457b8b193e3c712c9a0612f07b2c27a983b2e83588d4428720423
-EBUILD libav-0.8.ebuild 8962 RMD160 ee9374b13f9af1d807cb22baaf47657817bbe823 SHA1 76d3597a0a4a5af063873ab39d8b22ee150b6c48 SHA256 fad8f0af438d54157e535198e831e5e22deb656656012e8f5b08ad74470ddc3d
-EBUILD libav-9999.ebuild 8937 RMD160 fdeacabf114609466df62425ed306ac36916eb24 SHA1 82a12e1c534004fb359acc6042d0edfdb486ead4 SHA256 1acbe0c458749e0db62c45c04eb68d531e603db340074d92db9a28f0fa3a2db5
-MISC ChangeLog 9347 RMD160 019d94253cf5d09744a94a39153c663ab377ddad SHA1 5a30cf1280c70acf849e1711526bbb0c92247c1d SHA256 4fc359f05f7133ba0f1601d3c873672ab0f550918cf898e161b196292791d4db
-MISC metadata.xml 2901 RMD160 a803fd4d095dede8d2e8d1e1150dd4dbdc593772 SHA1 b963c57764c3464383eb61decdbfad757f553101 SHA256 246c0b2f532a0514d458eb166855abb1809740d037ed76ab41a5f107c83a9b1f
+EBUILD libav-0.7.4.ebuild 7945 RMD160 8ff42e56972bea6b77c7a50c8ac05d885fcf4445 SHA1 8f29577f1466dd6182cf46a0192915d7341180a3 SHA256 f948997260c972aad8a10538c5669c245de8fb4d73a31c91768a39d0b98af788
+EBUILD libav-0.7.9999.ebuild 7962 RMD160 94bb668d56b57a862ffa76b79e84054a765163f9 SHA1 9689197a2c93d716b73d3d2bfee261bcd742efcf SHA256 1657573ab256e4ed3692970d996eb685889c2a335e9141bc5b566c683582fcc5
+EBUILD libav-0.8.1.ebuild 8966 RMD160 1a2d876511a21b93fa39daed2880725e71a43ad6 SHA1 34efeca24176664b57fc555ef559a48b57011ecc SHA256 bdafe52c089d99f297efdba761b64562cc487a22d55cb30c08bf8613c9dbf3e7
+EBUILD libav-0.8.9999.ebuild 8969 RMD160 20f6b2e1ae4f447012c4419455e78716468ad647 SHA1 2c586f05f50ab11072c3f9657a7dd46d9c05eeb7 SHA256 23e26fbd56e189b8d69d955dcce70ff120216c895eb3c6ad6c3e2f959a83a5ad
+EBUILD libav-0.8.ebuild 8964 RMD160 540befa022148e4f9861d42439d3e4571135931f SHA1 1d5abc45f814a73c1b5d09fd76c8f26df2e25457 SHA256 379d844ae2f16266f6bd98c6e13ad108e428065114b5810aa001164f00341a54
+EBUILD libav-9999.ebuild 8983 RMD160 fc025211c16c8fd90d85637a3855a2d23960a1cd SHA1 0bd02e546dc65ccc3acd4ab9f8bc1c0eb10216af SHA256 9cccc6c497c1f791ddc3f5f8117adc0b2c2cf4232020e3fa59474ba079acf0af
+MISC ChangeLog 9623 RMD160 239bcb08d9bacdca2a30f4207647d613c3d641c1 SHA1 02cb6b3200443cc5a38d4431baf607c3efa738e7 SHA256 184c582913369584944aa738cd4f67fe3f09cdc3bd7c553f105d1329f036fada
+MISC metadata.xml 3016 RMD160 fc42812761795898df2b16a5237cb17d25e7eae0 SHA1 e3c253ef2c720e92c35a835fe13ca2be05f2a5b0 SHA256 0c095864751b4928ade42eeb6b1066ddcaa35c86c2e4f7620c76e7c7792c9047
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iF4EAREIAAYFAk9joAcACgkQYpJnKVbCxcxw/AD8DdWPC/lifzDsXk7y6rIe+rB5
-m85sqc94/laX4dvpBKUA/2jbOo1ft769UFh3QF+IXVkTq+N1Qr90v0aSuHqqi4Vf
-=mXxe
+iF4EAREIAAYFAk9pC8AACgkQYpJnKVbCxcx77AD/efTYTb47fwioHlgotwQpAXmA
+z40yxW3p882e34/QIA8A/3KfhFwd+Ok8/FjdzmxpsID26sClPYguvcM3feRae1at
+=31ZB
-----END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-0.7.4.ebuild b/media-video/libav/libav-0.7.4.ebuild
index e114e103e741..b1c33b7793e5 100644
--- a/media-video/libav/libav-0.7.4.ebuild
+++ b/media-video/libav/libav-0.7.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.4.ebuild,v 1.1 2012/01/27 10:06:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.4.ebuild,v 1.2 2012/03/20 22:58:59 lu_zero Exp $
EAPI=4
@@ -22,7 +22,7 @@ else # Official release
SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
fi
-LICENSE="LGPL-2 gpl? ( GPL-3 )"
+LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
SLOT="0"
[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
diff --git a/media-video/libav/libav-0.7.9999.ebuild b/media-video/libav/libav-0.7.9999.ebuild
index f08ed41c6eb6..ffdc554b7303 100644
--- a/media-video/libav/libav-0.7.9999.ebuild
+++ b/media-video/libav/libav-0.7.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.9999.ebuild,v 1.5 2012/02/08 19:43:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.9999.ebuild,v 1.6 2012/03/20 22:58:59 lu_zero Exp $
EAPI=4
@@ -22,7 +22,7 @@ else # Official release
SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
fi
-LICENSE="LGPL-2 gpl? ( GPL-3 )"
+LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
SLOT="0"
[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
diff --git a/media-video/libav/libav-0.8.1.ebuild b/media-video/libav/libav-0.8.1.ebuild
index 6a766bb10db5..0f010371dc30 100644
--- a/media-video/libav/libav-0.8.1.ebuild
+++ b/media-video/libav/libav-0.8.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.1.ebuild,v 1.1 2012/03/16 20:18:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.1.ebuild,v 1.2 2012/03/20 22:58:59 lu_zero Exp $
EAPI=4
@@ -22,7 +22,7 @@ else # Official release
SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
fi
-LICENSE="LGPL-2 gpl? ( GPL-3 )"
+LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
SLOT="0"
[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
diff --git a/media-video/libav/libav-0.8.9999.ebuild b/media-video/libav/libav-0.8.9999.ebuild
index b52eef75db6c..60d4bd2f9ed9 100644
--- a/media-video/libav/libav-0.8.9999.ebuild
+++ b/media-video/libav/libav-0.8.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild,v 1.6 2012/03/16 20:18:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild,v 1.7 2012/03/20 22:58:59 lu_zero Exp $
EAPI=4
@@ -22,7 +22,7 @@ else # Official release
SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
fi
-LICENSE="LGPL-2 gpl? ( GPL-3 )"
+LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
SLOT="0"
[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
diff --git a/media-video/libav/libav-0.8.ebuild b/media-video/libav/libav-0.8.ebuild
index 397768b297f7..099c878817b9 100644
--- a/media-video/libav/libav-0.8.ebuild
+++ b/media-video/libav/libav-0.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.ebuild,v 1.8 2012/03/16 20:18:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.ebuild,v 1.9 2012/03/20 22:58:59 lu_zero Exp $
EAPI=4
@@ -22,7 +22,7 @@ else # Official release
SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
fi
-LICENSE="LGPL-2 gpl? ( GPL-3 )"
+LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
SLOT="0"
[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index da52c3e17d97..bf135c06a239 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.34 2012/03/16 20:18:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.35 2012/03/20 22:58:59 lu_zero Exp $
EAPI=4
@@ -22,7 +22,7 @@ else # Official release
SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
fi
-LICENSE="LGPL-2 gpl? ( GPL-3 )"
+LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
SLOT="0"
[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
@@ -30,9 +30,8 @@ SLOT="0"
IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection
custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm
+hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl
- oss pic pulseaudio +qt-faststart rtmp schroedinger sdl speex ssl +ssse3
- static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid
- +zlib"
+ oss pic pulseaudio rtmp schroedinger sdl speex ssl +ssse3 static-libs
+ test theora threads tools v4l vaapi vdpau vorbis vpx X x264 xvid +zlib"
CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 ssse3 vis neon"
@@ -105,6 +104,8 @@ src_prepare() {
fi
}
+TOOLS="aviocat graph2dot ismindex qt-faststart"
+
src_configure() {
local myconf="${EXTRA_FFMPEG_CONF}"
local uses i
@@ -115,6 +116,8 @@ src_configure() {
--enable-avfilter
"
+ use zlib && TOOLS+=" cws2fws"
+
# enabled by default
uses="debug doc network zlib"
for i in ${uses}; do
@@ -262,21 +265,27 @@ src_configure() {
src_compile() {
emake
- if use qt-faststart; then
+ if use tools; then
tc-export CC
- emake tools/qt-faststart
+ local i
+ for i in ${TOOLS}; do
+ emake tools/${i}
+ done
fi
}
src_install() {
+ local i
emake DESTDIR="${D}" install install-man
dodoc Changelog README INSTALL
dodoc doc/*.txt
use doc && dodoc doc/*.html
- if use qt-faststart; then
- dobin tools/qt-faststart
+ if use tools; then
+ for i in ${TOOLS}; do
+ dobin tools/${i}
+ done
fi
for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do
@@ -288,8 +297,7 @@ pkg_postinst() {
elog "Please note that the programs formerly known as ffplay, ffserver"
elog "and ffprobe are now called avplay, avserver and avprobe."
elog
- elog "ffmpeg had been replaced by the feature incompatible avconv thus"
- elog "the legacy ffmpeg is provided for compatibility with older scripts"
+ elog "ffmpeg had been replaced by the feature incompatible avconv"
}
src_test() {
diff --git a/media-video/libav/metadata.xml b/media-video/libav/metadata.xml
index f555b6968a63..9a9e1188b56b 100644
--- a/media-video/libav/metadata.xml
+++ b/media-video/libav/metadata.xml
@@ -33,6 +33,7 @@
<flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
<flag name="ssl">Enable SSL/TLS support using <pkg>dev-libs/openssl</pkg> or <pkg>dev-libs/gnutls</pkg>.</flag>
<flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips).</flag>
+ <flag name="tools">Build and install small tools like aviocat, cws2fws, graph2dot, ismindex, qt-faststart.</flag>
<flag name="vaapi">Enable VAAPI (Video Acceleration API) for hardware decoding.</flag>
<flag name="vdpau">Enable VDPAU decoders (requires nVidia video cards to offload CPU processing to video card.</flag>
<flag name="vis"> Adds support for SIMD optimizations for UltraSPARC processors.</flag>