Date: Sat, 24 Jan 2015 23:56:41 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377841 - head/multimedia/gstreamer-plugins-good/files Message-ID: <201501242356.t0ONufQg079025@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Sat Jan 24 23:56:40 2015 New Revision: 377841 URL: https://svnweb.freebsd.org/changeset/ports/377841 QAT: https://qat.redports.org/buildarchive/r377841/ Log: Add patches to fix build of the v4l2 plugin with newer v4l_compat/libv4l. https://reviews.freebsd.org/D1482 Added: head/multimedia/gstreamer-plugins-good/files/patch-sys_v4l2_gstv4l2bufferpool.c (contents, props changed) head/multimedia/gstreamer-plugins-good/files/patch-sys_v4l2_v4l2-calls.c (contents, props changed) Added: head/multimedia/gstreamer-plugins-good/files/patch-sys_v4l2_gstv4l2bufferpool.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/gstreamer-plugins-good/files/patch-sys_v4l2_gstv4l2bufferpool.c Sat Jan 24 23:56:40 2015 (r377841) @@ -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, Added: head/multimedia/gstreamer-plugins-good/files/patch-sys_v4l2_v4l2-calls.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/gstreamer-plugins-good/files/patch-sys_v4l2_v4l2-calls.c Sat Jan 24 23:56:40 2015 (r377841) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501242356.t0ONufQg079025>