On Tue, Jul 12, 2011 at 11:21:22AM +0200, Michael Grzeschik wrote:
> * currently disable support for qv4l2
>
> Signed-off-by: Michael Grzeschik <[email protected]>
> ---
> .../0001-Disable-build-of-qv4l2.patch | 37
> ++++++++++++++++++++
> patches/v4l-utils-0.8.4/series | 3 ++
> rules/v4l-utils-tools.in | 32 +++++++++++++++++
> rules/v4l-utils.in | 3 +-
> rules/v4l-utils.make | 18 ++++++++--
> 5 files changed, 89 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
> create mode 100644 rules/v4l-utils-tools.in
>
> 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..8a4d2b7
> --- /dev/null
> +++ b/patches/v4l-utils-0.8.4/0001-Disable-build-of-qv4l2.patch
> @@ -0,0 +1,37 @@
> +From: Michael Grzeschik <[email protected]>
> +Date: Mon, 11 Jul 2011 17:18:40 +0200
> +Subject: [PATCH] Disable build of qv4l2
> +
> +---
> + 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-tools.in b/rules/v4l-utils-tools.in
> new file mode 100644
> index 0000000..bc3db81
> --- /dev/null
> +++ b/rules/v4l-utils-tools.in
no need for a separate file. Just put this in v4l-utils.in
And no separate menu level. These are not that many options.
> @@ -0,0 +1,32 @@
> +## SECTION=multimedia_tools
> +
> +menuconfig V4L_UTILS_TOOLS
> + tristate
> + prompt "v4l-utils; userspace tools "
> + depends on V4L_UTILS
> + help
> + Linux V4L2 and DVB API utilities and v4l libraries (libv4l).
> +
> +if V4L_UTILS_TOOLS
> +
> +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"
> +
> +config V4L_UTILS_V4L2SYSFSPATH
> + bool
> + select V4L_UTILS_LIBV4L2
> + prompt "install v4l2-sysfs-path"
> +
> +endif
> diff --git a/rules/v4l-utils.in b/rules/v4l-utils.in
> index 1ba6049..ce056dc 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; libs "
prompt "v4l-utils "
Michael
> select LIBC_RT if V4L_UTILS_LIBV4LCONVERT
> select LIBC_M if V4L_UTILS_LIBV4LCONVERT
> select LIBC_PTHREAD if V4L_UTILS_LIBV4L2
> @@ -27,3 +27,4 @@ config V4L_UTILS_LIBV4LCONVERT
>
> endif
>
> +
> diff --git a/rules/v4l-utils.make b/rules/v4l-utils.make
> index dc6af56..9d61823 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,21 @@ 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
> +
> +ifdef PTXCONF_V4L_UTILS_V4L2SYSFSPATH
> + @$(call install_copy, v4l-utils, 0, 0, 0755, -,
> /usr/bin/v4l2-sysfs-path)
> +endif
>
> @$(call install_finish, v4l-utils)
>
> --
> 1.7.5.4
>
>
> --
> ptxdist mailing list
> [email protected]
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
[email protected]
