Attachment #146465 for bug #192953




# $FreeBSD$

PORTNAME=	nvidia-driver
DISTVERSION?=	340.32
# Always try to set PORTREVISION as it can be overridden by the slave ports
PORTREVISION?=	0
CATEGORIES=	x11

		${WRKSRC}/src/nvidia_linux.c
.endif
# Adjust Linux headers #include's after FreeBSD src SVN r246085
.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 && ${NVVERSION} < 3316700
	${REINPLACE_CMD} -e '/#include <vm\/vm_object.h>/ \
		{ x ; s/.*/#include <sys\/rwlock.h>/ ; G ; }' \
			${WRKSRC}/src/nv-freebsd.h

		/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 &/' \

	${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

Lines 1-7 Link Here

(-)x11/nvidia-driver/distinfo (-4 / +4 lines)
1	SHA256 (NVIDIA-FreeBSD-x86_64-331.67.tar.gz) = 5781bba8b7783f96c1f239961140317426910633fbfa3ba80fdcefe54aec7e92	1	SHA256 (NVIDIA-FreeBSD-x86_64-340.32.tar.gz) = 4a55cbd4f87528d4d5b5a8809a8c6e2dac9ad22b0f8b357590893dfb39e52512
2	SIZE (NVIDIA-FreeBSD-x86_64-331.67.tar.gz) = 46997728	2	SIZE (NVIDIA-FreeBSD-x86_64-340.32.tar.gz) = 59836909
3	SHA256 (NVIDIA-FreeBSD-x86-331.67.tar.gz) = 0c88c363db516ef09b0027aacb1e686191d3d4676f44445bab2156c2197a6cae	3	SHA256 (NVIDIA-FreeBSD-x86-340.32.tar.gz) = ee4f34a279ae84b97373adbc8c91ab7d34eb52dd4a7b095d51d8592b3e264df8
4	SIZE (NVIDIA-FreeBSD-x86-331.67.tar.gz) = 55876749	4	SIZE (NVIDIA-FreeBSD-x86-340.32.tar.gz) = 59021194
5	SHA256 (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = be0e20a543fa14a8f91481dd64b080093b19edf951bf631c62365a64dadb1934	5	SHA256 (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = be0e20a543fa14a8f91481dd64b080093b19edf951bf631c62365a64dadb1934
6	SIZE (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = 34597351	6	SIZE (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = 34597351
7	SHA256 (NVIDIA-FreeBSD-x86-304.88.tar.gz) = 739325b26a93d934d015159c420ef1875a24ccd62a5bb482e688cf918d4fa33d	7	SHA256 (NVIDIA-FreeBSD-x86-304.88.tar.gz) = 739325b26a93d934d015159c420ef1875a24ccd62a5bb482e688cf918d4fa33d

Lines 31-36 lib/vdpau/libvdpau_nvidia.so.1 Link Here

(-)x11/nvidia-driver/pkg-plist (+3 lines)
31	%%MODULESDIR%%/libnvidia-wfb.so.1	31	%%MODULESDIR%%/libnvidia-wfb.so.1
32	@dirrm %%MODULESDIR%%/extensions/.nvidia	32	@dirrm %%MODULESDIR%%/extensions/.nvidia
33	@dirrmtry %%MODULESDIR%%/drivers	33	@dirrmtry %%MODULESDIR%%/drivers
		34	share/nvidia/nvidia-application-profiles-key-documentation
		35	share/nvidia/nvidia-application-profiles-rc
		36	@dirrmtry share/nvidia
34	@cwd /%%KMODDIR%%	37	@cwd /%%KMODDIR%%
35	nvidia.ko	38	nvidia.ko
36	%%LINUX%%@cwd %%LINUXBASE%%	39	%%LINUX%%@cwd %%LINUXBASE%%

Return to bug 192953

Lines 2-8 Link Here

(-)x11/nvidia-driver/Makefile (-3 / +16 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= nvidia-driver	4	PORTNAME= nvidia-driver
5	DISTVERSION?= 331.67	5	DISTVERSION?= 340.32
6	# Always try to set PORTREVISION as it can be overridden by the slave ports	6	# Always try to set PORTREVISION as it can be overridden by the slave ports
7	PORTREVISION?= 0	7	PORTREVISION?= 0
8	CATEGORIES= x11	8	CATEGORIES= x11
Lines 147-159 post-patch: .SILENT Link Here
147	${WRKSRC}/src/nvidia_linux.c	148	${WRKSRC}/src/nvidia_linux.c
148	.endif	149	.endif
149	# Adjust Linux headers #include's after FreeBSD src SVN r246085	150	# Adjust Linux headers #include's after FreeBSD src SVN r246085
150	.if ${OSVERSION} > 1000027 && ${NVVERSION} >= 964323	151	.if ${OSVERSION} > 1000027 && ${NVVERSION} >= 964323 && ${NVVERSION} < 3316700
151	${REINPLACE_CMD} -E '/#include "machine\/\.\.\/linux(32)?\/linux.h"/ \	152	${REINPLACE_CMD} -E '/#include "machine\/\.\.\/linux(32)?\/linux.h"/ \
152	{ x ; s/.*/#include "machine\/..\/..\/compat\/linux\/linux_ioctl.h"/ ; H ; x ; }' \	153	{ x ; s/.*/#include "machine\/..\/..\/compat\/linux\/linux_ioctl.h"/ ; H ; x ; }' \
153	${WRKSRC}/src/nvidia_linux.c	154	${WRKSRC}/src/nvidia_linux.c
154	.endif	155	.endif
155	# Adjust vm_object locking after FreeBSD src SVN r248084	156	# Adjust vm_object locking after FreeBSD src SVN r248084
156	.if ${OSVERSION} > 1000029	157	.if ${OSVERSION} > 1000029 && ${NVVERSION} < 3316700
157	${REINPLACE_CMD} -e '/#include <vm\/vm_object.h>/ \	158	${REINPLACE_CMD} -e '/#include <vm\/vm_object.h>/ \
158	{ x ; s/.*/#include <sys\/rwlock.h>/ ; G ; }' \	159	{ x ; s/.*/#include <sys\/rwlock.h>/ ; G ; }' \
159	${WRKSRC}/src/nv-freebsd.h	160	${WRKSRC}/src/nv-freebsd.h
Lines 183-188 post-patch: .SILENT Link Here
183	/return SYSCTL_OUT\(req, bus_type/d' \	184	/return SYSCTL_OUT\(req, bus_type/d' \
184	${WRKSRC}/src/nvidia_sysctl.c	185	${WRKSRC}/src/nvidia_sysctl.c
185	.endif	186	.endif
		187	# Fix prefix for application profiles (chase x11/nvidia-settings)
		188	.if ${NVVERSION} >= 3341600
		189	${REINPLACE_CMD} -e 's,/usr/share,${STAGEDIR}${PREFIX}/share,' \
		190	${WRKSRC}/doc/Makefile \
		191	${WRKSRC}/lib/libGL/Makefile
		192	${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \
		193	${WRKSRC}/doc/html/profiles.html \
		194	${WRKSRC}/doc/README \
		195	${WRKSRC}/obj/nvidia-bug-report.sh
		196	.endif
186	# Unbreak the build of 173.14.xx legacy series on recent -CURRENT	197	# Unbreak the build of 173.14.xx legacy series on recent -CURRENT
187	.if ${NVVERSION} < 1952200 && ${NVVERSION} >= 1690400	198	.if ${NVVERSION} < 1952200 && ${NVVERSION} >= 1690400
188	${REINPLACE_CMD} -E 's/os_(alloc\|free)_contig_pages/NV_API_CALL &/' \	199	${REINPLACE_CMD} -E 's/os_(alloc\|free)_contig_pages/NV_API_CALL &/' \
Lines 275-280 post-install: .SILENT Link Here
275	${REINPLACE_CMD} -E '/lib(nvidia-)?(EGL\|eglcore\|GLESv\|glsi)/d' \	286	${REINPLACE_CMD} -E '/lib(nvidia-)?(EGL\|eglcore\|GLESv\|glsi)/d' \
276	${TMPPLIST}	287	${TMPPLIST}
277	.endif	288	.endif
		289	.if ${NVVERSION} < 3341600
		290	${REINPLACE_CMD} -e '/share\/nvidia/d' ${TMPPLIST}
		291	.endif
278	.if ${NVVERSION} >= 1952200	292	.if ${NVVERSION} >= 1952200
279	${REINPLACE_CMD} -e '/does not support PAE/,+1d' ${PKGMESSAGE}	293	${REINPLACE_CMD} -e '/does not support PAE/,+1d' ${PKGMESSAGE}
280	.endif	294	.endif