From: Karol Wojtaszek Date: Wed, 6 Oct 2004 21:21:09 +0000 (+0000) Subject: Making xvidcap to compile with >=media-video/ffmpeg-0.4.9_pre1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=08dc0a32ed3d5748a366a563ef350b034bf6348a;p=gentoo.git Making xvidcap to compile with >=media-video/ffmpeg-0.4.9_pre1 --- diff --git a/x11-misc/xvidcap/ChangeLog b/x11-misc/xvidcap/ChangeLog index 40bed0bb5033..db5284988f53 100644 --- a/x11-misc/xvidcap/ChangeLog +++ b/x11-misc/xvidcap/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-misc/xvidcap # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.8 2004/08/21 12:03:21 s4t4n Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.9 2004/10/06 21:21:09 sekretarz Exp $ + +*xvidcap-1.1.3-r1 (06 Oct 2004) + + 06 Oct 2004; Karol Wojtaszek + +files/xvidcap-1.1.3-use-ffmpeg-0.4.9.patch, +xvidcap-1.1.3-r1.ebuild: + Making xvidcap to compile with >=media-video/ffmpeg-0.4.9_pre1 21 Aug 2004; Michele Noberasco xvidcap-1.1.3.ebuild: General ebuild clean up: remove 'inherit eutils', add '|| die' clause diff --git a/x11-misc/xvidcap/Manifest b/x11-misc/xvidcap/Manifest index adf8fe6f2d2f..ad9d6be0696a 100644 --- a/x11-misc/xvidcap/Manifest +++ b/x11-misc/xvidcap/Manifest @@ -1,4 +1,7 @@ +MD5 79345a87e914df238e644585c0b27f18 xvidcap-1.1.3-r1.ebuild 1084 MD5 f948235abbbbae40d4a3b52488c270c1 xvidcap-1.1.3.ebuild 981 -MD5 e066db5e9f6c5410437ed6888bc4c44f ChangeLog 943 +MD5 c614045fcc32deee29723bb43263daf8 ChangeLog 1173 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166 +MD5 33358554888df8808749a9c3cf28348b files/digest-xvidcap-1.1.3-r1 66 +MD5 588ec359065346a6c3413d4ce9427ec5 files/xvidcap-1.1.3-use-ffmpeg-0.4.9.patch 573 MD5 33358554888df8808749a9c3cf28348b files/digest-xvidcap-1.1.3 66 diff --git a/x11-misc/xvidcap/files/digest-xvidcap-1.1.3-r1 b/x11-misc/xvidcap/files/digest-xvidcap-1.1.3-r1 new file mode 100644 index 000000000000..545730f3eabf --- /dev/null +++ b/x11-misc/xvidcap/files/digest-xvidcap-1.1.3-r1 @@ -0,0 +1 @@ +MD5 ea896ffd35d6fe6d2abf51b38605f5fd xvidcap-1.1.3.tar.gz 1627036 diff --git a/x11-misc/xvidcap/files/xvidcap-1.1.3-use-ffmpeg-0.4.9.patch b/x11-misc/xvidcap/files/xvidcap-1.1.3-use-ffmpeg-0.4.9.patch new file mode 100644 index 000000000000..8bacd6326868 --- /dev/null +++ b/x11-misc/xvidcap/files/xvidcap-1.1.3-use-ffmpeg-0.4.9.patch @@ -0,0 +1,16 @@ +--- src/xtoffmpeg.c 2004/08/27 20:04:38 1.1 ++++ src/xtoffmpeg.c 2004/08/28 00:23:53 +@@ -1117,7 +1117,12 @@ XImageToFFMPEG (FILE *fp, XImage *image, + } + #endif // HAVE_FFMPEG_AUDIO + /* write frame to file */ +- av_write_frame (output_file, out_st->index, outbuf, out_size); ++ AVPacket _pkt, *pkt = &_pkt; ++ av_init_packet (pkt); ++ pkt->stream_index = out_st->index; ++ pkt->data = outbuf; ++ pkt->size = out_size; ++ av_write_frame (output_file, pkt); + #ifdef HAVE_FFMPEG_AUDIO + /* release the mutex */ + if (job->flags & FLG_AUDIO_WANTED) { diff --git a/x11-misc/xvidcap/xvidcap-1.1.3-r1.ebuild b/x11-misc/xvidcap/xvidcap-1.1.3-r1.ebuild new file mode 100644 index 000000000000..7d2e6e100571 --- /dev/null +++ b/x11-misc/xvidcap/xvidcap-1.1.3-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/xvidcap-1.1.3-r1.ebuild,v 1.1 2004/10/06 21:21:09 sekretarz Exp $ + +inherit eutils + +IUSE="gtk" + +DESCRIPTION="Screen capture utility enabling you to create videos of your desktop for illustration or documentation purposes." +HOMEPAGE="http://xvidcap.sourceforge.net/" +SRC_URI="mirror://sourceforge/xvidcap/${P}.tar.gz" + +KEYWORDS="~x86" +LICENSE="GPL-2" +RDEPEND="gtk? ( >=x11-libs/gtk+-2.0.0 ) + >=media-video/ffmpeg-0.4.9_pre1 + media-libs/libpng + media-libs/jpeg + sys-libs/zlib + virtual/x11" + +SLOT="0" + +src_unpack() { + unpack ${A} + cd ${S} + + #fix bug #62741 + epatch ${FILESDIR}/${P}-use-ffmpeg-0.4.9.patch +} + +src_compile() { + use gtk && myconf="${myconf} --with-gtk2" + + econf ${myconf} || die "Configuration failed" + emake || die "Compilation failed" +} + +src_install() { + einstall || die "Installation failed" + + # Fix for #58322 + rm -fr ${D}/usr/share/doc/${PN}_${PV} + dodoc NEWS TODO README AUTHORS INSTALL ChangeLog XVidcap.ad +}