From f90a08e89c96cf6593a403296d9ec458c1e265e8 Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Mon, 22 Jun 2020 23:16:42 +0200
Subject: [PATCH] Stop installing ffmpeg and phantomjs with Composer It is
 convenient but this a the job of the OS package manager

---
 classes/Config.php        |  4 +--
 composer.json             | 16 -----------
 composer.lock             | 56 +--------------------------------------
 config/config.example.yml |  4 +--
 4 files changed, 5 insertions(+), 75 deletions(-)

diff --git a/classes/Config.php b/classes/Config.php
index d95e212..8b90f8a 100644
--- a/classes/Config.php
+++ b/classes/Config.php
@@ -74,14 +74,14 @@ class Config
      *
      * @var string
      */
-    public $avconv = 'vendor/bin/ffmpeg';
+    public $avconv = '/usr/bin/ffmpeg';
 
     /**
      * Path to the directory that contains the phantomjs binary.
      *
      * @var string
      */
-    public $phantomjsDir = 'vendor/bin/';
+    public $phantomjsDir = '/usr/bin/';
 
     /**
      * Disable URL rewriting.
diff --git a/composer.json b/composer.json
index 9510c22..df69396 100644
--- a/composer.json
+++ b/composer.json
@@ -7,10 +7,8 @@
   "require": {
     "ext-intl": "*",
     "ext-json": "*",
-    "anam/phantomjs-linux-x86-binary": "^2.1",
     "aura/session": "^2.1",
     "barracudanetworks/archivestream-php": "^1.0",
-    "ffmpeg/ffmpeg": "^4.1",
     "jawira/case-converter": "^3.4",
     "jean85/pretty-package-versions": "^1.3",
     "mathmarques/smarty-view": "^1.1",
@@ -50,20 +48,6 @@
           "url": "https://github.com/ytdl-org/youtube-dl/archive/2020.06.16.1.zip"
         }
       }
-    },
-    {
-      "type": "package",
-      "package": {
-        "name": "ffmpeg/ffmpeg",
-        "version": "4.1.4",
-        "dist": {
-          "url": "https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-4.1.4-amd64-static.tar.xz",
-          "type": "xz"
-        },
-        "bin": [
-          "ffmpeg"
-        ]
-      }
     }
   ],
   "authors": [
diff --git a/composer.lock b/composer.lock
index 90c8d5a..44749d8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,50 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4468e4da3c9a9626c997b0da8be455ae",
+    "content-hash": "3c17df3876a2c769f866f845e4491763",
     "packages": [
-        {
-            "name": "anam/phantomjs-linux-x86-binary",
-            "version": "v2.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/anam-hossain/phantomjs-linux-x86-binary.git",
-                "reference": "cb90cd0e7bd4ad34f52e6834783b1c5adae15014"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/anam-hossain/phantomjs-linux-x86-binary/zipball/cb90cd0e7bd4ad34f52e6834783b1c5adae15014",
-                "reference": "cb90cd0e7bd4ad34f52e6834783b1c5adae15014",
-                "shasum": ""
-            },
-            "bin": [
-                "bin/phantomjs"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Anam\\PhantomLinux\\": "/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-2-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Anam hossain",
-                    "email": "enam33@gmail.com"
-                }
-            ],
-            "description": "PhantomJS static linked binary for 64 bit linux systems. Most of Linux distributions are supported including Ubuntu, Debian, Fedora and CentOS.",
-            "homepage": "http://phantomjs.org/download.html",
-            "keywords": [
-                "binary",
-                "phantomjs",
-                "phantomjs binary"
-            ],
-            "time": "2016-04-05T05:24:48+00:00"
-        },
         {
             "name": "aura/session",
             "version": "2.1.0",
@@ -205,18 +163,6 @@
             "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
             "time": "2020-06-19T07:59:31+00:00"
         },
-        {
-            "name": "ffmpeg/ffmpeg",
-            "version": "4.1.4",
-            "dist": {
-                "type": "xz",
-                "url": "https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-4.1.4-amd64-static.tar.xz"
-            },
-            "bin": [
-                "ffmpeg"
-            ],
-            "type": "library"
-        },
         {
             "name": "guzzlehttp/guzzle",
             "version": "6.5.5",
diff --git a/config/config.example.yml b/config/config.example.yml
index 29d6c5d..c6b1f0b 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -23,13 +23,13 @@ convertAdvanced: false
 convertAdvancedFormats: [mp3, avi, flv, wav]
 
 # Path to your avconv or ffmpeg binary
-avconv: vendor/bin/ffmpeg
+avconv: /usr/bin/ffmpeg
 
 # avconv/ffmpeg logging level.
 avconvVerbosity: error
 
 # Path to the directory that contains the phantomjs binary.
-phantomjsDir: vendor/bin/
+phantomjsDir: /usr/bin/
 
 # True to disable URL rewriting
 uglyUrls: false