[packages/cherokee] Fix for ffmpeg 1.0 (from mageia)
wiget
wiget at pld-linux.org
Fri Nov 9 12:14:12 CET 2012
commit 715af975d4dbed6bc3aea584ba7128b36a00bd9d
Author: Artur Frysiak <artur at frysiak.net>
Date: Fri Nov 9 12:13:14 2012 +0100
Fix for ffmpeg 1.0 (from mageia)
cherokee.spec | 6 ++++--
ffmpeg0.11.patch | 11 +++++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/cherokee.spec b/cherokee.spec
index 737a2b2..5f27465 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -14,7 +14,7 @@ Summary: Fast, Flexible and Lightweight Web server
Summary(pl.UTF-8): Cherokee - serwer WWW
Name: cherokee
Version: 1.2.101
-Release: 1
+Release: 2
License: GPL v2
Group: Networking/Daemons
Source0: http://www.cherokee-project.com/download/1.2/%{version}/%{name}-%{version}.tar.gz
@@ -24,11 +24,12 @@ Source2: %{name}.sysconfig
Source3: %{name}.upstart
Patch0: %{name}-config.patch
Patch1: %{name}-panic_path.patch
+Patch2: ffmpeg0.11.patch
URL: http://www.cherokee-project.com/
%{?with_geoip:BuildRequires: GeoIP-devel}
BuildRequires: autoconf
BuildRequires: automake
-%{?with_ffmpeg:BuildRequires: ffmpeg-devel}
+%{?with_ffmpeg:BuildRequires: ffmpeg-devel >= 1.0}
BuildRequires: gettext-devel
BuildRequires: libtool
%{?with_mysql:BuildRequires: mysql-devel}
@@ -135,6 +136,7 @@ Biblioteki serwera WWW Cherokee.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%{__libtoolize}
diff --git a/ffmpeg0.11.patch b/ffmpeg0.11.patch
new file mode 100644
index 0000000..eedbcf6
--- /dev/null
+++ b/ffmpeg0.11.patch
@@ -0,0 +1,11 @@
+--- a/cherokee/handler_streaming.c.ffmpeg 2012-06-04 12:56:16.000000000 +0800
++++ b/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);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cherokee.git/commitdiff/715af975d4dbed6bc3aea584ba7128b36a00bd9d
More information about the pld-cvs-commit
mailing list