2 files changed, 37 insertions, 6 deletions

diff --git a/multimedia/libva/files/extra-patch-va-va_trace.c b/multimedia/libva/files/extra-patch-va-va_trace.c
index 072b905167b3..5554365ea7bd 100644
--- a/multimedia/libva/files/extra-patch-va-va_trace.c
+++ b/multimedia/libva/files/extra-patch-va-va_trace.c
@@ -1,6 +1,6 @@
---- va/va_trace.c~
-+++ va/va_trace.c
-@@ -140,6 +140,17 @@ VAStatus vaUnlockSurface(VADisplay dpy,
+--- va/va_trace.c.orig	2012-10-04 15:30:51.000000000 +0200
++++ va/va_trace.c	2012-10-09 23:12:35.888197737 +0200
+@@ -137,6 +137,18 @@
                           VASurfaceID surface
                           );
  
@@ -15,6 +15,7 @@
 +	}
 +	return (len);
 +}
- 
- void va_TraceInit(VADisplay dpy)
- {
++
+ #define FILE_NAME_SUFFIX(env_value)                      \
+ do {                                                    \
+     int tmp = strnlen(env_value, sizeof(env_value));    \
diff --git a/multimedia/libva/files/patch-test-v4l_h264-encode-capture.cpp b/multimedia/libva/files/patch-test-v4l_h264-encode-capture.cpp
new file mode 100644
index 000000000000..cfea87dc01bc
--- /dev/null
+++ b/multimedia/libva/files/patch-test-v4l_h264-encode-capture.cpp
@@ -0,0 +1,30 @@
+--- test/v4l_h264/encode/capture.cpp.orig	2012-10-04 15:30:51.000000000 +0200
++++ test/v4l_h264/encode/capture.cpp	2012-10-08 22:31:01.067189237 +0200
+@@ -37,7 +37,11 @@
+ #include <fcntl.h> /* low-level i/o */
+ #include <errno.h>
+ #include <unistd.h>
++#ifdef __FreeBSD__
++#include <stdlib.h>
++#else
+ #include <malloc.h>
++#endif
+ #include <sys/stat.h>
+ #include <sys/mman.h>
+ #include <sys/ioctl.h>
+@@ -451,10 +455,15 @@
+     }
+     for (n_buffers = 0; n_buffers < 4; ++n_buffers) {
+         buffers[n_buffers].length = buffer_size;
++#ifdef __FreeBSD__
++	if(posix_memalign(&buffers[n_buffers].start, page_size, buffer_size))
++	{
++#else
+         buffers[n_buffers].start = memalign (/* boundary */ page_size,
+             buffer_size);
+ 
+         if (!buffers[n_buffers].start) {
++#endif
+             std::cerr << "Out of memory\n";
+             exit (EXIT_FAILURE);
+         }