diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2012-07-28 12:05:18 +0000 |
---|---|---|
committer | Eric Bénard <eric@eukrea.com> | 2012-07-30 10:22:15 +0200 |
commit | 568b98668fdf11b17839e20cb917922b7d51acce (patch) | |
tree | 4e2c867c601f212e136b0361448eb2c3b05b144c | |
parent | 06d6f7ec9245ed32de8910cb236094b7900605ba (diff) | |
download | meta-openembedded-568b98668fdf11b17839e20cb917922b7d51acce.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>
Signed-off-by: Eric Bénard <eric@eukrea.com>
-rw-r--r-- | meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-disable-qv4l2-build.patch | 39 | ||||
-rw-r--r-- | meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb | 6 |
2 files changed, 44 insertions, 1 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 000000000..4b11038c6 --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-disable-qv4l2-build.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 1422d4c562660407919fb753dc5f074293b395e5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Mon, 16 Jul 2012 12:00:34 +0200 | ||
4 | Subject: [PATCH] disable qv4l2 build | ||
5 | |||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
7 | --- | ||
8 | utils/Makefile | 15 --------------- | ||
9 | 1 files changed, 0 insertions(+), 15 deletions(-) | ||
10 | |||
11 | diff --git a/utils/Makefile b/utils/Makefile | ||
12 | index 014b82d..db74851 100644 | ||
13 | --- a/utils/Makefile | ||
14 | +++ b/utils/Makefile | ||
15 | @@ -5,21 +5,6 @@ all install: | ||
16 | $(MAKE) -C $$i $@ || exit 1; \ | ||
17 | done | ||
18 | |||
19 | - # Test whether qmake is installed, and whether it is for qt4. | ||
20 | - @if which qmake-qt4 >/dev/null 2>&1; then \ | ||
21 | - QMAKE=qmake-qt4; \ | ||
22 | - else \ | ||
23 | - QMAKE=qmake; \ | ||
24 | - fi; \ | ||
25 | - if which $$QMAKE >/dev/null 2>&1; then \ | ||
26 | - if $$QMAKE --version 2>&1 | grep '4\.[0-9][0-9]*\.[0-9][0-9]*' >/dev/null; then \ | ||
27 | - if [ ! -f qv4l2/Makefile ]; then \ | ||
28 | - (cd qv4l2 && $$QMAKE) || exit 1; \ | ||
29 | - fi; \ | ||
30 | - $(MAKE) -C qv4l2 -f Makefile.install $@; \ | ||
31 | - fi \ | ||
32 | - fi | ||
33 | - | ||
34 | sync-with-kernel: | ||
35 | $(MAKE) -C keytable $@ | ||
36 | $(MAKE) -C v4l2-dbg $@ | ||
37 | -- | ||
38 | 1.7.7.6 | ||
39 | |||
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb index 18f361f6c..e5d1fc2bc 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb | |||
@@ -3,12 +3,16 @@ LICENSE = "GPLv2 & LGPLv2.1" | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \ | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \ |
4 | file://COPYING.LIB;md5=d749e86a105281d7a44c2328acebc4b0" | 4 | file://COPYING.LIB;md5=d749e86a105281d7a44c2328acebc4b0" |
5 | 5 | ||
6 | PR = "r1" | ||
7 | |||
6 | DEPENDS = "jpeg" | 8 | DEPENDS = "jpeg" |
7 | 9 | ||
8 | # libv4l was absorbed into this, let OE know that | 10 | # libv4l was absorbed into this, let OE know that |
9 | PROVIDES = "libv4l" | 11 | PROVIDES = "libv4l" |
10 | 12 | ||
11 | SRC_URI = "git://linuxtv.org/v4l-utils.git;protocol=git" | 13 | SRC_URI = "git://linuxtv.org/v4l-utils.git;protocol=git \ |
14 | file://0001-disable-qv4l2-build.patch \ | ||
15 | " | ||
12 | # 54f16ca8183dd8ae8bf4ccc07949795aff0301f5 -> v0.8.8 tag | 16 | # 54f16ca8183dd8ae8bf4ccc07949795aff0301f5 -> v0.8.8 tag |
13 | SRCREV = "54f16ca8183dd8ae8bf4ccc07949795aff0301f5" | 17 | SRCREV = "54f16ca8183dd8ae8bf4ccc07949795aff0301f5" |
14 | 18 | ||