vlc | branch: master | Felix Paul Kühne <[email protected]> | Sat Mar 31 
14:57:01 2012 +0200| [3416f9fd544a04edc93393da7227af57a0ba4c2c] | committer: 
Felix Paul Kühne

contrib: fixed broken patch for libebml included in 
b0ea094267e4bb5e654028b5b4a4ef38ec90e6d9

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

 contrib/src/ebml/no-ansi.patch |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/contrib/src/ebml/no-ansi.patch b/contrib/src/ebml/no-ansi.patch
index 3c83cd9..2a5b42d 100644
--- a/contrib/src/ebml/no-ansi.patch
+++ b/contrib/src/ebml/no-ansi.patch
@@ -1,12 +1,12 @@
-diff -ur libebml.orig/make/linux/Makefile libebml/make/linux/Makefile
---- libebml.orig/make/linux/Makefile   2012-03-29 16:03:42.965538360 -0400
-+++ libebml/make/linux/Makefile        2012-03-29 16:04:03.673538362 -0400
+diff -ru libebml-1.2.2/make/linux/Makefile libebml-fix/make/linux/Makefile
+--- libebml-1.2.2/make/linux/Makefile  2012-03-31 14:53:46.000000000 +0200
++++ libebml-fix/make/linux/Makefile    2012-03-31 14:54:28.000000000 +0200
 @@ -61,7 +61,7 @@
- objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
- objects_so:=$(objects)
- 
--WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
-+WARNINGFLAGS=-Wall -Wno-unknown-pragmas -fno-gnu-keywords -Wshadow
- COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
- DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)
- 
+ objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
+ objects_so:=$(objects)
+ 
+-WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
++WARNINGFLAGS=-Wall -Wno-unknown-pragmas -fno-gnu-keywords -Wshadow
+ COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
+ DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)
+ 

_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits

Reply via email to