mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-16 04:17:25 +00:00
Code Issues Projects Releases Wiki Activity

v4l-utils 0.8.8: disable qv4l2 build

Browse Source 
It picks up host qmake and breaks the build.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Eric Bénard <eric@eukrea.com>
This commit is contained in:
Koen Kooi
2012-07-28 12:05:18 +00:00
committed by Eric Bénard
parent 06d6f7ec92
commit a8aa197265
2 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-disable-qv4l2-build.patch
+39
View File
@@ -0,0 +1,39 @@
From 1422d4c562660407919fb753dc5f074293b395e5 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Mon, 16 Jul 2012 12:00:34 +0200
Subject: [PATCH] disable qv4l2 build
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
utils/Makefile | 15 ---------------
1 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/utils/Makefile b/utils/Makefile
index 014b82d..db74851 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -5,21 +5,6 @@ all install:
$(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 $@
--
1.7.7.6
meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb
+5 -1
View File
@@ -3,12 +3,16 @@ LICENSE = "GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \ LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \
file://COPYING.LIB;md5=d749e86a105281d7a44c2328acebc4b0" file://COPYING.LIB;md5=d749e86a105281d7a44c2328acebc4b0"
PR = "r1"
DEPENDS = "jpeg" DEPENDS = "jpeg"
# libv4l was absorbed into this, let OE know that # libv4l was absorbed into this, let OE know that
PROVIDES = "libv4l" PROVIDES = "libv4l"
SRC_URI = "git://linuxtv.org/v4l-utils.git;protocol=git" SRC_URI = "git://linuxtv.org/v4l-utils.git;protocol=git \
file://0001-disable-qv4l2-build.patch \
"
# 54f16ca8183dd8ae8bf4ccc07949795aff0301f5 -> v0.8.8 tag # 54f16ca8183dd8ae8bf4ccc07949795aff0301f5 -> v0.8.8 tag
SRCREV = "54f16ca8183dd8ae8bf4ccc07949795aff0301f5" SRCREV = "54f16ca8183dd8ae8bf4ccc07949795aff0301f5"