[vlc-commits] contrib: medialibrary: Fix windows build with gcc

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Dec 16 13:26:28 2019 +0100| [3977a4f1de0937ec768c01728bc66ea81f62a9ad] | committer: Hugo Beauzée-Luyssen

contrib: medialibrary: Fix windows build with gcc

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3977a4f1de0937ec768c01728bc66ea81f62a9ad
---

 contrib/src/medialibrary/fix-win-build.patch | 24 ++++++++++++++++++++++++
 contrib/src/medialibrary/rules.mak           |  1 +
 2 files changed, 25 insertions(+)

diff --git a/contrib/src/medialibrary/fix-win-build.patch b/contrib/src/medialibrary/fix-win-build.patch
new file mode 100644
index 0000000000..b44c8fd5e8
--- /dev/null
+++ b/contrib/src/medialibrary/fix-win-build.patch
@@ -0,0 +1,24 @@
+From 52dbd4f4449876c4776a35a519970bf584b0d63f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo at beauzee.fr>
+Date: Mon, 16 Dec 2019 13:21:51 +0100
+Subject: [PATCH] utils: Filename: Fix win32 build with GCC
+
+---
+ src/utils/Filename.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/utils/Filename.cpp b/src/utils/Filename.cpp
+index 737191cd..1216d12e 100644
+--- a/src/utils/Filename.cpp
++++ b/src/utils/Filename.cpp
+@@ -29,6 +29,7 @@
+ #include "medialibrary/filesystem/Errors.h"
+ 
+ #ifdef _WIN32
++# include <algorithm>
+ # define DIR_SEPARATOR "\\/"
+ # define DIR_SEPARATOR_CHAR '\\'
+ #else
+-- 
+2.20.1
+
diff --git a/contrib/src/medialibrary/rules.mak b/contrib/src/medialibrary/rules.mak
index 096fce097e..0059aaa6b8 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/fix-win-build.patch
 	$(call pkg_static, "medialibrary.pc.in")
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)