From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EEFE51381F3 for ; Sat, 1 Dec 2012 22:41:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EFBBFE06B0; Sat, 1 Dec 2012 22:40:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 34D4CE0691 for ; Sat, 1 Dec 2012 22:40:29 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E594533D9CE for ; Sat, 1 Dec 2012 22:40:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 42256E5446 for ; Sat, 1 Dec 2012 22:40:26 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1354401613.ce9ab3f0ca8c58f1d3f3c4b8a5b9c4872ef03a01.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: media-plugins/gst-plugins-v4l2/files/, media-plugins/gst-plugins-v4l2/ X-VCS-Repository: proj/gnome X-VCS-Files: media-plugins/gst-plugins-v4l2/files/gst-plugins-v4l2-0.10.31-linux-headers-3.6.patch media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.10.31.ebuild X-VCS-Directories: media-plugins/gst-plugins-v4l2/files/ media-plugins/gst-plugins-v4l2/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: ce9ab3f0ca8c58f1d3f3c4b8a5b9c4872ef03a01 X-VCS-Branch: master Date: Sat, 1 Dec 2012 22:40:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 54468120-6e47-46ec-a228-b545491d9556 X-Archives-Hash: 2ae2ef840dd62582d5c020cd77ae0e55 commit: ce9ab3f0ca8c58f1d3f3c4b8a5b9c4872ef03a01 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sat Dec 1 22:31:37 2012 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sat Dec 1 22:40:13 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ce9ab3f0 media-plugins/gst-plugins-v4l2: copy from gentoo-x86 --- ...st-plugins-v4l2-0.10.31-linux-headers-3.6.patch | 38 ++++++++++++++++++++ .../gst-plugins-v4l2-0.10.31.ebuild | 31 ++++++++++++++++ 2 files changed, 69 insertions(+), 0 deletions(-) diff --git a/media-plugins/gst-plugins-v4l2/files/gst-plugins-v4l2-0.10.31-linux-headers-3.6.patch b/media-plugins/gst-plugins-v4l2/files/gst-plugins-v4l2-0.10.31-linux-headers-3.6.patch new file mode 100644 index 0000000..919b19b --- /dev/null +++ b/media-plugins/gst-plugins-v4l2/files/gst-plugins-v4l2-0.10.31-linux-headers-3.6.patch @@ -0,0 +1,38 @@ +From 968a3dac9959c2a6ae4ff619535db15b37446ce4 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Thu, 9 Aug 2012 08:35:23 +0100 +Subject: [PATCH] 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 + 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 + +[Alexandre Rostovtsev : backport to 0.10.31] +--- + sys/v4l2/gstv4l2bufferpool.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c +index b81c6a4..51cc0ce 100644 +--- a/sys/v4l2/gstv4l2bufferpool.c ++++ b/sys/v4l2/gstv4l2bufferpool.c +@@ -181,7 +181,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps) + 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, +-- +1.7.12.3 + diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.10.31.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.10.31.ebuild new file mode 100644 index 0000000..6984836 --- /dev/null +++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.10.31.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" + +inherit eutils gst-plugins-good gst-plugins10 + +DESCRIPION="plugin to allow capture from video4linux2 devices" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="udev" + +RDEPEND=" + media-libs/libv4l + >=media-plugins/gst-plugins-xvideo-${PV}:${SLOT} + udev? ( >=sys-fs/udev-143[gudev] ) +" +DEPEND="${RDEPEND} + virtual/os-headers" + +GST_PLUGINS_BUILD="gst_v4l2" + +src_prepare() { + epatch "${FILESDIR}/${PN}-0.10.31-linux-headers-3.6.patch" #437012 +} + +src_configure() { + gst-plugins10_src_configure \ + --with-libv4l2 \ + $(use_with udev gudev) +}