- Update to 1.4.0

- Add Linux DVB compatibility to capture app
- Fix driver load failure when built w/ clang
- Fix simultaneous captures w/ MSIs enabled

PR:		ports/160766
Submitted by:	Jason Harmening <jason.harmening@gmail.com> (maintainer)

4 files changed, 18 insertions, 27 deletions

diff --git a/multimedia/cx88/Makefile b/multimedia/cx88/Makefile
index 8121bcd4996..87faba73c21 100644
--- a/multimedia/cx88/Makefile
+++ b/multimedia/cx88/Makefile
@@ -6,17 +6,18 @@
 #
 
 PORTNAME=	cx88
-PORTVERSION=	1.3.1
-PORTREVISION=	1
+PORTVERSION=	1.4.0
 CATEGORIES=	multimedia kld
 MASTER_SITES=	ftp://corona.homeunix.net/ports/cx88/
 
 MAINTAINER=	jason.harmening@gmail.com
 COMMENT=	Drivers for Conexant CX23880/1/2/3/5/7/8-based TV/radio capture cards
 
+LICENSE=	BSD
+
 LIB_DEPENDS=	tuner.1:${PORTSDIR}/multimedia/libtuner
 BUILD_DEPENDS=	${LOCALBASE}/lib/libezxml.a:${PORTSDIR}/textproc/ezxml \
-		libtuner>=1.0.6:${PORTSDIR}/multimedia/libtuner
+		libtuner>=1.0.7:${PORTSDIR}/multimedia/libtuner
 
 KMODDIR=	/boot/modules
 PLIST_SUB+=	KMODDIR=${KMODDIR}
@@ -25,8 +26,15 @@ MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.pre.mk>
 
+.if (${OSVERSION} >= 801000)
+LIB_DEPENDS+= cuse4bsd.1:${PORTSDIR}/multimedia/cuse4bsd-kmod
+BUILD_DEPENDS+= v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat \
+		cuse4bsd-kmod>=0.1.12:${PORTSDIR}/multimedia/cuse4bsd-kmod
+MAKE_ARGS+= -D WITH_LINUX_DVB
+.endif
+
 .if (${OSVERSION} < 704000) || ((${OSVERSION} >= 800000) && (${OSVERSION} < 801000))
-IGNORE=	requires kernel support for kmem_alloc_attr() (FreeBSD 7.4+, FreeBSD 8.1+)
+IGNORE= requires kernel support for kmem_alloc_attr() (FreeBSD 7.4+, FreeBSD 8.1+)
 .endif
 
 .if !exists(${SRC_BASE}/sys/Makefile)
diff --git a/multimedia/cx88/distinfo b/multimedia/cx88/distinfo
index 47123770aff..7fe444e8f07 100644
--- a/multimedia/cx88/distinfo
+++ b/multimedia/cx88/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cx88-1.3.1.tar.gz) = 9d411e106ed57771462159a9a7ddd1d5fa7bb2178a46f5a421fda0b765526e53
-SIZE (cx88-1.3.1.tar.gz) = 163183
+SHA256 (cx88-1.4.0.tar.gz) = 28f37fcd033dcebac39085632adee0338a5bc69d207399c361605df107181a6d
+SIZE (cx88-1.4.0.tar.gz) = 177677
diff --git a/multimedia/cx88/files/patch-client-analog-cx88__analog__driver.cpp b/multimedia/cx88/files/patch-client-analog-cx88__analog__driver.cpp
deleted file mode 100644
index 9d98604daba..00000000000
--- a/multimedia/cx88/files/patch-client-analog-cx88__analog__driver.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: client/analog/cx88_analog_driver.cpp
-===================================================================
---- client/analog/cx88_analog_driver.cpp	(revision 562)
-+++ client/analog/cx88_analog_driver.cpp	(working copy)
-@@ -133,10 +133,6 @@
-          error = m_pip_driver->start(slave_pip_params);
-       }
-    }
--   if (m_slave_mode)
--   {
--      wait_for_event(0);
--   }
-    if (m_mode == CX88_ANALOG_MODE_VIDEO)
-    {
-       error = (error ? error : capture_video(params));
diff --git a/multimedia/cx88/pkg-descr b/multimedia/cx88/pkg-descr
index df61362e637..8ff09ac36d8 100644
--- a/multimedia/cx88/pkg-descr
+++ b/multimedia/cx88/pkg-descr
@@ -1,8 +1,6 @@
-cx88 provides drivers for PCI and PCI-e TV/radio capture
-cards based on the Conexant CX23880/1/2/3 and CX23885/7/8 
-chip families.  This port includes the cx88 kernel drivers
-as well as a simple app for TV capture. It requires 
-multimedia/libtuner for channel selection and peripheral
-configuration.
+cx88 provides drivers for PCI and PCI-e TV/radio capture cards based on the
+Conexant CX23880/1/2/3 and CX23885/7/8 chip families.  This port includes the
+cx88 kernel drivers as well as a simple app for TV capture. It requires
+multimedia/libtuner for channel selection and peripheral configuration.
 
 WWW: http://corona.homeunix.net/cx88wiki