diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2004-01-04 18:21:34 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2004-01-04 18:21:34 +0000 |
| commit | 7653e7b04082de9fc5251cc82da5da13a568e08a (patch) | |
| tree | 4febffd78ab5048d6dca881a227e049d84f70f0c /media-video/ffmpeg | |
| parent | changing to bz2 (Manifest recommit) (diff) | |
| download | gentoo-2-7653e7b04082de9fc5251cc82da5da13a568e08a.tar.gz gentoo-2-7653e7b04082de9fc5251cc82da5da13a568e08a.tar.bz2 gentoo-2-7653e7b04082de9fc5251cc82da5da13a568e08a.zip | |
Added a patch for 2.6 linux headers; closes bug #37081.
Diffstat (limited to 'media-video/ffmpeg')
| -rw-r--r-- | media-video/ffmpeg/Manifest | 9 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.4.7.ebuild | 7 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.4.8.ebuild | 4 | ||||
| -rw-r--r-- | media-video/ffmpeg/files/ffmpeg-0.4.7-2.6.patch | 17 |
4 files changed, 29 insertions, 8 deletions
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 0d34a0d9ead2..99ce7dc12568 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -1,7 +1,8 @@ -MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158 -MD5 28ca7cbff511a22bf10e9aeb34b4de9d ffmpeg-0.4.7.ebuild 2190 MD5 498385541026a1e9921cbe5058436729 ChangeLog 4110 -MD5 034fafc31e4ef015eeec936f7dba8d5b ffmpeg-0.4.8.ebuild 2417 -MD5 6f1d9c82b5e8c3b7c46b80bc3c1bb443 files/alpha-idct.patch 777 +MD5 e3702312059ff24a3bf994561162138a ffmpeg-0.4.7.ebuild 2229 +MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158 +MD5 614c48235f87cfa2921c5694880421a3 ffmpeg-0.4.8.ebuild 2417 MD5 7eca667f050b6c515830ff9be05bacc6 files/digest-ffmpeg-0.4.7 65 +MD5 6f1d9c82b5e8c3b7c46b80bc3c1bb443 files/alpha-idct.patch 777 +MD5 77014ea836fa26b88ebae7c85c912059 files/ffmpeg-0.4.7-2.6.patch 491 MD5 0a76b7a4442aea90d56ac85508b2eff5 files/digest-ffmpeg-0.4.8 65 diff --git a/media-video/ffmpeg/ffmpeg-0.4.7.ebuild b/media-video/ffmpeg/ffmpeg-0.4.7.ebuild index d819f14971d6..023cd6410890 100644 --- a/media-video/ffmpeg/ffmpeg-0.4.7.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.4.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.7.ebuild,v 1.2 2003/10/29 00:35:27 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.7.ebuild,v 1.3 2004/01/04 18:21:23 plasmaroo Exp $ inherit eutils @@ -38,6 +38,9 @@ src_unpack() { # http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/ffmpeg/ffmpeg/libavcodec/alpha/dsputil_alpha.c.diff?r1=1.19&r2=1.20 # so this patch should be removed with the next _pre build #epatch ${FILESDIR}/alpha-idct.patch + + epatch ${FILESDIR}/${P}-2.6.patch + } src_compile() { diff --git a/media-video/ffmpeg/ffmpeg-0.4.8.ebuild b/media-video/ffmpeg/ffmpeg-0.4.8.ebuild index 2f560133c2aa..96f8003fc023 100644 --- a/media-video/ffmpeg/ffmpeg-0.4.8.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.4.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.ebuild,v 1.3 2003/11/30 01:20:53 brad_mssw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.ebuild,v 1.4 2004/01/04 18:21:23 plasmaroo Exp $ inherit eutils diff --git a/media-video/ffmpeg/files/ffmpeg-0.4.7-2.6.patch b/media-video/ffmpeg/files/ffmpeg-0.4.7-2.6.patch new file mode 100644 index 000000000000..d2209b6b4434 --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-0.4.7-2.6.patch @@ -0,0 +1,17 @@ +--- ffmpeg-0.4.7/libavformat/grab.c 2003-08-24 23:29:50.000000000 +0100 ++++ ffmpeg-0.4.7/libavformat/grab.c 2004-01-04 18:04:29.000000000 +0000 +@@ -17,13 +17,13 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #include "avformat.h" +-#include <linux/videodev.h> + #include <unistd.h> + #include <fcntl.h> + #include <sys/ioctl.h> + #include <sys/mman.h> + #include <sys/time.h> + #include <time.h> ++#include <linux/videodev.h> + + typedef struct { + int fd; |