Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 Sep 2011 15:13:18 GMT
From:      Jason Harmening <jason.harmening@gmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/160766: Update port: multimedia/cx88 to 1.4.0
Message-ID:  <201109161513.p8GFDICd017369@red.freebsd.org>
Resent-Message-ID: <201109161520.p8GFK504089107@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         160766
>Category:       ports
>Synopsis:       Update port: multimedia/cx88 to 1.4.0
>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:   Fri Sep 16 15:20:05 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Jason Harmening
>Release:        9.0-BETA2
>Organization:
>Environment:
FreeBSD corona.austin.rr.com 9.0-BETA2 FreeBSD 9.0-BETA2 #1 r225453M: Thu Sep  8 20:46:36 CDT 2011     jason@corona.austin.rr.com:/usr/obj/usr/src/sys/CUSTOM  amd64
>Description:
--Add Linux DVB compatibility to capture app
--Fix driver load failure when built w/ clang
--Fix simultaneous captures w/ MSIs enabled

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN cx88.orig/Makefile cx88/Makefile
--- cx88.orig/Makefile	2011-05-20 01:47:50.000000000 -0500
+++ cx88/Makefile	2011-09-15 01:04:06.000000000 -0500
@@ -2,21 +2,22 @@
 # Date created:        7 September 2008
 # Whom:                jah
 #
-# $FreeBSD: ports/multimedia/cx88/Makefile,v 1.15 2011/05/20 06:47:50 culot Exp $
+# $FreeBSD$
 #
 
 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 @@
 
 .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 -ruN cx88.orig/distinfo cx88/distinfo
--- cx88.orig/distinfo	2011-05-16 03:14:46.000000000 -0500
+++ cx88/distinfo	2011-09-15 01:04:06.000000000 -0500
@@ -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 -ruN cx88.orig/files/patch-client-analog-cx88__analog__driver.cpp cx88/files/patch-client-analog-cx88__analog__driver.cpp
--- cx88.orig/files/patch-client-analog-cx88__analog__driver.cpp	2011-05-19 03:11:35.000000000 -0500
+++ cx88/files/patch-client-analog-cx88__analog__driver.cpp	1969-12-31 18:00:00.000000000 -0600
@@ -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 -ruN cx88.orig/pkg-descr cx88/pkg-descr
--- cx88.orig/pkg-descr	2009-06-22 17:46:10.000000000 -0500
+++ cx88/pkg-descr	2011-09-15 01:04:06.000000000 -0500
@@ -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


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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201109161513.p8GFDICd017369>