[meta-oe][PATCH v2] v4l-utils: skip qv4l2 instead of using host toolchain

[meta-oe][PATCH v2] v4l-utils: skip qv4l2 instead of using host toolchain

[Ciprian Ciubotariu]

See #2134

The makefiles in the project attempt to use the host 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..0e361de 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

Re: [meta-oe][PATCH v2] v4l-utils: skip qv4l2 instead of using host toolchain

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 22-02-12 01:05, Ciprian Ciubotariu schreef:
> See #2134

What does that mean?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk9EqpMACgkQMkyGM64RGpEfewCgqXchlAA5NdkJM2o+IAdKwd2y
Lk8An3xPy9yCbnvOPqlLnQxnV8E1Hu/U
=1MjV
-----END PGP SIGNATURE-----

Re: [meta-oe][PATCH v2] v4l-utils: skip qv4l2 instead of using host toolchain

[Ciprian Ciubotariu]

It's a reference to our internal issue tracker, which scans commit
messages for such 'See #blah' references and makes a nice list of
commits attached to each issue.

I can strip that if needed.

I was actually wondering how one can obey commit policies of more than
one community, and still make use of git's DSCM abilities.

On Wed, 2012-02-22 at 09:42 +0100, Koen Kooi wrote:
> 
> Op 22-02-12 01:05, Ciprian Ciubotariu schreef:
> > See #2134
> 
> What does that mean?

Re: [meta-oe][PATCH v2] v4l-utils: skip qv4l2 instead of using host toolchain

[Khem Raj]

On Wed, Feb 22, 2012 at 5:21 AM, Ciprian Ciubotariu <cheepeero@gmx.net> wrote:
> It's a reference to our internal issue tracker, which scans commit
> messages for such 'See #blah' references and makes a nice list of
> commits attached to each issue.
>
> I can strip that if needed.
>
> I was actually wondering how one can obey commit policies of more than
> one community, and still make use of git's DSCM abilities.

please strip it and resubmit. patch guidelines are on OE wiki

>
> On Wed, 2012-02-22 at 09:42 +0100, Koen Kooi wrote:
>>
>> Op 22-02-12 01:05, Ciprian Ciubotariu schreef:
>> > See #2134
>>
>> What does that mean?
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Re: [meta-oe][PATCH v2] v4l-utils: skip qv4l2 instead of using host toolchain

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 1170 bytes --]

Dear Ciprian,


thank you for your patch, but please adhere to the netiquette [1]. In
particular please use interleaved quoting style.


Am Mittwoch, den 22.02.2012, 15:21 +0200 schrieb Ciprian Ciubotariu:

> On Wed, 2012-02-22 at 09:42 +0100, Koen Kooi wrote:
> > 
> > Op 22-02-12 01:05, Ciprian Ciubotariu schreef:
> > > See #2134
> > 
> > What does that mean?
>
> It's a reference to our internal issue tracker, which scans commit
> messages for such 'See #blah' references and makes a nice list of
> commits attached to each issue.
> 
> I can strip that if needed.
> 
> I was actually wondering how one can obey commit policies of more than
> one community, and still make use of git's DSCM abilities.

Well you could provide more context so that it does not disturb the
reader. Either appending

        »This issue is reported as ticket #2134 in the internal issue
        tracker of *your company name*.«

or including it with more context in the commit message.

Additionally more importantly your patch is missing the Signed-off-by
line.


Thanks,

Paul


[1] http://en.opensuse.org/openSUSE:Mailing_list_netiquette

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]