fix build with ffmpeg-1, bug #458912

Package-Manager: portage-2.2.0_alpha164/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 56 insertions, 13 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/Manifest b/x11-misc/electricsheep/Manifest
index be3c381e4cde..406d7d04dff2 100644
--- a/x11-misc/electricsheep/Manifest
+++ b/x11-misc/electricsheep/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA256
 
 AUX electricsheep-2.7_beta11-asneeded.patch 683 SHA256 0583db7984c3a80200eeee4fcb14bb68909ffcaae4a19424878470d9f582303c SHA512 9bb4441b9ee5ad633e0849589dc19f99c22762d8373f74236301c34e1cb51ec23db09feed3ede7c5396899caa4457301625c320298f008a9a729265c7d89f7c2 WHIRLPOOL bdaab03893a9c9dcd49ea80c2ce69bc51f7606dd01c64c1361c20e0e3506fa0bdb0f26747f8994cffdf40094821173345aeaec3a7dda9439f4f408e1706c32d0
+AUX electricsheep-2.7_beta11-ffmpeg1.patch 1186 SHA256 37926b248b869edc6df9ac5e24701d5227462d214e2a377e6ac948627563484e SHA512 bb9731dfc24f4e5e3de54bd78feeab21e4f4ef62081fe01bbc470861fb3e0bee7b2d6dbb93c6108333165c9bad9afdd6fcf9a4930690663f837e0c504286e1dc WHIRLPOOL 041cbeb669511159935039b021f331cb77d185b64a9eeea15d7276b287859c667aa51dcfaebf43ee0d87a6261078217a7996af4c03994e8534f7f8c743058f6e
 AUX electricsheep-ffmpeg.patch 1292 SHA256 6d1c4ea7fa16fcdf74b6410eb56e1473a5c28bb9ff989100292fff8b0d2d7db1 SHA512 4f057ee8c8aebfe980629555d5b7451baba80f0b723ca166b38545c2e35bb11a10304d8b280510b74c55cf1c5054aff9f5abaaa8e525b8132e6b210f19a2eba4 WHIRLPOOL d08796d1936fdc49ed1c2ccff13144efec45c4f724d159e99228fc5e0aa22abb5e4ad882cbcfbd2bdd4bd492d6813c1c6822d87a615040a1fe8d3e3c6aba1587
 AUX electricsheep-gnome.patch 970 SHA256 259a82dee3437ae24489811a1ddd430c573e82c859a89f4c4808e9e9aadb79a4 SHA512 6c720ac9676f67ae3500c93e20def1ba87f48a94bbd56bd22f89df128958d143f7ca587ac61893e20f0f94babf8abd84d4416f5b1f915e022537d62a5c178c28 WHIRLPOOL 1b4af66381c7cf9ac6e405b4a57fa9bbbfb3c9e3013283f1b963586a0d7e65fd7477b993f716b35ba3c497cdafbd5ad248ec870af5bdedc7c69e7933d540e3db
 AUX electricsheep-xdg-utils.patch 556 SHA256 bc44dc82dcbe9f444a034bace50952940fa98091dbf0baa9457644db3a9228f9 SHA512 ef62642ee61c42d446bccb1251951e7e6209280894b0bd1f28e6a0e856f39bf0a03a6c31c014b61911b5798211675023d74c378ccf58251522869e33e0540f3a WHIRLPOOL 977f16427eeb07aa2f533053afb8aa7ff478279f3cef5ae822540f3ebc5bd0f2fa680c61ce5d34bd39f4e38f539eacb3e28f650761b1ddd5c8f631422110d8e9
-DIST electricsheep-2.7_beta11.tar.bz2 224892 SHA256 093ffdf65d24d0eb6c66e398c092bcf48d72e23151c0d572b2c327344f1261a1
-EBUILD electricsheep-2.7_beta11.ebuild 1720 SHA256 df4254a3bab2e7fd7000d7d9ce725bf09b878d966bf39d61b408d73fa98070ae SHA512 403b74b64a1291fd574fff7d3f3f230b02a921279cd56ceb6c7d04cf1ce21a7ed90743e8fd9dbf9db2d0813ae4dec16b076fbf13f0310d1af290f0b5c770dd42 WHIRLPOOL 4ca4b81b43a87c43fa693477b52da001386a29d5e90c5b3593c1093859c782887094aacb668ba6a1ddf429c0ea54b0b83fd5386f2884f1671f0ff38dccb88381
-MISC ChangeLog 9128 SHA256 c7e334e39626167bbeecce0b69afb64634372870df00e0dcc97b97fbda9052e2 SHA512 bb0f561c519358f90883b1f10ca2b4840633fc903506586af80f174662b661a3d54371dbc71a2ed7caa7bfc63265174110aaf48b0b206bc721e0ab0dfcb7301c WHIRLPOOL cd6aaea06d3fcb82cf0eb4fa8a606f2918a1ffb3cf0ac24ddca5a1d3e90a73470fc1c6f8ab8fadc3ef2ae101f5ffda35cac484f37da032adc0122aea003fa6bb
+DIST electricsheep-2.7_beta11.tar.bz2 224892 SHA256 093ffdf65d24d0eb6c66e398c092bcf48d72e23151c0d572b2c327344f1261a1 SHA512 13ff9b1a5aded75d07d5cb1a6a11e6c6417e98e218ce928c2f3e67879dc5947dba4acdc5b2c058d6994b245e4d666bd2bb8a6adc98876ba1134c962abfa29354 WHIRLPOOL 14a33b2d06e2fe19c2e1356cd20b61c3e26a246518d9912b92533b528b2b0086addf6e80ee226abaf30a3abc31930fd20f96f7970c975c80598370b9386cd86e
+EBUILD electricsheep-2.7_beta11.ebuild 1769 SHA256 36d28744b48959e2c63b013382c64d7af4b84300c34425572b4be1961a125234 SHA512 18815cf073629e5a93f673ef49e30ec57061b629c340db5986a433d7622f4c61cc0c7925d5aa69ee9a07210a2a26ad395432de891720abef1b182fcefb119e7c WHIRLPOOL d73aaa64bff1b98f9ff0e2f2b44c54a365c65bbf3ea5e488a7a846d42270f1bd1d91957ac74705b2e53190bf8c77fc01ee95834cd879956f84eea0e7d9e27bc0
+MISC ChangeLog 9308 SHA256 91383ad75231b9cc349c32865ccfac002b17e75eb764cb3c1a7a5fe414524fa9 SHA512 37b04aa554d86a5c0bd24a9f07e0c4ad042dc09a913dc25947545d617f1a6675f4f06a7b767463d1615cbf8c459397876497da1196685ea56b0cb6cf8a9c20cd WHIRLPOOL 7c45be0cd001dbe5c23fa530bd2c8c6c304359df55f37ac8e9642fa89f7f744921d8982c3eccc34a1162fa70c06a1bbac8ee48d733ca7b17fc8ccc34a35d4675
 MISC metadata.xml 214 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5 SHA512 701b8c51f43f8660d40700929c243a2dae9f19dcbc7b8eca877e20eadc1ae2e0c84f7c7d8c3cb576055c1a49a55e9c759ef469eeda67026ce252d341937f6691 WHIRLPOOL 977119e736e0795137df14faae681f7fa07ba8297a19ef4a7d7b93de7efceaed16f7103f179a762be41b8849c33c535b55d16d2fd0ea795df0525592752e0156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlBHCcgACgkQgAnW8HDreRYdaACeIlwhWD6h5mk2xAYE1DZTc8IC
-FRwAn225uF712uRV5FNga8FTYAHJaSNX
-=F0KN
+iEYEAREIAAYFAlEzQjoACgkQvFcC4BYPU0rL5wCfSa8J7hdvoq8PqJUUUN5+nMVG
+dRcAoLRBA7exTIHmokrmvwIlDKSowKgI
+=5Lkd
 -----END PGP SIGNATURE-----
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) {