Attachment 146465 Details for Bug 192953 – 340.32 + STRIP + EXAMPLES + profiles fix

[patch] 340.32 + STRIP + EXAMPLES + profiles fix

update.diff (text/plain), 3.81 KB, created by Jan Beich on 2014-08-28 18:52:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2014-08-28 18:52:47 UTC

Size: 3.81 KB

patch

obsolete

>Index: x11/nvidia-driver/Makefile
>===================================================================
>--- x11/nvidia-driver/Makefile	(revision 366443)
>+++ x11/nvidia-driver/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	nvidia-driver
>-DISTVERSION?=	331.67
>+DISTVERSION?=	340.32
> # Always try to set PORTREVISION as it can be overridden by the slave ports
> PORTREVISION?=	0
> CATEGORIES=	x11
>@@ -147,13 +148,13 @@ post-patch: .SILENT
> 		${WRKSRC}/src/nvidia_linux.c
> .endif
> # Adjust Linux headers #include's after FreeBSD src SVN r246085
>-.if ${OSVERSION} > 1000027 && ${NVVERSION} >= 964323
>+.if ${OSVERSION} > 1000027 && ${NVVERSION} >= 964323 && ${NVVERSION} < 3316700
> 	${REINPLACE_CMD} -E '/#include "machine\/\.\.\/linux(32)?\/linux.h"/ \
> 		{ x ; s/.*/#include "machine\/..\/..\/compat\/linux\/linux_ioctl.h"/ ; H ; x ; }' \
> 			${WRKSRC}/src/nvidia_linux.c
> .endif
> # Adjust vm_object locking after FreeBSD src SVN r248084
>-.if ${OSVERSION} > 1000029
>+.if ${OSVERSION} > 1000029 && ${NVVERSION} < 3316700
> 	${REINPLACE_CMD} -e '/#include <vm\/vm_object.h>/ \
> 		{ x ; s/.*/#include <sys\/rwlock.h>/ ; G ; }' \
> 			${WRKSRC}/src/nv-freebsd.h
>@@ -183,6 +184,16 @@ post-patch: .SILENT
> 		/return SYSCTL_OUT\(req, bus_type/d' \
> 			${WRKSRC}/src/nvidia_sysctl.c
> .endif
>+# Fix prefix for application profiles (chase x11/nvidia-settings)
>+.if ${NVVERSION} >= 3341600
>+	${REINPLACE_CMD} -e 's,/usr/share,${STAGEDIR}${PREFIX}/share,' \
>+		${WRKSRC}/doc/Makefile \
>+		${WRKSRC}/lib/libGL/Makefile
>+	${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \
>+		${WRKSRC}/doc/html/profiles.html \
>+		${WRKSRC}/doc/README \
>+		${WRKSRC}/obj/nvidia-bug-report.sh
>+.endif
> # Unbreak the build of 173.14.xx legacy series on recent -CURRENT
> .if ${NVVERSION} < 1952200 && ${NVVERSION} >= 1690400
> 	${REINPLACE_CMD} -E 's/os_(alloc|free)_contig_pages/NV_API_CALL &/' \
>@@ -275,6 +286,9 @@ post-install: .SILENT
> 	${REINPLACE_CMD} -E '/lib(nvidia-)?(EGL|eglcore|GLESv|glsi)/d' \
> 		${TMPPLIST}
> .endif
>+.if ${NVVERSION} < 3341600
>+	${REINPLACE_CMD} -e '/share\/nvidia/d' ${TMPPLIST}
>+.endif
> .if ${NVVERSION} >= 1952200
> 	${REINPLACE_CMD} -e '/does not support PAE/,+1d' ${PKGMESSAGE}
> .endif
>Index: x11/nvidia-driver/distinfo
>===================================================================
>--- x11/nvidia-driver/distinfo	(revision 366443)
>+++ x11/nvidia-driver/distinfo	(working copy)
>@@ -1,7 +1,7 @@
>-SHA256 (NVIDIA-FreeBSD-x86_64-331.67.tar.gz) = 5781bba8b7783f96c1f239961140317426910633fbfa3ba80fdcefe54aec7e92
>-SIZE (NVIDIA-FreeBSD-x86_64-331.67.tar.gz) = 46997728
>-SHA256 (NVIDIA-FreeBSD-x86-331.67.tar.gz) = 0c88c363db516ef09b0027aacb1e686191d3d4676f44445bab2156c2197a6cae
>-SIZE (NVIDIA-FreeBSD-x86-331.67.tar.gz) = 55876749
>+SHA256 (NVIDIA-FreeBSD-x86_64-340.32.tar.gz) = 4a55cbd4f87528d4d5b5a8809a8c6e2dac9ad22b0f8b357590893dfb39e52512
>+SIZE (NVIDIA-FreeBSD-x86_64-340.32.tar.gz) = 59836909
>+SHA256 (NVIDIA-FreeBSD-x86-340.32.tar.gz) = ee4f34a279ae84b97373adbc8c91ab7d34eb52dd4a7b095d51d8592b3e264df8
>+SIZE (NVIDIA-FreeBSD-x86-340.32.tar.gz) = 59021194
> SHA256 (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = be0e20a543fa14a8f91481dd64b080093b19edf951bf631c62365a64dadb1934
> SIZE (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = 34597351
> SHA256 (NVIDIA-FreeBSD-x86-304.88.tar.gz) = 739325b26a93d934d015159c420ef1875a24ccd62a5bb482e688cf918d4fa33d
>Index: x11/nvidia-driver/pkg-plist
>===================================================================
>--- x11/nvidia-driver/pkg-plist	(revision 366443)
>+++ x11/nvidia-driver/pkg-plist	(working copy)
>@@ -31,6 +31,9 @@ lib/vdpau/libvdpau_nvidia.so.1
> %%MODULESDIR%%/libnvidia-wfb.so.1
> @dirrm %%MODULESDIR%%/extensions/.nvidia
> @dirrmtry %%MODULESDIR%%/drivers
>+share/nvidia/nvidia-application-profiles-key-documentation
>+share/nvidia/nvidia-application-profiles-rc
>+@dirrmtry share/nvidia
> @cwd /%%KMODDIR%%
> nvidia.ko
> %%LINUX%%@cwd %%LINUXBASE%%

Actions: View | Diff

Attachments on bug 192953: 146192 | 146409 | 146410 | 146415 | 146416 | 146422 | 146464 | 146465 | 146467 | 146468 | 146470 | 146472 | 158352