diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2008-01-21 19:35:58 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2008-01-21 19:35:58 +0000 |
| commit | a973a4f154d9e17ed6551f3511f6a2bdc38f580f (patch) | |
| tree | 0e1598d718fe32873217e9cd94a475b0d3cd4b23 /sys/v4l2/v4l2src_calls.c | |
| parent | 612cbd9b47c82f2f18109d915cd38efdc73d7bc9 (diff) | |
configure.ac: Detect video4linux headers on Solaris too.
Original commit message from CVS:
* configure.ac:
Detect video4linux headers on Solaris too.
* sys/v4l2/gstv4l2colorbalance.h:
* sys/v4l2/gstv4l2object.h:
* sys/v4l2/v4l2_calls.c:
* sys/v4l2/v4l2src_calls.c: (gst_v4l2_buffer_finalize),
(gst_v4l2_buffer_new):
Make v4l2 build on Solaris.
Patch by: Brian Cameron <brian.cameron at sun dot com>
Fixes: #510505
Diffstat (limited to 'sys/v4l2/v4l2src_calls.c')
| -rw-r--r-- | sys/v4l2/v4l2src_calls.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c index dc6a23b2..4ecedf37 100644 --- a/sys/v4l2/v4l2src_calls.c +++ b/sys/v4l2/v4l2src_calls.c @@ -36,6 +36,11 @@ #include "v4l2src_calls.h" #include <sys/time.h> #include <unistd.h> +#ifdef __sun +/* Needed on older Solaris Nevada builds (72 at least) */ +#include <stropts.h> +#include <sys/ioccom.h> +#endif #include "gstv4l2tuner.h" @@ -98,7 +103,7 @@ gst_v4l2_buffer_finalize (GstV4l2Buffer * buffer) if (!resuscitated) { GST_LOG ("buffer %p not recovered, unmapping", buffer); gst_mini_object_unref (GST_MINI_OBJECT (pool)); - munmap (GST_BUFFER_DATA (buffer), buffer->vbuffer.length); + munmap ((void *) GST_BUFFER_DATA (buffer), buffer->vbuffer.length); } } @@ -173,7 +178,7 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps) GST_LOG (" length: %u", ret->vbuffer.length); GST_LOG (" input: %u", ret->vbuffer.input); - data = mmap (0, ret->vbuffer.length, + data = (guint8 *) mmap (0, ret->vbuffer.length, PROT_READ | PROT_WRITE, MAP_SHARED, pool->video_fd, ret->vbuffer.m.offset); |