summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Dibb <beandog@gentoo.org>2009-11-25 06:06:20 +0000
committerSteve Dibb <beandog@gentoo.org>2009-11-25 06:06:20 +0000
commitcb12ef5424965bd0abaf79c2e65f0e3b5411606e (patch)
tree2d6c8a5a489350e38ff05dec00c1848b3c26cfdb /media-video/ffmpeg
parentStable for HPPA (bug #293895). (diff)
downloadhistorical-cb12ef5424965bd0abaf79c2e65f0e3b5411606e.tar.gz
historical-cb12ef5424965bd0abaf79c2e65f0e3b5411606e.tar.bz2
historical-cb12ef5424965bd0abaf79c2e65f0e3b5411606e.zip
Fix libtheora dep
Package-Manager: portage-2.2_rc42/cvs/Linux x86_64
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ChangeLog6
-rw-r--r--media-video/ffmpeg/Manifest6
-rw-r--r--media-video/ffmpeg/ffmpeg-0.5_p20601.ebuild4
-rw-r--r--media-video/ffmpeg/ffmpeg-9999-r1.ebuild4
4 files changed, 12 insertions, 8 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index caa15212f550..4b9497a20827 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.328 2009/11/24 19:16:50 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.329 2009/11/25 06:06:20 beandog Exp $
+
+ 25 Nov 2009; Steve Dibb <beandog@gentoo.org> ffmpeg-0.5_p20601.ebuild,
+ ffmpeg-9999-r1.ebuild:
+ Fix libtheora dep
24 Nov 2009; Steve Dibb <beandog@gentoo.org> ffmpeg-9999-r1.ebuild:
Update vdpau deps
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 386445296122..a24754a4b086 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -3,7 +3,7 @@ DIST ffmpeg-0.5_p20373.tar.bz2 3087600 RMD160 6a960e0837f419c882c7bd18c91f582df0
DIST ffmpeg-0.5_p20601.tar.bz2 3103450 RMD160 0fb6ebf92673510ab4118422dcbb7f96b0d47e4f SHA1 38211d48ffcab03c83d0cf2043e3c931041a6928 SHA256 3e79c8245ab66d3eda907d5857a9cecda164a9eacfa83e52322760260519ade4
EBUILD ffmpeg-0.5-r1.ebuild 6579 RMD160 5e83ac138a45d2f52b16ee72c1ee6ff3073d2e21 SHA1 1c2517f10be827668807cf051b7c595162534eb0 SHA256 84d0af467747bd359582c4e7e90e61edf6eb6857d87905228fc1411e7ce00630
EBUILD ffmpeg-0.5_p20373.ebuild 7690 RMD160 e6cbfeb34dc0ff0d28341316f396d32572dcacdc SHA1 f5174899af372e0267f1dc258466be77a41fb0c8 SHA256 f8b9d7a6809f1520e5c1f0068dc490baad0671694615f18fb39f33d7c48899da
-EBUILD ffmpeg-0.5_p20601.ebuild 7672 RMD160 6a9884cac6978670b99ac5a39d6ee3c3282f40bc SHA1 094ef90ede781cba482e1ef8be9722f10979d735 SHA256 776cab81e5f23c6d1c914f73b9db76adf36ebbcc089f4d7541c42e9cf0674f30
-EBUILD ffmpeg-9999-r1.ebuild 7651 RMD160 d27c4f0d7acb105b7bd322326b40e35d16ab3f0b SHA1 3179b387b7834c945cb97cf9952fdfc46d445311 SHA256 0ec4cbab715820cee1360d7d693eef35521650b3608aedc0adaa728946b814c2
-MISC ChangeLog 49272 RMD160 4ba2a58d70c0029e18fda5c3f4dc4d452d781f11 SHA1 b9c4eaf677c4a3ce94d0d702c15bd64ee0d859b4 SHA256 72afb74a4afb8adc79f554337bcb0386d4a3bc15e635f01427979d79af4ba065
+EBUILD ffmpeg-0.5_p20601.ebuild 7680 RMD160 16bf816d04b29e38aa393066729a38cbab2eb304 SHA1 b4d21e06560df389d9f95a72db631fa9874ea7d7 SHA256 7dcbe9ada1d7ce2819bf1e56f602c942663b5b976d99330c91b8aae0ced67015
+EBUILD ffmpeg-9999-r1.ebuild 7659 RMD160 d97588f1a5ef6641c1d6ba8c22b082c35ff6bf6f SHA1 267031a7f4476bae98be4d8f13c8f2958d3253a0 SHA256 ef822c82e8dee8e8dd5365b88c00e8bb0e64f77d3939153b1c67dd1f2066e313
+MISC ChangeLog 49391 RMD160 b60e9eef7bc8226f9287e20719f3f1629905a612 SHA1 ade06541d758adb74139dd000eba13ea739ce434 SHA256 d4c09c9fb1b7b509d273bd512e080b74e8da9b70a8ccffc957e5060f0ede27b8
MISC metadata.xml 1876 RMD160 3fed4cfedd4cd693c1053bd4ea90c75260aa2815 SHA1 827e1fc2f346f5c8695d45c4697dbcd4fbc47462 SHA256 a2b6f4fce6ae13c3cdc007124cea38857942efeb7fac9779487d087b6068ca52
diff --git a/media-video/ffmpeg/ffmpeg-0.5_p20601.ebuild b/media-video/ffmpeg/ffmpeg-0.5_p20601.ebuild
index 83979203c305..6680701a570c 100644
--- a/media-video/ffmpeg/ffmpeg-0.5_p20601.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.5_p20601.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20601.ebuild,v 1.1 2009/11/24 17:09:38 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20601.ebuild,v 1.2 2009/11/25 06:06:20 beandog Exp $
EAPI=2
SCM=""
@@ -43,7 +43,7 @@ RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 )
faac? ( media-libs/faac )
mp3? ( media-sound/lame )
vorbis? ( media-libs/libvorbis media-libs/libogg )
- theora? ( media-libs/libtheora[encode] media-libs/libogg )
+ theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
x264? ( >=media-libs/x264-0.0.20091021 )
xvid? ( >=media-libs/xvid-1.1.0 ) )
faad? ( >=media-libs/faad2-2.6.1 )
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index 9b3036aa75d7..e2192cbb42ee 100644
--- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.24 2009/11/24 19:16:50 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.25 2009/11/25 06:06:20 beandog Exp $
EAPI=2
SCM=""
@@ -43,7 +43,7 @@ RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 )
faac? ( media-libs/faac )
mp3? ( media-sound/lame )
vorbis? ( media-libs/libvorbis media-libs/libogg )
- theora? ( media-libs/libtheora[encode] media-libs/libogg )
+ theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
x264? ( >=media-libs/x264-0.0.20091021 )
xvid? ( >=media-libs/xvid-1.1.0 ) )
faad? ( >=media-libs/faad2-2.6.1 )