From 2c4c134f37131ceeadf4067d9e39263fe0811d52 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Thu, 21 Mar 2013 11:39:20 +0100 Subject: [PATCH] Update Imagine and Media-Alchemyst dependencies --- composer.json | 4 ++++ composer.lock | 66 ++++++++++++++++++++++++--------------------------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/composer.json b/composer.json index d25966ae92..2306afbdf2 100644 --- a/composer.json +++ b/composer.json @@ -36,6 +36,10 @@ "fabpot/php-cs-fixer": "dev-master" }, "repositories": [ + { + "type": "git", + "url": "https://github.com/romainneutron/Imagine.git" + }, { "type": "git", "url": "https://github.com/alchemy-fr/oauth2-php" diff --git a/composer.lock b/composer.lock index 93520eb7f3..a4ed67132b 100644 --- a/composer.lock +++ b/composer.lock @@ -429,17 +429,11 @@ }, { "name": "imagine/Imagine", - "version": "dev-master", + "version": "dev-ColorSpaces", "source": { "type": "git", - "url": "https://github.com/avalanche123/Imagine", - "reference": "v0.4.1" - }, - "dist": { - "type": "zip", - "url": "https://github.com/avalanche123/Imagine/archive/v0.4.1.zip", - "reference": "v0.4.1", - "shasum": "" + "url": "https://github.com/romainneutron/Imagine.git", + "reference": "abc943f06cb0ab862b0d88392a942633126265d7" }, "require": { "php": ">=5.3.2" @@ -447,15 +441,17 @@ "require-dev": { "sami/sami": "dev-master" }, - "time": "2012-12-13 18:31:18", + "suggest": { + "ext-gd": "to use the GD implementation", + "ext-gmagick": "to use the Gmagick implementation", + "ext-imagick": "to use the Imagick implementation" + }, "type": "library", - "installation-source": "source", "autoload": { "psr-0": { "Imagine": "lib/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -469,48 +465,47 @@ "description": "Image processing for PHP 5.3", "homepage": "http://imagine.readthedocs.org/", "keywords": [ - "image manipulation", - "image processing", "drawing", - "graphics" - ] + "graphics", + "image manipulation", + "image processing" + ], + "time": "2013-03-21 10:11:30" }, { "name": "media-alchemyst/media-alchemyst", "version": "0.1.x-dev", "source": { "type": "git", - "url": "https://github.com/alchemy-fr/Media-Alchemyst", - "reference": "0.1.4" + "url": "https://github.com/alchemy-fr/Media-Alchemyst.git", + "reference": "0.1.5" }, "dist": { "type": "zip", - "url": "https://github.com/alchemy-fr/Media-Alchemyst/archive/0.1.4.zip", - "reference": "0.1.4", + "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/0.1.5", + "reference": "0.1.5", "shasum": "" }, "require": { + "alchemy/ghostscript": "0.2.*", + "imagine/imagine": "dev-ColorSpaces", + "mediavorus/mediavorus": "0.1.*", + "monolog/monolog": "1.*", "php": ">=5.3.2", + "php-ffmpeg/php-ffmpeg": "dev-master", + "php-mp4box/php-mp4box": "dev-master", + "php-unoconv/php-unoconv": "dev-master", "pimple/pimple": "1.*", "swftools/swftools": "dev-master", - "php-ffmpeg/php-ffmpeg": "dev-master", - "php-unoconv/php-unoconv": "dev-master", - "php-mp4box/php-mp4box": "dev-master", - "monolog/monolog": "1.*", - "mediavorus/mediavorus": "0.1.*", - "symfony/dependency-injection": ">2.0,<=2.2", "symfony/console": ">2.0,<=2.2", - "alchemy/ghostscript": "0.2.*", - "imagine/imagine": ">=0.4" + "symfony/dependency-injection": ">2.0,<=2.2" }, - "time": "2012-12-12 13:43:45", "type": "library", "extra": { "branch-alias": { "dev-master": "0.1.x-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "MediaAlchemyst": "src" @@ -534,13 +529,14 @@ ], "description": "An Object Oriented wrapper for easy multimedia conversion, based on Imagine, FFMpeg, SwfTools, Unoconv and other libs", "keywords": [ - "image processing", - "image", "audio", - "video processing", + "audio processing", + "image", + "image processing", "video", - "audio processing" - ] + "video processing" + ], + "time": "2013-03-21 09:21:45" }, { "name": "mediavorus/mediavorus",