Skip to content

V
vlc-2-2
Commit a6d52f6f authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

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

patch seems to work fine with this format when dealing with crlf
parent b87a34a7
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 11 deletions
contrib/src/openjpeg/freebsd.patch
View file @ a6d52f6f
--- openjpeg/libopenjpeg/opj_malloc.h.orig 2011-01-02 19:14:45.000000000 +0100 *** openjpeg/libopenjpeg/opj_malloc.h.orig 2012-01-27 16:25:43.875875000 -0500
+++ openjpeg/libopenjpeg/opj_malloc.h 2012-01-27 17:18:30.000000000 +0100 --- openjpeg/libopenjpeg/opj_malloc.h 2012-01-27 16:25:43.875875000 -0500
@@ -83,6 +83,8 @@ ***************
#else /* Not _WIN32 */ *** 83,88 ****
#if defined(__sun) --- 83,90 ----
#define HAVE_MEMALIGN #else /* Not _WIN32 */
+ #elif defined(__FreeBSD__) #if defined(__sun)
+ #define HAVE_POSIX_MEMALIGN #define HAVE_MEMALIGN
/* Linux x86_64 and OSX always align allocations to 16 bytes */ + #elif defined(__FreeBSD__)
#elif !defined(__amd64__) && !defined(__APPLE__) + #define HAVE_POSIX_MEMALIGN
#define HAVE_MEMALIGN /* Linux x86_64 and OSX always align allocations to 16 bytes */
#elif !defined(__amd64__) && !defined(__APPLE__)
#define HAVE_MEMALIGN
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment