[vlc-devel] [PATCH 1/2] contrib: medialibrary: backport upstream fix to build with modern C++

[Steve Lhomme]

---
 ...brary-IDeviceLister.h-Include-string.patch | 25 +++++++++++++++++++
 contrib/src/medialibrary/rules.mak            |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 contrib/src/medialibrary/0001-include-medialibrary-IDeviceLister.h-Include-string.patch

diff --git a/contrib/src/medialibrary/0001-include-medialibrary-IDeviceLister.h-Include-string.patch b/contrib/src/medialibrary/0001-include-medialibrary-IDeviceLister.h-Include-string.patch
new file mode 100644
index 000000000000..0827a7e09b70
--- /dev/null
+++ b/contrib/src/medialibrary/0001-include-medialibrary-IDeviceLister.h-Include-string.patch
@@ -0,0 +1,25 @@
+From 168ae35bde46a713bf08cbb4bc3456a427531e32 Mon Sep 17 00:00:00 2001
+From: Christopher Degawa <ccom at randomderp.com>
+Date: Wed, 13 May 2020 19:53:28 +0000
+Subject: [PATCH] include/medialibrary/IDeviceLister.h: Include string
+
+`std::string` is used, but string is not included, causing errors when compiling with mingw-w64
+---
+ include/medialibrary/IDeviceLister.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/medialibrary/IDeviceLister.h b/include/medialibrary/IDeviceLister.h
+index f6324610..299e5995 100644
+--- a/include/medialibrary/IDeviceLister.h
++++ b/include/medialibrary/IDeviceLister.h
+@@ -24,6 +24,7 @@
+ 
+ #include <tuple>
+ #include <vector>
++#include <string>
+ 
+ namespace medialibrary
+ {
+-- 
+2.26.0.windows.1
+
diff --git a/contrib/src/medialibrary/rules.mak b/contrib/src/medialibrary/rules.mak
index 55642b35e6d2..0741385b763f 100644
--- a/contrib/src/medialibrary/rules.mak
+++ b/contrib/src/medialibrary/rules.mak
@@ -20,6 +20,7 @@ medialibrary: medialibrary-$(MEDIALIBRARY_VERSION).tar.xz .sum-medialibrary
 	rm -rf $@-$(MEDIALIBRARY_VERSION) $@
 	mkdir -p $@-$(MEDIALIBRARY_VERSION)
 	tar xvf "$<" --strip-components=1 -C $@-$(MEDIALIBRARY_VERSION)
+	$(APPLY) $(SRC)/medialibrary/0001-include-medialibrary-IDeviceLister.h-Include-string.patch
 	$(call pkg_static, "medialibrary.pc.in")
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
-- 
2.26.2