[Pkg-php-commits] r1101 - in ffmpeg-php/trunk/debian: . patches

Raphael Geissert atomo64-guest at alioth.debian.org
Sun Jun 29 23:58:26 UTC 2008 

Author: atomo64-guest
Date: 2008-06-29 23:58:26 +0000 (Sun, 29 Jun 2008)
New Revision: 1101

Added:
   ffmpeg-php/trunk/debian/patches/
   ffmpeg-php/trunk/debian/patches/allow_persistent_on_persistentMovie.phpt.patch
   ffmpeg-php/trunk/debian/patches/series
Removed:
   ffmpeg-php/trunk/debian/patches/
Modified:
   ffmpeg-php/trunk/debian/changelog
   ffmpeg-php/trunk/debian/control
   ffmpeg-php/trunk/debian/copyright
   ffmpeg-php/trunk/debian/ffmpeg.ini
   ffmpeg-php/trunk/debian/rules
   ffmpeg-php/trunk/debian/watch
Log:
Preparing new upstream release


Modified: ffmpeg-php/trunk/debian/changelog
===================================================================
--- ffmpeg-php/trunk/debian/changelog	2008-06-29 13:10:08 UTC (rev 1100)
+++ ffmpeg-php/trunk/debian/changelog	2008-06-29 23:58:26 UTC (rev 1101)
@@ -1,10 +1,19 @@
-ffmpeg-php (0.5.1-3) UNRELEASED; urgency=low
+ffmpeg-php (0.5.3.1-1) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
-  * Added Homepage and Vcs-* fields
-  * Bumped Standards-Version: 3.7.3, no change needed
+  * New upstream release
+  * debian/control:
+    + Added Homepage and Vcs-* fields
+    + Bumped Standards-Version: 3.8.0, no changes needed
+  * 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 <atomo64 at gmail.com>  Sun, 09 Dec 2007 21:21:29 -0600
+ -- Raphael Geissert <atomo64 at gmail.com>  Sun, 29 Jun 2008 18:06:42 -0500
 
 ffmpeg-php (0.5.1-2) unstable; urgency=low
 

Modified: ffmpeg-php/trunk/debian/control
===================================================================
--- ffmpeg-php/trunk/debian/control	2008-06-29 13:10:08 UTC (rev 1100)
+++ ffmpeg-php/trunk/debian/control	2008-06-29 23:58:26 UTC (rev 1101)
@@ -1,9 +1,11 @@
 Source: ffmpeg-php
 Section: web
 Priority: optional
-Maintainer: Raphael Geissert <atomo64 at gmail.com>
-Build-Depends: debhelper (>= 5), php5-dev (>= 5.2.0), libavformat-dev, libavcodec-dev, libgd2-xpm-dev, quilt (>= 0.40)
-Standards-Version: 3.7.3
+Maintainer: Debian PHP Maintainers <pkg-php-maint at lists.alioth.debian.org>
+Uploaders: Raphael Geissert <atomo64 at gmail.com>
+Build-Depends: debhelper (>= 5), php5-dev (>= 5.2.0), libavformat-dev, libavcodec-dev, libgd2-xpm-dev, php5-cli (>= 5.2.0), php5-gd, quilt
+Build-Conflicts: php5-ffmpeg
+Standards-Version: 3.8.0
 Homepage: http://ffmpeg-php.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/pkg-php/ffmpeg-php/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-php/ffmpeg-php/trunk

Modified: ffmpeg-php/trunk/debian/copyright
===================================================================
--- ffmpeg-php/trunk/debian/copyright	2008-06-29 13:10:08 UTC (rev 1100)
+++ ffmpeg-php/trunk/debian/copyright	2008-06-29 23:58:26 UTC (rev 1101)
@@ -3,9 +3,12 @@
 
 It was downloaded from: http://ffmpeg-php.sourceforge.net/
 
-Upstream authors: Todd Kirby <ffmpeg.php at gmail.com> and Martin Prangl <martin.prangl at itec.uni-klu.ac.at>
+Upstream authors:
+    Todd Kirby <ffmpeg.php at gmail.com>
+    Martin Prangl <martin.prangl at itec.uni-klu.ac.at>
+    Alexey Zakhlestin <indeyets at gmail.com>
 
-Copyright: 2004-2007 by Todd Kirby
+Copyright (C) 2004-2007 by Todd Kirby
 
 License:
 
@@ -38,7 +41,9 @@
    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'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
-The Debian packaging is (C) 2007, Raphael Geissert <atomo64 at gmail.com> and
-is licensed under the GPL, see above.
+The Debian packaging is: 
+Copyright (C) 2007, 2008 by Raphael Geissert <atomo64 at gmail.com>
+And is licensed under the GNU GPL version 2 or (at your option) any 
+later version.

Modified: ffmpeg-php/trunk/debian/ffmpeg.ini
===================================================================
--- ffmpeg-php/trunk/debian/ffmpeg.ini	2008-06-29 13:10:08 UTC (rev 1100)
+++ ffmpeg-php/trunk/debian/ffmpeg.ini	2008-06-29 23:58:26 UTC (rev 1101)
@@ -1,2 +1,9 @@
-; configuration for php ffmpeg module
+; 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

