diff options
author | sno <sno@pkgsrc.org> | 2010-09-21 05:43:16 +0000 |
---|---|---|
committer | sno <sno@pkgsrc.org> | 2010-09-21 05:43:16 +0000 |
commit | 1d57f94351f91768e1f7c2d474d928f290749eec (patch) | |
tree | b84e62dad3349ffe2fd9098b197766421e3d515d /x11/xf86-video-nv | |
parent | f40247d5a69eeb413513c0eff9288bcc55b159ce (diff) | |
download | pkgsrc-1d57f94351f91768e1f7c2d474d928f290749eec.tar.gz |
Updating x11/xf86-video-nv from 2.1.14nb2 to 2.1.18 (pkg/43886)
pkgsrc changes:
- add license definition
Upstream changes:
2010-07-30 nv 2.1.18
Remove RANDR_12_INTERFACE checking, always defined.
config: add comments for main statements
config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
config: complete AC_INIT m4 quoting
config: remove unrequired AC_SUBST([XORG_CFLAGS])
config: remove unrequired AC_HEADER_STDC
config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
config: update AC_PREREQ statement to 2.60
config: upgrade to util-macros 1.8 for additional man page support
Add a missing " }," pointed out by Johannes Obermayr.
Merge branch 'master' of git://soprano/~aaron/xf86-video-nv
The /compat code is no longer required.
Add PCI table entries for the GeForce 315
Unlike for lspci and the kernel, X bus IDs are decimal instead of hex.
Bring NVKnownChipsets up to date.
Fix the kernel driver error reporting to be a little more verbose.
Depend on libpciaccess >= 0.10.7.
Revert "Refuse to bind to a device which has kernel modesetting active."
nv: refuse to load if there's a kernel driver bound to the device already
COPYING: update file with Copyright notices from source code.
Don't use libcwrappers for calloc and free
Refuse to bind to a device which has kernel modesetting active.
Update MCP6x supported products.
Bug #19817: Add support for GeForce 7025 and 7050.
Bug #24787: Don't crash if LVDS initialization fails
2010-03-08 nv 2.1.17
More products
G80: Cast register reads before shifting them to avoid truncation to 32 bits.
Bug #19545: Add support for MCP7x-based integrated GPUs.
G80: Log unrecognized outputs
Bug #26612: Separate LUTs per output.
Update Sun license notices to current X.Org standard form
configure.ac: remove unused sdkdir=$(pkg-config...) statement
2009-12-15 nv 2.1.16
New board names
Remove an unnecessary (and typo'd) gitignore comment
g80: Add a no-op gamma hook so we don't crash on 1.7 servers
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Several driver modules do not have a ChangeLog target in Makefile.am #23814
.gitignore: use common defaults with custom section # 24239
.gitignore: use common defaults with custom section # 24239
More new boards
New boards
2009-09-11 nv 2.1.15
abi: fixup so the define is picked up
nv: change to using ABI version check
nv: update for resources/RAC API removal
Update to xextproto 7.1 support.
xf86-video-nv: use XORG_CHANGELOG macro to create ChangeLog. #22611
Diffstat (limited to 'x11/xf86-video-nv')
-rw-r--r-- | x11/xf86-video-nv/Makefile | 7 | ||||
-rw-r--r-- | x11/xf86-video-nv/distinfo | 10 | ||||
-rw-r--r-- | x11/xf86-video-nv/patches/patch-aa | 28 | ||||
-rw-r--r-- | x11/xf86-video-nv/patches/patch-ab | 28 |
4 files changed, 8 insertions, 65 deletions
diff --git a/x11/xf86-video-nv/Makefile b/x11/xf86-video-nv/Makefile index 2fcf97502bf..74c98bfc02b 100644 --- a/x11/xf86-video-nv/Makefile +++ b/x11/xf86-video-nv/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.20 2010/09/14 11:03:14 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2010/09/21 05:43:16 sno Exp $ -DISTNAME= xf86-video-nv-2.1.14 -PKGREVISION= 2 +DISTNAME= xf86-video-nv-2.1.18 +#PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -9,6 +9,7 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg NVIDIA video driver +LICENSE= mit AND modified-bsd PKG_DESTDIR_SUPPORT= user-destdir diff --git a/x11/xf86-video-nv/distinfo b/x11/xf86-video-nv/distinfo index 4ce04052372..336a7700a4a 100644 --- a/x11/xf86-video-nv/distinfo +++ b/x11/xf86-video-nv/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.14 2009/08/09 22:47:09 wiz Exp $ +$NetBSD: distinfo,v 1.15 2010/09/21 05:43:16 sno Exp $ -SHA1 (xf86-video-nv-2.1.14.tar.bz2) = eda0e94c7a86c7cbc51a9a5de79e71813f28d045 -RMD160 (xf86-video-nv-2.1.14.tar.bz2) = cd1d21ffe9cfb115acd821fe6ea03b2572eb0aa6 -Size (xf86-video-nv-2.1.14.tar.bz2) = 380104 bytes -SHA1 (patch-aa) = 46425003bc1a8bd8b80c31eeb59162ba5b33be16 -SHA1 (patch-ab) = 406f8233b47222e18ecad8288388122eadd1e0e6 +SHA1 (xf86-video-nv-2.1.18.tar.bz2) = d35b2fa5a26a507a9cc95b69243d9fd0c0f32aa2 +RMD160 (xf86-video-nv-2.1.18.tar.bz2) = 8a3833ce1523f01306c5829dc2947ac90bcaddfc +Size (xf86-video-nv-2.1.18.tar.bz2) = 354719 bytes diff --git a/x11/xf86-video-nv/patches/patch-aa b/x11/xf86-video-nv/patches/patch-aa deleted file mode 100644 index c9ec24be6d4..00000000000 --- a/x11/xf86-video-nv/patches/patch-aa +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2009/08/09 22:47:09 wiz Exp $ - ---- src/nv_driver.c.orig 2009-06-27 00:47:57.000000000 +0000 -+++ src/nv_driver.c -@@ -373,6 +373,7 @@ static SymTabRec NVKnownChipsets[] = - { 0x10DE0244, "GeForce Go 6150" }, - { 0x10DE0245, "Quadro NVS 210S / NVIDIA GeForce 6150LE" }, - { 0x10DE0247, "GeForce Go 6100" }, -+ { 0x10DE0533, "GeForce 7000M" }, - - { 0x10DE03D0, "GeForce 6150SE" }, - { 0x10DE03D1, "GeForce 6100 nForce 405" }, -@@ -764,6 +765,7 @@ NVIsSupported(CARD32 id) - case 0x0340: - case 0x0390: - case 0x03D0: -+ case 0x0530: - return TRUE; - } - -@@ -1685,6 +1687,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) - case 0x0390: /* GeForce 7600 */ - case 0x0240: /* GeForce 6100 */ - case 0x03D0: -+ case 0x0530: /* GeForce 7000M */ - pNv->Architecture = NV_ARCH_40; - break; - default: diff --git a/x11/xf86-video-nv/patches/patch-ab b/x11/xf86-video-nv/patches/patch-ab deleted file mode 100644 index 024a426ab71..00000000000 --- a/x11/xf86-video-nv/patches/patch-ab +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2009/05/12 13:20:41 tnn Exp $ - ---- src/nv_hw.c.orig 2008-10-27 22:54:04.000000000 +0100 -+++ src/nv_hw.c -@@ -890,6 +890,7 @@ void NVCalcStateExt ( - case NV_ARCH_30: - default: - if(((pNv->Chipset & 0xfff0) == 0x0240) || -+ ((pNv->Chipset & 0xfff0) == 0x0530) || - ((pNv->Chipset & 0xfff0) == 0x03D0)) - { - state->arbitration0 = 128; -@@ -1226,6 +1227,7 @@ void NVLoadStateExt ( - case 0x01D0: - case 0x0240: - case 0x03D0: -+ case 0x0530: - pNv->PMC[0x1700/4] = pNv->PFB[0x020C/4]; - pNv->PMC[0x1704/4] = 0; - pNv->PMC[0x1708/4] = 0; -@@ -1316,6 +1318,7 @@ void NVLoadStateExt ( - pNv->PGRAPH[(0x0900/4) + i] = pNv->PFB[(0x0600/4) + i]; - if(((pNv->Chipset & 0xfff0) != 0x0160) && - ((pNv->Chipset & 0xfff0) != 0x0220) && -+ ((pNv->Chipset & 0xfff0) != 0x0530) && - ((pNv->Chipset & 0xfff0) != 0x0240)) - { - pNv->PGRAPH[(0x6900/4) + i] = pNv->PFB[(0x0600/4) + i]; |