ports/135903: Update port: multimedia/cx88 Add support for CX23885/7/8

[Jason Harmening]

>Number:         135903
>Category:       ports
>Synopsis:       Update port: multimedia/cx88 Add support for CX23885/7/8
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 22 02:10:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Jason Harmening
>Release:        7.2-PRERELEASE
>Organization:
>Environment:
FreeBSD CORONA 7.2-PRERELEASE FreeBSD 7.2-PRERELEASE #0: Sun May  3 18:39:23 CDT 2009     jason at CORONA:/usr/obj/usr/src/sys/CUSTOM  amd64
>Description:
--Add kernel MPEG support for CX23885/7/8-based PCIe cards
--Add userspace support for Hauppauge WinTV HVR-1800 and HVR-1250
--Fix panic when synchronizing userspace buffers on large-memory machines
--Fix build on -CURRENT
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN cx88/Makefile /usr/ports/multimedia/cx88/Makefile
--- cx88/Makefile	2009-06-21 19:14:09.000000000 -0500
+++ /usr/ports/multimedia/cx88/Makefile	2009-06-20 17:29:05.000000000 -0500
@@ -2,16 +2,16 @@
 # Date created:        7 September 2008
 # Whom:                jah
 #
-# $FreeBSD: ports/multimedia/cx88/Makefile,v 1.4 2009/05/25 10:54:12 erwin Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	cx88
-PORTVERSION=	1.1.0
+PORTVERSION=	1.2.0
 CATEGORIES=	multimedia kld
 MASTER_SITES=	ftp://corona.homeunix.net/ports/cx88/
 
 MAINTAINER=	jason.harmening at gmail.com
-COMMENT=	Drivers for Conexant CX23880/1/2/3-based TV/radio capture cards
+COMMENT=	Drivers for Conexant CX23880/1/2/3/5/7/8-based TV/radio capture cards
 
 LIB_DEPENDS=	tuner:${PORTSDIR}/multimedia/libtuner
 BUILD_DEPENDS=	${LOCALBASE}/lib/libezxml.a:${PORTSDIR}/textproc/ezxml
@@ -24,8 +24,6 @@
 
 .if ${OSVERSION} < 700055
 IGNORE=		requires FreeBSD 7.0-RELEASE or later
-.elif ${OSVERSION} >= 800000
-BROKEN=		does not build
 .endif
 
 .if !exists(/usr/src/sys/Makefile)
diff -ruN cx88/distinfo /usr/ports/multimedia/cx88/distinfo
--- cx88/distinfo	2009-06-21 19:11:03.000000000 -0500
+++ /usr/ports/multimedia/cx88/distinfo	2009-06-20 17:29:05.000000000 -0500
@@ -1,3 +1,3 @@
-MD5 (cx88-1.1.0.tar.gz) = 450d6d989d6ea3203f6175aa25c6a62d
-SHA256 (cx88-1.1.0.tar.gz) = 1bf37ef1e940513926fcf40dd3573b3bc82ba9116d54249c3e19c1b2ed20805d
-SIZE (cx88-1.1.0.tar.gz) = 134386
+MD5 (cx88-1.2.0.tar.gz) = 3146890105b709e7a484fbbf2e291e29
+SHA256 (cx88-1.2.0.tar.gz) = b00eedd03002a945867d02fe770d39ab5f04315c10b6e0a6f5dc578644605445
+SIZE (cx88-1.2.0.tar.gz) = 143665
diff -ruN cx88/pkg-descr /usr/ports/multimedia/cx88/pkg-descr
--- cx88/pkg-descr	2009-06-21 19:11:30.000000000 -0500
+++ /usr/ports/multimedia/cx88/pkg-descr	2009-06-20 17:29:05.000000000 -0500
@@ -1,7 +1,8 @@
-cx88 provides drivers for TV/radio capture cards based on
-the Conexant CX23880/1/2/3 series of chips.  This port
-includes the cx88 kernel drivers as well as a simple app
-for HDTV 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
diff -ruN cx88/pkg-plist /usr/ports/multimedia/cx88/pkg-plist
--- cx88/pkg-plist	2009-06-21 19:11:53.000000000 -0500
+++ /usr/ports/multimedia/cx88/pkg-plist	2009-06-20 17:29:05.000000000 -0500
@@ -4,13 +4,10 @@
 %%DATADIR%%/or51132_qam.fw
 %%EXAMPLESDIR%%/cx88_audio_enable.cpp
 %%EXAMPLESDIR%%/remote.cpp
+%%EXAMPLESDIR%%/cx88_mpeg_client.cpp
 %%EXAMPLESDIR%%/hd3k_analog_kbuf.cpp
 %%EXAMPLESDIR%%/tuner_config
-%%EXAMPLESDIR%%/hd3k_mpeg_ubuf.cpp
-%%EXAMPLESDIR%%/hd5k_mpeg_ubuf.cpp
-%%EXAMPLESDIR%%/hd3k_mpeg_kbuf.cpp
 %%EXAMPLESDIR%%/cx88_audio_client.cpp
-%%EXAMPLESDIR%%/hd5k_mpeg_kbuf.cpp
 %%EXAMPLESDIR%%/hd3k_analog_ubuf.cpp
 %%EXAMPLESDIR%%/hd5k_analog_ubuf.cpp
 include/iicdev/iicdev_ioctl.h
@@ -27,8 +24,10 @@
 cx88i2c.ko
 iicdev.ko
 cx88ir.ko
+cx88mpegcore.ko
 cx88mpeg.ko
 cx88video.ko
 cx88audio.ko
+cx23885.ko
 @exec kldxref %D
 @unexec kldxref %D


>Release-Note:
>Audit-Trail:
>Unformatted: