diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-12-06 16:10:00 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-12-06 16:10:00 +0100 |
| commit | 40c5d2104f0c3de5aba3a130b6740287085272b7 (patch) | |
| tree | 360b96a60aeb6bf9b1482b2a26481c3cd8dc5cce | |
| parent | 021ac5081380eb82a6851a6de61cb0b966525b0f (diff) | |
| download | ptxdist-40c5d2104f0c3de5aba3a130b6740287085272b7.tar.gz ptxdist-40c5d2104f0c3de5aba3a130b6740287085272b7.tar.xz | |
v4l-utils: version bump 0.8.4 -> 0.9.1
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/v4l-utils-0.8.4/0001-Disable-build-of-qv4l2.patch | 43 | ||||
| -rw-r--r-- | patches/v4l-utils-0.8.4/series | 3 | ||||
| -rw-r--r-- | rules/v4l-utils.make | 11 |
3 files changed, 6 insertions, 51 deletions
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 deleted file mode 100644 index 4e15bbfad..000000000 --- a/patches/v4l-utils-0.8.4/0001-Disable-build-of-qv4l2.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Michael Grzeschik <m.grzeschik@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 deleted file mode 100644 index bb55579b4..000000000 --- a/patches/v4l-utils-0.8.4/series +++ /dev/null @@ -1,3 +0,0 @@ -# generated by git-ptx-patches -0001-Disable-build-of-qv4l2.patch -# 8829cdd6da15e4da278cac27b97f09eb - git-ptx-patches magic diff --git a/rules/v4l-utils.make b/rules/v4l-utils.make index e0a65a23c..d04788523 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 := 0.8.4 -V4L_UTILS_MD5 := f2ded401b9b8d77f5ec7fac4683cfadf +V4L_UTILS_VERSION := 0.9.1 +V4L_UTILS_MD5 := dce548c1b497a39e59bb52387cf18dc1 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) @@ -29,9 +29,10 @@ V4L_UTILS_LICENSE := unknown # Prepare # ---------------------------------------------------------------------------- -V4L_UTILS_CONF_TOOL := NO -V4L_UTILS_MAKE_ENV := $(CROSS_ENV) -V4L_UTILS_INSTALL_OPT := PREFIX=/usr install +V4L_UTILS_CONF_TOOL := autoconf +V4L_UTILS_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --disable-qv4l2 # ---------------------------------------------------------------------------- # Target-Install |