diff options
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/electricsheep/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild | 9 | ||||
| -rw-r--r-- | x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg1.patch | 37 |
3 files changed, 49 insertions, 6 deletions
diff --git a/x11-misc/electricsheep/ChangeLog b/x11-misc/electricsheep/ChangeLog index 3828ebe003d9..032e856e3b58 100644 --- a/x11-misc/electricsheep/ChangeLog +++ b/x11-misc/electricsheep/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-misc/electricsheep -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.53 2012/09/05 08:13:55 jlec Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.54 2013/03/03 12:29:45 aballier Exp $ + + 03 Mar 2013; Alexis Ballier <aballier@gentoo.org> + electricsheep-2.7_beta11.ebuild, + +files/electricsheep-2.7_beta11-ffmpeg1.patch: + fix build with ffmpeg-1, bug #458912 05 Sep 2012; Justin Lecher <jlec@gentoo.org> electricsheep-2.7_beta11.ebuild: Use domenu instead insinto + doins to install .desktop files diff --git a/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild b/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild index ec2b2b28669a..08a507cb4d54 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-2012 Gentoo Foundation +# Copyright 1999-2013 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.9 2012/09/05 08:13:55 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild,v 1.10 2013/03/03 12:29:45 aballier Exp $ EAPI=2 inherit eutils flag-o-matic autotools @@ -16,7 +16,7 @@ KEYWORDS="amd64 x86" DEPEND="dev-libs/expat >=gnome-base/libglade-2.5.0:2.0 - virtual/ffmpeg + >=virtual/ffmpeg-0.10 sys-libs/zlib >=x11-libs/gtk+-2.7.0:2 x11-libs/libX11" @@ -36,7 +36,8 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-xdg-utils.patch \ "${FILESDIR}"/${PN}-gnome.patch \ "${FILESDIR}"/${P}-asneeded.patch \ - "${FILESDIR}"/${PN}-ffmpeg.patch + "${FILESDIR}"/${PN}-ffmpeg.patch \ + "${FILESDIR}"/${P}-ffmpeg1.patch eautoreconf } diff --git a/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg1.patch b/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg1.patch new file mode 100644 index 000000000000..aa5fd179ebfe --- /dev/null +++ b/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg1.patch @@ -0,0 +1,37 @@ +Index: electricsheep-2.7_beta11/electricsheep.c +=================================================================== +--- electricsheep-2.7_beta11.orig/electricsheep.c ++++ electricsheep-2.7_beta11/electricsheep.c +@@ -652,7 +652,7 @@ void copy_out_file(char *fname) { + return; + } + +- if (0 > av_open_input_file(&ictx, fname, NULL, 0, NULL)) { ++ if (0 > avformat_open_input(&ictx, fname, NULL, NULL)) { + perror(fname); + exit(1); + } +@@ -699,8 +699,6 @@ void copy_out_file(char *fname) { + output_ctx->oformat = ofmt; + + st = av_new_stream(output_ctx, output_ctx->nb_streams); +- st->stream_copy = 1; +- av_set_parameters(output_ctx, NULL); + + icodec = ictx->streams[input_stream_index]->codec; + codec = output_ctx->streams[0]->codec; +@@ -718,12 +716,12 @@ void copy_out_file(char *fname) { + codec->height = icodec->height; + codec->has_b_frames = icodec->has_b_frames; + +- if (url_fopen(&output_ctx->pb, pipe, URL_WRONLY) < 0) { ++ if (avio_open(&output_ctx->pb, pipe, AVIO_FLAG_WRITE) < 0) { + fprintf(logout, "Could not open '%s'\n", pipe); + exit(1); + } + +- av_write_header(output_ctx); ++ avformat_write_header(output_ctx, NULL); + } + + while (1) { |