From patchwork Wed Aug 6 19:18:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yann Diorcet X-Patchwork-Id: 377381 X-Patchwork-Delegate: chbs@prevas.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 9C15A140092 for ; Thu, 7 Aug 2014 05:19:39 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 47F283FB81 for ; Wed, 6 Aug 2014 21:19:38 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by hugin.dotsrc.org (Postfix) with ESMTPS id AC85A3F9B1 for ; Wed, 6 Aug 2014 21:19:36 +0200 (CEST) Received: by mail-wi0-f177.google.com with SMTP id ho1so3818840wib.4 for ; Wed, 06 Aug 2014 12:19:36 -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:in-reply-to:references; bh=+wtbQz7yvmKHr2JW0MB8qBNqNXbQdRLw+ErrdsJH2Mg=; b=jcvHFMP6oohPu8bYhUiFE14Fr5cmQwMRSMQVMTtpaqH/JDJrKC5HsghCQDqyb4JGQj 7qrWCe2Gj5UrCeNF2fThaIuKrfQR5dCL8xABEwJ4ljpK4oaERDQMyGWwsdCZJ0E0KPOF hRYygTMVsYC9cgNi1bhhO+GnZ1w0QZuDk+Co1XMBlt4kqr1cV1IDM1hS7i54/CJ7HYrW Bu3Vk27+UQw2F1isxOEGehaz7P1VFHKqh9wYEUmehBUmqGuwtXLBgAMpLLoaa/Wv+kjO NJRKUbgB8SranRY3q7bGZH2T+B2T5v02DQof9cD9Ss4+4IhH+CjBCMtJ2gEW7/ougJbn FWgQ== X-Received: by 10.195.12.97 with SMTP id ep1mr17955521wjd.26.1407352776114; Wed, 06 Aug 2014 12:19:36 -0700 (PDT) Received: from localhost.localdomain (mut38-h01-31-33-249-220.dsl.sta.abo.bbox.fr. [31.33.249.220]) by mx.google.com with ESMTPSA id fb12sm4426294wjc.43.2014.08.06.12.19.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Aug 2014 12:19:35 -0700 (PDT) From: Yann Diorcet To: dev@oe-lite.org Subject: [PATCH 1/8] Add video4linux Date: Wed, 6 Aug 2014 21:18:50 +0200 Message-Id: <1407352737-7959-1-git-send-email-diorcet.yann@gmail.com> X-Mailer: git-send-email 2.0.1 In-Reply-To: References: X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org --- .../v4l-utils-0.8.7/fix-missing-includes.patch | 14 +++++ recipes/v4l-utils/v4l-utils-0.8.7/qt.patch | 70 ++++++++++++++++++++++ recipes/v4l-utils/v4l-utils.inc | 33 ++++++++++ recipes/v4l-utils/v4l-utils_0.8.7.oe | 4 ++ recipes/v4l-utils/v4l-utils_0.8.7.oe.sig | 1 + 5 files changed, 122 insertions(+) create mode 100644 recipes/v4l-utils/v4l-utils-0.8.7/fix-missing-includes.patch create mode 100644 recipes/v4l-utils/v4l-utils-0.8.7/qt.patch create mode 100644 recipes/v4l-utils/v4l-utils.inc create mode 100644 recipes/v4l-utils/v4l-utils_0.8.7.oe create mode 100644 recipes/v4l-utils/v4l-utils_0.8.7.oe.sig diff --git a/recipes/v4l-utils/v4l-utils-0.8.7/fix-missing-includes.patch b/recipes/v4l-utils/v4l-utils-0.8.7/fix-missing-includes.patch new file mode 100644 index 0000000..0eb8b1a --- /dev/null +++ b/recipes/v4l-utils/v4l-utils-0.8.7/fix-missing-includes.patch @@ -0,0 +1,14 @@ +Upstream: Yes (fixed in git version) +Reason: Add missing include to fix building with latest kernels +Source: Dirk Mallunat + +--- a/utils/dvb/dvb_frontend.h 2012-08-03 18:03:44.831131089 +0200 ++++ b/utils/dvb/dvb_frontend.h 2012-08-03 18:03:33.631844968 +0200 +@@ -26,6 +26,7 @@ + #ifndef _DVBFRONTEND_H_ + #define _DVBFRONTEND_H_ + ++#include + #include + + typedef enum fe_type { diff --git a/recipes/v4l-utils/v4l-utils-0.8.7/qt.patch b/recipes/v4l-utils/v4l-utils-0.8.7/qt.patch new file mode 100644 index 0000000..ca4689d --- /dev/null +++ b/recipes/v4l-utils/v4l-utils-0.8.7/qt.patch @@ -0,0 +1,70 @@ +diff -urN v4l-utils-0.8.7/lib/libv4l1/Makefile v4l-utils-0.8.7n//lib/libv4l1/Makefile +--- v4l-utils-0.8.7/lib/libv4l1/Makefile 2012-04-06 18:55:44.000000000 +0200 ++++ v4l-utils-0.8.7n//lib/libv4l1/Makefile 2012-04-14 01:09:14.294984942 +0200 +@@ -33,9 +33,7 @@ + @echo 'Name: libv4l1' >> libv4l1.pc + @echo 'Description: v4l1 compatibility library' >> libv4l1.pc + @echo 'Version: '$(V4L_UTILS_VERSION) >> libv4l1.pc +- @echo 'Requires.private: libv4l2' >> libv4l1.pc + @echo 'Libs: -L$${libdir} -lv4l1' >> libv4l1.pc +- @echo 'Libs.private: '$(LIBS_libv4l1) >> libv4l1.pc + @echo 'Cflags: -I$${prefix}/include' >> libv4l1.pc + + install: all +diff -urN v4l-utils-0.8.7/lib/libv4l2/Makefile v4l-utils-0.8.7n//lib/libv4l2/Makefile +--- v4l-utils-0.8.7/lib/libv4l2/Makefile 2012-04-06 18:55:44.000000000 +0200 ++++ v4l-utils-0.8.7n//lib/libv4l2/Makefile 2012-04-14 01:09:26.166985513 +0200 +@@ -33,9 +33,7 @@ + @echo 'Name: libv4l2' >> libv4l2.pc + @echo 'Description: v4l2 device access library' >> libv4l2.pc + @echo 'Version: '$(V4L_UTILS_VERSION) >> libv4l2.pc +- @echo 'Requires.private: libv4lconvert' >> libv4l2.pc + @echo 'Libs: -L$${libdir} -lv4l2' >> libv4l2.pc +- @echo 'Libs.private: '$(LIBS_libv4l2) >> libv4l2.pc + @echo 'Cflags: -I$${prefix}/include' >> libv4l2.pc + + install: all +diff -urN v4l-utils-0.8.7/lib/libv4lconvert/Makefile v4l-utils-0.8.7n//lib/libv4lconvert/Makefile +--- v4l-utils-0.8.7/lib/libv4lconvert/Makefile 2012-04-06 18:55:44.000000000 +0200 ++++ v4l-utils-0.8.7n//lib/libv4lconvert/Makefile 2012-04-14 01:08:45.758983570 +0200 +@@ -36,7 +36,6 @@ + @echo 'Description: v4l format conversion library' >> libv4lconvert.pc + @echo 'Version: '$(V4L_UTILS_VERSION) >> libv4lconvert.pc + @echo 'Libs: -L$${libdir} -lv4lconvert' >> libv4lconvert.pc +- @echo 'Libs.private: '$(LIBS_libv4lconvert) >> libv4lconvert.pc + @echo 'Cflags: -I$${prefix}/include' >> libv4lconvert.pc + + install: all +diff -urN v4l-utils-0.8.7/utils/Makefile v4l-utils-0.8.7n//utils/Makefile +--- v4l-utils-0.8.7/utils/Makefile 2012-04-06 18:55:44.000000000 +0200 ++++ v4l-utils-0.8.7n//utils/Makefile 2012-04-13 23:55:44.166771431 +0200 +@@ -5,21 +5,6 @@ + $(MAKE) -C $$i $@ || exit 1; \ + done + +- # Test whether qmake is installed, and whether it is for qt4. +- @if which qmake-qt4 >/dev/null 2>&1; then \ +- QMAKE=qmake-qt4; \ +- else \ +- QMAKE=qmake; \ +- fi; \ +- if which $$QMAKE >/dev/null 2>&1; then \ +- if $$QMAKE --version 2>&1 | grep '4\.[0-9][0-9]*\.[0-9][0-9]*' >/dev/null; then \ +- if [ ! -f qv4l2/Makefile ]; then \ +- (cd qv4l2 && $$QMAKE) || exit 1; \ +- fi; \ +- $(MAKE) -C qv4l2 -f Makefile.install $@; \ +- fi \ +- fi +- + sync-with-kernel: + $(MAKE) -C keytable $@ + $(MAKE) -C v4l2-dbg $@ +@@ -30,7 +15,5 @@ + $(MAKE) -C $$i $@; \ + done + $(MAKE) -C v4l2-sysfs-path $@ +- if [ -f qv4l2/Makefile ]; then $(MAKE) -C qv4l2 $@; fi +- rm -f qv4l2/Makefile qv4l2/qv4l2 + + include ../Make.rules diff --git a/recipes/v4l-utils/v4l-utils.inc b/recipes/v4l-utils/v4l-utils.inc new file mode 100644 index 0000000..0f2cdc3 --- /dev/null +++ b/recipes/v4l-utils/v4l-utils.inc @@ -0,0 +1,33 @@ +DESCRIPTION = "The LinuxTV project develops and maintains the media driver Linux Kernel Subsystems, which consists of devices for webcams, analog TV, digital TV and remote controllers" +LICENSE = "LGPL" + +RECIPE_TYPES = "machine native" + +DEPENDS = "libjpeg librt libm" + +inherit autotools pkgconfig c++ + +SRC_URI = "http://linuxtv.org/downloads/v4l-utils/${PN}-${PV}.tar.bz2" + +DEPENDS_${PN} += "${DEPENDS}" + +EXTRA_OEMAKE_INSTALL += " PREFIX=${prefix}//" +EXTRA_OEMAKE += " PREFIX=${prefix}//" + +inherit auto-package-libs +AUTO_PACKAGE_LIBS = "v4l1 v4l2 v4lconvert" +AUTO_PACKAGE_LIBS_DEV_DEPENDS = "${PN}-dev_${PV}" + +FILES_${PN}-dbg += "/sbin/.debug/*" + +FILES_${PN} += "/lib/udev /sbin/*" +FILES_${PN}-libv4l1 += "${libdir}/libv4l" + +DEPENDS_${PN}-libv4l2 += "libv4lconvert" +DEPENDS_${PN}-libv4l1 += "libv4lconvert" + +RDEPENDS_${PN}-libv4l1 += "${DEPENDS} ${PN}-libv4lconvert" +RDEPENDS_${PN}-libv4l2 += "${DEPENDS} ${PN}-libv4lconvert" +RDEPENDS_${PN}-libv4lconvert += "${DEPENDS}" + + diff --git a/recipes/v4l-utils/v4l-utils_0.8.7.oe b/recipes/v4l-utils/v4l-utils_0.8.7.oe new file mode 100644 index 0000000..3111ce6 --- /dev/null +++ b/recipes/v4l-utils/v4l-utils_0.8.7.oe @@ -0,0 +1,4 @@ +require v4l-utils.inc + +SRC_URI += "file://qt.patch" +SRC_URI += "file://fix-missing-includes.patch" diff --git a/recipes/v4l-utils/v4l-utils_0.8.7.oe.sig b/recipes/v4l-utils/v4l-utils_0.8.7.oe.sig new file mode 100644 index 0000000..f57da68 --- /dev/null +++ b/recipes/v4l-utils/v4l-utils_0.8.7.oe.sig @@ -0,0 +1 @@ +74d0272acbf826ec73645d05268f23a0881a6da4 v4l-utils-0.8.7.tar.bz2