Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting8.git;a=commitdiff;h=38636463938feabb8e0e2940365ef571bc287615
commit 38636463938feabb8e0e2940365ef571bc287615 Author: James Buren <[email protected]> Date: Sun Oct 28 22:59:56 2012 -0500 cherokee-1.2.101-6-x86_64 * rebuild with ffmpeg diff --git a/source/network-extra/cherokee/FrugalBuild b/source/network-extra/cherokee/FrugalBuild index d95aee1..87ca4fd 100644 --- a/source/network-extra/cherokee/FrugalBuild +++ b/source/network-extra/cherokee/FrugalBuild @@ -4,7 +4,7 @@ pkgname=cherokee pkgver=1.2.101 -pkgrel=5 +pkgrel=6 pkgdesc="A flexible, very fast, lightweight HTTP server" url="http://www.cherokee-project.com/"; pkgurl="http://ftp.easynet.be/ftp/cherokee/"; @@ -21,7 +21,8 @@ source=($pkgurl/1.2/$pkgver/cherokee-$pkgver.tar.gz \ generatessl \ index.html \ http://frugalware.org/images/logo-new.png \ - cherokee.service) + cherokee.service \ + ffmpeg.patch) sha1sums=('b27f149c7d7111207ac8c3cd8a4856c05490d136' \ '2596646e2d9420a7898d592d55790fd796bb3440' \ '90db20b5183c6e22e91488fd6d44df47018b1942' \ @@ -29,13 +30,14 @@ sha1sums=('b27f149c7d7111207ac8c3cd8a4856c05490d136' \ '03171e23d5f2f2b2a11a4064230b0ee8823ba996' \ '1b9446b810a71ea50efaa7d24c5919cb954983ef' \ '57b61b4ffabb0542cdce881fdc895011fc89171e' \ - '01368b9c79ee040be34f1aefc074709a7e48cac3') + '01368b9c79ee040be34f1aefc074709a7e48cac3' \ + 'a815a275071f56627946f43d116a841bfeeec22c') subpkgs=("$pkgname-ldap" "$pkgname-ffmpeg" "$pkgname-geoip") subdescs=('Ldap validator for cherokee' \ 'Audio/Video streaming handler for cherokee' \ 'GeoIP rule module for cherokee') -subdepends=('libldap' 'ffmpeg>=0.10' 'geoip') +subdepends=('libldap' 'ffmpeg>=1.0' 'geoip') subrodepends=("$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver") subgroups=('network-extra' 'network-extra' 'network-extra') subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') diff --git a/source/network-extra/cherokee/ffmpeg.patch b/source/network-extra/cherokee/ffmpeg.patch new file mode 100644 index 0000000..7c84b44 --- /dev/null +++ b/source/network-extra/cherokee/ffmpeg.patch @@ -0,0 +1,14 @@ +--- cherokee-1.2.101/cherokee/handler_streaming.c.ffmpeg 2012-06-04 12:56:16.000000000 +0800 ++++ cherokee-1.2.101/cherokee/handler_streaming.c 2012-06-04 12:56:40.000000000 +0800 +@@ -380,7 +380,7 @@ + if (likely (secs > 0)) { + long tmp; + +- tmp = (hdl->avformat->file_size / secs); ++ tmp = (avio_size(hdl->avformat) / secs); + if (tmp > rate) { + rate = tmp; + TRACE(ENTRIES, "New rate: %d bytes/s\n", rate); + + + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
