From cafb75a9c19107714e774f86340e7db4d06261a0 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Sat, 21 Nov 2015 20:44:32 +0100 Subject: [PATCH 1/4] Use Composer to download ffmpeg (fixes #38) --- classes/Config.php | 2 +- composer.json | 14 +++++++++++++- composer.lock | 15 +++++++++++++-- config.example.yml | 2 +- ffmpeg/.gitignore | 2 -- package.json | 2 +- 6 files changed, 29 insertions(+), 8 deletions(-) delete mode 100644 ffmpeg/.gitignore diff --git a/classes/Config.php b/classes/Config.php index c0c53257..dcd7f8ea 100644 --- a/classes/Config.php +++ b/classes/Config.php @@ -31,7 +31,7 @@ public $python = '/usr/bin/python'; public $params = '--no-playlist --no-warnings -f best'; public $convert = false; - public $avconv = 'ffmpeg/ffmpeg'; + public $avconv = 'vendor/ffmpeg/ffmpeg/ffmpeg'; /** * Config constructor diff --git a/composer.json b/composer.json index 4dab2587..5abc2e03 100644 --- a/composer.json +++ b/composer.json @@ -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,17 @@ "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" + } + } } ], "authors": [ diff --git a/composer.lock b/composer.lock index 4d1ae0be..95b0ef18 100644 --- a/composer.lock +++ b/composer.lock @@ -4,9 +4,20 @@ "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": "f0413ea9f5a3839553b545d6f8d97a04", + "content-hash": "17101d634f04111528073e6c9e5dcb8c", "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 + }, + "type": "library" + }, { "name": "jeremykendall/php-domain-parser", "version": "3.0.0", diff --git a/config.example.yml b/config.example.yml index 7dd99407..067d6cc0 100644 --- a/config.example.yml +++ b/config.example.yml @@ -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/ffmpeg/ffmpeg/ffmpeg diff --git a/ffmpeg/.gitignore b/ffmpeg/.gitignore deleted file mode 100644 index d6b7ef32..00000000 --- a/ffmpeg/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/package.json b/package.json index bb6eff60..4997c0fd 100644 --- a/package.json +++ b/package.json @@ -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" } } From c74623a9dd0ee08bc74acba2c6844eb7f3eb0b4f Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Sat, 21 Nov 2015 20:54:38 +0100 Subject: [PATCH 2/4] Declare ffmpeg binary in composer.json --- classes/Config.php | 2 +- composer.json | 5 ++++- composer.lock | 7 +++++-- config.example.yml | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/classes/Config.php b/classes/Config.php index dcd7f8ea..8cca1867 100644 --- a/classes/Config.php +++ b/classes/Config.php @@ -31,7 +31,7 @@ public $python = '/usr/bin/python'; public $params = '--no-playlist --no-warnings -f best'; public $convert = false; - public $avconv = 'vendor/ffmpeg/ffmpeg/ffmpeg'; + public $avconv = 'vendor/bin/ffmpeg'; /** * Config constructor diff --git a/composer.json b/composer.json index 5abc2e03..bd22e940 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,10 @@ "dist": { "url": "http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz", "type": "xz" - } + }, + "bin": [ + "ffmpeg" + ] } } ], diff --git a/composer.lock b/composer.lock index 95b0ef18..57950e6c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "f0413ea9f5a3839553b545d6f8d97a04", - "content-hash": "17101d634f04111528073e6c9e5dcb8c", + "hash": "a4d07c0b568b699f11966a06bb02c01a", + "content-hash": "d44f2b04ee42d003e6c04dbde30106c5", "packages": [ { "name": "ffmpeg/ffmpeg", @@ -16,6 +16,9 @@ "reference": null, "shasum": null }, + "bin": [ + "ffmpeg" + ], "type": "library" }, { diff --git a/config.example.yml b/config.example.yml index 067d6cc0..b0c7301c 100644 --- a/config.example.yml +++ b/config.example.yml @@ -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: vendor/ffmpeg/ffmpeg/ffmpeg +avconv: vendor/bin/ffmpeg From ba7720ec8185bfee388ce8767001a71a01ee964d Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Sat, 21 Nov 2015 21:51:59 +0100 Subject: [PATCH 3/4] Update composer on Travis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 89517deb..fbe6512f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,3 +2,5 @@ language: php install: - composer install - npm install +before_install: + - composer selfupdate From 6205dd555db5fc83077dc231a11ab40935a6c41a Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Sat, 21 Nov 2015 21:59:23 +0100 Subject: [PATCH 4/4] 0.4.2 release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4997c0fd..21fdae73 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "alltube", - "version": "0.4.1", + "version": "0.4.2", "dependencies": { "grunt": "~0.4.5", "grunt-cli": "~0.1.13",