hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

use php-ffmpeg v0.15

Browse Source
This commit is contained in:
aynsix
2020-04-01 13:52:55 +03:00
parent 65a4a7deb0
commit a39c0b5ff0
3 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@@ -96,7 +96,7 @@
"league/flysystem": "^1.0", "league/flysystem": "^1.0",
"league/flysystem-aws-s3-v2": "^1.0", "league/flysystem-aws-s3-v2": "^1.0",
"league/fractal": "dev-webgalleries#af1acc0275438571bc8c1d08a05a4b5af92c9f97 as 0.13.0", "league/fractal": "dev-webgalleries#af1acc0275438571bc8c1d08a05a4b5af92c9f97 as 0.13.0",
"media-alchemyst/media-alchemyst": "^0.5.5", "media-alchemyst/media-alchemyst": "^0.5.6",
"monolog/monolog": "~1.3", "monolog/monolog": "~1.3",
"mrclay/minify": "~2.1.6", "mrclay/minify": "~2.1.6",
"neutron/process-manager": "2.0.x-dev@dev", "neutron/process-manager": "2.0.x-dev@dev",
@@ -105,7 +105,7 @@
"neutron/silex-imagine-provider": "~0.1.0", "neutron/silex-imagine-provider": "~0.1.0",
"neutron/temporary-filesystem": "~2.1", "neutron/temporary-filesystem": "~2.1",
"pagerfanta/pagerfanta": "^1.0", "pagerfanta/pagerfanta": "^1.0",
"php-ffmpeg/php-ffmpeg": "~0.5.0", "php-ffmpeg/php-ffmpeg": "^v0.15",
"php-xpdf/php-xpdf": "~0.2.1", "php-xpdf/php-xpdf": "~0.2.1",
"exiftool/exiftool": "^11", "exiftool/exiftool": "^11",
"ramsey/uuid": "^3.0", "ramsey/uuid": "^3.0",

