Changes - j0ke.net Open Build Service

Changes of Revision 7

[-] [+]	Changed	php5-ffmpeg.spec
@@ -7,9 +7,8 @@ URL: http://ffmpeg-php.sourceforge.net/ Source0: ffmpeg-php-%{version}.tbz2 Patch0: ffmpeg-php_x86_64-fix.diff +Patch1: ffmpeg-php-PIX.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Packager: Carsten Schoene <cs@linux-administrator.com> -Vendor: linux-administrator.com BuildRequires: libffmpeg0 libffmpeg0-devel autoconf automake php5-devel glibc-devel libgcc gcc gcc-c++ Requires: php5 libffmpeg0 sed grep @@ -26,6 +25,9 @@ %prep %setup -q -n ffmpeg-php-%{version} %patch -p1 +%if 0%{?suse_version} >= 1110 +%patch1 -p0 +%endif export PHP_PREFIX=%{_prefix} $PHP_PREFIX/bin/phpize x 1 @@ -7,9 +7,8 @@ 2 URL: http://ffmpeg-php.sourceforge.net/ 3 Source0: ffmpeg-php-%{version}.tbz2 4 Patch0: ffmpeg-php_x86_64-fix.diff 5 +Patch1: ffmpeg-php-PIX.patch 6 BuildRoot: %{_tmppath}/%{name}-%{version}-build 7 -Packager: Carsten Schoene <cs@linux-administrator.com> 8 -Vendor: linux-administrator.com 9 BuildRequires: libffmpeg0 libffmpeg0-devel autoconf automake php5-devel glibc-devel libgcc gcc gcc-c++ 10 Requires: php5 libffmpeg0 sed grep 11 12 @@ -26,6 +25,9 @@ 13 %prep 14 %setup -q -n ffmpeg-php-%{version} 15 %patch -p1 16 +%if 0%{?suse_version} >= 1110 17 +%patch1 -p0 18 +%endif 19 20 export PHP_PREFIX=%{_prefix} 21 $PHP_PREFIX/bin/phpize 22
[-] [+]	Added	ffmpeg-php-PIX.patch ^
@@ -0,0 +1,29 @@ +--- ffmpeg_frame.c.orig 2011-04-06 13:56:49.405339958 +0200 ++++ ffmpeg_frame.c 2011-04-06 13:57:31.980589409 +0200 +@@ -333,7 +333,7 @@ + + GET_FRAME_RESOURCE(getThis(), ff_frame); + +- _php_convert_frame(ff_frame, PIX_FMT_RGBA32); ++ _php_convert_frame(ff_frame, PIX_FMT_RGB32); + + return_value->value.lval = _php_get_gd_image(ff_frame->width, + ff_frame->height); +@@ -418,7 +418,7 @@ + + /* create a an av_frame and allocate space for it / + frame = avcodec_alloc_frame(); +- avpicture_alloc((AVPicture)frame, PIX_FMT_RGBA32, width, height); ++ avpicture_alloc((AVPicture)frame, PIX_FMT_RGB32, width, height); + + / copy the gd image to the av_frame / + _php_gd_image_to_avframe(gd_img, frame, width, height); +@@ -429,7 +429,7 @@ + / set the ffpmeg_frame's properties */ + ff_frame->width = width; + ff_frame->height = height; +- ff_frame->pixel_format = PIX_FMT_RGBA32; ++ ff_frame->pixel_format = PIX_FMT_RGB32; + break; + default: + zend_error(E_ERROR, "Invalid argument\n");