Author: glen Date: Tue Aug 24 12:45:41 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- do not make avcodec_find_decoder failure fatal; rel 8
---- Files affected:
packages/php-ffmpeg:
php-ffmpeg.spec (1.17 -> 1.18) , avcodec_find_decoder-warn.patch (NONE ->
1.1) (NEW)
---- Diffs:
================================================================
Index: packages/php-ffmpeg/php-ffmpeg.spec
diff -u packages/php-ffmpeg/php-ffmpeg.spec:1.17
packages/php-ffmpeg/php-ffmpeg.spec:1.18
--- packages/php-ffmpeg/php-ffmpeg.spec:1.17 Mon Jun 7 22:29:10 2010
+++ packages/php-ffmpeg/php-ffmpeg.spec Tue Aug 24 14:45:36 2010
@@ -1,26 +1,36 @@
# $Revision$, $Date$
#
# Conditional build:
+%if "%{pld_release}" == "ac"
+%bcond_with tests # build without tests
+%else
%bcond_without tests # build without tests
+%endif
%define modname ffmpeg
Summary: Extension to manipulate movie in PHP
Summary(pl.UTF-8): Rozszerzenie do obróbki filmów w PHP
Name: php-%{modname}
Version: 0.6.0
-Release: 7
+Release: 8
License: GPL
Group: Development/Languages/PHP
Source0:
http://downloads.sourceforge.net/ffmpeg-php/ffmpeg-php-%{version}.tbz2
# Source0-md5: f779c0dbffda9dac54729d60c0e04c05
Patch0: gdImageBoundsSafe.patch
+Patch1: avcodec_find_decoder-warn.patch
Patch2: tests-genre.patch
Patch3: tests-dtspts.patch
URL: http://ffmpeg-php.sourceforge.net/
-%{?with_tests:BuildRequires: /usr/bin/php}
-BuildRequires: ffmpeg-devel >= 0.4.9
+%if %{with tests}
+BuildRequires: /usr/bin/php
BuildRequires: php-devel >= 4:5.3.2-5
+%else
+BuildRequires: php-devel >= 3:5.0.0
+%endif
+BuildRequires: ffmpeg-devel >= 0.4.9
BuildRequires: php-gd
+BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.344
Requires: php-common >= 4:5.0.4
Requires: php-gd
@@ -50,6 +60,7 @@
%prep
%setup -q -n ffmpeg-php-%{version}
%patch0 -p1
+%patch1 -p1
%if "%{pld_release}" != "ac"
%patch2 -p1
%patch3 -p1
@@ -119,6 +130,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.18 2010/08/24 12:45:36 glen
+- do not make avcodec_find_decoder failure fatal; rel 8
+
Revision 1.17 2010/06/07 20:29:10 glen
- update tests to run with php53
================================================================
Index: packages/php-ffmpeg/avcodec_find_decoder-warn.patch
diff -u /dev/null packages/php-ffmpeg/avcodec_find_decoder-warn.patch:1.1
--- /dev/null Tue Aug 24 14:45:41 2010
+++ packages/php-ffmpeg/avcodec_find_decoder-warn.patch Tue Aug 24 14:45:36 2010
@@ -0,0 +1,17 @@
+
+Do not make unsupported codec a php fatal error.
+
+PHP Fatal error: Could not find decoder for movie.flv in ffmpeg-info.php on
line 15
+
+Signed-off-by: Elan Ruusamäe <[email protected]>
+--- ffmpeg-php-0.6.0/ffmpeg_movie.c~ 2008-10-14 01:46:53.000000000 +0300
++++ ffmpeg-php-0.6.0/ffmpeg_movie.c 2010-08-24 15:37:30.402235881 +0300
+@@ -501,7 +501,7 @@
+ codec_id));
+
+ if (!decoder) {
+- zend_error(E_ERROR, "Could not find decoder for %s",
++ zend_error(E_WARNING, "Could not find decoder for %s",
+ _php_get_filename(ffmovie_ctx));
+ return NULL;
+ }
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-ffmpeg/php-ffmpeg.spec?r1=1.17&r2=1.18&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
