vlc | branch: master | Felix Paul Kühne <[email protected]> | Sat Mar 31 15:06:07 2012 +0200| [842d0af385864580d2460c12f7baec089d60946d] | committer: Felix Paul Kühne
contrib: fixed broken patch for libmatroska included in b0ea094267e4bb5e654028b5b4a4ef38ec90e6d9 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=842d0af385864580d2460c12f7baec089d60946d --- contrib/src/matroska/no-ansi.patch | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/contrib/src/matroska/no-ansi.patch b/contrib/src/matroska/no-ansi.patch index f452c43..14ec732 100644 --- a/contrib/src/matroska/no-ansi.patch +++ b/contrib/src/matroska/no-ansi.patch @@ -1,12 +1,12 @@ -diff -ru libmatroska.orig/make/linux/Makefile libmatroska/make/linux/Makefile ---- libmatroska.orig/make/linux/Makefile 2012-03-29 16:04:40.525538362 -0400 -+++ libmatroska/make/linux/Makefile 2012-03-29 16:04:58.105538361 -0400 +diff -ru libmatroska-1.3.0/make/linux/Makefile libmatroska-fix/make/linux/Makefile +--- libmatroska-1.3.0/make/linux/Makefile 2012-03-31 15:04:21.000000000 +0200 ++++ libmatroska-fix/make/linux/Makefile 2012-03-31 15:05:04.000000000 +0200 @@ -67,7 +67,7 @@ - - objects_so:=$(objects) - --WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \ -+WARNINGFLAGS=-Wall -Wno-unknown-pragmas -fno-gnu-keywords -D_GNU_SOURCE \ - -Wshadow - COMPILEFLAGS=$(DEBUGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(WARNINGFLAGS) $(INCLUDE) - LINKFLAGS=-L. -L$(LIBEBML_LIB_DIR) $(LDFLAGS) + + objects_so:=$(objects) + +-WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \ ++WARNINGFLAGS=-Wall -Wno-unknown-pragmas -fno-gnu-keywords -D_GNU_SOURCE \ + -Wshadow + COMPILEFLAGS=$(DEBUGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(WARNINGFLAGS) $(INCLUDE) + LINKFLAGS=-L. -L$(LIBEBML_LIB_DIR) $(LDFLAGS) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
