diff --git a/multimedia/video/ffmpeg/files/fix-vmaf-model-path.patch b/multimedia/video/ffmpeg/files/fix-vmaf-model-path.patch new file mode 100644 index 0000000000..88a949b438 --- /dev/null +++ b/multimedia/video/ffmpeg/files/fix-vmaf-model-path.patch @@ -0,0 +1,25 @@ +From 37b8f54578ac1bcb7a63dc9038a5238fd6a58793 Mon Sep 17 00:00:00 2001 +From: Leigh Scott +Date: Sat, 23 May 2020 12:32:44 +0100 +Subject: [PATCH] fix vmaf model path + +--- + libavfilter/vf_libvmaf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c +index 14c3216b3a..e7273b6d1d 100644 +--- a/libavfilter/vf_libvmaf.c ++++ b/libavfilter/vf_libvmaf.c +@@ -72,7 +72,7 @@ typedef struct LIBVMAFContext { + #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM + + static const AVOption libvmaf_options[] = { +- {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/local/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS}, ++ {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS}, + {"log_path", "Set the file path to be used to store logs.", OFFSET(log_path), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS}, + {"log_fmt", "Set the format of the log (xml or json).", OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS}, + {"enable_transform", "Enables transform for computing vmaf.", OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS}, +-- +2.26.2 + diff --git a/multimedia/video/ffmpeg/files/fix_ppc_build.patch b/multimedia/video/ffmpeg/files/fix_ppc_build.patch new file mode 100644 index 0000000000..3c35dc4d21 --- /dev/null +++ b/multimedia/video/ffmpeg/files/fix_ppc_build.patch @@ -0,0 +1,21 @@ +--- a/libswscale/ppc/swscale_vsx.c ++++ b/libswscale/ppc/swscale_vsx.c +@@ -154,7 +154,7 @@ + } + } + +-static void yuv2plane1_nbps_vsx(const int16_t *src, uint16_t *dest, int dstW, ++static av_always_inline void yuv2plane1_nbps_vsx(const int16_t *src, uint16_t *dest, int dstW, + int big_endian, int output_bits) + { + const int dst_u = -(uintptr_t)dest & 7; +@@ -273,7 +273,7 @@ + } + } + +-static void yuv2plane1_16_vsx(const int32_t *src, uint16_t *dest, int dstW, ++static av_always_inline void yuv2plane1_16_vsx(const int32_t *src, uint16_t *dest, int dstW, + int big_endian, int output_bits) + { + const int dst_u = -(uintptr_t)dest & 7; + diff --git a/multimedia/video/ffmpeg/pspec.xml b/multimedia/video/ffmpeg/pspec.xml index 4712067202..8bd9c7c139 100644 --- a/multimedia/video/ffmpeg/pspec.xml +++ b/multimedia/video/ffmpeg/pspec.xml @@ -15,7 +15,7 @@ app:console A command-line tool to record, convert and stream audio and video FFmpeg is a complete solution to record, convert and stream audio and video. - https://ffmpeg.org/releases/ffmpeg-4.2.2.tar.bz2 + https://ffmpeg.org/releases/ffmpeg-4.2.3.tar.bz2 freetype-devel fontconfig-devel @@ -106,8 +106,8 @@ opencv-devel - - + fix_ppc_build.patch + fix-vmaf-model-path.patch @@ -226,6 +226,13 @@ + + 2020-07-08 + 4.2.3 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2020-04-16 4.2.2