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

This reverts commit f5470b586795de7c8c75017c214c35ed74ab5717.

diff --git a/contrib/src/ebml/ebml-pic.patch b/contrib/src/ebml/ebml-pic.patch
index 68a0fdb31219a10300263ef5238edd9cf8bea64d..c9511b1961fa20d82bec12da34d9afbf6ef89365 100644 (file)
--- 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)
+ \r
+ # object files; replace .cxx extension with .o\r
+ objects:=$(patsubst %$(EXTENSION),%.o,$(sources))\r
+-objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))\r
++objects_so:=$(objects)\r
+ \r
+ WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow\r
+ COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)\r
 @@ -81,9 +81,6 @@
-
- # Build rules
- %.o: %$(EXTENSION)
--      $(CXX) -c $(COMPILEFLAGS) -o $@ $<
--
--%.lo: %$(EXTENSION)
-       $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
-
- $(LIBRARY): $(objects)
+ \r
+ # Build rules\r
+ %.o: %$(EXTENSION)\r
+-      $(CXX) -c $(COMPILEFLAGS) -o $@ $<\r
+-\r
+-%.lo: %$(EXTENSION)\r
+       $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<\r
+ \r
+ $(LIBRARY): $(objects)\r

diff --git a/contrib/src/ebml/no-ansi.patch b/contrib/src/ebml/no-ansi.patch
index 577a15b21de71908c227a7388ef366d70b7a669c..3f098a2ad77a38bf2dad60012ea380424d0cca7b 100644 (file)
--- 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))\r
+ objects_so:=$(objects)\r
+ \r
+-WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow\r
++WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -fno-gnu-keywords -Wshadow\r
+ COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)\r
+ DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)\r
+ \r

diff --git a/contrib/src/openjpeg/freebsd.patch b/contrib/src/openjpeg/freebsd.patch
index e6226bdeacd705b20181e1f7589498baa193e2bf..4d952f4b9edafd3b8d5b1f79579ed8b6ec5d6bce 100644 (file)
--- 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 */\r
+       #if defined(__sun)\r
+               #define HAVE_MEMALIGN\r
++      #elif defined(__FreeBSD__)\r
++              #define HAVE_POSIX_MEMALIGN\r
+       /* Linux x86_64 and OSX always align allocations to 16 bytes */\r
+       #elif !defined(__amd64__) && !defined(__APPLE__)        \r
+               #define HAVE_MEMALIGN\r