From patchwork Sat Jul 26 05:34:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 373918 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 1E0461400D6 for ; Sat, 26 Jul 2014 15:34:44 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2752232BAD; Sat, 26 Jul 2014 05:34:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id me1Q2H-VXm5a; Sat, 26 Jul 2014 05:34:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id A01C1312A8; Sat, 26 Jul 2014 05:34:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 7FC1F1C24B4 for ; Sat, 26 Jul 2014 05:34:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 79EB58B18D for ; Sat, 26 Jul 2014 05:34:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 96md8RDL-VGc for ; Sat, 26 Jul 2014 05:34:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pd0-f173.google.com (mail-pd0-f173.google.com [209.85.192.173]) by whitealder.osuosl.org (Postfix) with ESMTPS id CED9A8B181 for ; Sat, 26 Jul 2014 05:34:39 +0000 (UTC) Received: by mail-pd0-f173.google.com with SMTP id w10so6681589pde.4 for ; Fri, 25 Jul 2014 22:34:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=Q8rFPIwx2iwAY/pTX5M3lMyLLa9VAXMKZI0j0ucjlyo=; b=ulwwSGK1J36t0EL2eGQd2hNxQ/iDCTSrXcOkO3HrayQBCgSDXbEJG6L8hRQeKbrhbB fD+bMj1r7VJ5XSvg2e+Go1C5Ko5VSuKhkk3EiMCeAtCBIzfP96GO0TgciD5IIHOPUK9d a8R4/JK0H+Kq1GsW/SAfupQWTAOr1Gr9RBf+Ck4JvXRT8DVfEN8C4gar1xqFW+sLE+mZ IymNEWrmruiIyPvN3OzKB/ixUTjpcFQYdhdbOW6P/XCb73oQ5YnViyPBnee39xCSg7kW A67PoOq+eKWFV0zsgHW8ChKw83gruYlwv1NDCNROpEaALrXlNME/pmZIVbXmczmGvh1Q vwhQ== X-Received: by 10.70.35.43 with SMTP id e11mr23198724pdj.10.1406352879525; Fri, 25 Jul 2014 22:34:39 -0700 (PDT) Received: from n411z.WORKGROUP. (c-24-22-143-40.hsd1.wa.comcast.net. [24.22.143.40]) by mx.google.com with ESMTPSA id vy8sm10629144pbc.84.2014.07.25.22.34.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 Jul 2014 22:34:38 -0700 (PDT) From: Gary Bisson To: buildroot@busybox.net Date: Fri, 25 Jul 2014 22:34:30 -0700 Message-Id: <1406352870-9607-1-git-send-email-bisson.gary@gmail.com> X-Mailer: git-send-email 2.0.1 Cc: thomas.petazzoni@free-electrons.com, Gary Bisson , yann.morin.1998@free.fr Subject: [Buildroot] [PATCH] gst-fsl-plugins: fix build for kernel headers >= 3.10 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net This package couldn't build using a toolchain with kernel headers >= 3.10 because of the use of VIDIOC_DBG_G_CHIP_IDENT. As stated in videodev2.h, this ioctl should never be used. Signed-off-by: Gary Bisson Acked-by: "Yann E. MORIN" --- Yann, Thomas, all, After looking at the source code it appears that nothing justifies the use of that obsolete ioctl. Its only purpose is to get the video device name so this patch actually removes those unnecessary calls. Thanks, Gary --- ...e-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch | 69 ++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0005-Remove-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0005-Remove-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0005-Remove-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch new file mode 100644 index 0000000..5635275 --- /dev/null +++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0005-Remove-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch @@ -0,0 +1,69 @@ +From ce90794a3458af0aed43b8570cf44cd87900185d Mon Sep 17 00:00:00 2001 +From: Gary Bisson +Date: Fri, 25 Jul 2014 16:44:53 -0700 +Subject: [PATCH] Remove use of obsolete VIDIOC_DBG_G_CHIP_IDENT + +This ioctl should never be used in application as +stated in videodev2.h header. +Moreover, its use in this plugin was very limited. + +Signed-off-by: Gary Bisson +--- + src/misc/tvsrc/src/mfw_gst_tvsrc.c | 8 -------- + src/misc/v4l_source/src/mfw_gst_v4lsrc.c | 7 ------- + 2 files changed, 15 deletions(-) + +diff --git a/src/misc/tvsrc/src/mfw_gst_tvsrc.c b/src/misc/tvsrc/src/mfw_gst_tvsrc.c +index 67e0cd2..f495b6f 100755 +--- a/src/misc/tvsrc/src/mfw_gst_tvsrc.c ++++ b/src/misc/tvsrc/src/mfw_gst_tvsrc.c +@@ -450,7 +450,6 @@ mfw_gst_tvsrc_capture_setup (MFWGstTVSRC * v4l_src) + struct v4l2_format fmt; + struct v4l2_control ctrl; + struct v4l2_streamparm parm; +- struct v4l2_dbg_chip_ident chip; + gint fd_v4l = 0; + struct v4l2_mxc_offset off; + gint in_width = 0, in_height = 0; +@@ -461,13 +460,6 @@ mfw_gst_tvsrc_capture_setup (MFWGstTVSRC * v4l_src) + return 0; + } + +- if (ioctl (fd_v4l, VIDIOC_DBG_G_CHIP_IDENT, &chip)) { +- g_print ("VIDIOC_DBG_G_CHIP_IDENT failed.\n"); +- } else +- g_print ("sensor chip is %s\n", chip.match.name); +- +- +- + if (ioctl (fd_v4l, VIDIOC_G_STD, &id) < 0) { + g_print ("VIDIOC_G_STD failed\n"); + close (fd_v4l); +diff --git a/src/misc/v4l_source/src/mfw_gst_v4lsrc.c b/src/misc/v4l_source/src/mfw_gst_v4lsrc.c +index 2c2e838..85e7ff0 100755 +--- a/src/misc/v4l_source/src/mfw_gst_v4lsrc.c ++++ b/src/misc/v4l_source/src/mfw_gst_v4lsrc.c +@@ -464,7 +464,6 @@ mfw_gst_v4lsrc_capture_setup (MFWGstV4LSrc * v4l_src) + struct v4l2_format fmt = {0}; + struct v4l2_control ctrl = {0}; + struct v4l2_streamparm parm = {0}; +- struct v4l2_dbg_chip_ident chip = {0}; + struct v4l2_frmsizeenum fszenum = {0}; + gint input; + gint fd_v4l = 0; +@@ -476,12 +475,6 @@ mfw_gst_v4lsrc_capture_setup (MFWGstV4LSrc * v4l_src) + return 0; + } + +- if (ioctl (fd_v4l, VIDIOC_DBG_G_CHIP_IDENT, &chip)) { +- GST_ERROR ("VIDIOC_DBG_G_CHIP_IDENT failed."); +- } else +- GST_INFO ("sensor chip is %s", chip.match.name); +- +- + if (v4l_src->crop_pixel) { + in_width = v4l_src->capture_width - (2 * v4l_src->crop_pixel); + in_height = v4l_src->capture_height - (2 * v4l_src->crop_pixel); +-- +2.0.1 +