YunoHost-Apps/lychee_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/lychee_ynh.git synced 2024-09-03 19:36:36 +02:00
Code Issues Activity Actions 1

Fix

Browse source
This commit is contained in:
ericgaspar 2021-06-25 12:19:43 +02:00
parent 364c2f034b
commit 3e5b6e0046
No known key found for this signature in database
GPG key ID: 574F281483054D44
3 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/install
View file

@ -141,6 +141,17 @@ popd
# Setup custom user.css file # Setup custom user.css file
ynh_add_config --template="../conf/user.css.example" --destination="$final_path/public/dist/user.css" ynh_add_config --template="../conf/user.css.example" --destination="$final_path/public/dist/user.css"
#=================================================
# PATCHS
#=================================================
(cd $final_path/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php/
patch -p1 < ../sources/app-00-add-ffprobe-path.patch)
(cd $final_path/app/Actions/Photo/Extensions/VideoEditing.php/
patch -p1 < ../sources/app-01-add-ffprobe-path.patch)
#================================================= #=================================================
# SETUP SSOWAT # SETUP SSOWAT
#================================================= #=================================================

16
sources/app-00-add-ffprobe-path.patch
View file

@ -1,19 +1,3 @@
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')) ||
diff --git a/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php b/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php diff --git a/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php b/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php
index 9ececfe..106eadd 100644 index 9ececfe..106eadd 100644
--- a/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php --- a/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php

16
sources/app-01-add-ffprobe-path.patch Normal file
View file

@ -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')) ||