From nobody@FreeBSD.org  Wed Sep  5 17:32:09 2007
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 8277E16A421
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  5 Sep 2007 17:32:09 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 56A9013C478
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  5 Sep 2007 17:32:09 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.1/8.14.1) with ESMTP id l85HW99j097135
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 5 Sep 2007 17:32:09 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.1/8.14.1/Submit) id l85HW8Nq097132;
	Wed, 5 Sep 2007 17:32:08 GMT
	(envelope-from nobody)
Message-Id: <200709051732.l85HW8Nq097132@www.freebsd.org>
Date: Wed, 5 Sep 2007 17:32:08 GMT
From: Simun Mikecin <numisemis@yahoo.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] multiimedia/pvr250: unbreak on -CURRENT
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: edwin@mavetju.org

>Number:         116128
>Category:       ports
>Synopsis:       [patch] multimedia/pvr250: unbreak on -CURRENT
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    edwin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 05 17:40:03 GMT 2007
>Closed-Date:    Thu Sep 06 01:13:43 GMT 2007
>Last-Modified:  Thu Sep  6 01:20:02 GMT 2007
>Originator:     Simun Mikecin
>Release:        FreeBSD/amd64 7.0-CURRENT
>Organization:
>Environment:
FreeBSD xxx 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Sat Sep  1 15:18:17 CEST 2007     root@xxx:/usr/obj/usr/src.current/sys/DATA  amd64
>Description:
newbus API has changed. patch accordingly.

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN pvr250.old/Makefile pvr250/Makefile
--- pvr250.old/Makefile	2007-06-29 11:16:38.000000000 +0200
+++ pvr250/Makefile	2007-09-05 19:16:21.384764172 +0200
@@ -39,6 +39,11 @@
 .endif
 PLIST_SUB=	MODULESDIR=${MODULESDIR}
 
+.if ${OSVERSION} >= 700031
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-dev::cxm::cxm.h \
+		${PATCHDIR}/extra-patch-dev::cxm::cxm.c
+.endif
+
 .if !exists(${DISTDIR}/hcwPVRP2.sys)
 IGNORE=		You need the file hcwPVRP2.sys from the CD coming with the PVR-250/350 card. Please place this file in ${DISTDIR} and run make again.
 .endif
diff -urN pvr250.old/files/extra-patch-dev::cxm::cxm.c pvr250/files/extra-patch-dev::cxm::cxm.c
--- pvr250.old/files/extra-patch-dev::cxm::cxm.c	1970-01-01 01:00:00.000000000 +0100
+++ pvr250/files/extra-patch-dev::cxm::cxm.c	2007-09-05 19:15:12.820160226 +0200
@@ -0,0 +1,11 @@
+--- dev/cxm/cxm.c.orig	2007-09-05 19:08:24.707875447 +0200
++++ dev/cxm/cxm.c	2007-09-05 19:08:17.000000000 +0200
+@@ -1799,7 +1799,7 @@
+ 	}
+ 
+ 	error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_TTY,
+-			       cxm_intr, sc, &sc->ih_cookie);
++			       NULL, cxm_intr, sc, &sc->ih_cookie);
+ 	if (error) {
+ 		device_printf(dev, "could not setup irq\n");
+ 		goto fail;
diff -urN pvr250.old/files/extra-patch-dev::cxm::cxm.h pvr250/files/extra-patch-dev::cxm::cxm.h
--- pvr250.old/files/extra-patch-dev::cxm::cxm.h	1970-01-01 01:00:00.000000000 +0100
+++ pvr250/files/extra-patch-dev::cxm::cxm.h	2007-09-05 19:14:56.126747634 +0200
@@ -0,0 +1,20 @@
+--- dev/cxm/cxm.h.orig	2007-09-05 19:10:08.361061000 +0200
++++ dev/cxm/cxm.h	2007-09-05 19:14:25.486827125 +0200
+@@ -211,8 +211,6 @@
+ 			 cxm_pal_60hz_source_format,
+ 			 cxm_secam_50hz_source_format };
+ 
+-extern const struct cxm_tuner cxm_tuners[];
+-
+ enum cxm_type { cxm_unknown_type, cxm_iTVC15_type, cxm_iTVC16_type };
+ 
+ /*
+@@ -635,6 +633,8 @@
+ 	const struct cxm_saa7115_command *scaling;
+ };
+ 
++extern const struct cxm_tuner cxm_tuners[];
++
+ int cxm_saa7115_init( struct cxm_softc *sc );
+ int cxm_saa7115_mute( struct cxm_softc *sc );
+ int cxm_saa7115_unmute( struct cxm_softc *sc );


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->edwin 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Sep 5 22:15:54 UTC 2007 
Responsible-Changed-Why:  
edwin@mavetju.org => edwin@ 

http://www.freebsd.org/cgi/query-pr.cgi?pr=116128 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Sep 5 22:16:02 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=116128 
State-Changed-From-To: feedback->closed 
State-Changed-By: edwin 
State-Changed-When: Thu Sep 6 01:12:16 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/116128: commit references a PR
Date: Thu,  6 Sep 2007 01:13:42 +0000 (UTC)

 edwin       2007-09-06 01:13:37 UTC
 
   FreeBSD ports repository
 
   Modified files:
     multimedia/pvr250    Makefile 
   Added files:
     multimedia/pvr250/files extra-patch-dev::cxm::cxm.c 
                             extra-patch-dev::cxm::cxm.h 
   Log:
   [patch] multimedia/pvr250: unbreak on -CURRENT
   
           newbus API has changed. patch accordingly.
   
   PR:             ports/116128
   Submitted by:   Simun Mikecin <numisemis@yahoo.com>
   Approved by:    edwin@
   
   Revision  Changes    Path
   1.18      +5 -0      ports/multimedia/pvr250/Makefile
   1.1       +11 -0     ports/multimedia/pvr250/files/extra-patch-dev::cxm::cxm.c (new)
   1.1       +20 -0     ports/multimedia/pvr250/files/extra-patch-dev::cxm::cxm.h (new)
 _______________________________________________
 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:
