Merge branch 'release-0.4.2'

This commit is contained in:
Pierre Rudloff 2015-11-21 21:59:32 +01:00
commit 3f06b8226b
7 changed files with 38 additions and 9 deletions

View file

@ -2,3 +2,5 @@ language: php
install:
- composer install
- npm install
before_install:
- composer selfupdate

View file

@ -31,7 +31,7 @@ Class Config
public $python = '/usr/bin/python';
public $params = '--no-playlist --no-warnings -f best';
public $convert = false;
public $avconv = 'ffmpeg/ffmpeg';
public $avconv = 'vendor/bin/ffmpeg';
/**
* Config constructor

View file

@ -10,7 +10,8 @@
"slim/slim": "~2.6.2",
"slim/views": "~0.1.3",
"rudloff/smarty-plugin-noscheme": "~0.1.0",
"symfony/yaml": "~2.7.6"
"symfony/yaml": "~2.7.6",
"ffmpeg/ffmpeg": "~2.8.2"
},
"require-dev": {
"symfony/var-dumper": "~2.7.6"
@ -34,6 +35,20 @@
"reference": "2015.11.13"
}
}
},
{
"type": "package",
"package": {
"name": "ffmpeg/ffmpeg",
"version": "2.8.2",
"dist": {
"url": "http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz",
"type": "xz"
},
"bin": [
"ffmpeg"
]
}
}
],
"authors": [

18
composer.lock generated
View file

@ -4,9 +4,23 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "9e5e7fd038b781a2e3d8225c106c4cf8",
"content-hash": "f12c36b7fa62650562772e94d85a1a8a",
"hash": "a4d07c0b568b699f11966a06bb02c01a",
"content-hash": "d44f2b04ee42d003e6c04dbde30106c5",
"packages": [
{
"name": "ffmpeg/ffmpeg",
"version": "2.8.2",
"dist": {
"type": "xz",
"url": "http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz",
"reference": null,
"shasum": null
},
"bin": [
"ffmpeg"
],
"type": "library"
},
{
"name": "jeremykendall/php-domain-parser",
"version": "3.0.0",

View file

@ -2,4 +2,4 @@ youtubedl: vendor/rg3/youtube-dl/youtube_dl/__main__.py
python: /usr/bin/python
params: --no-playlist --no-warnings -f best
convert: false
avconv: ffmpeg/ffmpeg
avconv: vendor/bin/ffmpeg

2
ffmpeg/.gitignore vendored
View file

@ -1,2 +0,0 @@
*
!.gitignore

View file

@ -1,6 +1,6 @@
{
"name": "alltube",
"version": "0.4.1",
"version": "0.4.2",
"dependencies": {
"grunt": "~0.4.5",
"grunt-cli": "~0.1.13",
@ -20,6 +20,6 @@
"url": "https://github.com/Rudloff/alltube.git"
},
"scripts": {
"postinstall": "./node_modules/bower/bin/bower install; ./node_modules/grunt-cli/bin/grunt; curl http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz -o ffmpeg.tar.xz; tar xJf ffmpeg.tar.xz -C ffmpeg --strip-components=1"
"postinstall": "./node_modules/bower/bin/bower install; ./node_modules/grunt-cli/bin/grunt"
}
}