[vlc-commits] contrib: goom: fix patch line returns when building on Windows

Steve Lhomme git at videolan.org
Tue Nov 27 14:24:12 CET 2018


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Nov 27 09:55:26 2018 +0100| [fa4dc9915f72e4eab7e25285dd41f19991e2dc6c] | committer: Steve Lhomme

contrib: goom: fix patch line returns when building on Windows

Otherwise the patch doesn't apply in Msys2.

It may work on other OS as well and thus the patch might just be changed directly.

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

 contrib/src/goom/rules.mak | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contrib/src/goom/rules.mak b/contrib/src/goom/rules.mak
index 64e96e6e1e..3769f62270 100644
--- a/contrib/src/goom/rules.mak
+++ b/contrib/src/goom/rules.mak
@@ -21,6 +21,9 @@ goom: goom-$(GOOM_VERSION)-src.tar.gz .sum-goom
 	$(APPLY) $(SRC)/goom/goom2k4-noxmmx.patch
 	$(APPLY) $(SRC)/goom/goom2k4-xmmslibdir.patch
 ifdef HAVE_WIN32
+ifndef HAVE_CROSS_COMPILE
+	unix2dos $(SRC)/goom/goom2k4-0-win32.patch
+endif
 	$(APPLY) $(SRC)/goom/goom2k4-0-win32.patch
 endif
 ifdef HAVE_MACOSX



More information about the vlc-commits mailing list