X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FPatches%2Flibmatroska-win32.patch;h=39a4160bc668591173baed46af441420141704ef;hb=f5abb96d4aef877581f7afb92b7c9ccd7c5a0869;hp=91719cb8ea633d234a0f2e8ccfad254d6f02ee88;hpb=b49b25bb5b2c5b9c55471f3688db45473e26a282;p=vlc

diff --git a/extras/contrib/src/Patches/libmatroska-win32.patch b/extras/contrib/src/Patches/libmatroska-win32.patch
index 91719cb8ea..39a4160bc6 100644
--- a/extras/contrib/src/Patches/libmatroska-win32.patch
+++ b/extras/contrib/src/Patches/libmatroska-win32.patch
@@ -1,17 +1,11 @@
-Index: make/linux/Makefile
-===================================================================
---- make/linux/Makefile	(revision 1206)
-+++ make/linux/Makefile	(working copy)
-@@ -29,9 +29,9 @@
- INSTALL_OPTS_LIB = -m 644
- INSTALL_DIR_OPTS = -m 755
- 
--ifneq (,$(shell $(CXX) -v 2>&1 | tail -n 1 | grep -i mingw))
--$(error Please use the Makefile in ../mingw32)
--endif
-+#ifneq (,$(shell $(CXX) -v 2>&1 | tail -n 1 | grep -i mingw))
-+#$(error Please use the Makefile in ../mingw32)
-+#endif
- 
- CWD=$(shell pwd)
- 
+--- libmatroska/make/mingw32/Makefile	2010-04-11 18:40:15.000000000 +0200
++++ libmatroska.new/make/mingw32/Makefile	2010-05-29 14:38:19.000000000 +0200
+@@ -67,7 +67,7 @@
+ 	rm -f .depend
+ 
+ libmatroska.a: $(OBJ)
+-	$(AR) r $@ $(OBJ)
++	$(AR) rcvu $@ $(OBJ)
+ 	$(RANLIB) $@
+ 
+ libmatroska.dll: $(OBJ)