CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

v4l-utils: fix build breakage

Browse Source 
Update to a newer SRCREV for fixed and get autotools support as a bonus.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Koen Kooi 2012-10-05 12:52:05 +02:00
parent 96fb528a77
commit c40cedebf7
2 changed files with 11 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-disable-qv4l2-build.patch
View File

@ -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

27
meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb
View File

@ -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}"
EXTRA_OECONF = "--disable-qv4l2 --enable-shared"
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
}
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"