diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2013-04-21 12:56:01 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-04-21 12:56:01 +0000 |
| commit | 790622de0ba6626d063bedaa3e4d989d661411ae (patch) | |
| tree | bda302cee3170079652d3c560b75cb5c8eda1892 /media-video/ffmpeg2theora | |
| parent | Stable for arm, wrt bug #444242 (diff) | |
| download | historical-790622de0ba6626d063bedaa3e4d989d661411ae.tar.gz historical-790622de0ba6626d063bedaa3e4d989d661411ae.tar.bz2 historical-790622de0ba6626d063bedaa3e4d989d661411ae.zip | |
Fix libav support, remove stray requirement
Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Diffstat (limited to 'media-video/ffmpeg2theora')
| -rw-r--r-- | media-video/ffmpeg2theora/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg2theora/Manifest | 14 | ||||
| -rw-r--r-- | media-video/ffmpeg2theora/ffmpeg2theora-0.29.ebuild | 11 |
3 files changed, 14 insertions, 16 deletions
diff --git a/media-video/ffmpeg2theora/ChangeLog b/media-video/ffmpeg2theora/ChangeLog index 777d6e0e0916..77cdaf025f6e 100644 --- a/media-video/ffmpeg2theora/ChangeLog +++ b/media-video/ffmpeg2theora/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/ffmpeg2theora # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.57 2013/04/04 10:00:42 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.58 2013/04/21 12:55:51 lu_zero Exp $ + + 21 Apr 2013; Luca Barbato <lu_zero@gentoo.org> ffmpeg2theora-0.29.ebuild: + Fix libav support, remove stray requirement 04 Apr 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg2theora-0.29.ebuild: Depend on media-video/ffmpeg as it does not work with libav, bug #428106 diff --git a/media-video/ffmpeg2theora/Manifest b/media-video/ffmpeg2theora/Manifest index 9ce4a7220cc4..5a36e002d838 100644 --- a/media-video/ffmpeg2theora/Manifest +++ b/media-video/ffmpeg2theora/Manifest @@ -1,18 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX ffmpeg2theora-0.28-ffmpeg-0.10.patch 414 SHA256 c878e2100cb95acb00c2a726c0a0cd5941c4e5f6f05de6230616996edca74eed SHA512 a9a4aed74a82afaaa9297a1fc874d785d3b49d93c63d815f106e0cc58fbd1f58c436637d0cc2e75d9398a7dcd847c5681ac4f513bd5f2fdda5738c7ed9623225 WHIRLPOOL f87525e6eedd29bbf6a22e44e38d970974135d099820684db00e703acf229830ccfd370ebc0a1c28852ee0a4cae45afa9ea521b4ecb92a895d9f005ddfa65538 DIST ffmpeg2theora-0.28.tar.bz2 95404 SHA256 6893c1444d730a1514275ba76ba487ca207205b916d6cb1285704225ee86fe1e SHA512 14c7f783994995826014b08b4e6978669a0ac038ec1a75db38de8fc1e528d92f6f7e7aaab1f51603a832685761df75382d083f53c1923e7c07a5866763886ad7 WHIRLPOOL 8ddc99235473f103e4bf0f85e83cf3fe6055c8c1c258d65f3629e8f3543921d525e5953797f2eb997171e65686bcfffaa11d0bb5acc087a9469d8c496062ae91 DIST ffmpeg2theora-0.29.tar.bz2 90143 SHA256 214110e2a5afdd8ff8e0be18152e893dbff5dabc1ae1d1124e64d9f93eae946d SHA512 5e5cf1dbc6807a15b3a3e8526955ef341357b6a3106a6449a54b5dc09c652a9df34b5e93c9cbf05e1efad87542364cb8335e173a59a184aa2ff38ec4b536a725 WHIRLPOOL d093a0b0a5d90f6b9a3d959ff662e5e8c9f8ca36d51122f0c293d2189493bdf6daa710fa94be0fdca0d63166c3102dba82da1e533e1876e62f3ed4ec47b65bea EBUILD ffmpeg2theora-0.28-r1.ebuild 1199 SHA256 e05e845d07805d885322260fdece7eaea0e653eea40e3e19ac10c041f94367c2 SHA512 9cdb9dba969deb54f67ffff5bd52b909dccb3da565a64fcf8992bca57df11336dfb3a143d2923a9fb8aab55973841092c3ce53c23ba8eb02a2e73f1fc3f8f6d4 WHIRLPOOL f6f42352c22f2568a8abea40fa12591e1022e65dc41c15ed264e8c95fba50b39c7352402680b1bf205a29a1caa052fd7125f3a0163854035b8a17150c88b5fd6 EBUILD ffmpeg2theora-0.28.ebuild 1207 SHA256 c5be6ca8a29fd0e78ad532ffdffbfd32cd24d0e565039dc9523c9f2545f6c80a SHA512 e8d080edf0c3e90f3d10f327071f98fb2d46420240f0ce33c2633a1cb3f8bfd27fb3e5645efec9fb9aaa99e2faa2ecbdefdcc07ec25eb844186742232f43811e WHIRLPOOL 5b1f66ad7ab4e33c97745bc080e6ae6c0a7d5d02556cc990ca767e3f1d0d6a4ddf45ad732122a52f5dc300ef3d6a76d5d8a160d6d6a15193eeb11a3b69964581 -EBUILD ffmpeg2theora-0.29.ebuild 1138 SHA256 c31c92bf4c9c961241f5288d30fcf55227bd8c2b997e2aa9a39d88eb47522e2c SHA512 1aac37f0b841f36ec9cf76999bab7822bbc1b97dbee5519907ef23b3f8e0ab425168889c4b9f2f254b6dc1cb0b2ac0606e1b81fb1cc4a9b5a8c8a79f39c77323 WHIRLPOOL f1a2b070ab11c3c8af526953a849fe362c5395396ba07debda96ba6073ec23f3721abd26bee750367a8925815f697ca43c51c753d7fe99e460aa5beff74f8cd4 -MISC ChangeLog 8765 SHA256 03d4ab3dc76df6c73c5e28ecf27a59219f9b82cf589aa81b3ef48ba0b9bf0bfa SHA512 e92831c8d2e370ae2b80308fa983fb81937c87ab61b9991b793d5b21fe2c10f18c1eddb779dea3860515d83882a3060d8d134ce0d9a4ce1e39d84a3302b6bfa6 WHIRLPOOL a2de8fa302dc88a7a95e4648ea8f0a7e50face30a1a8c3ca6c5a017299e9f76e0d5a7ad477d3dee861b04488600a6e54e4c1f49cc78d3bb9aa85d85c21fe28c6 +EBUILD ffmpeg2theora-0.29.ebuild 1202 SHA256 ec24b8922d1ed96498fb106315a7918c58dceb5c80f8b702afaf91c8e216b3ff SHA512 7f194be6a1e65417096b52a85b490f6c61c1469a530a68efd6c531ddfdde157463ec20edff87ee516812733f41fe93e357ff8294a1df82bc345d155de2cf50fb WHIRLPOOL 2899094dcd706147ee2d88ecc3ad81d9c5686a97c5e9b0039242dbc85b0061269985d4c310cf16a40cb08ac72419bce28b1380eed7ff31c8450716dbff47c7c8 +MISC ChangeLog 8887 SHA256 9d831aa72a970410d14765ed34e3da7817eca50bdcf5518551906e06d9492a67 SHA512 7dda834c093ce6b9c61aa4512b49744dd7af7b412b3f859a1af67584906c146758af5cb369b31dc64b81a59ccf459740148c6ee089eb8502a7014795dd725876 WHIRLPOOL b2546909c6bca0a2436c651939d8e77d54b9704c5d98d026ba7b624061b5437960f6105e316da065ecb8ff7a0b61551b436db406dfd077bddb57d3dee1e29a26 MISC metadata.xml 319 SHA256 0baf3db1e97a58c0210e91be4f08d6ecd30270f6875c0b63a77deab3aa85e530 SHA512 32c75672f9052ca9341ca231961d98777d7629027da1221c042a23834ccb4bea444bc8571e6157464f53c038064e68a5c0bfcfd0c0f459cac1df67297230e403 WHIRLPOOL 41c55a833e2d927d416c3948b2ee961a116e3d68375ba07b0c459c0dc98c9a8df5dc3fb104fd6670045a52ff744d2fcf3acfc4cb64db1ebb660eddde760c551a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iEYEAREIAAYFAlFdT0sACgkQvFcC4BYPU0pPAgCfdt6+5BoMKdWxoW/KHFjS1ZIe -oLwAoLef6SM5OO6v0IBYOsh/SEZ0SCbe -=XAkg ------END PGP SIGNATURE----- diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.29.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.29.ebuild index 5f1fd7ea3111..7283d2a1c612 100644 --- a/media-video/ffmpeg2theora/ffmpeg2theora-0.29.ebuild +++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.29.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/media-video/ffmpeg2theora/ffmpeg2theora-0.29.ebuild,v 1.2 2013/04/04 10:00:42 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.29.ebuild,v 1.3 2013/04/21 12:55:51 lu_zero Exp $ EAPI=4 inherit eutils scons-utils @@ -14,9 +14,10 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="debug kate" -# || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) RDEPEND=" - >=media-video/ffmpeg-0.10 + || ( media-libs/libpostproc + <media-video/libav-0.8.2-r1 media-video/ffmpeg ) + >=virtual/ffmpeg-0.10 >=media-libs/libvorbis-1.1 >=media-libs/libogg-1.1 >=media-libs/libtheora-1.1[encode] @@ -35,6 +36,10 @@ pkg_setup() { ) } +src_prepare() { + sed -i -e "/swresample/d" SConstruct || die +} + src_compile() { escons } |