[Pkg-php-commits] r881 - in ffmpeg-php/trunk: . debian debian/patches
Raphael Geissert
atomo64-guest at alioth.debian.org
Wed Sep 19 23:27:08 UTC 2007
tags 397462 pending
thanks
Author: atomo64-guest
Date: 2007-09-19 23:27:08 +0000 (Wed, 19 Sep 2007)
New Revision: 881
Added:
ffmpeg-php/trunk/debian/
ffmpeg-php/trunk/debian/changelog
ffmpeg-php/trunk/debian/compat
ffmpeg-php/trunk/debian/control
ffmpeg-php/trunk/debian/copyright
ffmpeg-php/trunk/debian/docs
ffmpeg-php/trunk/debian/ffmpeg.ini
ffmpeg-php/trunk/debian/patches/
ffmpeg-php/trunk/debian/patches/01gd.patch
ffmpeg-php/trunk/debian/patches/series
ffmpeg-php/trunk/debian/rules
ffmpeg-php/trunk/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: ffmpeg-php/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: ffmpeg-php/trunk/debian/changelog
===================================================================
--- ffmpeg-php/trunk/debian/changelog (rev 0)
+++ ffmpeg-php/trunk/debian/changelog 2007-09-19 23:27:08 UTC (rev 881)
@@ -0,0 +1,19 @@
+ffmpeg-php (0.5.1-3) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+
+ -- Raphael Geissert <atomo64 at gmail.com> Wed, 19 Sep 2007 18:22:20 -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 <atomo64 at gmail.com> Mon, 16 Jul 2007 14:09:27 -0500
+
+ffmpeg-php (0.5.1-1) unstable; urgency=low
+
+ * Initial release (Closes: #397462)
+
+ -- Raphael Geissert <atomo64 at gmail.com> Thu, 21 Jun 2007 11:18:17 -0500
+
Added: ffmpeg-php/trunk/debian/compat
===================================================================
--- ffmpeg-php/trunk/debian/compat (rev 0)
+++ ffmpeg-php/trunk/debian/compat 2007-09-19 23:27:08 UTC (rev 881)
@@ -0,0 +1 @@
+5
Added: ffmpeg-php/trunk/debian/control
===================================================================
--- ffmpeg-php/trunk/debian/control (rev 0)
+++ ffmpeg-php/trunk/debian/control 2007-09-19 23:27:08 UTC (rev 881)
@@ -0,0 +1,14 @@
+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.2
+
+Package: php5-ffmpeg
+Architecture: any
+Depends: ${shlibs:Depends}, ${php:Depends}
+Recommends: php5-gd
+Description: ffmpeg support for php5
+ Provides access and retrieval of information from movies and audio files.
+ Supports the many audio and video formats supported by ffmpeg.
Added: ffmpeg-php/trunk/debian/copyright
===================================================================
--- ffmpeg-php/trunk/debian/copyright (rev 0)
+++ ffmpeg-php/trunk/debian/copyright 2007-09-19 23:27:08 UTC (rev 881)
@@ -0,0 +1,44 @@
+This package was debianized by Raphael Geissert <atomo64 at gmail.com> on
+Fri, 13 Apr 2007 13:03:17 -0500.
+
+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>
+
+Copyright: 2004-2007 by Todd Kirby
+
+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'.
+
+The Debian packaging is (C) 2007, Raphael Geissert <atomo64 at gmail.com> and
+is licensed under the GPL, see above.
Added: ffmpeg-php/trunk/debian/docs
===================================================================
--- ffmpeg-php/trunk/debian/docs (rev 0)
+++ ffmpeg-php/trunk/debian/docs 2007-09-19 23:27:08 UTC (rev 881)
@@ -0,0 +1,3 @@
+CREDITS
+TODO
+EXPERIMENTAL
Added: ffmpeg-php/trunk/debian/ffmpeg.ini
===================================================================
--- ffmpeg-php/trunk/debian/ffmpeg.ini (rev 0)
+++ ffmpeg-php/trunk/debian/ffmpeg.ini 2007-09-19 23:27:08 UTC (rev 881)
@@ -0,0 +1,2 @@
+; configuration for php ffmpeg module
+extension=ffmpeg.so
Added: ffmpeg-php/trunk/debian/patches/01gd.patch
===================================================================
--- ffmpeg-php/trunk/debian/patches/01gd.patch (rev 0)
+++ ffmpeg-php/trunk/debian/patches/01gd.patch 2007-09-19 23:27:08 UTC (rev 881)
@@ -0,0 +1,121 @@
+diff -urN ffmpeg-php-0.5.1.orig/gd.h ffmpeg-php-0.5.1/gd.h
+--- ffmpeg-php-0.5.1.orig/gd.h 2007-06-13 11:21:55.000000000 -0500
++++ ffmpeg-php-0.5.1/gd.h 2007-04-23 10:17:47.000000000 -0500
+@@ -5,14 +5,24 @@
+ extern "C" {
+ #endif
+
+-#ifndef WIN32
+-/* default fontpath for unix systems */
+-#define DEFAULT_FONTPATH "/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:."
+-#define PATHSEPARATOR ":"
+-#else
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#include "php_compat.h"
++
++#ifdef NETWARE
++/* default fontpath for netware systems */
++#define DEFAULT_FONTPATH "sys:/java/nwgfx/lib/x11/fonts/ttf;."
++#define PATHSEPARATOR ";"
++#elif defined(WIN32)
+ /* default fontpath for windows systems */
+ #define DEFAULT_FONTPATH "c:\\winnt\\fonts;c:\\windows\\fonts;."
+ #define PATHSEPARATOR ";"
++#else
++/* default fontpath for unix systems */
++#define DEFAULT_FONTPATH "/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:."
++#define PATHSEPARATOR ":"
+ #endif
+
+ /* gd.h: declarations file for the graphic-draw module.
+@@ -231,8 +241,8 @@
+ gdImagePtr gdImageCreateFromPngCtx(gdIOCtxPtr in);
+ gdImagePtr gdImageCreateFromWBMP(FILE *inFile);
+ gdImagePtr gdImageCreateFromWBMPCtx(gdIOCtx *infile);
+-gdImagePtr gdImageCreateFromJpeg(FILE *infile);
+-gdImagePtr gdImageCreateFromJpegCtx(gdIOCtx *infile);
++gdImagePtr gdImageCreateFromJpeg(FILE *infile, int ignore_warning);
++gdImagePtr gdImageCreateFromJpegCtx(gdIOCtx *infile, int ignore_warning);
+
+ /* A custom data source. */
+ /* The source function must return -1 on error, otherwise the number
+@@ -295,6 +305,14 @@
+ void gdImageString16(gdImagePtr im, gdFontPtr f, int x, int y, unsigned short *s, int color);
+ void gdImageStringUp16(gdImagePtr im, gdFontPtr f, int x, int y, unsigned short *s, int color);
+
++/*
++ * The following functions are required to be called prior to the
++ * use of any sort of threads in a module load / shutdown function
++ * respectively.
++ */
++void gdFontCacheMutexSetup();
++void gdFontCacheMutexShutdown();
++
+ /* 2.0.16: for thread-safe use of gdImageStringFT and friends,
+ * call this before allowing any thread to call gdImageStringFT.
+ * Otherwise it is invoked by the first thread to invoke
+@@ -438,8 +456,8 @@
+ * compression (smallest files) but takes a long time to compress, and
+ * -1 selects the default compiled into the zlib library.
+ */
+-void gdImagePngEx(gdImagePtr im, FILE * out, int level);
+-void gdImagePngCtxEx(gdImagePtr im, gdIOCtx * out, int level);
++void gdImagePngEx(gdImagePtr im, FILE * out, int level, int basefilter);
++void gdImagePngCtxEx(gdImagePtr im, gdIOCtx * out, int level, int basefilter);
+
+ void gdImageWBMP(gdImagePtr image, int fg, FILE *out);
+ void gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out);
+@@ -483,7 +501,7 @@
+
+ /* Best to free this memory with gdFree(), not free() */
+ void* gdImageGdPtr(gdImagePtr im, int *size);
+-void *gdImagePngPtrEx(gdImagePtr im, int *size, int level);
++void *gdImagePngPtrEx(gdImagePtr im, int *size, int level, int basefilter);
+
+ /* Best to free this memory with gdFree(), not free() */
+ void* gdImageGd2Ptr(gdImagePtr im, int cs, int fmt, int *size);
+@@ -534,11 +552,11 @@
+ substituted automatically. */
+ void gdImageCopyResampled(gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int srcX, int srcY, int dstW, int dstH, int srcW, int srcH);
+
+-gdImagePtr gdImageRotate90(gdImagePtr src);
+-gdImagePtr gdImageRotate180(gdImagePtr src);
+-gdImagePtr gdImageRotate270(gdImagePtr src);
+-gdImagePtr gdImageRotate45(gdImagePtr src, double dAngle, int clrBack);
+-gdImagePtr gdImageRotate (gdImagePtr src, double dAngle, int clrBack);
++gdImagePtr gdImageRotate90(gdImagePtr src, int ignoretransparent);
++gdImagePtr gdImageRotate180(gdImagePtr src, int ignoretransparent);
++gdImagePtr gdImageRotate270(gdImagePtr src, int ignoretransparent);
++gdImagePtr gdImageRotate45(gdImagePtr src, double dAngle, int clrBack, int ignoretransparent);
++gdImagePtr gdImageRotate (gdImagePtr src, double dAngle, int clrBack, int ignoretransparent);
+
+ void gdImageSetBrush(gdImagePtr im, gdImagePtr brush);
+ void gdImageSetTile(gdImagePtr im, gdImagePtr tile);
+diff -urN ffmpeg-php-0.5.1.orig/gd_io.h ffmpeg-php-0.5.1/gd_io.h
+--- ffmpeg-php-0.5.1.orig/gd_io.h 2007-06-13 11:21:55.000000000 -0500
++++ ffmpeg-php-0.5.1/gd_io.h 2003-12-28 14:11:08.000000000 -0600
+@@ -6,18 +6,18 @@
+ #ifdef VMS
+ #define Putchar gdPutchar
+ #endif
+-
++
+ typedef struct gdIOCtx {
+ int (*getC)(struct gdIOCtx*);
+ int (*getBuf)(struct gdIOCtx*, void*, int);
+
+- void (*putC)(struct gdIOCtx*, int);
++ void (*putC)(struct gdIOCtx*, int);
+ int (*putBuf)(struct gdIOCtx*, const void*, int);
+
+ int (*seek)(struct gdIOCtx*, const int);
+ long (*tell)(struct gdIOCtx*);
+
+- void (*gd_free)(struct gdIOCtx*);
++ void (*gd_free)(struct gdIOCtx*);
+
+ } gdIOCtx;
+
Added: ffmpeg-php/trunk/debian/patches/series
===================================================================
--- ffmpeg-php/trunk/debian/patches/series (rev 0)
+++ ffmpeg-php/trunk/debian/patches/series 2007-09-19 23:27:08 UTC (rev 881)
@@ -0,0 +1 @@
+01gd.patch
Added: ffmpeg-php/trunk/debian/rules
===================================================================
--- ffmpeg-php/trunk/debian/rules (rev 0)
+++ ffmpeg-php/trunk/debian/rules 2007-09-19 23:27:08 UTC (rev 881)
@@ -0,0 +1,73 @@
+#!/usr/bin/make -f
+EXTN=ffmpeg
+BUILD=$(CURDIR)/debian/php5-$(EXTN)
+PHP_EX=$(shell /usr/bin/php-config5 --extension-dir)
+
+#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
+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:
+ dh_testdir
+ phpize5
+ ./configure --disable-rpath --prefix=$(BUILD)/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ --with-php-config=/usr/bin/php-config5
+ $(MAKE) DESTDIR=$(BUILD)
+
+ touch build-stamp
+
+build: patch build-stamp
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -rf build-stamp
+ [ ! -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
+ 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
Property changes on: ffmpeg-php/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: ffmpeg-php/trunk/debian/watch
===================================================================
--- ffmpeg-php/trunk/debian/watch (rev 0)
+++ ffmpeg-php/trunk/debian/watch 2007-09-19 23:27:08 UTC (rev 881)
@@ -0,0 +1,5 @@
+version=3
+
+http://sf.net/ffmpeg-php/ffmpeg-php-(.*)\.tbz2
+
+
More information about the Pkg-php-commits
mailing list