packages: php-ffmpeg/php-ffmpeg.spec - added patch which fixes build with n...

lisu lisu at pld-linux.org
Mon Jul 11 14:47:58 CEST 2011


Author: lisu                         Date: Mon Jul 11 12:47:58 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added patch which fixes build with newer ffmpeg
- BR: php-pcre when building with tests
- TODO added

---- Files affected:
packages/php-ffmpeg:
   php-ffmpeg.spec (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: packages/php-ffmpeg/php-ffmpeg.spec
diff -u packages/php-ffmpeg/php-ffmpeg.spec:1.30 packages/php-ffmpeg/php-ffmpeg.spec:1.31
--- packages/php-ffmpeg/php-ffmpeg.spec:1.30	Mon Jun 27 21:22:53 2011
+++ packages/php-ffmpeg/php-ffmpeg.spec	Mon Jul 11 14:47:52 2011
@@ -1,8 +1,10 @@
 # $Revision$, $Date$
 #
+# TODO: doesn't pass all tests
+#
 # Conditional build:
 %if "%{pld_release}" == "ac"
-%bcond_with		tests		# build without tests
+%bcond_with	tests		# build without tests
 %else
 %bcond_without	tests		# build without tests
 %endif
@@ -24,14 +26,16 @@
 Patch7:		test_fixes.patch
 Patch8:		tests-frame_md5.patch
 Patch9:		tests-metadata-api.patch
+Patch10:	%{name}-ffmpeg08.patch
 URL:		http://ffmpeg-php.sourceforge.net/
 %if %{with tests}
 BuildRequires:	/usr/bin/php
 BuildRequires:	php-devel >= 4:5.3.2-5
+BuildRequires:	php-pcre
 %else
 BuildRequires:	php-devel >= 3:5.0.0
 %endif
-BuildRequires:	ffmpeg-devel >= 0.5
+BuildRequires:	ffmpeg-devel >= 0.7.1
 BuildRequires:	php-gd
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.344
@@ -71,13 +75,14 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 # empty file
 rm tests/getFramesBackwards.phpt
 
 %build
 phpize
-CPPFLAGS="%{rpmcppflags} -Werror"
+CPPFLAGS="%{rpmcppflags}"
 %configure
 %{__make}
 
@@ -129,6 +134,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2011/07/11 12:47:52  lisu
+- added patch which fixes build with newer ffmpeg
+- BR: php-pcre when building with tests
+- TODO added
+
 Revision 1.30  2011/06/27 19:22:53  arekm
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-ffmpeg/php-ffmpeg.spec?r1=1.30&r2=1.31&f=u



More information about the pld-cvs-commit mailing list