diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2012-11-25 17:24:03 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2012-11-25 17:24:03 +0000 |
| commit | a81d29d0f4ca5112d48b697729a353abbe444915 (patch) | |
| tree | f1c9189ba2ef9dbb5758939ffaf3fb114b78e554 | |
| parent | Switch back code from 0.2.1 and 0.2.2 ebuilds, what a mess did I do... (diff) | |
| download | gentoo-2-a81d29d0f4ca5112d48b697729a353abbe444915.tar.gz gentoo-2-a81d29d0f4ca5112d48b697729a353abbe444915.tar.bz2 gentoo-2-a81d29d0f4ca5112d48b697729a353abbe444915.zip | |
Add libav-9 support
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 1191738E)
| -rw-r--r-- | www-servers/cherokee/ChangeLog | 6 | ||||
| -rw-r--r-- | www-servers/cherokee/cherokee-1.2.101-r2.ebuild | 5 | ||||
| -rw-r--r-- | www-servers/cherokee/files/cherokee-1.2.101-libav-9.patch | 29 |
3 files changed, 37 insertions, 3 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/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); |