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

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri Jan 27 11:21:46 2012 -0500| [4105ebb57dda9350ef0dcb23089146c9af79857c] | committer: Rafaël Carré

contrib: openjpeg: freebsd has posix_memalign

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

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

diff --git a/contrib/src/openjpeg/freebsd.patch b/contrib/src/openjpeg/freebsd.patch
new file mode 100644
index 0000000..1faa0d6
--- /dev/null
+++ b/contrib/src/openjpeg/freebsd.patch
@@ -0,0 +1,11 @@
+--- 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
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)