Index: head/x11/nvidia-driver/Makefile =================================================================== --- head/x11/nvidia-driver/Makefile (revision 238842) +++ head/x11/nvidia-driver/Makefile (revision 238843) @@ -1,132 +1,126 @@ # New ports collection makefile for: nvidia-driver (latest and master port) # Date created: 4 December 2002 # Whom: Stijn Hoop # # $FreeBSD$ # PORTNAME= nvidia-driver -DISTVERSION?= 180.60 +DISTVERSION?= 185.18.29 PORTREVISION?= 0 # As a reminder it can be overridden CATEGORIES= x11 kld MASTER_SITES= ${MASTER_SITE_NVIDIA} MASTER_SITE_SUBDIR= freebsd/${DISTVERSION} DISTNAME= NVIDIA-FreeBSD-x86-${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 SUB_FILES+= pkg-message DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0 MODULESDIR= lib/xorg/modules PORTDOCS= * OPTIONS= FREEBSD_AGP "Use FreeBSD AGP GART driver" off \ ACPI "Enable support for ACPI Power Management" off \ LINUX "Build with support for Linux compatibility" on # 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 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 .include # XXX Should use ${PKG_INFO} but it does not expand for some reason XXX # XSERVVERSION!= /usr/sbin/pkg_info -qO x11-servers/xorg-server 2>/dev/null || true LIBGLVERSION!= /usr/sbin/pkg_info -qO graphics/libGL 2>/dev/null || true .if empty(XSERVVERSION) IGNORE= needs an X server implementation installed .endif PLIST_SUB+= XSERVVERSION=${XSERVVERSION} LIBGLVERSION=${LIBGLVERSION} \ LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \ MODULESDIR=${MODULESDIR} .if !defined(WITHOUT_LINUX) 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 LIB_DEPENDS+= m.3:${PORTSDIR}/misc/compat5x post-patch: .SILENT # We should support -CURRENT: kill the check ${REINPLACE_CMD} '24,26d' ${WRKSRC}/src/nv-freebsd.h -# Switch from suser() to priv_check() API on recent -CURRENT -.if ${OSVERSION} >= 800049 - ${REINPLACE_CMD} -e \ - 's/suser(CURTHREAD)/priv_check(CURTHREAD, PRIV_DRIVER)/' \ - ${WRKSRC}/src/nvidia_os.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) ${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 # Don't build any binaries (nvidia-settings and nvidia-xconfig) and manuals .if ${NVVERSION} < 974600 ${REINPLACE_CMD} -E 's/(extension).*/\1/' ${WRKSRC}/x11/Makefile .else ${REINPLACE_CMD} -E 's/(lib).*/\1/' ${WRKSRC}/x11/Makefile .endif ${REINPLACE_CMD} '/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: # XXX This port silently assumes PREFIX == LOCALBASE XXX @${MKDIR} ${PREFIX}/${MODULESDIR}/drivers post-install: # pkg-plist is already overbloated, so use this hack instead of PLIST_SUB's .if ${NVVERSION} < 817400 @${REINPLACE_CMD} '/libnvidia-cfg/d' ${TMPPLIST} .else @${REINPLACE_CMD} '/nvidia_drv\.o/d' ${TMPPLIST} .endif .if ${NVVERSION} < 974600 @${REINPLACE_CMD} '/wfb/d' ${TMPPLIST} .endif .if ${NVVERSION} < 1802900 - @${REINPLACE_CMD} '/libvdpau/d' ${TMPPLIST} + @${REINPLACE_CMD} '/libcuda/d ; /libvdpau/d' ${TMPPLIST} .endif # Some applications need this symlink (see PR ports/72877) @${LN} -sf libXvMCNVIDIA.so.1 ${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1 @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} .include Property changes on: head/x11/nvidia-driver/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.90 \ No newline at end of property +1.91 \ No newline at end of property Index: head/x11/nvidia-driver/distinfo =================================================================== --- head/x11/nvidia-driver/distinfo (revision 238842) +++ head/x11/nvidia-driver/distinfo (revision 238843) @@ -1,12 +1,12 @@ -MD5 (NVIDIA-FreeBSD-x86-180.60.tar.gz) = 08f97cd4e322f5992275bdae15e68be9 -SHA256 (NVIDIA-FreeBSD-x86-180.60.tar.gz) = 7ddf39476b42ccf1f0585340ad6b384d5c7cdc5825cba33f81138156077bf89a -SIZE (NVIDIA-FreeBSD-x86-180.60.tar.gz) = 18594717 -MD5 (NVIDIA-FreeBSD-x86-173.14.18.tar.gz) = ad9a421ef5a29782a263facce985f00b -SHA256 (NVIDIA-FreeBSD-x86-173.14.18.tar.gz) = 7c77dd3e442351a5e782888db93a4e2f3832396adb85f65c086ed1f1c906700a -SIZE (NVIDIA-FreeBSD-x86-173.14.18.tar.gz) = 16203001 -MD5 (NVIDIA-FreeBSD-x86-96.43.11.tar.gz) = fe5ee7c4ae37b91c4d7d1641295af4ea -SHA256 (NVIDIA-FreeBSD-x86-96.43.11.tar.gz) = 5e17d537ae8ef4c56cb1b95c17672865a49f3aa504775e96d61a6795f6d9c26f -SIZE (NVIDIA-FreeBSD-x86-96.43.11.tar.gz) = 11051460 -MD5 (NVIDIA-FreeBSD-x86-71.86.09.tar.gz) = bdef215b8a56bd95a54beb8ac63bddf4 -SHA256 (NVIDIA-FreeBSD-x86-71.86.09.tar.gz) = 778f9fedf37ad08f68224b84ef366966021312417e5ec90f71a968a68a775da1 -SIZE (NVIDIA-FreeBSD-x86-71.86.09.tar.gz) = 8020966 +MD5 (NVIDIA-FreeBSD-x86-185.18.29.tar.gz) = 14b054dc1dd2fdfa1a06d95a2b77cfed +SHA256 (NVIDIA-FreeBSD-x86-185.18.29.tar.gz) = 843fbb119f9cf0d624dbd1efae25caad20e26a5894c245f9b014da09a0e53bca +SIZE (NVIDIA-FreeBSD-x86-185.18.29.tar.gz) = 19243110 +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 +MD5 (NVIDIA-FreeBSD-x86-96.43.13.tar.gz) = a9bbcc7d0bab6fa3fd64dd7952b14e54 +SHA256 (NVIDIA-FreeBSD-x86-96.43.13.tar.gz) = 614396a11ab8b304c51721cd4b47fb82a5f75884ff77d3d414e0e5739835c738 +SIZE (NVIDIA-FreeBSD-x86-96.43.13.tar.gz) = 11057193 +MD5 (NVIDIA-FreeBSD-x86-71.86.11.tar.gz) = 5f414ee297bff0d9e70e3ce437efdbeb +SHA256 (NVIDIA-FreeBSD-x86-71.86.11.tar.gz) = 9f7dfbb8acdc46bee3c9dd8a6ca3399946f96120e196bf49b484bacb3796aedd +SIZE (NVIDIA-FreeBSD-x86-71.86.11.tar.gz) = 8023461 Property changes on: head/x11/nvidia-driver/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.31 \ No newline at end of property +1.32 \ No newline at end of property Index: head/x11/nvidia-driver/pkg-plist =================================================================== --- head/x11/nvidia-driver/pkg-plist (revision 238842) +++ head/x11/nvidia-driver/pkg-plist (revision 238843) @@ -1,51 +1,53 @@ @comment I can't add the below files to the package because pkg_delete @comment will complain when removing this package: @comment %%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%% @comment %%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% @comment lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%% @comment They are however restored when this package is removed: @exec mv -f %D/%%MODULESDIR%%/extensions/libglx.la %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%% @unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.la @exec mv -f %D/%%MODULESDIR%%/extensions/libglx.so %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% @unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.so @exec mv -f %D/lib/libGL.so.1 %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%% @unexec mv -f %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%% %D/lib/libGL.so.1 lib/libnvidia-tls.so.1 lib/libnvidia-tls.so lib/libnvidia-cfg.so.1 lib/libnvidia-cfg.so lib/libGLcore.so.1 lib/libGLcore.so lib/libvdpau.so.1 lib/libvdpau.so lib/libvdpau_nvidia.so.1 lib/libvdpau_nvidia.so lib/libvdpau_trace.so.1 lib/libvdpau_trace.so lib/libXvMCNVIDIA.so.1 lib/libXvMCNVIDIA.so lib/libXvMCNVIDIA.a lib/libXvMCNVIDIA_dynamic.so.1 %%MODULESDIR%%/libnvidia-wfb.so.1 %%MODULESDIR%%/drivers/nvidia_drv.o %%MODULESDIR%%/drivers/nvidia_drv.so %%MODULESDIR%%/extensions/libglx.so.1 @dirrmtry %%MODULESDIR%%/drivers @cwd /boot/modules nvidia.ko @unexec kldxref %D %%LINUX%%@cwd %%LINUXBASE%% %%LINUX%%usr/lib/libGL.so.%%SHLIB_VERSION%% %%LINUX%%usr/lib/libGL.so.1 %%LINUX%%usr/lib/libGLcore.so.%%SHLIB_VERSION%% %%LINUX%%usr/lib/libGLcore.so.1 +%%LINUX%%usr/lib/libcuda.so.%%SHLIB_VERSION%% +%%LINUX%%usr/lib/libcuda.so.1 %%LINUX%%usr/lib/libnvidia-tls.so.%%SHLIB_VERSION%% %%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%%@exec %D/sbin/ldconfig -r %D %%LINUX%%@unexec %D/sbin/ldconfig -r %D Property changes on: head/x11/nvidia-driver/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.23 \ No newline at end of property +1.24 \ No newline at end of property Index: head/x11/nvidia-driver-173/Makefile =================================================================== --- head/x11/nvidia-driver-173/Makefile (revision 238842) +++ head/x11/nvidia-driver-173/Makefile (revision 238843) @@ -1,13 +1,13 @@ # New ports collection makefile for: nvidia-driver, legacy version 173.14.xx # Date created: 26 Oct 2008 # Whom: Alexey Dokuchaev # # $FreeBSD$ # -DISTVERSION= 173.14.18 +DISTVERSION= 173.14.20 MASTERDIR= ${.CURDIR}/../nvidia-driver NO_LATEST_LINK= yes .include "${MASTERDIR}/Makefile" Property changes on: head/x11/nvidia-driver-173/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/x11/nvidia-driver-71/Makefile =================================================================== --- head/x11/nvidia-driver-71/Makefile (revision 238842) +++ head/x11/nvidia-driver-71/Makefile (revision 238843) @@ -1,13 +1,13 @@ # New ports collection makefile for: nvidia-driver, legacy version 71.86.xx # Date created: 08 Feb 2007 # Whom: Alexey Dokuchaev # # $FreeBSD$ # -DISTVERSION= 71.86.09 +DISTVERSION= 71.86.11 MASTERDIR= ${.CURDIR}/../nvidia-driver NO_LATEST_LINK= yes .include "${MASTERDIR}/Makefile" Property changes on: head/x11/nvidia-driver-71/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.13 \ No newline at end of property +1.14 \ No newline at end of property Index: head/x11/nvidia-driver-96/Makefile =================================================================== --- head/x11/nvidia-driver-96/Makefile (revision 238842) +++ head/x11/nvidia-driver-96/Makefile (revision 238843) @@ -1,13 +1,13 @@ # New ports collection makefile for: nvidia-driver, legacy version 96.43.xx # Date created: 08 Feb 2007 # Whom: Alexey Dokuchaev # # $FreeBSD$ # -DISTVERSION= 96.43.11 +DISTVERSION= 96.43.13 MASTERDIR= ${.CURDIR}/../nvidia-driver NO_LATEST_LINK= yes .include "${MASTERDIR}/Makefile" Property changes on: head/x11/nvidia-driver-96/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.13 \ No newline at end of property +1.14 \ No newline at end of property