Added: ffmpeg-php/trunk/debian/patches/allow_persistent_on_persistentMovie.phpt.patch
===================================================================
--- ffmpeg-php/trunk/debian/patches/allow_persistent_on_persistentMovie.phpt.patch	                        (rev 0)
+++ ffmpeg-php/trunk/debian/patches/allow_persistent_on_persistentMovie.phpt.patch	2008-06-29 23:58:26 UTC (rev 1101)
@@ -0,0 +1,11 @@
+diff -urN ffmpeg-php-swscaler-0.5.3+r601.orig/tests/persistentMovie.phpt ffmpeg-php-swscaler-0.5.3+r601/tests/persistentMovie.phpt
+--- ffmpeg-php-swscaler-0.5.3+r601.orig/tests/persistentMovie.phpt	2008-04-21 02:07:42.000000000 -0500
++++ ffmpeg-php-swscaler-0.5.3+r601/tests/persistentMovie.phpt	2008-06-29 17:58:48.000000000 -0500
+@@ -4,6 +4,7 @@
+ <?php extension_loaded('ffmpeg') or die("ffmpeg extension not loaded"); ?>
+ --FILE--
+ <?php
++ini_set('ffmpeg.allow_persistent', 1);
+ $mov = new ffmpeg_movie(dirname(__FILE__) . '/test_media/robot.avi', 1);
+ $mov2 = new ffmpeg_movie(dirname(__FILE__) . '/test_media/robot.avi', 1);
+ printf("ffmpeg getDuration(): %0.2f\n", $mov->getDuration());

Added: ffmpeg-php/trunk/debian/patches/series
===================================================================
--- ffmpeg-php/trunk/debian/patches/series	                        (rev 0)
+++ ffmpeg-php/trunk/debian/patches/series	2008-06-29 23:58:26 UTC (rev 1101)
@@ -0,0 +1 @@
+allow_persistent_on_persistentMovie.phpt.patch

Modified: ffmpeg-php/trunk/debian/rules
===================================================================
--- ffmpeg-php/trunk/debian/rules	2008-06-29 13:10:08 UTC (rev 1100)
+++ ffmpeg-php/trunk/debian/rules	2008-06-29 23:58:26 UTC (rev 1101)
@@ -5,42 +5,52 @@
 
 #export DH_VERBOSE=1
 
-DEB_HOST_GNU_TYPE    ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS += -O2 -Wall -fno-strict-aliasing
+CFLAGS += -fno-strict-aliasing
 LFSFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 
-# Enable IEEE-conformant floating point math on alphas (not the default)
-ifeq (alpha-linux-gnu,$(DEB_HOST_GNU_TYPE))
-	CFLAGS += -mieee
-endif
-
-ifeq ($(DEB_HOST_GNU_TYPE), $(findstring $(DEB_HOST_GNU_TYPE), ia64-linux-gnu powerpc64-linux-gnu))
-	CFLAGS += -g
-else
-	CFLAGS += -gstabs
-endif
-
 include /usr/share/quilt/quilt.make
 
-build-stamp:
+modules/$(EXTN).so: build-stamp
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	phpize5
+	CFLAGS="$(CFLAGS)" LFSFLAGS="$(LFSFLAGS)" \
 	./configure --disable-rpath --prefix=$(BUILD)/usr \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
-		--with-php-config=/usr/bin/php-config5
+		--with-php-config=/usr/bin/php-config5 \
+		--enable-skip-gd-check
 	$(MAKE) DESTDIR=$(BUILD)
 	
 	touch build-stamp
 
-build: patch build-stamp
+test: test-stamp
+test-stamp: modules/$(EXTN).so
+	dh_testdir
+ifeq (,$(find nocheck,$(DEB_BUILD_OPTIONS)))
+	# prevent php from throwing warnings, causing the tests to fail
+	ln -s $(PHP_EX)/*.so $(CURDIR)/modules/
+	$(MAKE) test > test-results.txt 2>&1
+	@cat test-results.txt
+	# this prints 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 -rf build-stamp
+	$(RM) build-stamp test-stamp
+	[ ! -d modules ] || { for l in modules/*; do \
+		[ ! -L "$$l" ] || unlink "$$l"; \
+		done; \
+	}
 	[ ! -f Makefile ] || $(MAKE) clean
 	phpize5 --clean
 	dh_clean
@@ -70,4 +80,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: clean binary-indep binary-arch binary install
+.PHONY: clean binary-indep binary-arch binary install test

Modified: ffmpeg-php/trunk/debian/watch
===================================================================
--- ffmpeg-php/trunk/debian/watch	2008-06-29 13:10:08 UTC (rev 1100)
+++ ffmpeg-php/trunk/debian/watch	2008-06-29 23:58:26 UTC (rev 1101)
@@ -1,5 +1,3 @@
 version=3
 
 http://sf.net/ffmpeg-php/ffmpeg-php-(.*)\.tbz2
-
-

More information about the Pkg-php-commits mailing list