* currently disable support for qv4l2 with
a patch on the Makefile. Otherwise qmake
will not find the v4l libraries.
Signed-off-by: Michael Grzeschik <m.grzesc...@pengutronix.de>
---
v1 -> v2: removed not needed additional v4l-utils-tools.in
v2 -> v3: added missing select on LIBSYSFS by V4L_UTILS_LIBV4L2
v3 -> v4: remove entry for libsysfs utility
v4 -> v5: fix broken patch 0001-Disable-build-of-qv4l2.patch
.../0001-Disable-build-of-qv4l2.patch | 43 ++++++++++++++++++++
patches/v4l-utils-0.8.4/series | 3 +
rules/v4l-utils.in | 18 ++++++++-
rules/v4l-utils.make | 14 +++++-
4 files changed, 74 insertions(+), 4 deletions(-)
create mode 100644 patches/v4l-utils-0.8.4/0001-Disable-build-of-qv4l2.patch
create mode 100644 patches/v4l-utils-0.8.4/series
diff --git a/patches/v4l-utils-0.8.4/0001-Disable-build-of-qv4l2.patch
b/patches/v4l-utils-0.8.4/0001-Disable-build-of-qv4l2.patch
new file mode 100644
index 0000000..4e15bbf
--- /dev/null
+++ b/patches/v4l-utils-0.8.4/0001-Disable-build-of-qv4l2.patch
@@ -0,0 +1,43 @@
+From: Michael Grzeschik <m.grzesc...@pengutronix.de>
+Date: Mon, 11 Jul 2011 17:18:40 +0200
+Subject: [PATCH] Disable build of qv4l2
+
+* currently disable support for qv4l2 with
+ a patch on the Makefile. Otherwise qmake
+ will not find the v4l libraries.
+
+This is not for upstream!
+
+---
+ utils/Makefile | 15 ---------------
+ 1 files changed, 0 insertions(+), 15 deletions(-)
+
+diff --git a/utils/Makefile b/utils/Makefile
+index 71a3cb7..0cb03e1 100644
+--- a/utils/Makefile
++++ b/utils/Makefile
+@@ -10,21 +10,6 @@ all install:
+ $(MAKE) -C v4l2-sysfs-path $@; \
+ 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
+-
+ sync-with-kernel:
+ $(MAKE) -C keytable $@
+ $(MAKE) -C v4l2-dbg $@
+--
+1.7.5.4
+
diff --git a/patches/v4l-utils-0.8.4/series b/patches/v4l-utils-0.8.4/series
new file mode 100644
index 0000000..bb55579
--- /dev/null
+++ b/patches/v4l-utils-0.8.4/series
@@ -0,0 +1,3 @@
+# generated by git-ptx-patches
+0001-Disable-build-of-qv4l2.patch
+# 8829cdd6da15e4da278cac27b97f09eb - git-ptx-patches magic
diff --git a/rules/v4l-utils.in b/rules/v4l-utils.in
index 1ba6049..136e17b 100644
--- a/rules/v4l-utils.in
+++ b/rules/v4l-utils.in
@@ -2,7 +2,7 @@
menuconfig V4L_UTILS
tristate
- prompt "v4l-utils"
+ prompt "v4l-utils "
select LIBC_RT if V4L_UTILS_LIBV4LCONVERT
select LIBC_M if V4L_UTILS_LIBV4LCONVERT
select LIBC_PTHREAD if V4L_UTILS_LIBV4L2
@@ -25,5 +25,21 @@ config V4L_UTILS_LIBV4LCONVERT
bool
prompt "install libv4lconvert"
+config V4L_UTILS_V4L2COMPLIANCE
+ bool
+ select V4L_UTILS_LIBV4L2
+ prompt "install v4l2compliance"
+
+config V4L_UTILS_V4L2DBG
+ bool
+ select V4L_UTILS_LIBV4L2
+ prompt "install v4l-dbg"
+
+config V4L_UTILS_V4L2CTL
+ bool
+ select V4L_UTILS_LIBV4L2
+ prompt "install v4l-ctl"
+
endif
+
diff --git a/rules/v4l-utils.make b/rules/v4l-utils.make
index dc6af56..e0a65a2 100644
--- a/rules/v4l-utils.make
+++ b/rules/v4l-utils.make
@@ -33,9 +33,6 @@ V4L_UTILS_CONF_TOOL := NO
V4L_UTILS_MAKE_ENV := $(CROSS_ENV)
V4L_UTILS_INSTALL_OPT := PREFIX=/usr install
-# just the libs for now
-V4L_UTILS_SUBDIR := lib
-
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
@@ -61,6 +58,17 @@ ifdef PTXCONF_V4L_UTILS_LIBV4LCONVERT
@$(call install_lib, v4l-utils, 0, 0, 0644, libv4lconvert)
endif
+ifdef PTXCONF_V4L_UTILS_V4L2COMPLIANCE
+ @$(call install_copy, v4l-utils, 0, 0, 0755, -,
/usr/bin/v4l2-compliance)
+endif
+
+ifdef PTXCONF_V4L_UTILS_V4L2DBG
+ @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/sbin/v4l2-dbg)
+endif
+
+ifdef PTXCONF_V4L_UTILS_V4L2CTL
+ @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/v4l2-ctl)
+endif
@$(call install_finish, v4l-utils)
--
1.7.5.4
--
ptxdist mailing list
ptxdist@pengutronix.de
