Date: Sun, 6 Aug 2006 22:33:21 -0500 From: "User1001" <supraexpress@globaleyes.net> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/101549: multimedia/mplayer V0.99.8.1 nvidia patch files need correcting Message-ID: <1154921601.81097@freebsd2.localnet10> Resent-Message-ID: <200608070340.k773e9jA069366@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101549
>Category: ports
>Synopsis: multimedia/mplayer V0.99.8.1 nvidia patch files need correcting
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Aug 07 03:40:09 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: User1001
>Release: FreeBSD 5.5-STABLE i386
>Organization:
>Environment:
System: FreeBSD 5.5-STABLE #5: Mon Jul 10 21:19:25 CDT 2006
>Description:
Two patch files for Nvidia drivers are out of synchronization which causes extract + patch to fail.
Corrected Nvidia driver patch files are attached.
>How-To-Repeat:
>Fix:
--- patch-libdha-oth-pci.db.diffs begins here ---
*** patch-libdha-oth-pci.db.orig Sun May 22 22:32:55 2005
--- files/patch-libdha-oth-pci.db Sun Aug 6 22:19:55 2006
***************
*** 1,11 ****
! *** libdha/oth/pci.db.orig Sun Apr 10 12:39:18 2005
! --- libdha/oth/pci.db Sun May 22 22:31:19 2005
***************
! *** 2672,2677 ****
! --- 2672,2678 ----
! d 10de0338 NV35GL [Quadro FX 3000] 0
d 10de0341 NV 36 [GeForce 5700 Ultra] 1 MSI MS-8938, 128 MB DDR2, DVI, TV-out, AGP
d 10de0342 NV 36 [GeForce 5700] 1 MSI FX5700-TD128, 128 MB DDR, DVI, TV-out, AGP
+ d 10de0040 NV40.0 [GeForce4 6800 Ultra] 0
v 10df Emulex Corporation 0
d 10df1ae5 LP6000 Fibre Channel Host Adapter 0
--- 1,11 ----
! *** libdha/oth/pci.db.orig Sun Jun 11 13:35:43 2006
! --- libdha/oth/pci.db Sun Aug 6 22:17:40 2006
***************
! *** 2676,2681 ****
! --- 2676,2682 ----
d 10de0341 NV 36 [GeForce 5700 Ultra] 1 MSI MS-8938, 128 MB DDR2, DVI, TV-out, AGP
d 10de0342 NV 36 [GeForce 5700] 1 MSI FX5700-TD128, 128 MB DDR, DVI, TV-out, AGP
+ d 10de0347 NV36 [GeForce FX Go5700] 0
+ d 10de0040 NV40.0 [GeForce4 6800 Ultra] 0
v 10df Emulex Corporation 0
d 10df1ae5 LP6000 Fibre Channel Host Adapter 0
--- patch-libdha-oth-pci.db.diffs ends here ---
--- patch-vidix-drivers-nvidia_vid.c.diffs begins here ---
*** patch-vidix-drivers-nvidia_vid.c.orig Sun May 22 23:11:24 2005
--- files/patch-vidix-drivers-nvidia_vid.c Sun Aug 6 22:25:07 2006
***************
*** 1,31 ****
! *** vidix/drivers/nvidia_vid.c.orig Sun Feb 1 05:35:28 2004
! --- vidix/drivers/nvidia_vid.c Sun May 22 21:18:30 2005
***************
! *** 60,65 ****
! --- 60,66 ----
#define NV_ARCH_10 0x10
#define NV_ARCH_20 0x20
#define NV_ARCH_30 0x30
+ #define NV_ARCH_40 0x40
-
- struct nvidia_cards {
- unsigned short chip_id;
- ***************
- *** 135,141 ****
- {DEVICE_NVIDIA_NV34GL_QUADRO_FX,NV_ARCH_30},
- {DEVICE_NVIDIA_NV35_GEFORCE_FX,NV_ARCH_30},
- {DEVICE_NVIDIA_NV35_GEFORCE_FX2,NV_ARCH_30},
- ! {DEVICE_NVIDIA_NV35GL_QUADRO_FX,NV_ARCH_30}
- };
!
! --- 135,143 ----
! {DEVICE_NVIDIA_NV34GL_QUADRO_FX,NV_ARCH_30},
! {DEVICE_NVIDIA_NV35_GEFORCE_FX,NV_ARCH_30},
{DEVICE_NVIDIA_NV35_GEFORCE_FX2,NV_ARCH_30},
! ! {DEVICE_NVIDIA_NV35GL_QUADRO_FX,NV_ARCH_30},
! ! /*NV40*/
! ! {DEVICE_NVIDIA_NV40_0_GEFORCE4_6800,NV_ARCH_40}
};
--- 1,23 ----
! *** vidix/drivers/nvidia_vid.c.orig Sun Jun 11 13:35:43 2006
! --- vidix/drivers/nvidia_vid.c Sun Aug 6 22:22:33 2006
***************
! *** 61,66 ****
! --- 61,67 ----
#define NV_ARCH_10 0x10
#define NV_ARCH_20 0x20
#define NV_ARCH_30 0x30
+ #define NV_ARCH_40 0x40
! // since no useful information whatsoever is passed
! // to the equalizer functions we need this
! ***************
! *** 151,156 ****
! --- 152,159 ----
{DEVICE_NVIDIA_NV35_GEFORCE_FX2,NV_ARCH_30},
! {DEVICE_NVIDIA_NV35GL_QUADRO_FX,NV_ARCH_30},
! {DEVICE_NVIDIA_NV36_GEFORCE_FX,NV_ARCH_30},
! + /*NV40*/
! + {DEVICE_NVIDIA_NV40_0_GEFORCE4_6800,NV_ARCH_40}
};
--- patch-vidix-drivers-nvidia_vid.c.diffs ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1154921601.81097>