diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2015-02-06 15:52:12 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2015-02-06 15:52:12 +0000 |
| commit | 27b3fe7bce002971c95d388ed1c5f6a536a79616 (patch) | |
| tree | e79553c7681939d64149ef9c0622116f13508183 /x11-misc/electricsheep | |
| parent | Drop old (diff) | |
| download | gentoo-2-27b3fe7bce002971c95d388ed1c5f6a536a79616.tar.gz gentoo-2-27b3fe7bce002971c95d388ed1c5f6a536a79616.tar.bz2 gentoo-2-27b3fe7bce002971c95d388ed1c5f6a536a79616.zip | |
fix build with latest ffmpeg versions, bug #539116
Signed-off-by: aballier@gentoo.org
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'x11-misc/electricsheep')
| -rw-r--r-- | x11-misc/electricsheep/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild | 7 | ||||
| -rw-r--r-- | x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg2.patch | 32 |
3 files changed, 43 insertions, 5 deletions
diff --git a/x11-misc/electricsheep/ChangeLog b/x11-misc/electricsheep/ChangeLog index c018d2db95fb..ab25e6227c8a 100644 --- a/x11-misc/electricsheep/ChangeLog +++ b/x11-misc/electricsheep/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-misc/electricsheep -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.55 2014/01/21 02:19:38 creffett Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.56 2015/02/06 15:52:12 aballier Exp $ + + 06 Feb 2015; Alexis Ballier <aballier@gentoo.org> + electricsheep-2.7_beta11.ebuild, + +files/electricsheep-2.7_beta11-ffmpeg2.patch: + fix build with latest ffmpeg versions, bug #539116 21 Jan 2014; Chris Reffett <creffett@gentoo.org> electricsheep-2.7_beta11.ebuild: diff --git a/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild b/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild index 0579a5522ed0..dbbbbd5a7d1c 100644 --- a/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild +++ b/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild,v 1.11 2014/01/21 02:19:38 creffett Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild,v 1.12 2015/02/06 15:52:12 aballier Exp $ EAPI=5 inherit eutils flag-o-matic autotools @@ -37,7 +37,8 @@ src_prepare() { "${FILESDIR}"/${PN}-gnome.patch \ "${FILESDIR}"/${P}-asneeded.patch \ "${FILESDIR}"/${PN}-ffmpeg.patch \ - "${FILESDIR}"/${P}-ffmpeg1.patch + "${FILESDIR}"/${P}-ffmpeg1.patch \ + "${FILESDIR}"/${P}-ffmpeg2.patch eautoreconf } diff --git a/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg2.patch b/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg2.patch new file mode 100644 index 000000000000..d08f3b0c5f00 --- /dev/null +++ b/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg2.patch @@ -0,0 +1,32 @@ +Index: electricsheep-2.7_beta11/electricsheep.c +=================================================================== +--- electricsheep-2.7_beta11.orig/electricsheep.c ++++ electricsheep-2.7_beta11/electricsheep.c +@@ -657,7 +657,7 @@ void copy_out_file(char *fname) { + exit(1); + } + +- if (0 > av_find_stream_info(ictx)) { ++ if (0 > avformat_find_stream_info(ictx, NULL)) { + fprintf(logout, "%s: could not find codec parameters\n", fname); + exit(1); + } +@@ -698,7 +698,8 @@ void copy_out_file(char *fname) { + } + output_ctx->oformat = ofmt; + +- st = av_new_stream(output_ctx, output_ctx->nb_streams); ++ st = avformat_new_stream(output_ctx, NULL); ++ if(st) st->id = output_ctx->nb_streams; + + icodec = ictx->streams[input_stream_index]->codec; + codec = output_ctx->streams[0]->codec; +@@ -741,7 +742,7 @@ void copy_out_file(char *fname) { + av_free_packet(&opkt); + av_free_packet(&ipkt); + } +- av_close_input_file(ictx); ++ avformat_close_input(&ictx); + } + + time_t search_time; |