packages: php-ffmpeg/php-ffmpeg.spec, php-ffmpeg/ffmpeg.patch (NEW) - ffmpe...

[glen]

Author: glen                         Date: Fri Oct 22 12:24:24 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ffmpeg PIX_FMT_RGBA32 fix

---- Files affected:
packages/php-ffmpeg:
   php-ffmpeg.spec (1.20 -> 1.21) , ffmpeg.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php-ffmpeg/php-ffmpeg.spec
diff -u packages/php-ffmpeg/php-ffmpeg.spec:1.20 packages/php-ffmpeg/php-ffmpeg.spec:1.21
--- packages/php-ffmpeg/php-ffmpeg.spec:1.20	Wed Aug 25 13:33:46 2010
+++ packages/php-ffmpeg/php-ffmpeg.spec	Fri Oct 22 14:24:19 2010
@@ -21,6 +21,7 @@
 Patch1:		avcodec_find_decoder-warn.patch
 Patch2:		tests-genre.patch
 Patch3:		tests-dtspts.patch
+Patch4:		ffmpeg.patch
 URL:		http://ffmpeg-php.sourceforge.net/
 %if %{with tests}
 BuildRequires:	/usr/bin/php
@@ -65,6 +66,7 @@
 %patch2 -p1
 %patch3 -p1
 %endif
+%patch4 -p1
 
 # ./run-tests.sh --show-out tests/getPTS.phpt
 mv tests/getPTS.phpt{,.broken}
@@ -130,6 +132,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2010/10/22 12:24:19  glen
+- ffmpeg PIX_FMT_RGBA32 fix
+
 Revision 1.20  2010/08/25 11:33:46  glen
 - release 10
 

================================================================
Index: packages/php-ffmpeg/ffmpeg.patch
diff -u /dev/null packages/php-ffmpeg/ffmpeg.patch:1.1
--- /dev/null	Fri Oct 22 14:24:24 2010
+++ packages/php-ffmpeg/ffmpeg.patch	Fri Oct 22 14:24:19 2010
@@ -0,0 +1,16 @@
+--- ffmpeg-php-0.6.0/ffmpeg_frame.c~	2010-10-22 15:21:46.000000000 +0300
++++ ffmpeg-php-0.6.0/ffmpeg_frame.c	2010-10-22 15:22:44.447708469 +0300
+@@ -47,6 +47,13 @@
+ #include "ffmpeg_frame.h"
+ #include "ffmpeg_tools.h"
+ 
++/*
++ * fix for newer ffmpeg
++ */
++#ifndef PIX_FMT_RGBA32
++#define PIX_FMT_RGBA32 PIX_FMT_RGB32
++#endif
++
+ /* 
+    include gd header from local include dir. This is a copy of gd.h that is 
+    distributed with php-5.2.5. It is distributed along with ffmpeg-php to
================================================================

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