[vlc-commits] openjpeg patch: use a context patch: -c, not -u

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri Jan 27 16:28:14 2012 -0500| [a6d52f6fa7a1f62d29fac153f486156134d9ff86] | committer: Rafaël Carré

openjpeg patch: use a context patch: -c, not -u

patch seems to work fine with this format when dealing with crlf

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

 contrib/src/openjpeg/freebsd.patch |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/contrib/src/openjpeg/freebsd.patch b/contrib/src/openjpeg/freebsd.patch
index 1faa0d6..4d952f4 100644
--- a/contrib/src/openjpeg/freebsd.patch
+++ b/contrib/src/openjpeg/freebsd.patch
@@ -1,11 +1,13 @@
---- openjpeg/libopenjpeg/opj_malloc.h.orig	2011-01-02 19:14:45.000000000 +0100
-+++ openjpeg/libopenjpeg/opj_malloc.h	2012-01-27 17:18:30.000000000 +0100
-@@ -83,6 +83,8 @@
- #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
+*** openjpeg/libopenjpeg/opj_malloc.h.orig	2012-01-27 16:25:43.875875000 -0500
+--- openjpeg/libopenjpeg/opj_malloc.h	2012-01-27 16:25:43.875875000 -0500
+***************
+*** 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