From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Sep 5 17:40:03 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CEDEF16A418 for ; Wed, 5 Sep 2007 17:40:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id AB25113C461 for ; Wed, 5 Sep 2007 17:40:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l85He30G094954 for ; Wed, 5 Sep 2007 17:40:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l85He3lP094953; Wed, 5 Sep 2007 17:40:03 GMT (envelope-from gnats) Resent-Date: Wed, 5 Sep 2007 17:40:03 GMT Resent-Message-Id: <200709051740.l85He3lP094953@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Simun Mikecin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8277E16A421 for ; 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 ; 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 ; 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 To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/116128: [patch] multiimedia/pvr250: unbreak on -CURRENT X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Sep 2007 17:40:04 -0000 >Number: 116128 >Category: ports >Synopsis: [patch] multiimedia/pvr250: unbreak on -CURRENT >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Sep 05 17:40:03 GMT 2007 >Closed-Date: >Last-Modified: >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: >Unformatted: