Add libav-9 support

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x1191738E

4 files changed, 44 insertions, 9 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index d18f8a0124a5..fd27d68e11db 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/cherokee
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.95 2012/08/08 12:28:37 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.96 2012/11/25 17:24:03 lu_zero Exp $
+
+  25 Nov 2012; Luca Barbato <lu_zero@gentoo.org> cherokee-1.2.101-r2.ebuild,
+  +files/cherokee-1.2.101-libav-9.patch:
+  Add libav-9 support
 
 *cherokee-1.2.101-r2 (08 Aug 2012)
 
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index 5c8c94c137f0..959e6b4402c2 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX cherokee-1.2.101-libav-9.patch 941 SHA256 59586d2a449f3803370cc8300a267607714fecfe6d197dcede87b14a22690f6d SHA512 fc3d307f25fd9dfa234706aeff6501f09d04b5c1a687cf309ace53c0dbccc038f46de0f6a17288a9ac8430ea6c21c500ff932c3bb98c39348622a36c1f8ab4de WHIRLPOOL d9c13fcb574a247b1173f6997cd3ee5928533c0ca14bf9fdd265b9e94523e7d535782f9978253e35e85e6f0960dc6584cab59116d258a9b7b039521ead86d37d
 AUX cherokee-1.2.98-linux3.patch 1914 SHA256 cc03fa321bb01cd4a7026685ef2e3fc606fd53da056f629307c6e1904987ad1b SHA512 558926386ad19df5f69fd445d6cf775fb0b8c4a78db4be49e2cd086dc95719f15b5ac97bb37c249ce3c4f27fcea922bbedb8a669f64972c55de7e91014bcd98c WHIRLPOOL 26362654752f75d2c286b89f05455f8884bb36b39d3c1bd384ed96d72022bd92b229f098e6c4cbd02a816216ccaeb9c5dba34944f5848b0dcde951eb10df1180
 AUX cherokee-1.2.99-gentoo.patch 1763 SHA256 66b3e85370082feb20205ed484a858a79656e0adb793fea5be796632fc327201 SHA512 2f2b1aa03cd7656ceb90f9a94d24704b4a411b3ab99e084444d1f60ce0270bad650b597b1edbdcb4fb0dda750215f42c3f5de3e9f6253825f3742dfbe871be4b WHIRLPOOL e8d03dc5c15e22cc94bae1f6082ee0aabb4990239bb6db9da3dda78565379720af5e61f2f60715505538a9c974e24fb84a2738d8ed593777d4621fcfdc2bfe62
 AUX cherokee-confd-1.2.98 144 SHA256 48331d56dfa6743444e0b01ce4df2013b27dd30804c88365257d560cc6adcab0 SHA512 e010ec9e6d6bd6862c486c494e968cf93ff5f7eeaa523f1bc1fb9db72dc878c17fbc04443e74aef0bbfef1e2ba64ba00a7dc8bbd1b58f6759d2e000c76e88f84 WHIRLPOOL 4ee6e81e60a934c190201b920488dbfb2f073b387da46068c616891c16b6ef05c9932487374b3ca051d3b1a1b8809d7245f289c8128547b6297ce1a32ce48800
@@ -8,13 +9,13 @@ AUX cherokee-initd-1.2.99 1185 SHA256 f1cf6e6094948f0ab248a5533c0a19c08c8f6f5bcf
 AUX cherokee.logrotate-r1 377 SHA256 db1b0d69dc323500a37c167e6ff45e2a9cf7109835251d46a606b2a37938fed0 SHA512 325e3fd54c7b44ad858f952d15088622f58d71a7be49de804cfd3f415d9775f56598515dc18211324ad2b5e8fea5c0d94877df68442d36c1d6d86ea1c7f6ce28 WHIRLPOOL c6dacdfb1e7dce0df60e8b4fd039ecd43f14e433728d16fbfd0a16c6d59aefbdd137ca798410d4a185c730ddc6dc1a14ee9764f9d7f91b64481d5faa412c4129
 DIST cherokee-1.2.101.tar.gz 6320209 SHA256 ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8 SHA512 a2c513cadcc0d43def2199d38c5248eb7dae4d100ea019d3d705e46741df6c0a8f9a164668eb3983d6bdfebdb1e28d29dc8e6bf7f6858c600307067e083e1098 WHIRLPOOL 7363d88c224cf25af635f0be99509bff7441b228564c43c30492d628a33f2d30b9c0c3b85e9ff6cd1171644072c0e8b47152aee5eded4c33b56f3cb3530c66c8
 EBUILD cherokee-1.2.101-r1.ebuild 4990 SHA256 7b6fafc56edb5ddab3440f82802068db74084b2c9dfba94bc6c258bfb352baa6 SHA512 1664d3d1e7565c7ec6b357deacbc7d49231a9a2ec4ff100bb4759131e37e1bccacb3e47f6cdaf56fcf540fa69e1896c191f7413cc31df29253fe74d0386991f5 WHIRLPOOL f0680ec81b2e02e88c416071e276f15ae37c20c300c741bce9fb55c4fcd0e58d4fb7e5ac24aa2ea643bbc7d0841a080d40b899b29ebd5647b8f7a3a72d703340
-EBUILD cherokee-1.2.101-r2.ebuild 5105 SHA256 98c1f9e242508ddd59a1fd992dc51baa4868e5b037fcd6d6bbe2274df0752730 SHA512 5c9b3bd2d987c388237f619a17d400509e84b3ead3b18354455a10ff289e33d97f0e34ec594cd7195ec2fc22783eddafd49f562f7d2cbd1ab15296e415590052 WHIRLPOOL 354616dfd9a44245aeaec017c936c0713313ceee026898c161430b35f81c548d2e4b2d29b751922fe4cb57747d9066630e0dd1884648ad3bf926e4272c470ffe
-MISC ChangeLog 21989 SHA256 dd1675ee594a981c151757f78e234156afb2b1b72ce1a0f8d1bc13fb948a6cbe SHA512 c1dec6fcb964905409ce499fdf216632a8401abb048200bbddfc9c8d4abacfeb2ebcd929bb65c97d7e794077f2313b60313118c43ce05e972c1382ac09b64daf WHIRLPOOL 42a38444e44ad559d76c523c87aeae4376e24154e208b8c9c9c9e81eff42488f4231a0a0357047ef0316764483d48fb37a699fb7a84dbbadaab6088d13710fed
+EBUILD cherokee-1.2.101-r2.ebuild 5141 SHA256 6d41d3fe3b9a9bfed30ddd40b28f316a8965a2477245a15bd007d97d86503e30 SHA512 8f48a1b75d4034002c9ebb4724fab5b6271fee0bdf44402c5da05cee003d7a1ec1ced8fa3887794d553c1dfb98639b620fd9cedd72dc449583ca46de30129a27 WHIRLPOOL 05356f1b38e376b98d3c907b370895551bae8c59fdf2fb3d891ef525900935c1d5c27d145b63104550a54781aab83258af4eeb1d140cf5af9210cd8155e2b9fa
+MISC ChangeLog 22129 SHA256 dda126dc725ade44c27039cae665133067840c28abae524d4512869ac0b4a739 SHA512 60e72a29c895e9a9dbfc252c70d577df7321a84697b6f90e8a60b081c9d5a78da7c544484786ad013e4be477be3340eadde459ffec5e7a8b631f0ac596c00e4a WHIRLPOOL 8a9afabd4f95064ff0bd26fa180323663b8ee57bd56a06d89d02e72269b6a2eec679d72d3e5ef024f4928910c1824536dff9033e3498812009c2aa8d698870d9
 MISC metadata.xml 440 SHA256 21e70301f21aa69d90ebede277859fcbdd5194528b4ff186610d0143408a0949 SHA512 74b1ea827c31205fe666c6be1475959857148eec167754f11dcccb5098daf3d64ad950793983d7920ea26fd8ac864c7da606c37ecff9841b714ba7b9ad24516d WHIRLPOOL 370deef54eaeaceec348852489cea16e24d9aa472bbbaf93ac18e6c08d160492e108145bfa8ef59636c85e0c2d3a1bd191a0e371ac2e66615fc3d9c34544d547
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREIAAYFAlAiW3gACgkQl5yvQNBFVTWzbACgjsL3tiunqKZXGVtzT4ddnQd+
-wZ4AnRF7l9zK1MLZu7JQzSosnwnGgpqg
-=ik6+
+iF4EAREIAAYFAlCyVDwACgkQcXOrnRGRc45RbQD/eBQ7P+cTlG8i+Y1GOqHXKagj
+IlB66EKEslBam5wyqcYBAMmV02XnYWRlGqSbaPvZ0LkT+zLPzSsrrq//RbQB0axI
+=jRCt
 -----END PGP SIGNATURE-----
diff --git a/www-servers/cherokee/cherokee-1.2.101-r2.ebuild b/www-servers/cherokee/cherokee-1.2.101-r2.ebuild
index 4b8f71efc3c7..7e639c0a8351 100644
--- a/www-servers/cherokee/cherokee-1.2.101-r2.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.101-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.101-r2.ebuild,v 1.1 2012/08/08 12:28:37 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.101-r2.ebuild,v 1.2 2012/11/25 17:24:03 lu_zero Exp $
 
 EAPI=4
 PYTHON_DEPEND="admin? 2"
@@ -51,7 +51,8 @@ pkg_setup() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}/${PN}-1.2.99-gentoo.patch" \
-		"${FILESDIR}/${PN}-1.2.98-linux3.patch"
+		"${FILESDIR}/${PN}-1.2.98-linux3.patch" \
+		"${FILESDIR}/${P}-libav-9.patch"
 
 	python_convert_shebangs -r 2 .
 }
diff --git a/www-servers/cherokee/files/cherokee-1.2.101-libav-9.patch b/www-servers/cherokee/files/cherokee-1.2.101-libav-9.patch
new file mode 100644
index 000000000000..e7ec110d17c3
--- /dev/null
+++ b/www-servers/cherokee/files/cherokee-1.2.101-libav-9.patch
@@ -0,0 +1,29 @@
+diff -burN cherokee-1.2.101.old//cherokee/handler_streaming.c cherokee-1.2.101/cherokee/handler_streaming.c
+--- cherokee-1.2.101.old//cherokee/handler_streaming.c	2011-10-12 20:07:44.000000000 +0200
++++ cherokee-1.2.101/cherokee/handler_streaming.c	2012-11-25 18:08:05.606331619 +0100
+@@ -312,14 +312,14 @@
+ 
+ 	/* Open the media stream
+ 	 */
+-	re = av_open_input_file (&hdl->avformat, hdl->local_file.buf, NULL, 0, NULL);
++	re = avformat_open_input (&hdl->avformat, hdl->local_file.buf, NULL, NULL);
+ 	if (re != 0) {
+ 		goto error;
+ 	}
+ 
+ 	/* Read the info
+ 	 */
+-	re = av_find_stream_info (hdl->avformat);
++	re = avformat_find_stream_info (hdl->avformat, NULL);
+ 	if (re < 0) {
+ 		goto error;
+ 	}
+@@ -380,7 +380,7 @@
+ 	if (likely (secs > 0)) {
+ 		long tmp;
+ 
+-		tmp = (hdl->avformat->file_size / secs);
++		tmp = (avio_size(hdl->avformat->pb) / secs);
+ 		if (tmp > rate) {
+ 			rate = tmp;
+ 			TRACE(ENTRIES, "New rate: %d bytes/s\n", rate);