57
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "5a4a0be62b13071a6b06893b7ce08372", "content-hash": "008ff0b5d3d13b4f0ce5d34348ded83a",
"packages": [ "packages": [
{ {
"name": "alchemy-fr/tcpdf-clone", "name": "alchemy-fr/tcpdf-clone",
@@ -4331,16 +4331,16 @@
}, },
{ {
"name": "media-alchemyst/media-alchemyst", "name": "media-alchemyst/media-alchemyst",
"version": "0.5.5", "version": "0.5.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/alchemy-fr/Media-Alchemyst.git", "url": "https://github.com/alchemy-fr/Media-Alchemyst.git",
"reference": "3bd3204b69882f495adfb617383a077face92ed0" "reference": "2b9f7697997f7863bbc3d08344c559a1cba519c2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/3bd3204b69882f495adfb617383a077face92ed0", "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/2b9f7697997f7863bbc3d08344c559a1cba519c2",
"reference": "3bd3204b69882f495adfb617383a077face92ed0", "reference": "2b9f7697997f7863bbc3d08344c559a1cba519c2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -4350,7 +4350,7 @@
"monolog/monolog": "~1.0", "monolog/monolog": "~1.0",
"neutron/temporary-filesystem": "^2.1.1", "neutron/temporary-filesystem": "^2.1.1",
"php": ">=5.3.3", "php": ">=5.3.3",
"php-ffmpeg/php-ffmpeg": ">=0.4.2,<0.6", "php-ffmpeg/php-ffmpeg": "^v0.15",
"php-mp4box/php-mp4box": "~0.3.0", "php-mp4box/php-mp4box": "~0.3.0",
"php-unoconv/php-unoconv": "~0.3.1", "php-unoconv/php-unoconv": "~0.3.1",
"pimple/pimple": "~1.0", "pimple/pimple": "~1.0",
@@ -4401,7 +4401,7 @@
"video", "video",
"video processing" "video processing"
], ],
"time": "2019-12-11T07:20:45+00:00" "time": "2020-04-01T08:51:55+00:00"
}, },
{ {
"name": "monolog/monolog", "name": "monolog/monolog",
@@ -5147,29 +5147,29 @@
}, },
{ {
"name": "php-ffmpeg/php-ffmpeg", "name": "php-ffmpeg/php-ffmpeg",
"version": "0.5.1", "version": "v0.15",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/PHP-FFMpeg/PHP-FFMpeg.git", "url": "https://github.com/PHP-FFMpeg/PHP-FFMpeg.git",
"reference": "c8949fe3df89edd7692368cc110a51a27971f28a" "reference": "984dbd046b6d8c285f9e7419fc7645f197513bfa"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/PHP-FFMpeg/PHP-FFMpeg/zipball/c8949fe3df89edd7692368cc110a51a27971f28a", "url": "https://api.github.com/repos/PHP-FFMpeg/PHP-FFMpeg/zipball/984dbd046b6d8c285f9e7419fc7645f197513bfa",
"reference": "c8949fe3df89edd7692368cc110a51a27971f28a", "reference": "984dbd046b6d8c285f9e7419fc7645f197513bfa",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"alchemy/binary-driver": "~1.5", "alchemy/binary-driver": "^1.5 || ~2.0.0 || ^5.0",
"doctrine/cache": "~1.0", "doctrine/cache": "^1.0",
"evenement/evenement": "~1.0", "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
"neutron/temporary-filesystem": "~2.1, >=2.1.1", "neutron/temporary-filesystem": "^2.1.1",
"php": ">=5.3.3" "php": "^5.3.9 || ^7.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~3.7",
"sami/sami": "~1.0", "sami/sami": "~1.0",
"silex/silex": "~1.0" "silex/silex": "~1.0",
"symfony/phpunit-bridge": "^5.0.4"
}, },
"suggest": { "suggest": {
"php-ffmpeg/extras": "A compilation of common audio & video drivers for PHP-FFMpeg" "php-ffmpeg/extras": "A compilation of common audio & video drivers for PHP-FFMpeg"
@@ -5177,7 +5177,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "0.5-dev" "dev-master": "0.7-dev"
} }
}, },
"autoload": { "autoload": {
@@ -5199,6 +5199,21 @@
"name": "Phraseanet Team", "name": "Phraseanet Team",
"email": "info@alchemy.fr", "email": "info@alchemy.fr",
"homepage": "http://www.phraseanet.com/" "homepage": "http://www.phraseanet.com/"
},
{
"name": "Patrik Karisch",
"email": "patrik@karisch.guru",
"homepage": "http://www.karisch.guru"
},
{
"name": "Romain Biard",
"email": "romain.biard@gmail.com",
"homepage": "https://www.strime.io/"
},
{
"name": "Jens Hausdorf",
"email": "hello@jens-hausdorf.de",
"homepage": "https://jens-hausdorf.de"
} }
], ],
"description": "FFMpeg PHP, an Object Oriented library to communicate with AVconv / ffmpeg", "description": "FFMpeg PHP, an Object Oriented library to communicate with AVconv / ffmpeg",
@@ -5212,7 +5227,7 @@
"video", "video",
"video processing" "video processing"
], ],
"time": "2014-08-26T08:46:56+00:00" "time": "2020-03-23T09:32:09+00:00"
}, },
{ {
"name": "php-mp4box/php-mp4box", "name": "php-mp4box/php-mp4box",
@@ -7772,7 +7787,7 @@
], ],
"packages-dev": [ "packages-dev": [
{ {
"name": "mikey179/vfsStream", "name": "mikey179/vfsstream",
"version": "v1.6.4", "version": "v1.6.4",
"source": { "source": {
"type": "git", "type": "git",

1
docker/phraseanet/entrypoint.sh
View File

@@ -15,6 +15,7 @@ chown -R app:app \
FILE=config/configuration.yml FILE=config/configuration.yml
if [ -f "$FILE" ]; then if [ -f "$FILE" ]; then
bin/setup system:config set registry.general.title $PHRASEANET_PROJECT_NAME
echo "$FILE exists, skip setup." echo "$FILE exists, skip setup."
else else
echo "$FILE doesn't exist, entering setup..." echo "$FILE doesn't exist, entering setup..."