fix build with latest ffmpeg, bug #394213

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

4 files changed, 56 insertions, 11 deletions

diff --git a/x11-misc/electricsheep/ChangeLog b/x11-misc/electricsheep/ChangeLog
index 1831f8efcde2..c8d61e06533f 100644
--- a/x11-misc/electricsheep/ChangeLog
+++ b/x11-misc/electricsheep/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/electricsheep
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.50 2011/07/20 15:07:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.51 2011/12/15 12:16:01 aballier Exp $
+
+  15 Dec 2011; Alexis Ballier <aballier@gentoo.org>
+  electricsheep-2.7_beta11.ebuild, +files/electricsheep-ffmpeg.patch:
+  fix build with latest ffmpeg, bug #394213
 
   20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #34534
diff --git a/x11-misc/electricsheep/Manifest b/x11-misc/electricsheep/Manifest
index 71af99c0e8b3..13c021597077 100644
--- a/x11-misc/electricsheep/Manifest
+++ b/x11-misc/electricsheep/Manifest
@@ -1,19 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX electricsheep-2.7_beta11-asneeded.patch 683 RMD160 42c744b8615182c0eba4cc75863a7b0737ece11f SHA1 2bccf1d1ff83527505bd5d6d2cac9c3eab2ec4ef SHA256 0583db7984c3a80200eeee4fcb14bb68909ffcaae4a19424878470d9f582303c
+AUX electricsheep-ffmpeg.patch 1292 RMD160 ea47a3b1ba41e7e5b35180f3e40df31f0f463386 SHA1 2113fe04eede4c31785017e8bab7057caf17efee SHA256 6d1c4ea7fa16fcdf74b6410eb56e1473a5c28bb9ff989100292fff8b0d2d7db1
 AUX electricsheep-gnome.patch 970 RMD160 ab0203cea690f90e342ce24055d5f55a73cd2b71 SHA1 9854b43ba17a53e3fbfc369747401215ad9c596e SHA256 259a82dee3437ae24489811a1ddd430c573e82c859a89f4c4808e9e9aadb79a4
 AUX electricsheep-xdg-utils.patch 556 RMD160 e2903425d868861f1e015373b975b15225e06140 SHA1 bae398d8b1082699db066de851d2b688cd3c58f8 SHA256 bc44dc82dcbe9f444a034bace50952940fa98091dbf0baa9457644db3a9228f9
 DIST electricsheep-2.7_beta11.tar.bz2 224892 RMD160 dce0cec9cbc1fb25d00461855bacdd6079967bdd SHA1 c9ba55b62dfc7ddad679758a1cd3464b0de749ea SHA256 093ffdf65d24d0eb6c66e398c092bcf48d72e23151c0d572b2c327344f1261a1
-EBUILD electricsheep-2.7_beta11.ebuild 1779 RMD160 1dd971e4d10859c225de4c03de826d4fe761cc49 SHA1 ce033222b703eeaa76d49fcbfed8f6794eba54b1 SHA256 1cf751abd0aabe5bf826a83dca0ddcade69b8de3a0601e9de6b5f1b089e8bd73
-MISC ChangeLog 8691 RMD160 d897ffdc0b4f9ba6670fe757b74232c4043a3c7e SHA1 22647255608cc8992a12199bbb060451924675a2 SHA256 25e7eef03404e90406b8b5f68e905f96b3ac7f2094684292db9d59f81d5cc4b6
+EBUILD electricsheep-2.7_beta11.ebuild 1815 RMD160 e953be161e80871d4ee4fb727ff8499b6bee6bb8 SHA1 daccc1853e7248193118189d919bc7b2e20f06e6 SHA256 6d2a42acea6c540f2680bb9a3765c143b0f3ebf816c09339aac3a88664494b99
+MISC ChangeLog 8861 RMD160 c63e65a76d9d6925450140e505d8a8ac233ab914 SHA1 a2c427fa5251986246c94ac13e0b158c39eed3e4 SHA256 eef7d79ef86c83eb2b5476b40a7d35cb199045baa862eadb3298bf6a81645c58
 MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59ulQACgkQfXuS5UK5QB28JQP/f58QbbR86AQvvoNZAdBVgQio
-CSXBaP99SnCwVPNRcMFppqIzhiy7CD1yms5eSYYwb3MBos6thG+qg1Q65ttzhdQ/
-LzNMGKGrmObvLx1kcdeDREBwF38cFjrOx+/cBWPR5BMJND/VVkZtQJdwjBUQPbky
-SLQfyd0F1uTRITH5tkg=
-=rrP3
+iEYEARECAAYFAk7p5QYACgkQvFcC4BYPU0p0LACgnXLAcLs1WekYJ6ooeviny/ie
+9N8AoJX1j3oS5URlyz4M5Iz1GfYmUYVN
+=/N/x
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild b/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild
index 0df859f70fd4..a5d646402c0e 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-2011 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.6 2011/04/03 18:55:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild,v 1.7 2011/12/15 12:16:01 aballier Exp $
 
 EAPI=2
 inherit eutils flag-o-matic autotools
@@ -35,7 +35,8 @@ DEPEND="${DEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-xdg-utils.patch \
 		"${FILESDIR}"/${PN}-gnome.patch \
-		"${FILESDIR}"/${P}-asneeded.patch
+		"${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${PN}-ffmpeg.patch
 	eautoreconf
 }
 
diff --git a/x11-misc/electricsheep/files/electricsheep-ffmpeg.patch b/x11-misc/electricsheep/files/electricsheep-ffmpeg.patch
new file mode 100644
index 000000000000..d40c171cb221
--- /dev/null
+++ b/x11-misc/electricsheep/files/electricsheep-ffmpeg.patch
@@ -0,0 +1,41 @@
+Index: electricsheep-2.7_beta11/electricsheep.c
+===================================================================
+--- electricsheep-2.7_beta11.orig/electricsheep.c
++++ electricsheep-2.7_beta11/electricsheep.c
+@@ -61,6 +61,9 @@
+ #define STATFS statfs
+ #endif
+ 
++#ifndef guess_format
++#define guess_format av_guess_format
++#endif
+ 
+ prefs_t prefs;
+ 
+@@ -662,7 +665,7 @@ void copy_out_file(char *fname) {
+     input_stream_index = -1;
+     for (j = 0; j < ictx->nb_streams; j++) {
+ 	AVCodecContext *enc = ictx->streams[j]->codec;
+-	if (CODEC_TYPE_VIDEO == enc->codec_type) {
++	if (AVMEDIA_TYPE_VIDEO == enc->codec_type) {
+ 	    input_stream_index = j;
+ 	    break;
+ 	}
+@@ -686,7 +689,7 @@ void copy_out_file(char *fname) {
+ 	    }
+ 	}
+ 
+-	output_ctx = av_alloc_format_context();
++	output_ctx = avformat_alloc_context();
+ 
+ 	ofmt = guess_format(NULL, fname, NULL);
+ 	if (!ofmt) {
+@@ -730,7 +733,7 @@ void copy_out_file(char *fname) {
+ 	av_init_packet(&opkt);
+ 	if (av_parser_change(ictx->streams[input_stream_index]->parser, output_ctx->streams[0]->codec,
+ 			     &opkt.data, &opkt.size, ipkt.data, ipkt.size,
+-			     ipkt.flags & PKT_FLAG_KEY))
++			     ipkt.flags & AV_PKT_FLAG_KEY))
+ 	    opkt.destruct= av_destruct_packet;
+ 		
+ 	if (-1 == av_interleaved_write_frame(output_ctx, &opkt)) {