diff options
| author | kwm <kwm@FreeBSD.org> | 2015-01-25 07:56:40 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2015-01-25 07:56:40 +0800 |
| commit | 41bd60cc0f78305fa51f654a6bc3181555938df1 (patch) | |
| tree | 4cdc52e3604cf9a227c385128df5b9254099631d /multimedia | |
| parent | 7aa8f2ab22c7bc061a2bbc294e6c97d8c7f95fcf (diff) | |
| download | freebsd-ports-graphics-41bd60cc0f78305fa51f654a6bc3181555938df1.tar.gz freebsd-ports-graphics-41bd60cc0f78305fa51f654a6bc3181555938df1.tar.zst freebsd-ports-graphics-41bd60cc0f78305fa51f654a6bc3181555938df1.zip | |
Add patches to fix build of the v4l2 plugin with newer v4l_compat/libv4l.
https://reviews.freebsd.org/D1482
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/gstreamer-plugins-good/files/patch-sys_v4l2_gstv4l2bufferpool.c | 31 | ||||
| -rw-r--r-- | multimedia/gstreamer-plugins-good/files/patch-sys_v4l2_v4l2-calls.c | 30 |
2 files changed, 61 insertions, 0 deletions
diff --git a/multimedia/gstreamer-plugins-good/files/patch-sys_v4l2_gstv4l2bufferpool.c b/multimedia/gstreamer-plugins-good/files/patch-sys_v4l2_gstv4l2bufferpool.c new file mode 100644 index 00000000000..808d59499a8 --- /dev/null +++ b/multimedia/gstreamer-plugins-good/files/patch-sys_v4l2_gstv4l2bufferpool.c @@ -0,0 +1,31 @@ +From 9f2aa8d47f835ea155aaf635f618c0fc1ca87012 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <mclasen@redhat.com> +Date: Thu, 9 Aug 2012 08:35:23 +0100 +Subject: v4l2: fix build with recent kernels, the v4l2_buffer input field was + removed + +This was unused apparently and removed in the kernel in commit: + + From 2b719d7baf490e24ce7d817c6337b7c87fda84c1 Mon Sep 17 00:00:00 2001 + From: Sakari Ailus <sakari.ailus@iki.fi> + Date: Wed, 2 May 2012 09:40:03 -0300 + Subject: [PATCH] [media] v4l: drop v4l2_buffer.input and V4L2_BUF_FLAG_INPUT + + Remove input field in struct v4l2_buffer and flag V4L2_BUF_FLAG_INPUT which + tells the former is valid. The flag is used by no driver currently. + +https://bugzilla.gnome.org/show_bug.cgi?id=681491 + +Conflicts: + sys/v4l2/gstv4l2bufferpool.c + +--- sys/v4l2/gstv4l2bufferpool.c.orig 2011-12-30 14:59:13.000000000 +0100 ++++ sys/v4l2/gstv4l2bufferpool.c 2015-01-25 00:40:42.521756686 +0100 +@@ -181,7 +181,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * + GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u", + ret->vbuffer.m.offset); + GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length); +- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input); + + data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length, + PROT_READ | PROT_WRITE, MAP_SHARED, pool->video_fd, diff --git a/multimedia/gstreamer-plugins-good/files/patch-sys_v4l2_v4l2-calls.c b/multimedia/gstreamer-plugins-good/files/patch-sys_v4l2_v4l2-calls.c new file mode 100644 index 00000000000..7b379378368 --- /dev/null +++ b/multimedia/gstreamer-plugins-good/files/patch-sys_v4l2_v4l2-calls.c @@ -0,0 +1,30 @@ +--- sys/v4l2/v4l2_calls.c.orig 2015-01-25 00:45:56.388735097 +0100 ++++ sys/v4l2/v4l2_calls.c 2015-01-25 00:47:42.802727457 +0100 +@@ -53,14 +53,6 @@ + + #include "gst/gst-i18n-plugin.h" + +-/* Those are ioctl calls */ +-#ifndef V4L2_CID_HCENTER +-#define V4L2_CID_HCENTER V4L2_CID_HCENTER_DEPRECATED +-#endif +-#ifndef V4L2_CID_VCENTER +-#define V4L2_CID_VCENTER V4L2_CID_VCENTER_DEPRECATED +-#endif +- + GST_DEBUG_CATEGORY_EXTERN (v4l2_debug); + #define GST_CAT_DEFAULT v4l2_debug + +@@ -294,8 +286,12 @@ + break; + case V4L2_CID_HFLIP: + case V4L2_CID_VFLIP: ++#ifdef V4L2_CID_HCENTER + case V4L2_CID_HCENTER: ++#endif ++#ifdef V4L2_CID_VCENTER + case V4L2_CID_VCENTER: ++#endif + #ifdef V4L2_CID_PAN_RESET + case V4L2_CID_PAN_RESET: + #endif |