ffmpegthumbnailer: fix compilation with macOS

Signed-off-by: Rosen Penev <[email protected]>

Author: neheb

releases.json

@@ -1999,6 +1999,7 @@
       "libffmpegthumbnailer"
     ],
     "versions": [
+      "2.2.3-2",
       "2.2.3-1",
       "2.2.2-4",
       "2.2.2-3",

subprojects/libffmpegthumbnailer.wrap

@@ -6,5 +6,4 @@ source_hash = 8c9b9057c6cc8bce9d11701af224c8139c940f734c439a595525e073b09d19b8
 patch_directory = libffmpegthumbnailer
 
 [provide]
-libffmpegthumbnailer = libffmpegthumbnailer_dep
-
+dependency_names = libffmpegthumbnailer

subprojects/packagefiles/libffmpegthumbnailer/meson.build

@@ -1,8 +1,8 @@
 project(
   'ffmpegthumbnailer',
   'cpp',
+  license: 'LGPL-2.1-or-later',
   version: '2.2.3',
-  default_options: ['warning_level=0', 'cpp_std=c++11'],
   meson_version: '>=0.54.1',
 )
 
@@ -81,6 +81,7 @@ endif
 libffmpegthumbnailer = library(
   'ffmpegthumbnailer',
   compfiles,
+  override_options: 'cpp_std=c++11',
   dependencies: ffmpegthumbnailer_deps,
   install: true,
   version: '4.15.1',
@@ -103,10 +104,11 @@ install_headers(
   subdir: 'libffmpegthumbnailer',
 )
 
-depinc = include_directories('.')
 libffmpegthumbnailer_dep = declare_dependency(
-  include_directories: depinc,
+  include_directories: '.',
   link_with: libffmpegthumbnailer,
 )
 
+meson.override_dependency('libffmpegthumbnailer', libffmpegthumbnailer_dep)
+
 subdir('test')

subprojects/packagefiles/libffmpegthumbnailer/test/meson.build

@@ -15,9 +15,8 @@ testlib = static_library(
   dependencies: [ffmpegthumbnailer_deps, libffmpegthumbnailer_dep],
 )
 
-tdepinc = [include_directories('.'), depinc]
 testdep = declare_dependency(
-  include_directories: tdepinc,
+  include_directories: ['.', depinc],
   link_with: testlib,
 )
 
@@ -28,6 +27,7 @@ ffmpegthumbnailertest = executable(
   'videothumbnailertest.cpp',
   'videothumbnailerctest.cpp',
   cpp_args: '-DTEST_DATADIR="@0@"'.format(meson.current_source_dir()),
+  override_options: 'cpp_std=c++11',
   dependencies: [catch_dep, testdep],
 )