diff --git a/conf/ffmpeg.patch b/conf/ffmpeg.patch new file mode 100644 index 0000000..0d1f1a5 --- /dev/null +++ b/conf/ffmpeg.patch @@ -0,0 +1,16 @@ +diff --git a/app/Actions/Photo/Extensions/VideoEditing.php b/app/Actions/Photo/Extensions/VideoEditing.php +index 1a96769..5842606 100644 +--- a/app/Actions/Photo/Extensions/VideoEditing.php ++++ b/app/Actions/Photo/Extensions/VideoEditing.php +@@ -45,7 +45,10 @@ trait VideoEditing + /** + * ! check if we can use path instead of this ugly thing. + */ +- $ffmpeg = FFMpeg::create(); ++ $ffmpeg = FFMpeg::create(array( ++ 'ffmpeg.binaries' => '/usr/bin/ffmpeg', ++ 'ffprobe.binaries' => '/usr/bin/ffprobe', ++ )); + /** @var Video */ + $video = $ffmpeg->open(Storage::path('big/' . $photo->url)); + if (!($tmp = tempnam(sys_get_temp_dir(), 'lychee')) || \ No newline at end of file diff --git a/scripts/install b/scripts/install index 66ceb7a..b31852e 100755 --- a/scripts/install +++ b/scripts/install @@ -137,15 +137,12 @@ pushd $final_path php$phpversion artisan config:clear -n php$phpversion artisan config:cache -n patch -p1 < "$YNH_CWD/../conf/ffprobe.patch" + patch -p1 < "$YNH_CWD/../conf/ffmpeg.patch" popd # Setup custom user.css file ynh_add_config --template="../conf/user.css.example" --destination="$final_path/public/dist/user.css" -# pushd $final_path -# patch -p1 < $YNH_CWD/../conf/conf/ffprobe.patch -# popd - #================================================= # SETUP SSOWAT #=================================================