[packages] libv4l: unconditionally disable the qv4l2 utility

git-svn-id: svn://svn.openwrt.org/openwrt/packages@30914 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/libs/libv4l/Makefile b/libs/libv4l/Makefile
index 146bb8e..f201e32 100644 (file)
--- a/libs/libv4l/Makefile
+++ b/libs/libv4l/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v4l-utils
 PKG_VERSION:=0.8.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.linuxtv.org/downloads/v4l-utils

diff --git a/libs/libv4l/patches/004-disable-qv4l2.patch b/libs/libv4l/patches/004-disable-qv4l2.patch
new file mode 100644 (file)
index 0000000..f494643
--- /dev/null
+++ b/libs/libv4l/patches/004-disable-qv4l2.patch
@@ -0,0 +1,24 @@
+--- 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 $@