Date: Wed, 5 Sep 2007 17:32:08 GMT From: Simun Mikecin <numisemis@yahoo.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/116128: [patch] multiimedia/pvr250: unbreak on -CURRENT Message-ID: <200709051732.l85HW8Nq097132@www.freebsd.org> Resent-Message-ID: <200709051740.l85He3lP094953@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200709051732.l85HW8Nq097132>