Update to version 195.22. These are BETA drivers, and normally update would

not occur, but now it is special: it features long-awaited x86-64 (amd64)
support.  In order to use this driver release, your system will need to have
either FreeBSD 7-STABLE after 702106 or FreeBSD 8.0 and above.

Both the FreeBSD/x86 and FreeBSD/x86-64 driver packages include 32-bit Linux
ABI compatibility libraries; 64-bit Linux libraries may be included with a
future release (when support for Linux/x86-64 compatibility is added to
FreeBSD/amd64).  The FreeBSD/x86-64 package does not include the FreeBSD/x86
OpenGL libraries; however, the libraries shipped with the FreeBSD/x86 driver
package have been tested on FreeBSD/x86-64.

Port was updated to serve both versions seamlessly.  No need to specify
anything to distinguish between architectures.

I would like to thank everyone involved to make this happen.

Reviewed on:	-ports@
This commit is contained in:
Alexey Dokuchaev 2009-12-15 00:08:09 +00:00
parent f308f5fb13
commit 69e7885f35
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=245806
3 changed files with 42 additions and 17 deletions

View File

@ -6,18 +6,23 @@
#
PORTNAME= nvidia-driver
DISTVERSION?= 185.18.36
DISTVERSION?= 195.22
PORTREVISION?= 0 # As a reminder it can be overridden
CATEGORIES= x11 kld
MASTER_SITES= ${MASTER_SITE_NVIDIA}
ARCH_SUFX= ${ARCH:S/i386//:S/amd/_/}
.if ${DISTVERSION} == 195.22
MASTER_SITE_SUBDIR= XFree86/FreeBSD-x86${ARCH_SUFX}/${DISTVERSION}
ONLY_FOR_ARCHS= i386 amd64
.else
MASTER_SITE_SUBDIR= freebsd/${DISTVERSION}
DISTNAME= NVIDIA-FreeBSD-x86-${DISTVERSION}
ONLY_FOR_ARCHS= i386
.endif
DISTNAME= NVIDIA-FreeBSD-x86${ARCH_SUFX}-${DISTVERSION}
MAINTAINER= danfe@FreeBSD.org
COMMENT= NVidia graphics card binary drivers for hardware OpenGL rendering
ONLY_FOR_ARCHS= i386
NO_PACKAGE= should be recompiled for a particular FreeBSD kernel
USE_GL= gl
USE_LDCONFIG= yes
@ -27,8 +32,11 @@ MODULESDIR= lib/xorg/modules
PORTDOCS= *
OPTIONS= FREEBSD_AGP "Use FreeBSD AGP GART driver" off \
ACPI "Enable support for ACPI Power Management" off \
ACPI_PM "Enable support for ACPI Power Management" off \
LINUX "Build with support for Linux compatibility" on
.if ${DISTVERSION} == 195.22 # XXX should check against NVVERSION XXX
OPTIONS+= WBINVD "Enable heavy-weight cache-flush logic" off
.endif
# Starting with version 1.0-7667, NVidia has dropped support for numerous
# "legacy" GPUs. Consult NVidia README (the Appendix) to find out whether
@ -37,7 +45,7 @@ OPTIONS= FREEBSD_AGP "Use FreeBSD AGP GART driver" off \
# slave ports.
#
# XXX Until NVidia starts to name their releases consistently, employ this
# ugly hack to derive NVVERSION. XXX
# ugly hack below to derive NVVERSION. XXX
#
.if ${DISTVERSION:C/[0-9]+//g} == ".." # major.minor.update
NVVERSION= ${DISTVERSION:S/.//g}
@ -71,7 +79,13 @@ PLIST_SUB+= LINUX="@comment "
MAKE_ENV+= WITHOUT_LINUX=yes
.endif
.if ${OSVERSION} < 702106
IGNORE= requires fairly recent FreeBSD-STABLE, or FreeBSD-CURRENT
.endif
.if ${NVVERSION} < 1952200
LIB_DEPENDS+= m.3:${PORTSDIR}/misc/compat5x
.endif
post-patch: .SILENT
# We should support -CURRENT: kill the check
@ -80,7 +94,7 @@ post-patch: .SILENT
${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \
${WRKSRC}/src/nv-freebsd.h
.endif
.if defined(WITH_ACPI)
.if defined(WITH_ACPI_PM)
${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_ACPI_PM)/define \1/' \
${WRKSRC}/src/nv-freebsd.h
.endif
@ -88,8 +102,12 @@ post-patch: .SILENT
${REINPLACE_CMD} -E 's/define (NV_SUPPORT_LINUX_COMPAT)/undef \1/' \
${WRKSRC}/src/nv-freebsd.h
.endif
.if defined(WITH_WBINVD)
${REINPLACE_CMD} -E 's/undef (NV_USE_WBINVD)/define \1/' \
${WRKSRC}/src/nv-freebsd.h
.endif
# Don't build any binaries (nvidia-settings and nvidia-xconfig) and manuals
.if ${NVVERSION} < 974600
.if ${NVVERSION} < 974600 || ${NVVERSION} == 1952200
${REINPLACE_CMD} -E 's/(extension).*/\1/' ${WRKSRC}/x11/Makefile
.else
${REINPLACE_CMD} -E 's/(lib).*/\1/' ${WRKSRC}/x11/Makefile
@ -111,11 +129,11 @@ post-install:
.if ${NVVERSION} < 817400
@${REINPLACE_CMD} '/libnvidia-cfg/d' ${TMPPLIST}
.endif
.if ${NVVERSION} < 974600
.if ${NVVERSION} < 974600 || ${NVVERSION} == 1952200
@${REINPLACE_CMD} '/wfb/d' ${TMPPLIST}
.endif
.if ${NVVERSION} < 1802900
@${REINPLACE_CMD} '/libvdpau/d' ${TMPPLIST}
@${REINPLACE_CMD} '/vdpau/d' ${TMPPLIST}
.endif
.if ${NVVERSION} < 1851829
@${REINPLACE_CMD} '/libcuda/d' ${TMPPLIST}

View File

@ -1,6 +1,9 @@
MD5 (NVIDIA-FreeBSD-x86-185.18.36.tar.gz) = feff4da79a8c3a2f194f46c95c545adb
SHA256 (NVIDIA-FreeBSD-x86-185.18.36.tar.gz) = 890b9543d3c81bccc72d60c653647a719c9037f8fc7a88144a18b2a012fbd4a7
SIZE (NVIDIA-FreeBSD-x86-185.18.36.tar.gz) = 19245550
MD5 (NVIDIA-FreeBSD-x86-195.22.tar.gz) = 2c7faa5baa155693be978c446c5d44a3
SHA256 (NVIDIA-FreeBSD-x86-195.22.tar.gz) = 2299aeadeec81a1210d65529c17c2829fdc4d5586c46b1ae6f8b20089a2122e8
SIZE (NVIDIA-FreeBSD-x86-195.22.tar.gz) = 24784839
MD5 (NVIDIA-FreeBSD-x86_64-195.22.tar.gz) = c9b0cdeb68d573556a38e16c02ffed55
SHA256 (NVIDIA-FreeBSD-x86_64-195.22.tar.gz) = 3a6a0fc3003615c07090c04f2d5b41fa86cf8493309bf48eff8bcaa37126508c
SIZE (NVIDIA-FreeBSD-x86_64-195.22.tar.gz) = 25503618
MD5 (NVIDIA-FreeBSD-x86-173.14.20.tar.gz) = 54869428baee8878c04c19751a2a8047
SHA256 (NVIDIA-FreeBSD-x86-173.14.20.tar.gz) = c5a27324d96391ada41b4ccbbf2a321c3d86693e54d1e9d1139d97c3132530f3
SIZE (NVIDIA-FreeBSD-x86-173.14.20.tar.gz) = 16211218

View File

@ -18,14 +18,15 @@ lib/libGLcore.so.1
lib/libGLcore.so
lib/libvdpau.so.1
lib/libvdpau.so
lib/libvdpau_nvidia.so.1
lib/vdpau/libvdpau_nvidia.so.1
lib/libvdpau_nvidia.so
lib/libvdpau_trace.so.1
lib/vdpau/libvdpau_trace.so.1
lib/libvdpau_trace.so
lib/libXvMCNVIDIA.so.1
lib/libXvMCNVIDIA.so
lib/libXvMCNVIDIA.a
lib/libXvMCNVIDIA_dynamic.so.1
@dirrm lib/vdpau
%%MODULESDIR%%/libnvidia-wfb.so.1
%%MODULESDIR%%/drivers/nvidia_drv.so
%%MODULESDIR%%/extensions/libglx.so.1
@ -44,9 +45,12 @@ nvidia.ko
%%LINUX%%usr/lib/libnvidia-tls.so.1
%%LINUX%%usr/lib/libvdpau.so.%%SHLIB_VERSION%%
%%LINUX%%usr/lib/libvdpau.so.1
%%LINUX%%usr/lib/libvdpau_nvidia.so.%%SHLIB_VERSION%%
%%LINUX%%usr/lib/libvdpau_nvidia.so
%%LINUX%%usr/lib/libvdpau_trace.so.%%SHLIB_VERSION%%
%%LINUX%%usr/lib/libvdpau_trace.so
%%LINUX%%usr/lib/vdpau/libvdpau_nvidia.so.%%SHLIB_VERSION%%
%%LINUX%%usr/lib/vdpau/libvdpau_nvidia.so.1
%%LINUX%%usr/lib/vdpau/libvdpau_trace.so.%%SHLIB_VERSION%%
%%LINUX%%usr/lib/vdpau/libvdpau_trace.so.1
%%LINUX%%@dirrm usr/lib/vdpau
%%LINUX%%@exec %D/sbin/ldconfig -r %D
%%LINUX%%@unexec %D/sbin/ldconfig -r %D