From 9e941de5595ef76c1abed645fbec39ef6535e990 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 28 Feb 2013 12:02:38 +0100
Subject: update v4linux utils

---
 package/v4l-utils/Makefile                     |  8 +++++---
 package/v4l-utils/patches/patch-Make_rules     | 17 -----------------
 package/v4l-utils/patches/patch-utils_Makefile |  8 --------
 3 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 package/v4l-utils/patches/patch-Make_rules
 delete mode 100644 package/v4l-utils/patches/patch-utils_Makefile

(limited to 'package/v4l-utils')

diff --git a/package/v4l-utils/Makefile b/package/v4l-utils/Makefile
index 72e23f0f4..6a4e01b3b 100644
--- a/package/v4l-utils/Makefile
+++ b/package/v4l-utils/Makefile
@@ -4,15 +4,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		v4l-utils
-PKG_VERSION:=		0.8.5
+PKG_VERSION:=		0.9.3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		037bec9f68cfb0b84bcccb00d30e429b
+PKG_MD5SUM:=		f4d24bb9f0307345d5a8fc4febcb993d
 PKG_DESCR:=		Video4Linux2 utilities
 PKG_SECTION:=		multimedia
+PKG_BUILDDEP:=		jpeg
 PKG_SITES:=		http://linuxtv.org/downloads/v4l-utils/
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
+PKG_CFLINE_V4L_UTILS:=  depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
 PKG_SUBPKGS:=		V4L_UTILS LIBV4L
 
 include $(TOPDIR)/mk/package.mk
@@ -20,7 +22,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,V4L_UTILS,v4l-utils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBV4L,libv4l,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIG_STYLE:=		manual
+CONFIGURE_ARGS+=	--disable-qv4l2
 
 v4l-utils-install:
 	$(INSTALL_DIR) $(IDIR_V4L_UTILS)/usr/bin
diff --git a/package/v4l-utils/patches/patch-Make_rules b/package/v4l-utils/patches/patch-Make_rules
deleted file mode 100644
index f7bdb14f7..000000000
--- a/package/v4l-utils/patches/patch-Make_rules
+++ /dev/null
@@ -1,17 +0,0 @@
---- v4l-utils-0.8.5.orig/Make.rules	2011-07-17 18:06:39.000000000 +0200
-+++ v4l-utils-0.8.5/Make.rules	2011-09-18 20:20:32.000000000 +0200
-@@ -2,12 +2,12 @@ V4L_UTILS_VERSION=0.8.5
- 
- # These ones can be overriden from the cmdline
- 
--CFLAGS := -g -O1
-+CFLAGS ?= -g -O1
- CFLAGS += -Wall -Wpointer-arith
- CXXFLAGS := $(CFLAGS)
- CFLAGS += -Wstrict-prototypes -Wmissing-prototypes
- 
--PREFIX = /usr/local
-+PREFIX = /usr
- LIBDIR = $(PREFIX)/lib
- # subdir below LIBDIR in which to install the libv4lx libc wrappers
- LIBSUBDIR = libv4l
diff --git a/package/v4l-utils/patches/patch-utils_Makefile b/package/v4l-utils/patches/patch-utils_Makefile
deleted file mode 100644
index daf4c67e9..000000000
--- a/package/v4l-utils/patches/patch-utils_Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- v4l-utils-0.8.5.orig/utils/Makefile	2011-07-17 18:06:39.000000000 +0200
-+++ v4l-utils-0.8.5/utils/Makefile	2011-09-26 04:56:47.369377637 +0200
-@@ -1,4 +1,4 @@
--SUBDIRS=libv4l2util libmedia_dev decode_tm6000 keytable rds v4l2-compliance v4l2-ctl v4l2-dbg v4l2-sysfs-path xc3028-firmware
-+SUBDIRS=libv4l2util libmedia_dev v4l2-compliance v4l2-ctl v4l2-dbg
- 
- all install: 
- 	@for i in $(SUBDIRS); do \
-- 
cgit v1.2.3