From nobody@FreeBSD.org  Fri Sep 16 15:13:18 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8D865106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 16 Sep 2011 15:13:18 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 72E3F8FC12
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 16 Sep 2011 15:13:18 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p8GFDIGa017374
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 16 Sep 2011 15:13:18 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p8GFDICd017369;
	Fri, 16 Sep 2011 15:13:18 GMT
	(envelope-from nobody)
Message-Id: <201109161513.p8GFDICd017369@red.freebsd.org>
Date: Fri, 16 Sep 2011 15:13:18 GMT
From: Jason Harmening <jason.harmening@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update port: multimedia/cx88 to 1.4.0
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         160766
>Category:       ports
>Synopsis:       Update port: multimedia/cx88 to 1.4.0
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    beech
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 16 15:20:05 UTC 2011
>Closed-Date:    Mon Sep 19 19:34:18 UTC 2011
>Last-Modified:  Mon Sep 19 19:40:04 UTC 2011
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: beech 
Responsible-Changed-When: Sat Sep 17 20:15:30 UTC 2011 
Responsible-Changed-Why:  
I'll take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160766 
State-Changed-From-To: open->feedback 
State-Changed-By: beech 
State-Changed-When: Sat Sep 17 20:56:53 UTC 2011 
State-Changed-Why:  
Awaiting maintainer feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160766 

From: Beech Rintoul <beech@freebsd.org>
To: Jason Harmening <jason.harmening@gmail.com>
Cc: bug-followup@freebsd.org,
 Beech Rintoul <beech@freebsd.org>
Subject: Re: ports/160766: Update port: multimedia/cx88 to 1.4.0
Date: Sat, 17 Sep 2011 12:52:55 -0800

 Port fails tinderbox:
 
 http://www.maximumdata.biz/tb/errors/9.0-FreeBSD/cx88-1.4.0.log
 
 
 Beech
 -- 
 ---------------------------------------------------------------------------------------
 Beech Rintoul - FreeBSD Developer - beech@FreeBSD.org
 /"\   ASCII Ribbon Campaign  | FreeBSD Since 4.x
 \ / - NO HTML/RTF in e-mail  | http://people.freebsd.org/~beech
  X  - NO Word docs in e-mail | Skype: akbeech
 / \ - http://www.FreeBSD.org/releases/8.2R/announce.html
 ---------------------------------------------------------------------------------------
 
 
 

From: Jason Harmening <jason.harmening@gmail.com>
To: Beech Rintoul <beech@freebsd.org>
Cc: bug-followup@freebsd.org
Subject: Re: ports/160766: Update port: multimedia/cx88 to 1.4.0
Date: Sat, 17 Sep 2011 18:32:25 -0500

 > Port fails tinderbox:
 >
 > http://www.maximumdata.biz/tb/errors/9.0-FreeBSD/cx88-1.4.0.log
 >
 
 Isn't that a problem w/ the ports system on the test machine?
 From the logfile:
 
 ===>   cx88-1.4.0 depends on file: /usr/local/lib/libezxml.a - found
 ===>   cx88-1.4.0 depends on package: libtuner>=1.0.7 - found
 ===>   cx88-1.4.0 depends on package: v4l_compat>=1.0.20100321 - found
 ===>   cx88-1.4.0 depends on package: cuse4bsd-kmod>=0.1.12 - found
 ===>   cx88-1.4.0 depends on shared library: tuner.1 - found
 ===>   cx88-1.4.0 depends on shared library: cuse4bsd.1 - not found
 ===>    Verifying install for cuse4bsd.1 in /usr/ports/multimedia/cuse4
 ...
 ===>  Installing for cuse4bsd-kmod-0.1.16
 ===>   Generating temporary packing list
 ===>  Checking if multimedia/cuse4bsd-kmod already installed
 ===>   cuse4bsd-kmod-0.1.16 is already installed
       You may wish to ``make deinstall'' and install this port again
       by ``make reinstall'' to upgrade it properly.
       If you really wish to overwrite the old port of multimedia/cuse4bsd-kmod
       without deleting it first, set the variable "FORCE_PKG_REGISTER"
       in your environment or the "make install" command line.
 *** Error code 1
 
 Stop in /a/ports/multimedia/cuse4bsd-kmod.
 *** Error code 1
 
 Stop in /a/ports/multimedia/cx88.
 
 
 So the pkgdb is seeing cuse4bsd installed (BUILD_DEPENDS), but not its
 library (LIB_DEPENDS)...is there something I need to change on my end
 to prevent this?
State-Changed-From-To: feedback->closed 
State-Changed-By: beech 
State-Changed-When: Mon Sep 19 19:34:01 UTC 2011 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160766 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/160766: commit references a PR
Date: Mon, 19 Sep 2011 19:32:35 +0000 (UTC)

 beech       2011-09-19 19:32:22 UTC
 
   FreeBSD ports repository
 
   Modified files:
     multimedia/cx88      Makefile distinfo pkg-descr 
   Removed files:
     multimedia/cx88/files 
                           patch-client-analog-cx88__analog__driver.cpp 
   Log:
   - 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)
   
   Revision  Changes    Path
   1.16      +12 -4     ports/multimedia/cx88/Makefile
   1.9       +2 -2      ports/multimedia/cx88/distinfo
   1.2       +0 -15     ports/multimedia/cx88/files/patch-client-analog-cx88__analog__driver.cpp (dead)
   1.4       +4 -6      ports/multimedia/cx88/pkg-descr
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
