Update to 0.8.1.

Tweak compiler args so clang understands it.

Approved by:	hselasky@ (maintainer)

4 files changed, 36 insertions, 18 deletions

diff --git a/multimedia/libv4l/Makefile b/multimedia/libv4l/Makefile
index fd2f45bb1d48..e3f34d497430 100644
--- a/multimedia/libv4l/Makefile
+++ b/multimedia/libv4l/Makefile
@@ -6,20 +6,23 @@
 #
 
 PORTNAME=	libv4l
-PORTVERSION=	0.6.4
+PORTVERSION=	0.8.1
 CATEGORIES=	multimedia
-MASTER_SITES=	http://people.fedoraproject.org/~jwrdegoede/
+MASTER_SITES=	http://linuxtv.org/downloads/v4l-utils/
+DISTNAME=	v4l-utils-${PORTVERSION}
 
 MAINTAINER=	hselasky@FreeBSD.org
 COMMENT=	Video4Linux library
 
-BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+BUILD_DEPENDS=	v4l_compat>=1.0.20101027:${PORTSDIR}/multimedia/v4l_compat
 
 MAKE_ARGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LIBDIR="${PREFIX}/lib"
-USE_GZIP=	yes
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/lib
+
 .include <bsd.port.pre.mk>
 
 post-patch:
@@ -33,5 +36,6 @@ post-patch:
 		${WRKSRC}/libv4l1/Makefile \
 		${WRKSRC}/libv4l2/Makefile \
 		${WRKSRC}/libv4lconvert/Makefile
+	@${RM} ${WRKSRC}/../include/linux/videodev2.h
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/libv4l/distinfo b/multimedia/libv4l/distinfo
index 2ade2e4d5c8e..ed591ef4620a 100644
--- a/multimedia/libv4l/distinfo
+++ b/multimedia/libv4l/distinfo
@@ -1,3 +1,2 @@
-MD5 (libv4l-0.6.4.tar.gz) = 7ef58595dc36252be7f83f69b379a715
-SHA256 (libv4l-0.6.4.tar.gz) = d24bc2b14a4a631d6d07f73992508bed0360b6f5d96bc95af93c44d67cb6e53a
-SIZE (libv4l-0.6.4.tar.gz) = 134851
+SHA256 (v4l-utils-0.8.1.tar.bz2) = 2b03003f1e081c5c98d1fe287c0d88a6c720ca972c4d80a1782146bbde1ac5ea
+SIZE (v4l-utils-0.8.1.tar.bz2) = 287114
diff --git a/multimedia/libv4l/files/patch-Make.rules b/multimedia/libv4l/files/patch-Make.rules
new file mode 100644
index 000000000000..23ed35a13bef
--- /dev/null
+++ b/multimedia/libv4l/files/patch-Make.rules
@@ -0,0 +1,26 @@
+--- ../Make.rules.orig	2010-08-26 17:19:37.000000000 +0200
++++ ../Make.rules	2010-11-04 20:26:22.000000000 +0100
+@@ -7,8 +7,8 @@ CFLAGS += -Wall -Wpointer-arith
+ CXXFLAGS := $(CFLAGS)
+ CFLAGS += -Wstrict-prototypes -Wmissing-prototypes
+ 
+-PREFIX = /usr/local
+-LIBDIR = $(PREFIX)/lib
++PREFIX ?= /usr/local
++LIBDIR ?= $(PREFIX)/lib
+ # subdir below LIBDIR in which to install the libv4lx libc wrappers
+ LIBSUBDIR = libv4l
+ 
+@@ -22,10 +22,10 @@ LIB_RELEASE = 0
+ # And last various rules
+ 
+ %.o: %.c
+-	$(CC) -Wp,-MMD,"$*.d",-MQ,"$@",-MP -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
++	$(CC) -MMD -MF "$*.d" -MQ "$@" -MP -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
+ 
+ %.o: %.cpp
+-	$(CXX) -Wp,-MMD,"$*.d",-MQ,"$@",-MP -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
++	$(CXX) -MMD -MF "$*.d" -MQ "$@" -MP -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
+ 
+ %.so:
+ 	$(CC) -shared $(LDFLAGS) -Wl,-soname,$@.$(LIB_RELEASE) -o $@.$(LIB_RELEASE) $^ $(LIBS_$*)
diff --git a/multimedia/libv4l/files/patch-libv4lsyscall-priv.h b/multimedia/libv4l/files/patch-libv4lsyscall-priv.h
deleted file mode 100644
index ef449d9a1f70..000000000000
--- a/multimedia/libv4l/files/patch-libv4lsyscall-priv.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libv4lconvert/libv4lsyscall-priv.h	2010-01-09 23:33:01.000000000 +0100
-+++ libv4lconvert/libv4lsyscall-priv.h	2010-01-09 23:33:24.000000000 +0100
-@@ -84,7 +84,7 @@
- #define SYS_WRITE(fd, buf, len) \
-     syscall(SYS_write, (int)(fd), (void *)(buf), (size_t)(len));
- #define SYS_MMAP(addr, len, prot, flags, fd, off) \
--    syscall(SYS_mmap2, (void *)(addr), (size_t)(len), \
-+    __syscall(SYS_mmap2, (void *)(addr), (size_t)(len), \
- 	(int)(prot), (int)(flags), (int)(fd), (__off_t)((off) >> MMAP2_PAGE_SHIFT))
- #define SYS_MUNMAP(addr, len) \
-     syscall(SYS_munmap, (void *)(addr), (size_t)(len))