[vlc-commits] Revert "contribs: Fix ebml & openjpeg patches line endings"

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Nov 24 17:01:32 2014 +0100| [cf3c3b36815fd71efbc466fbb585b981077693db] | committer: Hugo Beauzée-Luyssen

Revert "contribs: Fix ebml & openjpeg patches line endings"

This reverts commit f5470b586795de7c8c75017c214c35ed74ab5717.

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

 contrib/src/ebml/ebml-pic.patch    |   34 +++++++++++++++++-----------------
 contrib/src/ebml/no-ansi.patch     |   16 ++++++++--------
 contrib/src/openjpeg/freebsd.patch |   16 ++++++++--------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/contrib/src/ebml/ebml-pic.patch b/contrib/src/ebml/ebml-pic.patch
index 68a0fdb..c9511b1 100644
--- a/contrib/src/ebml/ebml-pic.patch
+++ b/contrib/src/ebml/ebml-pic.patch
@@ -2,21 +2,21 @@ diff -ru libebml.orig/make/linux/Makefile libebml/make/linux/Makefile
 --- libebml.orig/make/linux/Makefile	2011-08-03 13:39:21.000000000 +0300
 +++ libebml/make/linux/Makefile	2011-08-03 13:39:57.000000000 +0300
 @@ -59,7 +59,7 @@
-
- # object files; replace .cxx extension with .o
- objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
--objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
-+objects_so:=$(objects)
-
- WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
- COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
+ 
+ # object files; replace .cxx extension with .o
+ objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
+-objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
++objects_so:=$(objects)
+ 
+ WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
+ COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
 @@ -81,9 +81,6 @@
-
- # Build rules
- %.o: %$(EXTENSION)
--	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
--
--%.lo: %$(EXTENSION)
-	$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
-
- $(LIBRARY): $(objects)
+ 
+ # Build rules
+ %.o: %$(EXTENSION)
+-	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
+-
+-%.lo: %$(EXTENSION)
+ 	$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
+ 
+ $(LIBRARY): $(objects)
diff --git a/contrib/src/ebml/no-ansi.patch b/contrib/src/ebml/no-ansi.patch
index 577a15b..3f098a2 100644
--- a/contrib/src/ebml/no-ansi.patch
+++ b/contrib/src/ebml/no-ansi.patch
@@ -1,11 +1,11 @@
 --- libebml-1.3.0/make/linux/Makefile.orig	2013-07-04 19:08:40.474927603 +0200
 +++ libebml-1.3.0/make/linux/Makefile	2013-07-04 19:09:09.568664476 +0200
 @@ -61,7 +61,7 @@
- objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
- objects_so:=$(objects)
-
--WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
-+WARNINGFLAGS=-Wall -Wextra -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 -Wextra -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
++WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -fno-gnu-keywords -Wshadow
+ COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
+ DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)
+ 
diff --git a/contrib/src/openjpeg/freebsd.patch b/contrib/src/openjpeg/freebsd.patch
index e6226bd..4d952f4 100644
--- a/contrib/src/openjpeg/freebsd.patch
+++ b/contrib/src/openjpeg/freebsd.patch
@@ -3,11 +3,11 @@
 ***************
 *** 83,88 ****
 --- 83,90 ----
-  #else /* Not _WIN32 */
-	#if defined(__sun)
-		#define HAVE_MEMALIGN
-+ 	#elif defined(__FreeBSD__)
-+ 		#define HAVE_POSIX_MEMALIGN
-	/* Linux x86_64 and OSX always align allocations to 16 bytes */
-	#elif !defined(__amd64__) && !defined(__APPLE__)
-		#define HAVE_MEMALIGN
+  #else /* Not _WIN32 */
+  	#if defined(__sun)
+  		#define HAVE_MEMALIGN
++ 	#elif defined(__FreeBSD__)
++ 		#define HAVE_POSIX_MEMALIGN
+  	/* Linux x86_64 and OSX always align allocations to 16 bytes */
+  	#elif !defined(__amd64__) && !defined(__APPLE__)	
+  		#define HAVE_MEMALIGN