From 4b1b34509fa87ac9503e3a44f75c0ed3b734c1a0 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Wed, 13 Nov 2024 13:15:21 -0800
Subject: [PATCH] libffmpegthumbnailer: update to 2.2.3

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 ci_config.json                                       | 12 +++++-------
 releases.json                                        |  1 +
 subprojects/libffmpegthumbnailer.wrap                |  8 ++++----
 .../packagefiles/libffmpegthumbnailer/meson.build    |  6 +-----
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/ci_config.json b/ci_config.json
index 75191a8de..dae8fa439 100644
--- a/ci_config.json
+++ b/ci_config.json
@@ -512,10 +512,10 @@
   },
   "libffmpegthumbnailer": {
     "alpine_packages": [
-      "ffmpeg4-dev"
+      "ffmpeg-dev"
     ],
     "brew_packages": [
-      "ffmpeg@4"
+      "ffmpeg"
     ],
     "debian_packages": [
       "libavcodec-dev",
@@ -523,13 +523,11 @@
       "libavformat-dev",
       "libavutil-dev"
     ],
-    "_comment": "ffmpeg4 is keg-only. Need to add pkgconfig path.",
-    "build_options": [
-      "pkg_config_path=/usr/local/opt/ffmpeg@4/lib/pkgconfig"
+    "msys_packages": [
+      "ffmpeg"
     ],
-    "_comment": "Broken with Windows because of a header issue",
+    "_comment": "MSVC needs ffmpeg to build",
     "build_on": {
-      "msys2": false,
       "windows": false
     }
   },
diff --git a/releases.json b/releases.json
index 251d761d4..9e22a9ab7 100644
--- a/releases.json
+++ b/releases.json
@@ -1657,6 +1657,7 @@
       "libffmpegthumbnailer"
     ],
     "versions": [
+      "2.2.3-1",
       "2.2.2-4",
       "2.2.2-3",
       "2.2.2-2",
diff --git a/subprojects/libffmpegthumbnailer.wrap b/subprojects/libffmpegthumbnailer.wrap
index f0df59684..84745a23a 100644
--- a/subprojects/libffmpegthumbnailer.wrap
+++ b/subprojects/libffmpegthumbnailer.wrap
@@ -1,8 +1,8 @@
 [wrap-file]
-directory = ffmpegthumbnailer-2.2.2
-source_url = https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/2.2.2/ffmpegthumbnailer-2.2.2.tar.bz2
-source_filename = ffmpegthumbnailer-2.2.2.tar.bz2
-source_hash = 1cb24059c38223f657b300c84dd80491b7040d4b69471c4fea69be862bc99b5b
+directory = ffmpegthumbnailer-2.2.3
+source_url = https://github.com/dirkvdb/ffmpegthumbnailer/archive/refs/tags/2.2.3.tar.gz
+source_filename = ffmpegthumbnailer-2.2.3.tar.gz
+source_hash = 8c9b9057c6cc8bce9d11701af224c8139c940f734c439a595525e073b09d19b8
 patch_directory = libffmpegthumbnailer
 
 [provide]
diff --git a/subprojects/packagefiles/libffmpegthumbnailer/meson.build b/subprojects/packagefiles/libffmpegthumbnailer/meson.build
index 9625c22b3..a3ab7e6a6 100644
--- a/subprojects/packagefiles/libffmpegthumbnailer/meson.build
+++ b/subprojects/packagefiles/libffmpegthumbnailer/meson.build
@@ -1,15 +1,11 @@
 project(
   'ffmpegthumbnailer',
   'cpp',
-  version: '2.2.2',
+  version: '2.2.3',
   default_options: ['warning_level=0', 'cpp_std=c++11'],
   meson_version: '>=0.54.1',
 )
 
-if host_machine.system() == 'windows'
-  error('Windows is not supported currently. See https://github.com/dirkvdb/ffmpegthumbnailer/commit/c2fba253f3751f9bb825defec66109e5d33c74d6')
-endif
-
 libavcodec_dep = dependency('libavcodec')
 libavfilter_dep = dependency('libavfilter')
 libavformat_dep = dependency('libavformat')