diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2012-07-16 11:20:47 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-07-17 08:52:01 +0200 |
| commit | a97d6003528d67ed5bf2a28acef1b6e9e9a5c1d5 (patch) | |
| tree | 55e09989e6a31f0d47fe7b3e99c7e374fc16f673 /meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-disable-qv4l2-build.patch | |
| parent | 0da076d59a2b19f69dda3588f8dc6ee76e9c5175 (diff) | |
| download | meta-openembedded-a97d6003528d67ed5bf2a28acef1b6e9e9a5c1d5.tar.gz | |
v4l-utils 0.8.8: disable qv4l2 build
It picks up host qmake and breaks the build.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-disable-qv4l2-build.patch')
| -rw-r--r-- | meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-disable-qv4l2-build.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-disable-qv4l2-build.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-disable-qv4l2-build.patch new file mode 100644 index 0000000000..4b11038c6a --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-disable-qv4l2-build.patch @@ -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 + |