diff --git a/scripts/install b/scripts/install index 65d74d1..652deab 100755 --- a/scripts/install +++ b/scripts/install @@ -141,6 +141,17 @@ popd # Setup custom user.css file 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 #================================================= diff --git a/sources/app-00-add-ffprobe-path.patch b/sources/app-00-add-ffprobe-path.patch index 7453bd3..58364e8 100644 --- a/sources/app-00-add-ffprobe-path.patch +++ b/sources/app-00-add-ffprobe-path.patch @@ -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 index 9ececfe..106eadd 100644 --- a/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php diff --git a/sources/app-01-add-ffprobe-path.patch b/sources/app-01-add-ffprobe-path.patch new file mode 100644 index 0000000..0d1f1a5 --- /dev/null +++ b/sources/app-01-add-ffprobe-path.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