aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-multimedia/v4l2apps
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2012-10-05 12:52:05 +0200
committerKoen Kooi <koen@dominion.thruhere.net>2012-10-05 12:52:05 +0200
commitc40cedebf777403348a45fe265a1d7c8e1eb8c6e (patch)
treec99f73d60ce4fe177aeb67515d86972139a61147 /meta-oe/recipes-multimedia/v4l2apps
parent96fb528a77b352fc004f058849713bf7b1026e42 (diff)
downloadmeta-openembedded-c40cedebf777403348a45fe265a1d7c8e1eb8c6e.tar.gz
meta-openembedded-c40cedebf777403348a45fe265a1d7c8e1eb8c6e.tar.bz2
meta-openembedded-c40cedebf777403348a45fe265a1d7c8e1eb8c6e.zip
v4l-utils: fix build breakage
Update to a newer SRCREV for fixed and get autotools support as a bonus. Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-multimedia/v4l2apps')
-rw-r--r--meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-disable-qv4l2-build.patch39
-rw-r--r--meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb27
2 files changed, 11 insertions, 55 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
deleted file mode 100644
index 4b11038c6..000000000
--- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-disable-qv4l2-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
-
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 e5d1fc2bc..ce5c5e1fc 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,39 +3,34 @@ LICENSE = "GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \
file://COPYING.LIB;md5=d749e86a105281d7a44c2328acebc4b0"
-PR = "r1"
+PR = "r2"
DEPENDS = "jpeg"
+inherit autotools gettext
+
# libv4l was absorbed into this, let OE know that
PROVIDES = "libv4l"
SRC_URI = "git://linuxtv.org/v4l-utils.git;protocol=git \
- file://0001-disable-qv4l2-build.patch \
"
# 54f16ca8183dd8ae8bf4ccc07949795aff0301f5 -> v0.8.8 tag
-SRCREV = "54f16ca8183dd8ae8bf4ccc07949795aff0301f5"
+SRCREV = "0298efdcd1153b8f719b9164548a3f0546f0cb7c"
S = "${WORKDIR}/git"
-EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D}"
-
-do_compile() {
- # fix up some ASNEEDED things
- for i in $(find ${S} -name "Makefile") ; do
- sed -i 's:-lrt:-lrt -lpthread:g' $i
- done
-
- oe_runmake
-}
+EXTRA_OECONF = "--disable-qv4l2 --enable-shared"
-do_install() {
- oe_runmake install
+do_configure() {
+ # autotools_do_configure fails with:
+ # | configure.ac:139: error: required file 'build-aux/config.rpath' not found
+ autoreconf -vfi
+ oe_runconf
}
PACKAGES =+ "rc-keymaps libv4l libv4l-dbg libv4l-dev"
-FILES_rc-keymaps = "${sysconfdir}/rc*"
+FILES_rc-keymaps = "${sysconfdir}/rc* ${base_libdir}/udev/rc*"
FILES_${PN} = "${bindir} ${sbindir} ${base_libdir}/udev/rules.d/70-infrared.rules"
FILES_libv4l += "${libdir}/libv4l/* ${libdir}/*.so.*"
FILES_libv4l-dbg += "${libdir}/libv4l/.debug"