summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2009-09-28 15:44:23 +0200
committerTreeve Jelbert2009-09-28 15:44:23 +0200
commit121756f20f8ff0eef1fa49ba666f14e22716c7a8 (patch)
tree7a959c4cc8ab1616921342692e4b628c6b1ca7bd
parent841f93c6b93cd6f70c1a2f87b83f9234e6d57546 (diff)
parent685bfda2b8d93f08d47562b87fb2dcc1d8d0198d (diff)
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
-rw-r--r--ChangeLog3
-rwxr-xr-xaudio-libs/liblastfm/BUILD6
-rw-r--r--audio-libs/liblastfm/HISTORY1
-rwxr-xr-xphp-pear/ffmpeg-php/DEPENDS2
-rwxr-xr-xphp-pear/ffmpeg-php/DETAILS19
-rw-r--r--php-pear/ffmpeg-php/HISTORY2
-rwxr-xr-xphp-pear/ffmpeg-php/PRE_BUILD4
7 files changed, 34 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 16fa79b06e..bd26809cdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-09-28 Vlad Glagolev <stealth@sourcemage.org>
+ * php-pear/ffmpeg-php: new spell, PHP support for ffmpeg
+
2009-09-28 Bor Kraljič <pyrobor@ver.si>
* audio-libs/liblastfm: new spell, Last.fm services libraries
diff --git a/audio-libs/liblastfm/BUILD b/audio-libs/liblastfm/BUILD
index cf4a0fca43..e0065ef301 100755
--- a/audio-libs/liblastfm/BUILD
+++ b/audio-libs/liblastfm/BUILD
@@ -1,4 +1,4 @@
-QTDIR=/usr &&
-PATH=$QTDIR/bin/qt4:$PATH &&
-./configure --prefix /usr &&
+QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" &&
+PATH="$QTDIR/bin/qt4:$PATH" &&
+./configure --prefix $INSTALL_ROOT/usr &&
default_build_make
diff --git a/audio-libs/liblastfm/HISTORY b/audio-libs/liblastfm/HISTORY
index b0e59bc548..d86b66bf7c 100644
--- a/audio-libs/liblastfm/HISTORY
+++ b/audio-libs/liblastfm/HISTORY
@@ -1,2 +1,3 @@
2009-09-28 Bor Kraljic <pyrobor@ver.si>
* BUILD, DEPENDS, DETAILS: spell created
+ * BUILD: fixing mistakes; /usr => $INSTALL_ROOT/usr
diff --git a/php-pear/ffmpeg-php/DEPENDS b/php-pear/ffmpeg-php/DEPENDS
new file mode 100755
index 0000000000..252a49e632
--- /dev/null
+++ b/php-pear/ffmpeg-php/DEPENDS
@@ -0,0 +1,2 @@
+depends php &&
+depends LIBAVCODEC
diff --git a/php-pear/ffmpeg-php/DETAILS b/php-pear/ffmpeg-php/DETAILS
new file mode 100755
index 0000000000..6436fe737a
--- /dev/null
+++ b/php-pear/ffmpeg-php/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=ffmpeg-php
+ VERSION=0.6.0
+ SOURCE=$SPELL-$VERSION.tbz2
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_HASH=sha512:837c854870886486683cf9d3ac2de376f0b4067487d68d4f5c685dd0bd4d306e406334821140bd1fab2d48105e7ee17956db70f2f70fb9bec4dcea14a2104127
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://ffmpeg-php.sourceforge.net/
+ LICENSE[0]=GPL
+ ENTERED=20090928
+ SHORT="PHP support for ffmpeg"
+cat << EOF
+ffmpeg-php is an extension for PHP that adds an easy to use, object-oriented
+API for accessing and retrieving information from video and audio files.
+It has methods for returning frames from movie files as images that can be
+manipulated using PHP's image functions. This works well for automatically
+creating thumbnail images from movies. ffmpeg-php is also useful for reporting
+the duration and bitrate of audio files (mp3, wma, etc). ffmpeg-php can
+access many of the video formats supported by ffmpeg (mov, avi, mpg, wmv, etc).
+EOF
diff --git a/php-pear/ffmpeg-php/HISTORY b/php-pear/ffmpeg-php/HISTORY
new file mode 100644
index 0000000000..ea6f927f2d
--- /dev/null
+++ b/php-pear/ffmpeg-php/HISTORY
@@ -0,0 +1,2 @@
+2009-09-28 Vlad Glagolev <stealth@sourcemage.org>
+ * BUILD, DEPENDS, DETAILS: spell created
diff --git a/php-pear/ffmpeg-php/PRE_BUILD b/php-pear/ffmpeg-php/PRE_BUILD
new file mode 100755
index 0000000000..7f85d2f274
--- /dev/null
+++ b/php-pear/ffmpeg-php/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+phpize