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

[glen]

Author: glen                         Date: Fri Oct 22 13:21:27 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- minor fixes for ffmpeg 0.6

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

---- Diffs:

================================================================
Index: packages/php-ffmpeg/php-ffmpeg.spec
diff -u packages/php-ffmpeg/php-ffmpeg.spec:1.21 packages/php-ffmpeg/php-ffmpeg.spec:1.22
--- packages/php-ffmpeg/php-ffmpeg.spec:1.21	Fri Oct 22 14:24:19 2010
+++ packages/php-ffmpeg/php-ffmpeg.spec	Fri Oct 22 15:21:22 2010
@@ -21,7 +21,7 @@
 Patch1:		avcodec_find_decoder-warn.patch
 Patch2:		tests-genre.patch
 Patch3:		tests-dtspts.patch
-Patch4:		ffmpeg.patch
+Patch4:		ffmpeg-0.6.patch
 URL:		http://ffmpeg-php.sourceforge.net/
 %if %{with tests}
 BuildRequires:	/usr/bin/php
@@ -65,8 +65,8 @@
 %if "%{pld_release}" != "ac"
 %patch2 -p1
 %patch3 -p1
-%endif
 %patch4 -p1
+%endif
 
 # ./run-tests.sh --show-out tests/getPTS.phpt
 mv tests/getPTS.phpt{,.broken}
@@ -81,6 +81,7 @@
 
 %build
 phpize
+CPPFLAGS="%{rpmcppflags} -Werror"
 %configure
 %{__make}
 
@@ -132,6 +133,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2010/10/22 13:21:22  glen
+- minor fixes for ffmpeg 0.6
+
 Revision 1.21  2010/10/22 12:24:19  glen
 - ffmpeg PIX_FMT_RGBA32 fix
 

================================================================
Index: packages/php-ffmpeg/ffmpeg-0.6.patch
diff -u /dev/null packages/php-ffmpeg/ffmpeg-0.6.patch:1.1
--- /dev/null	Fri Oct 22 15:21:27 2010
+++ packages/php-ffmpeg/ffmpeg-0.6.patch	Fri Oct 22 15:21:22 2010
@@ -0,0 +1,39 @@
+--- 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
+--- ffmpeg-php-0.6.0/ffmpeg_tools.c~	2010-10-22 15:36:52.000000000 +0300
++++ ffmpeg-php-0.6.0/ffmpeg_tools.c	2010-10-22 15:36:55.133422758 +0300
+@@ -74,7 +75,7 @@
+     }
+ 
+     result = sws_scale(sws_ctx, 
+-            src->data, src->linesize,
++            (const uint8_t * const*)src->data, src->linesize,
+             0, src_height,
+             dst->data, dst->linesize);
+ 
+--- ffmpeg-php-0.6.0/ffmpeg_movie.c~	2010-10-22 15:40:22.000000000 +0300
++++ ffmpeg-php-0.6.0/ffmpeg_movie.c	2010-10-22 15:40:23.647570108 +0300
+@@ -1212,8 +1212,7 @@
+     while (av_read_frame(ffmovie_ctx->fmt_ctx, &packet) >= 0) {
+         if (packet.stream_index == video_stream) {
+         
+-            avcodec_decode_video(decoder_ctx, frame, &got_frame,
+-                    packet.data, packet.size);
++            avcodec_decode_video2(decoder_ctx, frame, &got_frame, &packet);
+         
+             if (got_frame) {
+                 *is_keyframe = (packet.flags & PKT_FLAG_KEY);
================================================================

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