From 62485f9ec04eaee00b754279d82a66fa62a266bf Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 29 Jun 2013 10:16:39 +0200 Subject: [PATCH] cherokee: make this build again with a newer ffmpeg. --- srcpkgs/cherokee/patches/ffmpeg.patch | 14 ++++++++++++++ srcpkgs/cherokee/template | 6 ++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/cherokee/patches/ffmpeg.patch diff --git a/srcpkgs/cherokee/patches/ffmpeg.patch b/srcpkgs/cherokee/patches/ffmpeg.patch new file mode 100644 index 00000000000..03e8badf1cc --- /dev/null +++ b/srcpkgs/cherokee/patches/ffmpeg.patch @@ -0,0 +1,14 @@ +--- cherokee/handler_streaming.c.ffmpeg 2012-06-04 12:56:16.000000000 +0800 ++++ 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); + + + diff --git a/srcpkgs/cherokee/template b/srcpkgs/cherokee/template index 110162b7b87..f2a0b59b6ab 100644 --- a/srcpkgs/cherokee/template +++ b/srcpkgs/cherokee/template @@ -12,7 +12,7 @@ short_desc="An innovative, feature rich, and yet easy to configure open source W maintainer="davehome " homepage="http://www.cherokee-project.com/" license="GPL-2" -distfiles="http://www.${pkgname}-project.com/download/1.2/${version}/${pkgname}-${version}.tar.gz" +distfiles="http://www.cherokee-project.de/mirrors/cherokee/1.2/${version}/cherokee-${version}.tar.gz" checksum=ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8 long_desc=" Cherokee is an open-source Cross-platform Web server that runs on Linux, BSD @@ -46,18 +46,20 @@ cherokee-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/aclocal + vmove "usr/lib/*.so" } } libcherokee_package() { short_desc+=" - Runtime library" pkg_install() { - vmove "usr/lib/*.so*" + vmove "usr/lib/*.so.*" vmove usr/lib/cherokee } } cherokee_package() { + depends="shadow" conf_files="/etc/${pkgname}/${pkgname}.conf" systemd_services="cherokee.service on" system_accounts="httpd"