[vlc-commits] contrib: openjpeg: freebsd has posix_memalign

[Rafaël Carré]

vlc/vlc-2.0 | branch: master | Rafaël Carré <funman at videolan.org> | Fri Jan 27 11:21:46 2012 -0500| [377c1b104067b85715dd07814f778dc1975e5455] | committer: Jean-Baptiste Kempf

contrib: openjpeg: freebsd has posix_memalign
(cherry picked from commit 4105ebb57dda9350ef0dcb23089146c9af79857c)
(cherry picked from commit a6d52f6fa7a1f62d29fac153f486156134d9ff86)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/openjpeg/freebsd.patch |   13 +++++++++++++
 contrib/src/openjpeg/rules.mak     |    1 +
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/contrib/src/openjpeg/freebsd.patch b/contrib/src/openjpeg/freebsd.patch
new file mode 100644
index 0000000..4d952f4
--- /dev/null
+++ b/contrib/src/openjpeg/freebsd.patch
@@ -0,0 +1,13 @@
+*** 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
diff --git a/contrib/src/openjpeg/rules.mak b/contrib/src/openjpeg/rules.mak
index 360b698..6a76e85 100644
--- a/contrib/src/openjpeg/rules.mak
+++ b/contrib/src/openjpeg/rules.mak
@@ -11,6 +11,7 @@ $(TARBALLS)/openjpeg_v$(OPENJPEG_VERSION).tgz:
 openjpeg: openjpeg_v$(OPENJPEG_VERSION).tgz .sum-openjpeg
 	$(UNPACK)
 	$(APPLY) $(SRC)/openjpeg/pkg-config.patch
+	$(APPLY) $(SRC)/openjpeg/freebsd.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)