* [PATCH] v4l-utils: skip qv4l2
@ 2012-02-21 2:15 Ciprian Ciubotariu
2012-02-21 7:15 ` Andrei Gherzan
0 siblings, 1 reply; 2+ messages in thread
From: Ciprian Ciubotariu @ 2012-02-21 2:15 UTC (permalink / raw)
To: openembedded-devel
See #2134
The makefiles in the project attempt to use the hosts' compilers if
qmake is installed.
---
.../v4l2apps/files/skip-qv4l2-0.8.4.patch | 37 ++++++++++++++++++++
.../recipes-multimedia/v4l2apps/v4l-utils_0.8.4.bb | 5 ++-
2 files changed, 40 insertions(+), 2 deletions(-)
create mode 100644 meta-oe/recipes-multimedia/v4l2apps/files/skip-qv4l2-0.8.4.patch
diff --git a/meta-oe/recipes-multimedia/v4l2apps/files/skip-qv4l2-0.8.4.patch b/meta-oe/recipes-multimedia/v4l2apps/files/skip-qv4l2-0.8.4.patch
new file mode 100644
index 0000000..c8e8388
--- /dev/null
+++ b/meta-oe/recipes-multimedia/v4l2apps/files/skip-qv4l2-0.8.4.patch
@@ -0,0 +1,37 @@
+diff --git a/utils/Makefile b/utils/Makefile
+index 71a3cb7..1d23c8b 100644
+--- a/utils/Makefile
++++ b/utils/Makefile
+@@ -11,19 +11,19 @@ all install:
+ fi
+
+ # 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
++# @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 $@
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.4.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.4.bb
index 3252ae3..78ede0e 100644
--- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.4.bb
+++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.4.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "v4l2 and IR applications"
-LICENSE = "GPLv2/LGPLv2.1"
+LICENSE = "GPLv2 LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \
file://COPYING.LIB;md5=d749e86a105281d7a44c2328acebc4b0"
@@ -8,7 +8,8 @@ DEPENDS = "jpeg"
# libv4l was absorbed into this, let OE know that
PROVIDES = "libv4l"
-SRC_URI = "git://linuxtv.org/v4l-utils.git;protocol=git"
+SRC_URI = "git://linuxtv.org/v4l-utils.git;protocol=git \
+ file://skip-qv4l2-${PV}.patch"
SRCREV = "v4l-utils-${PV}"
S = "${WORKDIR}/git"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] v4l-utils: skip qv4l2
2012-02-21 2:15 [PATCH] v4l-utils: skip qv4l2 Ciprian Ciubotariu
@ 2012-02-21 7:15 ` Andrei Gherzan
0 siblings, 0 replies; 2+ messages in thread
From: Andrei Gherzan @ 2012-02-21 7:15 UTC (permalink / raw)
To: openembedded-devel
> +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.4.bb
> @@ -1,5 +1,5 @@
> DESCRIPTION = "v4l2 and IR applications"
> -LICENSE = "GPLv2/LGPLv2.1"
> +LICENSE = "GPLv2 LGPLv2.1"
This should be " GPLv2 | LGPLv2.1"
> LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \
>
file://COPYING.LIB;md5=d749e86a105281d7a44c2328acebc4b0"
>
> @@ -8,7 +8,8 @@ DEPENDS = "jpeg"
> # libv4l was absorbed into this, let OE know that
> PROVIDES = "libv4l"
>
> -SRC_URI = "git://linuxtv.org/v4l-utils.git;protocol=git"
> +SRC_URI = "git://linuxtv.org/v4l-utils.git;protocol=git \
> + file://skip-qv4l2-${PV}.patch"
> SRCREV = "v4l-utils-${PV}"
>
> S = "${WORKDIR}/git"
> --
> 1.7.3.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-02-21 7:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-21 2:15 [PATCH] v4l-utils: skip qv4l2 Ciprian Ciubotariu
2012-02-21 7:15 ` Andrei Gherzan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.