[vlc-devel] [PATCH] contrib:openjpeg: make sure the patch is matching the source EOL style

Steve Lhomme robux4 at videolabs.io
Fri Feb 26 09:29:31 CET 2016


on mingw the file is checked out with CRLF unlike the other patches in the folder
---
 contrib/src/openjpeg/rules.mak | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contrib/src/openjpeg/rules.mak b/contrib/src/openjpeg/rules.mak
index d756ab2..949a3b9 100644
--- a/contrib/src/openjpeg/rules.mak
+++ b/contrib/src/openjpeg/rules.mak
@@ -10,6 +10,9 @@ $(TARBALLS)/openjpeg-$(OPENJPEG_VERSION).tar.gz:
 
 openjpeg: openjpeg-$(OPENJPEG_VERSION).tar.gz .sum-openjpeg
 	$(UNPACK)
+ifdef HAVE_WIN32
+	dos2unix $(SRC)/openjpeg/freebsd.patch
+endif
 	$(APPLY) $(SRC)/openjpeg/freebsd.patch
 ifdef HAVE_VISUALSTUDIO
 	$(APPLY) $(SRC)/openjpeg/msvc.patch
-- 
2.6.1.windows.1



More information about the vlc-devel mailing list