Accepting request 1135304 from multimedia:libs

- Update ffmpeg-glslang-cxx17.patch to build with glslang 14
- Disable vmaf integration as ffmpeg-4 cannot handle vmaf>=3
- Delete vmaf-trim-usr-local.patch

OBS-URL: https://build.opensuse.org/request/show/1135304
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ffmpeg-4?expand=0&rev=62

ffmpeg-4.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Dec 26 13:36:38 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+
+- Update ffmpeg-glslang-cxx17.patch to build with glslang 14
+- Disable vmaf integration as ffmpeg-4 cannot handle vmaf>=3
+- Delete vmaf-trim-usr-local.patch
+
 -------------------------------------------------------------------
 Wed Dec  6 08:50:00 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
 

ffmpeg-4.spec

@@ -119,7 +119,6 @@ Patch2:         ffmpeg-new-coder-errors.diff
 Patch3:         ffmpeg-codec-choice.diff
 Patch4:         ffmpeg-4.2-dlopen-fdk_aac.patch
 Patch5:         soversion.patch
-Patch8:         vmaf-trim-usr-local.patch
 Patch9:         ffmpeg-4.4-CVE-2020-22046.patch
 Patch10:        ffmpeg-chromium.patch
 Patch11:        ffmpeg-libglslang-detection.patch
@@ -177,7 +176,6 @@ BuildRequires:  pkgconfig(libv4l2)
 BuildRequires:  pkgconfig(libva) >= 0.35.0
 BuildRequires:  pkgconfig(libva-drm)
 BuildRequires:  pkgconfig(libva-x11)
-BuildRequires:  pkgconfig(libvmaf) >= 1.3.9
 BuildRequires:  pkgconfig(libwebp) >= 0.4
 BuildRequires:  pkgconfig(libxml-2.0)
 %if %{with zmq}
@@ -697,7 +695,6 @@ LDFLAGS="%_lto_cflags" \
 %if %{with vidstab}
 	--enable-libvidstab \
 %endif
-	--enable-libvmaf \
 	--enable-libvorbis \
 	--enable-libv4l2 \
 	--enable-libvpx \

ffmpeg-glslang-cxx17.patch

@@ -4,8 +4,9 @@ Date: 2023-10-30 12:10:03.273303565 +0100
 glslang 13 needs C++17.
 
 ---
- configure |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ configure               |    2 +-
+ libavfilter/glslang.cpp |    1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
 
 Index: ffmpeg-4.4.4/configure
 ===================================================================
@@ -20,3 +21,15 @@ Index: ffmpeg-4.4.4/configure
  
  # some compilers silently accept -std=c11, so we also need to check that the
  # version macro is defined properly
+Index: ffmpeg-4.4.4/libavfilter/glslang.cpp
+===================================================================
+--- ffmpeg-4.4.4.orig/libavfilter/glslang.cpp
++++ ffmpeg-4.4.4/libavfilter/glslang.cpp
+@@ -16,6 +16,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#include <cassert>
+ #include <pthread.h>
+ 
+ extern "C" {

vmaf-trim-usr-local.patch

@@ -1,17 +0,0 @@
----
- libavfilter/vf_libvmaf.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: ffmpeg-4.4.1/libavfilter/vf_libvmaf.c
-===================================================================
---- ffmpeg-4.4.1.orig/libavfilter/vf_libvmaf.c
-+++ ffmpeg-4.4.1/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 (csv, json or xml).",                       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},