Signed-off-by: Philipp Zabel <p.za...@pengutronix.de> --- rules/v4l-utils.in | 16 +++++++++++++--- rules/v4l-utils.make | 19 +++++++++++++++---- 2 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/rules/v4l-utils.in b/rules/v4l-utils.in index 04347905c..b29a3c2b9 100644 --- a/rules/v4l-utils.in +++ b/rules/v4l-utils.in @@ -3,8 +3,8 @@ menuconfig V4L_UTILS tristate prompt "v4l-utils " - select UDEV if V4L_UTILS_MEDIACTL - select UDEV_LIBUDEV if V4L_UTILS_MEDIACTL + select UDEV + select UDEV_LIBUDEV select LIBC_DL if V4L_UTILS_LIBV4L2 || V4L_UTILS_MEDIACTL select LIBC_RT if V4L_UTILS_LIBV4LCONVERT || V4L_UTILS_MEDIACTL select LIBC_M if V4L_UTILS_LIBV4LCONVERT @@ -49,6 +49,16 @@ config V4L_UTILS_V4L2CTL select V4L_UTILS_LIBV4L2 prompt "install v4l-ctl" -endif +config V4L_UTILS_CECCTL + bool + prompt "install cec-ctl" + +config V4L_UTILS_CECCOMPLIANCE + bool + prompt "install cec-compliance" +config V4L_UTILS_CECFOLLOWER" + bool + prompt "install cec-follower" +endif diff --git a/rules/v4l-utils.make b/rules/v4l-utils.make index 4580a6ee9..5c94fdd01 100644 --- a/rules/v4l-utils.make +++ b/rules/v4l-utils.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_V4L_UTILS) += v4l-utils # # Paths and names # -V4L_UTILS_VERSION := 1.10.0 -V4L_UTILS_MD5 := 945a38979138997e805828a4a53e53ec +V4L_UTILS_VERSION := 1.12.2 +V4L_UTILS_MD5 := 13a3fde0f30bca32bc4e55fb371174ba V4L_UTILS := v4l-utils-$(V4L_UTILS_VERSION) V4L_UTILS_SUFFIX := tar.bz2 V4L_UTILS_URL := http://linuxtv.org/downloads/v4l-utils/$(V4L_UTILS).$(V4L_UTILS_SUFFIX) @@ -38,8 +38,7 @@ V4L_UTILS_CONF_OPT := \ --enable-libv4l \ --enable-v4l-utils \ --disable-qv4l2 \ - --$(call ptx/wwo, PTXCONF_V4L_UTILS_LIBV4LCONVERT)-jpeg \ - --$(call ptx/wwo, PTXCONF_V4L_UTILS_MEDIACTL)-libudev + --$(call ptx/wwo, PTXCONF_V4L_UTILS_LIBV4LCONVERT)-jpeg # ---------------------------------------------------------------------------- # Target-Install @@ -82,6 +81,18 @@ ifdef PTXCONF_V4L_UTILS_V4L2CTL @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/v4l2-ctl) endif +ifdef PTXCONF_V4L_UTILS_CECCTL + @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/cec-ctl) +endif + +ifdef PTXCONF_V4L_UTILS_CECCOMPLIANCE + @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/cec-compliance) +endif + +ifdef PTXCONF_V4L_UTILS_CECFOLLOWER + @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/cec-follower) +endif + @$(call install_finish, v4l-utils) @$(call touch) -- 2.11.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de