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:27:25 +02:00
parent 3e5b6e0046
commit f37c28c1ee
No known key found for this signature in database
GPG key ID: 574F281483054D44
3 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sources/app-01-add-ffprobe-path.patch → conf/ffprobe.patch
View file

@ -13,4 +13,17 @@ index 1a96769..5842606 100644
+ ));
/** @var Video */
$video = $ffmpeg->open(Storage::path('big/' . $photo->url));
if (!($tmp = tempnam(sys_get_temp_dir(), 'lychee')) ||
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
index 9ececfe..106eadd 100644
--- a/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php
+++ b/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php
@@ -33,7 +33,7 @@ class FFprobe extends AdapterAbstract
*
* @var string
*/
- protected $toolPath;
+ protected $toolPath = '/usr/bin/ffprobe';
/**
* @var string

6
scripts/install
View file

@ -146,11 +146,7 @@ ynh_add_config --template="../conf/user.css.example" --destination="$final_path/
# 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)
git apply ../conf/ffprobe.patch
#=================================================
# SETUP SSOWAT

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

@ -1,13 +0,0 @@
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
--- a/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php
+++ b/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php
@@ -33,7 +33,7 @@ class FFprobe extends AdapterAbstract
*
* @var string
*/
- protected $toolPath;
+ protected $toolPath = '/usr/bin/ffprobe';
/**
* @var string