Index: head/x11/nvidia-driver/Makefile =================================================================== --- head/x11/nvidia-driver/Makefile (revision 295258) +++ head/x11/nvidia-driver/Makefile (revision 295259) @@ -1,187 +1,188 @@ # New ports collection makefile for: nvidia-driver (latest and master port) # Date created: 4 December 2002 # Whom: Stijn Hoop # # $FreeBSD$ # PORTNAME= nvidia-driver -DISTVERSION?= 285.05.09 +DISTVERSION?= 295.40 PORTREVISION?= 0 # As a reminder it can be overridden CATEGORIES= x11 kld MASTER_SITES= ${MASTER_SITE_NVIDIA} # MASTER_SITE_SUBDIR has to be set later because it depends on NVVERSION DISTNAME= NVIDIA-FreeBSD-x86${ARCH_SUFX}-${DISTVERSION} MAINTAINER= danfe@FreeBSD.org COMMENT= NVidia graphics card binary drivers for hardware OpenGL rendering LICENSE= NVIDIA LICENSE_NAME= License For Customer Use of NVIDIA Software LICENSE_FILE= ${WRKSRC}/doc/license.txt LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept ARCH_SUFX= ${ARCH:S/i386//:S/amd/_/} USE_XORG= xorg-server USE_GL= gl USE_LDCONFIG= yes # NVIDIA_ROOT is not set in src/Makefile, which results in bogus -I/src # passed to compiler and broken build on HEAD since r221320 when option # -Wmissing-include-dirs was added for kernel sources. Until properly # fixed upstream across all versions (including legacy ones), use this # hack below to universally set NVIDIA_ROOT. Also provide X11BASE value # since it is going away from `Mk/bsd.port.mk' as deprecated. MAKE_ENV= NVIDIA_ROOT=${WRKSRC} X11BASE=${LOCALBASE} SUB_FILES= pkg-message DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0 MODULESDIR= lib/xorg/modules PORTDOCS= * # Starting with version 1.0-7667, NVidia has dropped support for numerous # "legacy" GPUs. Consult NVidia README (the Appendix) to find out whether # you need to use legacy driver version and install one of corresponding # `x11/nvidia-driver-71', `x11/nvidia-driver-96', or `x11/nvidia-driver-173' # slave ports. # # XXX Until NVidia starts to name their releases consistently, employ this # ugly hack below to derive NVVERSION. XXX # .if ${DISTVERSION:C/[0-9]+//g} == ".." # major.minor.update NVVERSION= ${DISTVERSION:S/.//g} .else # major.minor NVVERSION= ${DISTVERSION:S/.//g}00 .endif .if ${NVVERSION} >= 1952200 MASTER_SITE_SUBDIR= XFree86/FreeBSD-x86${ARCH_SUFX}/${DISTVERSION} ONLY_FOR_ARCHS= i386 amd64 .else MASTER_SITE_SUBDIR= freebsd/${DISTVERSION} ONLY_FOR_ARCHS= i386 .endif OPTIONS= FREEBSD_AGP "Use FreeBSD AGP GART driver" off \ ACPI_PM "Enable support for ACPI Power Management" off \ LINUX "Build with support for Linux compatibility" on .if ${NVVERSION} >= 1952200 OPTIONS+= WBINVD "Enable heavy-weight cache-flush logic" off .endif .include XSERVVERSION!= ${PKG_INFO} -qO x11-servers/xorg-server 2>/dev/null || true LIBGLVERSION!= ${PKG_INFO} -qO graphics/libGL 2>/dev/null || true PLIST_SUB+= XSERVVERSION=${XSERVVERSION} LIBGLVERSION=${LIBGLVERSION} \ LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \ MODULESDIR=${MODULESDIR} .if !defined(WITHOUT_LINUX) CONFLICTS= linux[-_]dri-[0-9]* linux-f10-dri-[0-9]* USE_LINUX= yes PLIST_SUB+= LINUX="" .else PLIST_SUB+= LINUX="@comment " # Propagate WITHOUT_LINUX variable down to inner Makefiles MAKE_ENV+= WITHOUT_LINUX=yes .endif .if ${OSVERSION} < 702106 && ${NVVERSION} >= 1952200 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 ${REINPLACE_CMD} -e '24,26d' ${WRKSRC}/src/nv-freebsd.h -# Adjust for updated d_mmap() in recent -CURRENT +# Adjust legacy drivers for updated d_mmap() since early 9.X .if ${OSVERSION} > 900005 && ${NVVERSION} < 1952200 ${REINPLACE_CMD} -e 's/vm_offset_t offset/vm_ooffset_t offset/ ; \ s/vm_offset_t \*address/vm_paddr_t *address/ ; \ s/int nprot/&, vm_memattr_t *memattr/' \ ${WRKSRC}/src/nvidia_dev.c .endif -# Catch up with FreeBSD SVN r225617 +# Catch up legacy drivers with FreeBSD SVN r225617 .if ${OSVERSION} > 900043 && ${NVVERSION} < 1952200 ${REINPLACE_CMD} -e '/return/s/ioctl/sys_&/' \ ${WRKSRC}/src/nvidia_linux.c .endif .if defined(WITH_FREEBSD_AGP) ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \ ${WRKSRC}/src/nv-freebsd.h .endif .if defined(WITH_ACPI_PM) ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_ACPI_PM)/define \1/' \ ${WRKSRC}/src/nv-freebsd.h .endif .if defined(WITHOUT_LINUX) ${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 ${REINPLACE_CMD} -e '/exists/s/$$/ \&\& !defined(WITHOUT_LINUX)/' \ ${WRKSRC}/lib/Makefile +# Do not install VDPAU libraries, they are provided by `multimedia/libvdpau' .if ${NVVERSION} >= 1802900 ${REINPLACE_CMD} -e '/libvdpau[[:blank:]_][^n]/d ; \ s/name libvdpau/&_nvidia/' ${WRKSRC}/lib/Makefile .endif -# Don't build any binaries (native nvidia-settings and nvidia-xconfig are +# Do not build any binaries (native nvidia-settings and nvidia-xconfig are # provided by corresponding ports) and manuals .if ${NVVERSION} < 974600 || ${NVVERSION} >= 1952200 ${REINPLACE_CMD} -E 's/(extension).*/\1/' ${WRKSRC}/x11/Makefile .else ${REINPLACE_CMD} -E 's/(lib).*/\1/' ${WRKSRC}/x11/Makefile .endif ${REINPLACE_CMD} -e '/bin/d ; /man/d' ${WRKSRC}/x11/Makefile # Conditionally install documentation (but you generally want it) .if defined(NOPORTDOCS) ${REINPLACE_CMD} -E 's/(x11).*/\1/ ; /doc/d' ${WRKSRC}/Makefile .endif # Do not execute afterinstall target (prevent automatic module registration) ${REINPLACE_CMD} -e 's/afterinstall/dontexecute/' ${WRKSRC}/Makefile pre-su-install: # While this port silently assumes PREFIX == LOCALBASE, at least try to # pretend we support different paths thereof and make sure these directories # exist @cd ${PREFIX}/${MODULESDIR} && ${MKDIR} drivers extensions post-install: .SILENT # pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's .if ${NVVERSION} < 817400 ${REINPLACE_CMD} -e '/libnvidia-cfg/d' ${TMPPLIST} .endif .if ${NVVERSION} < 974600 || ${NVVERSION} >= 1952200 ${REINPLACE_CMD} -e '/wfb/d' ${TMPPLIST} .endif .if ${NVVERSION} < 1802900 ${REINPLACE_CMD} -e '/vdpau/d' ${TMPPLIST} .endif .if ${NVVERSION} < 1851829 ${REINPLACE_CMD} -e '/libcuda/d' ${TMPPLIST} .endif .if ${NVVERSION} >= 2565300 ${REINPLACE_CMD} -E 's/libGLcore/libnvidia-glcore/ ; \ /usr.*(glcore|tls).*so\.1$$/d' ${TMPPLIST} .endif # Some applications need this symlink (see PR ports/72877) ${LN} -sf libXvMCNVIDIA.so.1 ${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1 .if ${NVVERSION} >= 1952200 . if ${OSVERSION} > 800090 ${REINPLACE_CMD} -e '/does not support PAE/,+1d' ${PKGMESSAGE} . else # when sed(1) does not support "addr1,+N" ranges, use line numbers ${REINPLACE_CMD} -e '26,27d' ${PKGMESSAGE} . endif .endif ${ECHO_MSG} ${CAT} ${PKGMESSAGE} ${ECHO_MSG} .include Property changes on: head/x11/nvidia-driver/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.114 \ No newline at end of property +1.115 \ No newline at end of property Index: head/x11/nvidia-driver/distinfo =================================================================== --- head/x11/nvidia-driver/distinfo (revision 295258) +++ head/x11/nvidia-driver/distinfo (revision 295259) @@ -1,10 +1,10 @@ -SHA256 (NVIDIA-FreeBSD-x86_64-285.05.09.tar.gz) = 757db4e25168a21419e33e1a9f0a3bb4bfbdad4ba79313bee90869903c96a336 -SIZE (NVIDIA-FreeBSD-x86_64-285.05.09.tar.gz) = 31650196 -SHA256 (NVIDIA-FreeBSD-x86-285.05.09.tar.gz) = d3ad51145cd57c70678ee659112a0973187b1b02e3062addadd0fe094b3c46fb -SIZE (NVIDIA-FreeBSD-x86-285.05.09.tar.gz) = 30697710 +SHA256 (NVIDIA-FreeBSD-x86_64-295.40.tar.gz) = 876b35085a11dbe3d924800d19eb56df373664335efb650753e5c1bf05cd3bc2 +SIZE (NVIDIA-FreeBSD-x86_64-295.40.tar.gz) = 32994463 +SHA256 (NVIDIA-FreeBSD-x86-295.40.tar.gz) = f47b603f39dfd2e405949aab6fbc7abd4b24f43c6fb47b4f23d7618f32021364 +SIZE (NVIDIA-FreeBSD-x86-295.40.tar.gz) = 32029253 SHA256 (NVIDIA-FreeBSD-x86-173.14.31.tar.gz) = 98699bc8dc1dad86cebc2ed067b4fc5cd37b8540e897bb218f38ac80c4b4d875 SIZE (NVIDIA-FreeBSD-x86-173.14.31.tar.gz) = 17991684 SHA256 (NVIDIA-FreeBSD-x86-96.43.20.tar.gz) = e75fce272e72644d53e6ad3c0957fe173735a4b621726ce227ba8ecf9bd9c5cf SIZE (NVIDIA-FreeBSD-x86-96.43.20.tar.gz) = 14060884 SHA256 (NVIDIA-FreeBSD-x86-71.86.15.tar.gz) = 7be5ba641eabaa96a068e147a1dd5d75aadc10575bb1d2c6e8529cd423438168 SIZE (NVIDIA-FreeBSD-x86-71.86.15.tar.gz) = 8067916 Property changes on: head/x11/nvidia-driver/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.41 \ No newline at end of property +1.42 \ No newline at end of property