--- ffmpeg-php-0.6.0.orig/debian/ffmpeg.ini +++ ffmpeg-php-0.6.0/debian/ffmpeg.ini @@ -0,0 +1,9 @@ +; configuration for the ffmpeg-php module + +extension=ffmpeg.so + +; Turn ffmpeg warnings into PHP warnings +;ffmpeg.show_warnings=0 + +; Persistent movies +;ffmpeg.allow_persistent=0 --- ffmpeg-php-0.6.0.orig/debian/control +++ ffmpeg-php-0.6.0/debian/control @@ -0,0 +1,21 @@ +Source: ffmpeg-php +Section: php +Priority: optional +Maintainer: Debian PHP Maintainers +Uploaders: Raphael Geissert +Build-Depends: debhelper (>= 5), php5-dev (>= 5.2.0), libavformat-dev, libavcodec-dev, libswscale-dev, libgd2-xpm-dev, php5-cli (>= 5.2.0), php5-gd, quilt, chrpath, hardening-includes +Build-Conflicts: php5-ffmpeg +Standards-Version: 3.8.4 +Homepage: http://ffmpeg-php.sourceforge.net/ +Vcs-Git: git://git.debian.org/pkg-php/ffmpeg-php.git +Vcs-Browser: http://git.debian.org/?p=pkg-php/ffmpeg-php.git;a=summary + +Package: php5-ffmpeg +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends} +Recommends: php5-gd +Description: audio and video support via ffmpeg for php5 + Provides access and retrieval of meta-data from all the movies and + audio file formats supported by ffmpeg. Extra features include retrieving and + manipulating frames from video files that can later be also manipulated by + PHP's own image functions. --- ffmpeg-php-0.6.0.orig/debian/copyright +++ ffmpeg-php-0.6.0/debian/copyright @@ -0,0 +1,51 @@ +This package was debianized by Raphael Geissert on +Fri, 13 Apr 2007 13:03:17 -0500. + +It was downloaded from: http://ffmpeg-php.sourceforge.net/ + +Upstream authors: + Todd Kirby + Martin Prangl + Alexey Zakhlestin + +Some portions of this software are: +Copyright (C) 2004-2008 by Todd Kirby +Copyright (C) 2008 by Alexey Zakhlestin + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + In addition, as a special exception, the copyright holders of ffmpeg-php + give you permission to combine ffmpeg-php with code included in the + standard release of PHP under the PHP license (or modified versions of + such code, with unchanged license). You may copy and distribute such a + system following the terms of the GNU GPL for ffmpeg-php and the licenses + of the other code concerned, provided that you include the source code of + that other code when and as the GNU GPL requires distribution of source code. + + You must obey the GNU General Public License in all respects for all of the + code used other than standard release of PHP. If you modify this file, you + may extend this exception to your version of the file, but you are not + obligated to do so. If you do not wish to do so, delete this exception + statement from your version. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. + +The Debian packaging is: +Copyright (C) 2007, 2008, 2009, 2010 by Raphael Geissert +And is licensed under the GNU GPL version 2 or (at your option) any +later version. --- ffmpeg-php-0.6.0.orig/debian/rules +++ ffmpeg-php-0.6.0/debian/rules @@ -0,0 +1,87 @@ +#!/usr/bin/make -f +EXTN=ffmpeg +BUILD=$(CURDIR)/debian/php5-$(EXTN) +PHP_EX=$(shell /usr/bin/php-config5 --extension-dir) +LFSFLAGS += $(shell getconf LFS_CFLAGS) +CFLAGS ?= -g -O2 + +include /usr/share/quilt/quilt.make + +DEB_BUILD_HARDENING_PIE:=0 +include /usr/share/hardening-includes/hardening.make + +CFLAGS += $(HARDENING_CFLAGS) +LDFLAGS += $(HARDENING_LDFLAGS) + +modules/$(EXTN).so: build-stamp +build-stamp: $(QUILT_STAMPFN) + dh_testdir + phpize5 + CFLAGS="$(CFLAGS) $(LFSFLAGS)" LDFLAGS="$(LDFLAGS)" \ + ./configure --disable-rpath --prefix=$(BUILD)/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --with-php-config=/usr/bin/php-config5 \ + --enable-skip-gd-check + $(MAKE) DESTDIR=$(BUILD) + + touch build-stamp + +test: test-stamp +test-stamp: modules/$(EXTN).so + dh_testdir +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + # prevent php from throwing warnings, causing the tests to fail + ln -s $(PHP_EX)/*.so $(CURDIR)/modules/ + $(MAKE) test 2>&1 | tee test-results.txt + # Print the failed tests output: + @sed -r 's,^ffmpeg\s+[^\[]+\s+\[(tests/\w+)\.phpt\]$$,\1.log,g' \ + < test-results.txt | egrep "^tests/.*\.log" | \ + xargs cat +else + echo 'Skipping test...' +endif + touch $@ + +build: patch build-stamp test + +clean: unpatch + dh_testdir + dh_testroot + $(RM) build-stamp test-stamp test-results.txt + [ ! -d modules ] || { for l in modules/*; do \ + [ ! -L "$$l" ] || unlink "$$l"; \ + done; \ + } + [ ! -f Makefile ] || $(MAKE) clean + phpize5 --clean + dh_clean + +install: build + dh_testdir + dh_testroot + dh_installdirs + install -D -m 644 modules/$(EXTN).so debian/php5-$(EXTN)$(PHP_EX)/$(EXTN).so + -chrpath -l debian/php5-$(EXTN)$(PHP_EX)/$(EXTN).so + -chrpath -d debian/php5-$(EXTN)$(PHP_EX)/$(EXTN).so + install -D -m 644 debian/$(EXTN).ini debian/php5-$(EXTN)/etc/php5/conf.d/$(EXTN).ini + +binary-indep: + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + echo "php:Depends=phpapi-`php-config5 --phpapi`" >> debian/php5-$(EXTN).substvars + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: clean binary-indep binary-arch binary install test --- ffmpeg-php-0.6.0.orig/debian/changelog +++ ffmpeg-php-0.6.0/debian/changelog @@ -0,0 +1,84 @@ +ffmpeg-php (0.6.0-2) unstable; urgency=low + + * Update my email address + * Drop DM-UA field + * Update VCS fields to reflect switch to git + * Update standards version to 3.8.4, no changes needed + * Switch to section 'php' instead of 'web' + * Use tee to print the test suite progress + * Drop ORed dependency on php5 (Closes: #566299) + * Define default CFLAGS, properly pass LFSFLAGS and build with + hardening flags + * Bump copyright year + * Actually redirect the testsuite's output to tee + * Remove the test-results.txt file on 'clean' + * Update the allow_persist... patch to use --INI-- + * Ignore ffmpeg's info/debug messages on the test suite + + -- Raphael Geissert Tue, 09 Feb 2010 23:17:17 -0600 + +ffmpeg-php (0.6.0-1) unstable; urgency=low + + * New upstream release (Closes: #516365) + - Support for the ffmpeg swscale API (Closes: #487643) + - API Changes: + + Removed obsolete resize() and crop() functions. + + Removed animated gif class. + - Added check to ensure that gd loads before ffmpeg-php if both are + compiled as extensions. + * debian/control: + + Improve the package description. + + Add an ORed dependency on a real php5 SAPI package. + + Add a BuildDep on libswscale-dev + * debian/rules: + + Minor cleanup. + * debian/copyright: + + Update copyright years + + -- Raphael Geissert Sun, 22 Feb 2009 20:42:18 -0600 + +ffmpeg-php (0.5.3.1-3) unstable; urgency=low + + * gdtoimage_fix.patch (Closes: #496079) + + fix the toGDImage method by not using gdImageBoundsSafeMacro + - Thanks to Patrick Matthäi for the patch + + -- Raphael Geissert Mon, 07 Jul 2008 18:24:47 -0500 + +ffmpeg-php (0.5.3.1-2) unstable; urgency=low + + * Fix build failure caused by chrpath returning an exit status of 2. + + -- Raphael Geissert Mon, 07 Jul 2008 17:50:11 -0500 + +ffmpeg-php (0.5.3.1-1) unstable; urgency=low + + * New upstream release + * debian/control: + + Added Homepage and Vcs-* fields + + Bumped Standards-Version: 3.8.0, no changes needed + + Added XS-DM-Upload-Allowed: yes + * debian/patches/: + + 01gd.patch: dropped, included by upstream + + allow_persistent_on_persistentMovie.phpt.patch: fixes a test + * Run test suite at build time + + Depend on php5-cli and php5-gd, and conflict php5-ffmpeg + * debian/copyright: Added more credits + * debian/rules: removed some useless stuff + * debian/ffmpeg.ini: added some new options as comments + + -- Raphael Geissert Mon, 30 Jun 2008 18:25:05 -0500 + +ffmpeg-php (0.5.1-2) unstable; urgency=low + + * Fixed libgd-xpm-dev dependency + * Replaced -$(MAKE) clean with [ ! -f Makefile ] || $(MAKE) clean + + -- Raphael Geissert Mon, 16 Jul 2007 14:09:27 -0500 + +ffmpeg-php (0.5.1-1) unstable; urgency=low + + * Initial release (Closes: #397462) + + -- Raphael Geissert Thu, 21 Jun 2007 11:18:17 -0500 + --- ffmpeg-php-0.6.0.orig/debian/watch +++ ffmpeg-php-0.6.0/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://sf.net/ffmpeg-php/ffmpeg-php-(.*)\.tbz2 --- ffmpeg-php-0.6.0.orig/debian/compat +++ ffmpeg-php-0.6.0/debian/compat @@ -0,0 +1 @@ +5 --- ffmpeg-php-0.6.0.orig/debian/docs +++ ffmpeg-php-0.6.0/debian/docs @@ -0,0 +1,3 @@ +CREDITS +TODO +EXPERIMENTAL --- ffmpeg-php-0.6.0.orig/debian/patches/gdtoimage_fix.patch +++ ffmpeg-php-0.6.0/debian/patches/gdtoimage_fix.patch @@ -0,0 +1,25 @@ +diff -Naur ffmpeg-php-0.5.3.1.orig/ffmpeg_frame.c ffmpeg-php-0.5.3.1/ffmpeg_frame.c +--- ffmpeg-php-0.5.3.1.orig/ffmpeg_frame.c 2008-08-22 17:03:55.000000000 +0200 ++++ ffmpeg-php-0.5.3.1/ffmpeg_frame.c 2008-08-22 17:06:15.000000000 +0200 +@@ -396,15 +396,14 @@ + int x, y; + int *src = (int*)frame->data[0]; + ++ if(width > dest->sx || height > dest->sy){ ++ return -1; ++ } ++ + for (y = 0; y < height; y++) { + for (x = 0; x < width; x++) { +- +- if (gdImageBoundsSafeMacro(dest, x, y)) { +- /* copy pixel to gdimage buffer zeroing the alpha channel */ +- dest->tpixels[y][x] = src[x] & 0x00ffffff; +- } else { +- return -1; +- } ++ /* copy pixel to gdimage buffer zeroing the alpha channel */ ++ dest->tpixels[y][x] = src[x] & 0x00ffffff; + } + src += width; + } --- ffmpeg-php-0.6.0.orig/debian/patches/series +++ ffmpeg-php-0.6.0/debian/patches/series @@ -0,0 +1,3 @@ +allow_persistent_on_persistentMovie.phpt.patch +gdtoimage_fix.patch +test_fixes.patch --- ffmpeg-php-0.6.0.orig/debian/patches/allow_persistent_on_persistentMovie.phpt.patch +++ ffmpeg-php-0.6.0/debian/patches/allow_persistent_on_persistentMovie.phpt.patch @@ -0,0 +1,13 @@ +Index: ffmpeg-php/tests/persistentMovie.phpt +=================================================================== +--- ffmpeg-php.orig/tests/persistentMovie.phpt ++++ ffmpeg-php/tests/persistentMovie.phpt +@@ -2,6 +2,8 @@ + ffmpeg persistent movie test + --SKIPIF-- + ++--INI-- ++ffmpeg.allow_persistent=1 + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + ++--INI-- ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- + + --INI-- + ffmpeg.allow_persistent=1 ++ffmpeg.show_warnings=1 ++error_reporting = E_ALL & ~E_NOTICE + --FILE-- +