taglib2: vlc-3.0.21

Simple diff to fix vlc-3.0.21 with taglib2. Tested on amd64. OK?

Cheers Rafael

diff --git a/x11/vlc/Makefile b/x11/vlc/Makefile
index 3e96ae771ee..437f5aaec58 100644
--- a/x11/vlc/Makefile
+++ b/x11/vlc/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= x11
SITES= https://download.videolan.org/pub/videolan/vlc/${V}/
EXTRACT_SUFX= .tar.xz
REVISION-jack= 0
-REVISION-main= 3
+REVISION-main= 4

USE_NOBTCFI= Yes

@@ -110,7 +110,7 @@ LIB_DEPENDS-main= ${MODQT5_LIB_DEPENDS} \
audio/libvorbis \
audio/opus \
audio/speex \
- audio/taglib \
+ audio/taglib>=2.0.2 \
devel/fribidi \
devel/gettext,-runtime \
devel/harfbuzz \
@@ -230,6 +230,8 @@ CONFIGURE_ENV+= BUILDCC="${CC}" \
RCC="${LOCALBASE}/bin/rcc-qt5" \
LUAC="${LOCALBASE}/bin/luac${MODLUA_DEP_VERSION}"

+CFLAGS+= -Wno-unreachable-code-generic-assoc
+
PSEUDO_FLAVORS= no_jack
FLAVOR?=

diff --git a/x11/vlc/patches/patch-modules_meta_engine_taglib_cpp b/x11/vlc/patches/patch-modules_meta_engine_taglib_cpp
new file mode 100644
index 00000000000..8b030137f66
--- /dev/null
+++ b/x11/vlc/patches/patch-modules_meta_engine_taglib_cpp
@@ -0,0 +1,158 @@
+Backport upstream fixes for taglib 2.x support and remove usages of member
+functions that were deprecated in taglib 1.x and removed in 2.x.
+Obtained from:
+https://code.videolan.org/videolan/vlc/-/commit/d2663d6c3fe3af76bdefd58367b4a45c598b83e4
+https://code.videolan.org/videolan/vlc/-/commit/ac59d0ba59ba800c52c0a92ec1d9576d2653dbe2
+https://code.videolan.org/videolan/vlc/-/commit/c404fdb24183031a419667639846edddca3401f8
+https://code.videolan.org/videolan/vlc/-/commit/ec29dfca1e59530dd412d779e0b045079b72ffb6
+Index: modules/meta_engine/taglib.cpp
+--- modules/meta_engine/taglib.cpp.orig
++++ modules/meta_engine/taglib.cpp
+@@ -125,7 +125,11 @@ VLCTagLib::ExtResolver<T>::ExtResolver(const std::stri
+ template <class T>
+ File *VLCTagLib::ExtResolver<T>::createFile(FileName fileName, bool, AudioProperties::ReadStyle) const
+ {
++#if defined(_WIN32) && TAGLIB_VERSION >= VERSION_INT(2, 0, 0)
++ std::string filename = fileName.toString().to8Bit(true);
++#else
+ std::string filename = std::string(fileName);
++