Attachment #199205 for bug #217901

Lines 16-21 PORTREVISION?= 0 Link Here

(-)x11/nvidia-driver/Makefile (-24 / +375 lines)
16	CATEGORIES= x11	16	CATEGORIES= x11
17	MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}	17	MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
18	DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}	18	DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
		19	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
		20	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
19		21
20	MAINTAINER= danfe@FreeBSD.org	22	MAINTAINER= danfe@FreeBSD.org
21	COMMENT= NVidia graphics card binary drivers for hardware OpenGL rendering	23	COMMENT= NVidia graphics card binary drivers for hardware OpenGL rendering
Lines 40-45 USE_LDCONFIG= yes Link Here
40	# hack below to universally set NVIDIA_ROOT. Also provide X11BASE value	42	# hack below to universally set NVIDIA_ROOT. Also provide X11BASE value
41	# since it is still used by legacy drivers.	43	# since it is still used by legacy drivers.
42	MAKE_ENV= NVIDIA_ROOT=${WRKSRC} X11BASE=${LOCALBASE}	44	MAKE_ENV= NVIDIA_ROOT=${WRKSRC} X11BASE=${LOCALBASE}
		45	PLIST_RE= # empty
43	SUB_FILES= pkg-deinstall pkg-install pkg-message nvidia.conf	46	SUB_FILES= pkg-deinstall pkg-install pkg-message nvidia.conf
44	DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0	47	DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0
45	MODULESDIR= lib/xorg/modules	48	MODULESDIR= lib/xorg/modules
Lines 66-77 SUB_LIST+= NVGL="\# " Link Here
66	.if ${NVVERSION} < 355.006	69	.if ${NVVERSION} < 355.006
67	EXTRA_PATCHES= ${FILESDIR}/extra-patch-src-Makefile \	70	EXTRA_PATCHES= ${FILESDIR}/extra-patch-src-Makefile \
68	${FILESDIR}/extra-patch-src-nv-freebsd.h \	71	${FILESDIR}/extra-patch-src-nv-freebsd.h \
69	${FILESDIR}/extra-patch-src-nv-misc.h	72	${FILESDIR}/extra-patch-src-nv-misc.h \
		73	${FILESDIR}/extra-patch-src-nvidia_linux.c
70	NVSRC= .	74	NVSRC= .
71	.else	75	.else
72	EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_nvidia_Makefile \	76	EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_nvidia_Makefile \
73	${FILESDIR}/extra-patch-src_nvidia_nv-freebsd.h \	77	${FILESDIR}/extra-patch-src_nvidia_nv-freebsd.h \
74	${FILESDIR}/extra-patch-src_nvidia_nv-misc.h	78	${FILESDIR}/extra-patch-src_nvidia_nv-misc.h \
		79	${FILESDIR}/extra-patch-src_nvidia_nvidia_linux.c
75	NVSRC= nvidia	80	NVSRC= nvidia
76	.endif	81	.endif
77		82
Lines 85-90 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_nvidia-mod Link Here
85	OPTIONS_DEFINE= ACPI_PM LINUX WBINVD DOCS	90	OPTIONS_DEFINE= ACPI_PM LINUX WBINVD DOCS
86	OPTIONS_DEFINE_i386= PAE	91	OPTIONS_DEFINE_i386= PAE
87	OPTIONS_DEFAULT= LINUX	92	OPTIONS_DEFAULT= LINUX
		93	OPTIONS_SUB= yes
88		94
89	ACPI_PM_DESC= ACPI Power Management support	95	ACPI_PM_DESC= ACPI Power Management support
90	LINUX_DESC= Linux compatibility support	96	LINUX_DESC= Linux compatibility support
Lines 96-117 OPTIONS_DEFINE+= FREEBSD_AGP Link Here
96	FREEBSD_AGP_DESC= Use FreeBSD AGP GART driver	102	FREEBSD_AGP_DESC= Use FreeBSD AGP GART driver
97	.endif	103	.endif
98		104
99	PLIST_SUB+= LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \	105	LINUX_MASTER_SITES=NVIDIA/XFree86/Linux-${LINUX_ARCH_SUFX}/${DISTVERSION}/:linux
		106	LINUX_DISTFILES=NVIDIA-Linux-${LINUX_ARCH_SUFX}-${DISTVERSION}.run:linux
		107	LINUX_USES= linux
		108	LINUX_USE= LINUX=xorglibs
		109
		110	LINUX_ARCH_SUFX=${LINUX_ARCH:S/i386/x86/}
		111	LINUX_LIBDIR= /usr/lib${LINUX_ARCH:S/i386//:S/x86_64/64/}
		112
		113	LINUX_LIBS= libcuda.so.${PORTVERSION} \
		114	libnvcuvid.so.${PORTVERSION} \
		115	libnvidia-cfg.so.${PORTVERSION} \
		116	libnvidia-compiler.so.${PORTVERSION} \
		117	libnvidia-glcore.so.${PORTVERSION} \
		118	libnvidia-ml.so.${PORTVERSION} \
		119	libnvidia-opencl.so.${PORTVERSION} \
		120	libnvidia-tls.so.${PORTVERSION} \
		121	libvdpau_nvidia.so.${PORTVERSION} \
		122	tls/libnvidia-tls.so.${PORTVERSION}
		123	LINUX_LINKS= libcuda.so.${PORTVERSION} libcuda.so.1 \
		124	libcuda.so.${PORTVERSION} libcuda.so \
		125	libnvcuvid.so.${PORTVERSION} libnvcuvid.so.1 \
		126	libnvcuvid.so.${PORTVERSION} libnvcuvid.so \
		127	libnvidia-cfg.so.${PORTVERSION} libnvidia-cfg.so.1 \
		128	libnvidia-cfg.so.${PORTVERSION} libnvidia-cfg.so \
		129	libnvidia-ml.so.${PORTVERSION} libnvidia-ml.so.1 \
		130	libnvidia-ml.so.${PORTVERSION} libnvidia-ml.so \
		131	libnvidia-opencl.so.${PORTVERSION} libnvidia-opencl.so.1 \
		132	libvdpau_nvidia.so.${PORTVERSION} vdpau/libvdpau_nvidia.so.1
		133	LINUX32_LIBS= libcuda.so.${PORTVERSION} \
		134	libnvidia-compiler.so.${PORTVERSION} \
		135	libnvidia-glcore.so.${PORTVERSION} \
		136	libnvidia-ml.so.${PORTVERSION} \
		137	libnvidia-opencl.so.${PORTVERSION} \
		138	libnvidia-tls.so.${PORTVERSION} \
		139	libvdpau_nvidia.so.${PORTVERSION} \
		140	tls/libnvidia-tls.so.${PORTVERSION}
		141	LINUX32_LINKS= libcuda.so.${PORTVERSION} libcuda.so.1 \
		142	libcuda.so.${PORTVERSION} libcuda.so \
		143	libnvidia-ml.so.${PORTVERSION} libnvidia-ml.so.1 \
		144	libnvidia-ml.so.${PORTVERSION} libnvidia-ml.so \
		145	libnvidia-opencl.so.${PORTVERSION} libnvidia-opencl.so.1 \
		146	libvdpau_nvidia.so.${PORTVERSION} vdpau/libvdpau_nvidia.so.1
		147	LINUX_PROGS= nvidia-debugdump nvidia-settings nvidia-smi nvidia-xconfig
		148	LINUX_MANS= nvidia-settings nvidia-smi nvidia-xconfig
		149	LINUX_DATA= nvidia.icd /etc/OpenCL/vendors
		150	.if ${NVVERSION} >= 375.010
		151	LINUX_DATA+= 10_nvidia.json /usr/share/glvnd/egl_vendor.d
		152	.else
		153	PLIST_RE+= '\,${LINUXBASE}/usr/share/glvnd,d'
		154	.endif
		155	.if ${NVVERSION} >= 378.009
		156	LINUX_DATA+= 10_nvidia_wayland.json /usr/share/egl/egl_external_platform.d
		157	.else
		158	PLIST_RE+= '\,${LINUXBASE}/usr/share/egl,d'
		159	.endif
		160	.if ${NVVERSION} >= 390.042
		161	LINUX_LIBS+= libEGL.so.1.1.0
		162	LINUX_LINKS+= libEGL.so.1.1.0 libEGL.so.1
		163	LINUX32_LIBS+= libEGL.so.1.1.0
		164	LINUX32_LINKS+= libEGL.so.1.1.0 libEGL.so.1
		165	PLIST_RE+= '\,${LINUXBASE},s/(libEGL\.so)\.X/\1.1.1.0/'
		166	.elif ${NVVERSION} >= 355.006
		167	LINUX_LIBS+= libEGL.so.1
		168	LINUX32_LIBS+= libEGL.so.1
		169	PLIST_RE+= '\,${LINUXBASE}.*libEGL\.so\.X,d'
170	.elif ${NVVERSION} >= 331.013
171	LINUX_LIBS+= libEGL.so.${PORTVERSION}
172	LINUX_LINKS+= libEGL.so.${PORTVERSION} libEGL.so.1
173	LINUX32_LIBS+= libEGL.so.${PORTVERSION}
174	LINUX32_LINKS+= libEGL.so.${PORTVERSION} libEGL.so.1
175	PLIST_RE+= '\,${LINUXBASE},s/(libEGL\.so)\.X/\1.${PORTVERSION}/'
176	.else
177	PLIST_RE+= '\,${LINUXBASE}.*libEGL\.so,d'
178	.endif
179	.if ${NVVERSION} >= 361.016
180	LINUX_LIBS+= libEGL_nvidia.so.${PORTVERSION}
181	LINUX_LINKS+= libEGL_nvidia.so.${PORTVERSION} libEGL_nvidia.so.0
182	LINUX32_LIBS+= libEGL_nvidia.so.${PORTVERSION}
183	LINUX32_LINKS+= libEGL_nvidia.so.${PORTVERSION} libEGL_nvidia.so.0
184	.elif ${NVVERSION} >= 355.006
185	LINUX_LIBS+= libEGL_nvidia.so.0
186	PLIST_RE+= '\,${LINUXBASE}.*libEGL_nvidia\.so\.${PORTVERSION},d'
187	.else
188	PLIST_RE+= '\,${LINUXBASE}.*libEGL_nvidia\.so,d'
189	.endif
190	.if ${NVVERSION} >= 390.042
191	LINUX_LIBS+= libGL.so.1.7.0
192	LINUX_LINKS+= libGL.so.1.7.0 libGL.so.1
193	LINUX32_LIBS+= libGL.so.1.7.0
194	LINUX32_LINKS+= libGL.so.1.7.0 libGL.so.1
195	PLIST_RE+= '\,${LINUXBASE},s/(libGL\.so)\.X/\1.1.7.0/'
196	.elif ${NVVERSION} >= 361.028
197	LINUX_LIBS+= libGL.so.1.0.0
198	LINUX_LINKS+= libGL.so.1.0.0 libGL.so.1
199	LINUX32_LIBS+= libGL.so.1.0.0
200	LINUX32_LINKS+= libGL.so.1.0.0 libGL.so.1
201	PLIST_RE+= '\,${LINUXBASE},s/(libGL\.so)\.X/\1.1.0.0/'
202	.elif ${NVVERSION} >= 361.016
203	LINUX_LIBS+= libGL.so.1
204	LINUX32_LIBS+= libGL.so.1
205	PLIST_RE+= '\,${LINUXBASE}.*libGL\.so\.X,d'
206	.else
207	LINUX_LIBS+= libGL.so.${PORTVERSION}
208	LINUX_LINKS+= libGL.so.${PORTVERSION} libGL.so.1
209	LINUX32_LIBS+= libGL.so.${PORTVERSION}
210	LINUX32_LINKS+= libGL.so.${PORTVERSION} libGL.so.1
211	PLIST_RE+= '\,${LINUXBASE},s/(libGL\.so)\.X/\1.${PORTVERSION}/'
212	.endif
213	.if ${NVVERSION} >= 390.042
214	LINUX_LIBS+= libGLESv1_CM.so.1.2.0 \
215	libGLESv2.so.2.1.0
216	LINUX_LINKS+= libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1 \
217	libGLESv2.so.2.1.0 libGLESv2.so.2
218	LINUX32_LIBS+= libGLESv1_CM.so.1.2.0 \
219	libGLESv2.so.2.1.0
220	LINUX32_LINKS+= libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1 \
221	libGLESv2.so.2.1.0 libGLESv2.so.2
222	PLIST_RE+= '\,${LINUXBASE},s/(libGLESv1_CM\.so)\.X/\1.1.2.0/' \
223	'\,${LINUXBASE},s/(libGLESv2\.so)\.X/\1.2.1.0/'
224	.elif ${NVVERSION} >= 361.016
225	LINUX_LIBS+= libGLESv1_CM.so.1 \
226	libGLESv2.so.2
227	LINUX32_LIBS+= libGLESv1_CM.so.1 \
228	libGLESv2.so.2
229	PLIST_RE+= '\,${LINUXBASE}.*GLESv(1_CM\|2)\.so\.X,d'
230	.elif ${NVVERSION} >= 331.013
231	LINUX_LIBS+= libGLESv1_CM.so.${PORTVERSION} \
232	libGLESv2.so.${PORTVERSION}
233	LINUX_LINKS+= libGLESv1_CM.so.${PORTVERSION} libGLESv1_CM.so.1 \
234	libGLESv2.so.${PORTVERSION} libGLESv2.so.2
235	LINUX32_LIBS+= libGLESv1_CM.so.${PORTVERSION} \
236	libGLESv2.so.${PORTVERSION}
237	LINUX32_LINKS+= libGLESv1_CM.so.${PORTVERSION} libGLESv1_CM.so.1 \
238	libGLESv2.so.${PORTVERSION} libGLESv2.so.2
239	PLIST_RE+= '\,${LINUXBASE},s/(libGLESv(1_CM\|2)\.so)\.X/\1.${PORTVERSION}/'
240	.else
241	PLIST_RE+= '\,${LINUXBASE}.*libGLESv(1_CM\|2)\.so,d'
242	.endif
243	.if ${NVVERSION} >= 361.016
244	LINUX_LIBS+= libGLESv1_CM_nvidia.so.${PORTVERSION} \
245	libGLESv2_nvidia.so.${PORTVERSION} \
246	libGLX.so.0 \
247	libGLX_nvidia.so.${PORTVERSION} \
248	libnvidia-fatbinaryloader.so.${PORTVERSION} \
249	libnvidia-ptxjitcompiler.so.${PORTVERSION}
250	LINUX_LINKS+= libGLESv1_CM_nvidia.so.${PORTVERSION} libGLESv1_CM_nvidia.so.1 \
251	libGLESv2_nvidia.so.${PORTVERSION} libGLESv2_nvidia.so.2 \
252	libGLX.so.0 libGLX.so \
253	libGLX_nvidia.so.${PORTVERSION} libGLX_nvidia.so.0 \
254	libGLX_nvidia.so.${PORTVERSION} libGLX_indirect.so.0 \
255	libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so.1 \
256	libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so
257	LINUX32_LIBS+= libGLESv1_CM_nvidia.so.${PORTVERSION} \
258	libGLESv2_nvidia.so.${PORTVERSION} \
259	libGLX.so.0 \
260	libGLX_nvidia.so.${PORTVERSION} \
261	libnvidia-fatbinaryloader.so.${PORTVERSION} \
262	libnvidia-ptxjitcompiler.so.${PORTVERSION}
263	LINUX32_LINKS+= libGLESv1_CM_nvidia.so.${PORTVERSION} libGLESv1_CM_nvidia.so.1 \
264	libGLESv2_nvidia.so.${PORTVERSION} libGLESv2_nvidia.so.2 \
265	libGLX.so.0 libGLX.so \
266	libGLX_nvidia.so.${PORTVERSION} libGLX_nvidia.so.0 \
267	libGLX_nvidia.so.${PORTVERSION} libGLX_indirect.so.0 \
268	libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so.1 \
269	libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so
270	.else
271	PLIST_RE+= '\,${LINUXBASE}.*libGLESv(1_CM\|2)_nvidia\.so,d' \
272	'\,${LINUXBASE}.*libGLX(_nvidia\|_indirect)?\.so,d' \
273	'\,${LINUXBASE}.*libnvidia-fatbinaryloader\.so,d' \
274	'\,${LINUXBASE}.*libnvidia-ptxjitcompiler\.so,d'
275	.endif
276	.if ${NVVERSION} >= 355.006
277	LINUX_LIBS+= libGLdispatch.so.0 \
278	libOpenGL.so.0
279	LINUX_LINKS+= libOpenGL.so.0 libOpenGL.so
280	LINUX32_LIBS+= libGLdispatch.so.0 \
281	libOpenGL.so.0
282	LINUX32_LINKS+= libOpenGL.so.0 libOpenGL.so
283	.else
284	PLIST_RE+= '\,${LINUXBASE}.*libGLdispatch\.so,d' \
285	'\,${LINUXBASE}.*libOpenGL\.so,d'
286	.endif
287	.if ${NVVERSION} >= 387.012
288	LINUX_LIBS+= libnvidia-egl-wayland.so.1.0.2
289	LINUX_LINKS+= libnvidia-egl-wayland.so.1.0.2 libnvidia-egl-wayland.so.1
290	PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.2/'
291	.elif ${NVVERSION} >= 378.013
292	LINUX_LIBS+= libnvidia-egl-wayland.so.1.0.1
293	LINUX_LINKS+= libnvidia-egl-wayland.so.1.0.1 libnvidia-egl-wayland.so.1
294	PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.1/'
295	.elif ${NVVERSION} >= 378.009
296	LINUX_LIBS+= libnvidia-egl-wayland.so.1.0.0
297	LINUX_LINKS+= libnvidia-egl-wayland.so.1.0.0 libnvidia-egl-wayland.so.1
298	PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.0/'
299	.elif ${NVVERSION} >= 364.012
300	LINUX_LIBS+= libnvidia-egl-wayland.so.${PORTVERSION}
301	LINUX_LINKS+= libnvidia-egl-wayland.so.${PORTVERSION} libnvidia-egl-wayland.so.1
302	PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.${PORTVERSION}/'
303	.else
304	PLIST_RE+= '\,${LINUXBASE}.*libnvidia-egl-wayland\.so,d'
305	.endif
306	.if ${NVVERSION} >= 331.013
307	LINUX_LIBS+= libnvidia-eglcore.so.${PORTVERSION} \
308	libnvidia-fbc.so.${PORTVERSION} \
309	libnvidia-glsi.so.${PORTVERSION} \
310	libnvidia-ifr.so.${PORTVERSION}
311	LINUX_LINKS+= libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so.1 \
312	libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so \
313	libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so.1 \
314	libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so
315	LINUX32_LIBS+= libnvidia-eglcore.so.${PORTVERSION} \
316	libnvidia-fbc.so.${PORTVERSION} \
317	libnvidia-glsi.so.${PORTVERSION} \
318	libnvidia-ifr.so.${PORTVERSION}
319	LINUX32_LINKS+= libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so.1 \
320	libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so \
321	libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so.1 \
322	libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so
323	.else
324	PLIST_RE+= '\,${LINUXBASE}.*libnvidia-(eglcore\|fbc\|glsi\|ifr),d'
325	.endif
326	.if ${NVVERSION} >= 310.014
327	LINUX_LIBS+= libnvidia-encode.so.${PORTVERSION}
328	LINUX_LINKS+= libnvidia-encode.so.${PORTVERSION} libnvidia-encode.so.1 \
329	libnvidia-encode.so.${PORTVERSION} libnvidia-encode.so
330	LINUX32_LIBS+= libnvidia-encode.so.${PORTVERSION}
331	LINUX32_LINKS+= libnvidia-encode.so.${PORTVERSION} libnvidia-encode.so.1 \
332	libnvidia-encode.so.${PORTVERSION} libnvidia-encode.so
333	PLIST_RE+= '\,${LINUXBASE}.*libXvMCNVIDIA,d'
334	.else
335	LINUX_LIBS+= libXvMCNVIDIA.so.${PORTVERSION}
336	LINUX_LINKS+= libXvMCNVIDIA.so.${PORTVERSION} libXvMCNVIDIA_dynamic.so.1 \
337	libXvMCNVIDIA.so.${PORTVERSION} libXvMCNVIDIA_dynamic.so
338	PLIST_RE+= '\,${LINUXBASE}.*libnvidia-encode,d'
339	.endif
340	.if ${NVVERSION} >= 346.016
341	LINUX_LIBS+= libnvidia-gtk2.so.${PORTVERSION} \
342	libnvidia-gtk3.so.${PORTVERSION}
343	.else
344	PLIST_RE+= '\,${LINUXBASE}.*libnvidia-gtk(2\|3)\.so,d'
345	.endif
346	.if ${NVVERSION} >= 331.049 && ${NVVERSION} < 352.009
347	LINUX_DATA+= monitoring.conf /usr/share/nvidia \
348	${WRKSRC}/pci.ids /usr/share/nvidia
349	.else
350	PLIST_RE+= '\,${LINUXBASE}.*monitoring\.conf,d' \
351	'\,${LINUXBASE}.*pci\.ids,d'
352	.endif
353	.if ${NVVERSION} >= 334.016
354	LINUX_DATA+= nvidia-application-profiles-${PORTVERSION}-key-documentation /usr/share/nvidia
355	.else
356	PLIST_RE+= '\,${LINUXBASE}.*application-profiles-${PORTVERSION}-key-documentation,d'
357	.endif
358	.if ${NVVERSION} >= 319.012
359	LINUX_DATA+= nvidia-application-profiles-${PORTVERSION}-rc /usr/share/nvidia
360	.else
361	PLIST_RE+= '\,${LINUXBASE}.*share/nvidia,d'
362	.endif
363	.if ${NVVERSION} >= 319.017
364	LINUX_PROGS+= nvidia-cuda-mps-control nvidia-cuda-mps-server \
365	nvidia-persistenced
366	LINUX_MANS+= nvidia-cuda-mps-control nvidia-persistenced
367	.else
368	LINUX_PROGS+= nvidia-cuda-proxy-control nvidia-cuda-proxy-server
369	LINUX_MANS+= nvidia-cuda-proxy-control
370	PLIST_RE+= '\,${LINUXBASE},s/cuda-mps/cuda-proxy/' \
371	'\,${LINUXBASE}.*nvidia-persistenced,d'
372	.endif
373	.if ${NVVERSION} >= 364.012
374	LINUX_DATA+= nvidia_icd.json /etc/vulkan/icd.d
375	.else
376	PLIST_RE+= '\,${LINUXBASE}/etc/vulkan,d'
377	.endif
378
379	PLIST_SUB+= LINUXBASE=${LINUXBASE} \
380	LINUX_LIBDIR=${LINUX_LIBDIR} \
381	SHLIB_VERSION=${PORTVERSION} \
100	MODULESDIR=${MODULESDIR}	382	MODULESDIR=${MODULESDIR}
101		383
102	.include <bsd.port.options.mk>	384	.include <bsd.port.pre.mk>
103		385
104	.if ${PORT_OPTIONS:MLINUX}	386	.if ${NVVERSION} >= 310.014
105	CONFLICTS_INSTALL= linux[-_]dri-[0-9]* linux-f10-dri-[0-9]*	387	LINUX32_LIBS+= libnvcuvid.so.${PORTVERSION}
106	USES+= linux	388	LINUX32_LINKS+= libnvcuvid.so.${PORTVERSION} libnvcuvid.so.1 \
107	USE_LINUX= base:build,run xorglibs	389	libnvcuvid.so.${PORTVERSION} libnvcuvid.so
108	PLIST_SUB+= LINUX=""	390	.elif "${LINUX_ARCH}" == "x86_64"
		391	PLIST_RE+= '\,${LINUXBASE}/usr/lib/libnvcuvid\.so,d'
		392	.endif
		393
		394	.if ${NVVERSION} >= 390.087 && "${LINUX_ARCH}" == "x86_64"
		395	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-linux_kernel_nvidia-uvm_uvm_unsupported.c
109	.else	396	.else
110	PLIST_SUB+= LINUX="@comment "	397	PLIST_RE+= '\,${KMODDIR}/nvidia-uvm\.ko,d'
111	# Propagate WITHOUT_LINUX variable down to inner Makefiles
112	MAKE_ENV+= WITHOUT_LINUX=yes
113	.endif	398	.endif
114		399
		400	.if "${LINUX_ARCH}" == "x86_64"
		401	PLIST_SUB+= LINUX32=""
		402	.else
		403	PLIST_SUB+= LINUX32="@comment "
		404	.endif
		405
		406	post-extract-LINUX-on:
		407	@(${SH} ${DISTDIR}/NVIDIA-Linux-${LINUX_ARCH_SUFX}-${DISTVERSION}.run \
		408	--extract-only --target ${WRKSRC}/linux > /dev/null)
		409
115	post-patch: .SILENT	410	post-patch: .SILENT
116	# We should support -CURRENT: kill the check	411	# We should support -CURRENT: kill the check
117	${REINPLACE_CMD} -e '24,26d' ${WRKSRC}/src/${NVSRC}/nv-freebsd.h	412	${REINPLACE_CMD} -e '24,26d' ${WRKSRC}/src/${NVSRC}/nv-freebsd.h
Lines 136-143 post-patch: .SILENT Link Here
136	-e 's/kmem_free(kmem_arena, /kmem_free(/' \	431	-e 's/kmem_free(kmem_arena, /kmem_free(/' \
137	${WRKSRC}/src/${NVSRC}/nvidia_subr.c	432	${WRKSRC}/src/${NVSRC}/nvidia_subr.c
138	.endif	433	.endif
139	# Respect WITHOUT_LINUX setting	434	# Disable installation of Linux libraries
140	${REINPLACE_CMD} -e 's/exists(\/.*/& \&\& !defined(WITHOUT_LINUX)/' \	435	${REINPLACE_CMD} -e 's/exists(\/.*/& \&\& 0/' \
141	${WRKSRC}/lib/Makefile	436	${WRKSRC}/lib/Makefile
142	# Do not install VDPAU libraries which are provided by `multimedia/libvdpau'	437	# Do not install VDPAU libraries which are provided by `multimedia/libvdpau'
143	# port for a while now	438	# port for a while now
Lines 197-202 post-patch: .SILENT Link Here
197	${REINPLACE_CMD} -E 's/(x11).*/\1/ ; /doc/d' ${WRKSRC}/Makefile	492	${REINPLACE_CMD} -E 's/(x11).*/\1/ ; /doc/d' ${WRKSRC}/Makefile
198	.endif	493	.endif
199		494
		495	post-patch-LINUX-on:
		496	.if ${NVVERSION} >= 384.047
		497	@${SED} 's/__NV_VK_ICD__/libGLX_nvidia.so.0/' \
		498	${WRKSRC}/linux/nvidia_icd.json.template > \
		499	${WRKSRC}/linux/nvidia_icd.json
		500	.endif
		501	.if ${NVVERSION} >= 390.087 && "${LINUX_ARCH}" == "x86_64"
		502	@${CP} ${FILESDIR}/Makefile.uvm \
		503	${WRKSRC}/linux/kernel/nvidia-uvm/Makefile
		504	@${REINPLACE_CMD} 's,SUBDIR=,& linux/kernel/nvidia-uvm ,' \
		505	${WRKSRC}/Makefile
		506	.endif
		507
200	pre-install:	508	pre-install:
201	@${MKDIR} ${STAGEDIR}${PREFIX}/${MODULESDIR}/drivers \	509	@${MKDIR} ${STAGEDIR}${PREFIX}/${MODULESDIR}/drivers \
202	${STAGEDIR}${PREFIX}/${MODULESDIR}/extensions	510	${STAGEDIR}${PREFIX}/${MODULESDIR}/extensions
Lines 206-242 post-install: .SILENT Link Here
206	${STAGEDIR}${PREFIX}/bin	514	${STAGEDIR}${PREFIX}/bin
207	# pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's	515	# pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's
208	.if ${NVVERSION} >= 304.128 && ${NVVERSION} < 310.019 \|\| ${NVVERSION} >= 361.016	516	.if ${NVVERSION} >= 304.128 && ${NVVERSION} < 310.019 \|\| ${NVVERSION} >= 361.016
209	${REINPLACE_CMD} -E '/libvdpau(_trace)?\.so/d' ${TMPPLIST}	517	${REINPLACE_CMD} -E '\,${LINUXBASE},!{/libvdpau(_trace)?\.so/d;}' \
		518	${TMPPLIST}
210	.endif	519	.endif
211	.if ${NVVERSION} >= 310.019	520	.if ${NVVERSION} >= 310.019
212	${REINPLACE_CMD} -e '/libXvMCNVIDIA/d' ${TMPPLIST}	521	${REINPLACE_CMD} -e '\,${LINUXBASE},!{/libXvMCNVIDIA/d;}' ${TMPPLIST}
213	.else # some applications need this symlink (see PR ports/72877)	522	.else # some applications need this symlink (see PR ports/72877)
214	${LN} -sf libXvMCNVIDIA.so.1 \	523	${LN} -sf libXvMCNVIDIA.so.1 \
215	${STAGEDIR}${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1	524	${STAGEDIR}${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1
216	.endif	525	.endif
217	.if ${NVVERSION} < 331.013 \|\| ${ARCH} == amd64 && ${NVVERSION} < 334.016	526	.if ${NVVERSION} < 331.013 \|\| ${ARCH} == amd64 && ${NVVERSION} < 334.016
218	${REINPLACE_CMD} -E '/lib(nvidia-)?(EGL\|eglcore\|GLESv\|glsi)/d' \	527	${REINPLACE_CMD} -E '\,${LINUXBASE},!{/lib(nvidia-)?(EGL\|eglcore\|GLESv\|glsi)/d;}' \
219	${TMPPLIST}	528	${TMPPLIST}
220	.endif	529	.endif
221	.if ${NVVERSION} < 352.009	530	.if ${NVVERSION} < 352.009
222	${REINPLACE_CMD} -E '/(lib)?nvidia-(debugdump\|smi\|ml)/d' ${TMPPLIST}	531	${REINPLACE_CMD} -E '\,${LINUXBASE},!{/(lib)?nvidia-(debugdump\|smi\|ml)/d;}' \
		532	${TMPPLIST}
223	.endif	533	.endif
224	.if ${NVVERSION} < 355.006	534	.if ${NVVERSION} < 355.006
225	${REINPLACE_CMD} -E '/(libEGL_nvidia\|GLdispatch\|OpenGL)/d' ${TMPPLIST}	535	${REINPLACE_CMD} -E '\,${LINUXBASE},!{/(libEGL_nvidia\|GLdispatch\|OpenGL)/d;}' \
		536	${TMPPLIST}
226	.else	537	.else
227	${REINPLACE_CMD} 's/libEGL\.so\.${PORTVERSION}/libEGL.so/' \	538	${REINPLACE_CMD} '\,${LINUXBASE},!s/libEGL\.so\.${PORTVERSION}/libEGL.so/' \
228	${TMPPLIST}	539	${TMPPLIST}
229	.endif	540	.endif
230	.if ${NVVERSION} < 358.009	541	.if ${NVVERSION} < 358.009
231	${REINPLACE_CMD} '/nvidia-modeset.ko/d' ${TMPPLIST}	542	${REINPLACE_CMD} '/nvidia-modeset.ko/d' ${TMPPLIST}
232	.endif	543	.endif
233	.if ${NVVERSION} >= 361.028	544	.if ${NVVERSION} >= 361.028
234	${REINPLACE_CMD} -E '/(EGL_nvidia\.so\|GLESv[12](_CM)?(\.so\.[0-9]+\.[0-9]+))$$/d' \	545	${REINPLACE_CMD} -E '\,${LINUXBASE},!{/(EGL_nvidia\.so\|GLESv[12](_CM)?(\.so\.[0-9]+\.[0-9]+))$$/d;}' \
235	${TMPPLIST}	546	${TMPPLIST}
236	.else	547	.else
237	${REINPLACE_CMD} -E '/\/lib\/libGLESv[12](_CM)?(\.so)?(_nvidia.so(\.[0-9]\|\.[0-9]+\.[0-9]+)?)?$$/d ; \	548	${REINPLACE_CMD} -E '\,${LINUXBASE},!{/\/lib\/libGLESv[12](_CM)?(\.so)?(_nvidia.so(\.[0-9]\|\.[0-9]+\.[0-9]+)?)?$$/d ; \
238	/libEGL_nvidia\.so\.${PORTVERSION}/d' ${TMPPLIST}	549	/libEGL_nvidia\.so\.${PORTVERSION}/d;}' ${TMPPLIST}
239	.endif	550	.endif
		551	${REINPLACE_CMD} -E ${PLIST_RE:S/^/-e /} ${TMPPLIST}
240	# rename libGL.so, libEGL.so and libGLESv2.so	552	# rename libGL.so, libEGL.so and libGLESv2.so
241	${MV} -f ${STAGEDIR}${PREFIX}/lib/libGL.so \	553	${MV} -f ${STAGEDIR}${PREFIX}/lib/libGL.so \
242	${STAGEDIR}${PREFIX}/lib/libGL-NVIDIA.so	554	${STAGEDIR}${PREFIX}/lib/libGL-NVIDIA.so
Lines 256-261 post-install: .SILENT Link Here
256	${INSTALL_DATA} ${WRKDIR}/nvidia.conf \	568	${INSTALL_DATA} ${WRKDIR}/nvidia.conf \
257	${STAGEDIR}${PREFIX}/etc/libmap.d/	569	${STAGEDIR}${PREFIX}/etc/libmap.d/
258		570
		571	post-install-LINUX-on:
		572	.for f d in ${LINUX_DATA}
		573	${MKDIR} ${STAGEDIR}${LINUXBASE}${d}
		574	${INSTALL_DATA} ${WRKSRC}/linux/${f} ${STAGEDIR}${LINUXBASE}${d}
		575	.endfor
		576	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/bin
		577	${INSTALL_SCRIPT} ${WRKSRC}/linux/nvidia-bug-report.sh \
		578	${STAGEDIR}${LINUXBASE}/usr/bin
		579	.for p in ${LINUX_PROGS}
		580	${INSTALL_PROGRAM} ${WRKSRC}/linux/${p} ${STAGEDIR}${LINUXBASE}/usr/bin
		581	.endfor
		582	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/share/man/man1
		583	.for m in ${LINUX_MANS}
		584	${INSTALL_MAN} ${WRKSRC}/linux/${m}.1.gz \
		585	${STAGEDIR}${LINUXBASE}/usr/share/man/man1
		586	.endfor
		587	${MKDIR} ${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/tls
		588	${MKDIR} ${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/vdpau
		589	.for l in ${LINUX_LIBS}
		590	${INSTALL_LIB} ${WRKSRC}/linux/${l} \
		591	${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/${l}
		592	.endfor
		593	.for s t in ${LINUX_LINKS}
		594	${RLN} ${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/${s} \
		595	${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/${t}
		596	.endfor
		597	.if "${LINUX_ARCH}" == "x86_64"
		598	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib/tls
		599	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib/vdpau
		600	.for l in ${LINUX32_LIBS}
		601	${INSTALL_LIB} ${WRKSRC}/linux/32/${l} \
		602	${STAGEDIR}${LINUXBASE}/usr/lib/${l}
		603	.endfor
		604	.for s t in ${LINUX32_LINKS}
		605	${RLN} ${STAGEDIR}${LINUXBASE}/usr/lib/${s} \
		606	${STAGEDIR}${LINUXBASE}/usr/lib/${t}
		607	.endfor
		608	.endif
		609
259	# Target below can be used instead of standard `makesum' to correctly	610	# Target below can be used instead of standard `makesum' to correctly
260	# update distinfo (i.e., keeping other driver version entries intact)	611	# update distinfo (i.e., keeping other driver version entries intact)
261	.if ${.TARGETS:Mupdate-distinfo}	612	.if ${.TARGETS:Mupdate-distinfo}
Lines 269-272 update-distinfo: makesum .SILENT Link Here
269	${MASTERDIR}/distinfo	620	${MASTERDIR}/distinfo
270	${RM} ${DISTINFO_FILE} ${MASTERDIR}/distinfo.bak	621	${RM} ${DISTINFO_FILE} ${MASTERDIR}/distinfo.bak
271		622
272	.include <bsd.port.mk>	623	.include <bsd.port.post.mk>

Lines 1-13 Link Here

(-)x11/nvidia-driver/distinfo (+12 lines)
1	TIMESTAMP = 1482026038	1	TIMESTAMP = 1482026038
2	SHA256 (NVIDIA-FreeBSD-x86_64-390.87.tar.gz) = 221c80982378a333f541646d5d2030c72311c491f5a0f98b93fdd95cd5be11fc	2	SHA256 (NVIDIA-FreeBSD-x86_64-390.87.tar.gz) = 221c80982378a333f541646d5d2030c72311c491f5a0f98b93fdd95cd5be11fc
3	SIZE (NVIDIA-FreeBSD-x86_64-390.87.tar.gz) = 63648591	3	SIZE (NVIDIA-FreeBSD-x86_64-390.87.tar.gz) = 63648591
		4	SHA256 (NVIDIA-Linux-x86_64-390.87.run) = 38290a0b19e86037112f22397e02be9cdd6bcd677dd926b2977bbd49119e611e
		5	SIZE (NVIDIA-Linux-x86_64-390.87.run) = 82690871
4	SHA256 (NVIDIA-FreeBSD-x86-390.87.tar.gz) = a2e61b0c541aa9bdcde7de43cd88a7ce5ff3de9fdafe60fa7d6e10942186d7d4	6	SHA256 (NVIDIA-FreeBSD-x86-390.87.tar.gz) = a2e61b0c541aa9bdcde7de43cd88a7ce5ff3de9fdafe60fa7d6e10942186d7d4
5	SIZE (NVIDIA-FreeBSD-x86-390.87.tar.gz) = 64326801	7	SIZE (NVIDIA-FreeBSD-x86-390.87.tar.gz) = 64326801
		8	SHA256 (NVIDIA-Linux-x86-390.87.run) = 5c29c5f9d80a07ea71219c6323fe5fc9b7577847b970f23161685d4b890b9966
		9	SIZE (NVIDIA-Linux-x86-390.87.run) = 47959124
6	SHA256 (NVIDIA-FreeBSD-x86_64-340.107.tar.gz) = 047efae28cc81e4d56c64d2a0c15d9b7ff07f09bba22696464de8276334a4df7	10	SHA256 (NVIDIA-FreeBSD-x86_64-340.107.tar.gz) = 047efae28cc81e4d56c64d2a0c15d9b7ff07f09bba22696464de8276334a4df7
7	SIZE (NVIDIA-FreeBSD-x86_64-340.107.tar.gz) = 61179967	11	SIZE (NVIDIA-FreeBSD-x86_64-340.107.tar.gz) = 61179967
		12	SHA256 (NVIDIA-Linux-x86_64-340.107.run) = e3e359964ed568008584c4fb2dbcb76b76a848591d1456a783e94dd0c7f6695f
		13	SIZE (NVIDIA-Linux-x86_64-340.107.run) = 70233686
8	SHA256 (NVIDIA-FreeBSD-x86-340.107.tar.gz) = 1978ae48512d8a693979b153463c76954d2aec91a6b2a568b3aa1198e5b3d199	14	SHA256 (NVIDIA-FreeBSD-x86-340.107.tar.gz) = 1978ae48512d8a693979b153463c76954d2aec91a6b2a568b3aa1198e5b3d199
9	SIZE (NVIDIA-FreeBSD-x86-340.107.tar.gz) = 60305952	15	SIZE (NVIDIA-FreeBSD-x86-340.107.tar.gz) = 60305952
		16	SHA256 (NVIDIA-Linux-x86-340.107.run) = 8d8bd2b04019eaa55d848534e2dbdc460be918e7731ecd8da87199ef9c1a0856
		17	SIZE (NVIDIA-Linux-x86-340.107.run) = 39016798
10	SHA256 (NVIDIA-FreeBSD-x86_64-304.137.tar.gz) = 231693189e1bdf5c1dd02315cde5ef9ed6c0854564314438f2f40f9788a34120	18	SHA256 (NVIDIA-FreeBSD-x86_64-304.137.tar.gz) = 231693189e1bdf5c1dd02315cde5ef9ed6c0854564314438f2f40f9788a34120
11	SIZE (NVIDIA-FreeBSD-x86_64-304.137.tar.gz) = 36474676	19	SIZE (NVIDIA-FreeBSD-x86_64-304.137.tar.gz) = 36474676
		20	SHA256 (NVIDIA-Linux-x86_64-304.137.run) = eb1f56db3a2bea13e3ccde7b5ae14abe8cd6c6dbe69af4c71c68a623cc96e3e2
		21	SIZE (NVIDIA-Linux-x86_64-304.137.run) = 70087133
12	SHA256 (NVIDIA-FreeBSD-x86-304.137.tar.gz) = 5f874133853eacc5b9a10311cec22d3c4898db7f75b92bb6c12d5be5126516fb	22	SHA256 (NVIDIA-FreeBSD-x86-304.137.tar.gz) = 5f874133853eacc5b9a10311cec22d3c4898db7f75b92bb6c12d5be5126516fb
13	SIZE (NVIDIA-FreeBSD-x86-304.137.tar.gz) = 35399011	23	SIZE (NVIDIA-FreeBSD-x86-304.137.tar.gz) = 35399011
		24	SHA256 (NVIDIA-Linux-x86-304.137.run) = ca98379fc2090bdfe8b74113d6ac7bcc7eadbd86a489c3c4ec4cd5ba9f6064f8
		25	SIZE (NVIDIA-Linux-x86-304.137.run) = 41504115




# $FreeBSD$

KMOD=	nvidia-uvm
SRCS=	uvm_unsupported.c \
	vnode_if.h

CFLAGS+=-I../common/inc
CFLAGS+=-I${SYSDIR}/compat/linuxkpi/common/include
CFLAGS+=-D__KERNEL__
CFLAGS+=-DNV_LINUX_PRINTK_H_PRESENT
CFLAGS+=-DNV_FILE_OPERATIONS_HAS_UNLOCKED_IOCTL
CFLAGS+=-DNV_FILE_OPERATIONS_HAS_COMPAT_IOCTL

.include <bsd.kmod.mk>




--- linux/kernel/nvidia-uvm/uvm_unsupported.c.orig	2018-08-22 00:55:24 UTC
+++ linux/kernel/nvidia-uvm/uvm_unsupported.c
@@ -39,7 +39,9 @@
 #include "uvmtypes.h"
 #include "uvm_linux_ioctl.h"
 #include "uvm_minimal_init.h"
+#ifdef __linux__
 #include "conftest.h"
+#endif
 
 #include <linux/module.h>
 #include <asm/uaccess.h>
@@ -138,6 +140,9 @@ static int __init uvm_unsupported_module_init(void)
     uvm_dev = MKDEV(MAJOR(g_uvm_base_dev), NVIDIA_UVM_PRIMARY_MINOR_NUMBER);
     cdev_init(&g_uvm_cdev, &uvm_unsupported_fops);
     g_uvm_cdev.owner = THIS_MODULE;
+#ifndef __linux__
+    kobject_set_name(&g_uvm_cdev.kobj, "%s", NVIDIA_UVM_DEVICE_NAME);
+#endif
 
     ret = cdev_add(&g_uvm_cdev, uvm_dev, 1);
     if (ret != 0) {
@@ -168,8 +173,32 @@ static void __exit uvm_unsupported_exit(void)
            MAJOR(g_uvm_base_dev));
 }
 
+#ifdef __linux__
 module_init(uvm_unsupported_module_init);
 module_exit(uvm_unsupported_exit);
+#else
+static int
+nvidia_uvm_load(module_t mod, int cmd, void *arg)
+{
+	int err = 0;
+
+	switch (cmd) {
+	case MOD_LOAD:
+		uvm_unsupported_module_init();
+		break;
+	case MOD_UNLOAD:
+	case MOD_SHUTDOWN:
+		uvm_unsupported_exit();
+		break;
+	default:
+		err = EINVAL;
+		break;
+	}
+	return(err);
+}
+DEV_MODULE(nvidia_uvm, nvidia_uvm_load, NULL);
+MODULE_DEPEND(nvidia_uvm, linuxkpi, 1, 1, 1);
+#endif
 
 MODULE_LICENSE("MIT");
 MODULE_INFO(supported, "external");




--- src/nvidia_linux.c.orig	2017-09-14 20:46:30 UTC
+++ src/nvidia_linux.c
@@ -35,23 +35,16 @@ int linux_ioctl_nvidia(
     struct linux_ioctl_args *args
 )
 {
-    struct file *fp;
-    int error;
-#if __FreeBSD_version >= 1000053
-    cap_rights_t rights;
-#endif
-    u_long cmd;
+    static const uint32_t dir[4] = { IOC_VOID, IOC_IN, IOC_OUT, IOC_INOUT };
 
-    error = fget(td, args->fd, cap_rights_init(&rights, CAP_IOCTL), &fp);
-    if (error != 0)
-        return error;
-
-    cmd = args->cmd;
-
-    error = fo_ioctl(fp, cmd, (caddr_t)args->arg, td->td_ucred, td);
-    fdrop(fp, td);
-
-    return error;
+    if ((args->cmd & (1<<29)) != 0) {
+        /* FreeBSD has only 13 bits to encode the size. */
+        printf("nvidia: pid %d (%s): ioctl cmd=0x%x size too large\n",
+            (int)td->td_proc->p_pid, td->td_proc->p_comm, args->cmd);
+        return (EINVAL);
+    }
+    args->cmd = (args->cmd & ~IOC_DIRMASK) | dir[args->cmd >> 30];
+    return (sys_ioctl(td, (struct ioctl_args *)args));
 }
 
 struct linux_ioctl_handler nvidia_handler = {

Lines 1-7 Link Here

(-)x11/nvidia-driver/files/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c (-2 / +46 lines)
1	--- src/nvidia-modeset/nvidia-modeset-freebsd.c.orig 2016-05-28 15:44:11 UTC	1	--- src/nvidia-modeset/nvidia-modeset-freebsd.c.orig 2018-08-21 23:09:28 UTC
2	+++ src/nvidia-modeset/nvidia-modeset-freebsd.c	2	+++ src/nvidia-modeset/nvidia-modeset-freebsd.c
3	@@ -245,7 +245,7 @@ struct nvkms_ref_ptr {	3	@@ -25,6 +25,7 @@
		4	#include <sys/poll.h>
		5	#include <sys/file.h>
		6	#include <sys/proc.h>
		7	+#include <sys/sysproto.h>
4		8
		9	#include "nvkms-ioctl.h"
		10	#include "nvidia-modeset-os-interface.h"
		11	@@ -250,7 +251,7 @@ struct nvkms_ref_ptr {
		12
5	struct nvkms_ref_ptr* NVKMS_API_CALL nvkms_alloc_ref_ptr(void *ptr)	13	struct nvkms_ref_ptr* NVKMS_API_CALL nvkms_alloc_ref_ptr(void *ptr)
6	{	14	{
7	- struct nvkms_ref_ptr ref_ptr = nvkms_alloc(sizeof(ref_ptr), NV_FALSE);	15	- struct nvkms_ref_ptr ref_ptr = nvkms_alloc(sizeof(ref_ptr), NV_FALSE);
Lines 9-11 Link Here
9	if (ref_ptr) {	17	if (ref_ptr) {
10	mtx_init(&ref_ptr->lock, "nvkms-ref-ptr-lock", NULL, MTX_SPIN);	18	mtx_init(&ref_ptr->lock, "nvkms-ref-ptr-lock", NULL, MTX_SPIN);
11	// The ref_ptr owner counts as a reference on the ref_ptr itself.	19	// The ref_ptr owner counts as a reference on the ref_ptr itself.
		20	@@ -873,27 +874,16 @@ static int nvkms_linux_ioctl_function(
		21	struct linux_ioctl_args *args
		22	)
		23	{
		24	- struct file *fp;
		25	- int status;
		26	- u_long cmd;
		27	+ static const uint32_t dir[4] = { IOC_VOID, IOC_IN, IOC_OUT, IOC_INOUT };
		28
		29	-#if NV_FGET_HAS_CAP_RIGHTS_T_ARG
		30	- cap_rights_t rights;
		31	- status = fget(td, args->fd, cap_rights_init(&rights, CAP_IOCTL), &fp);
		32	-#else
		33	- status = fget(td, args->fd, &fp);
		34	-#endif
		35	-
		36	- if (status != 0) {
		37	- return status;
		38	+ if ((args->cmd & (1<<29)) != 0) {
		39	+ /* FreeBSD has only 13 bits to encode the size. */
		40	+ printf("nvidia: pid %d (%s): ioctl cmd=0x%x size too large\n",
		41	+ (int)td->td_proc->p_pid, td->td_proc->p_comm, args->cmd);
		42	+ return (EINVAL);
		43	}
		44	-
		45	- cmd = args->cmd;
		46	-
		47	- status = fo_ioctl(fp, cmd, (caddr_t)args->arg, td->td_ucred, td);
		48	- fdrop(fp, td);
		49	-
		50	- return status;
		51	+ args->cmd = (args->cmd & ~IOC_DIRMASK) \| dir[args->cmd >> 30];
		52	+ return (sys_ioctl(td, (struct ioctl_args *)args));
		53	}
		54
		55	#define NVKMS_LINUX_IOCTL_MIN _IOC(0, NVKMS_IOCTL_MAGIC, NVKMS_IOCTL_CMD, 0)




--- src/nvidia/nvidia_linux.c.orig	2017-09-14 20:46:30 UTC
+++ src/nvidia/nvidia_linux.c
@@ -35,23 +35,16 @@ int linux_ioctl_nvidia(
     struct linux_ioctl_args *args
 )
 {
-    struct file *fp;
-    int error;
-#if __FreeBSD_version >= 1000053
-    cap_rights_t rights;
-#endif
-    u_long cmd;
+    static const uint32_t dir[4] = { IOC_VOID, IOC_IN, IOC_OUT, IOC_INOUT };
 
-    error = fget(td, args->fd, cap_rights_init(&rights, CAP_IOCTL), &fp);
-    if (error != 0)
-        return error;
-
-    cmd = args->cmd;
-
-    error = fo_ioctl(fp, cmd, (caddr_t)args->arg, td->td_ucred, td);
-    fdrop(fp, td);
-
-    return error;
+    if ((args->cmd & (1<<29)) != 0) {
+        /* FreeBSD has only 13 bits to encode the size. */
+        printf("nvidia: pid %d (%s): ioctl cmd=0x%x size too large\n",
+            (int)td->td_proc->p_pid, td->td_proc->p_comm, args->cmd);
+        return (EINVAL);
+    }
+    args->cmd = (args->cmd & ~IOC_DIRMASK) | dir[args->cmd >> 30];
+    return (sys_ioctl(td, (struct ioctl_args *)args));
 }
 
 struct linux_ioctl_handler nvidia_handler = {




%%MODULESDIR%%/extensions/.nvidia/libglx.so.1
/%%KMODDIR%%/nvidia.ko
/%%KMODDIR%%/nvidia-modeset.ko
%%LINUX%%/%%KMODDIR%%/nvidia-uvm.ko
%%LINUX%%%%LINUXBASE%%/etc/OpenCL/vendors/nvidia.icd
%%LINUX%%%%LINUXBASE%%/etc/vulkan/icd.d/nvidia_icd.json
%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-bug-report.sh
%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-cuda-mps-control
%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-cuda-mps-server
%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-debugdump
%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-persistenced
%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-settings
%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-smi
%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-xconfig
%%LINUX32%%%%LINUXBASE%%/usr/lib/libEGL.so.1
%%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libEGL.so.1.0.0 ] || ln -sf libEGL.so.1.0.0 %%LINUXBASE%%/usr/lib/libEGL.so.1
%%LINUX32%%%%LINUXBASE%%/usr/lib/libEGL.so.X
%%LINUX32%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so.0
%%LINUX32%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libGL.so.1
%%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libGL.so.1.2.0 ] || ln -sf libGL.so.1.2.0 %%LINUXBASE%%/usr/lib/libGL.so.1
%%LINUX32%%%%LINUXBASE%%/usr/lib/libGL.so.X
%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLdispatch.so.0
%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.1
%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.X
%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv1_CM_nvidia.so.1
%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv1_CM_nvidia.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv2.so.2
%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv2.so.X
%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv2_nvidia.so.2
%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv2_nvidia.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLX.so
%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLX.so.0
%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLX_indirect.so.0
%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLX_nvidia.so.0
%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLX_nvidia.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libOpenGL.so
%%LINUX32%%%%LINUXBASE%%/usr/lib/libOpenGL.so.0
%%LINUX32%%%%LINUXBASE%%/usr/lib/libcuda.so
%%LINUX32%%%%LINUXBASE%%/usr/lib/libcuda.so.1
%%LINUX32%%%%LINUXBASE%%/usr/lib/libcuda.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvcuvid.so
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvcuvid.so.1
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvcuvid.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-compiler.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-eglcore.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-encode.so
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-encode.so.1
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-encode.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fatbinaryloader.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so.1
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glcore.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glsi.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so.1
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ml.so
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ml.so.1
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ml.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-opencl.so.1
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-opencl.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ptxjitcompiler.so
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ptxjitcompiler.so.1
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ptxjitcompiler.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-tls.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libvdpau_nvidia.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/tls/libnvidia-tls.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/vdpau/libvdpau_nvidia.so.1
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.1
%%LINUX%%@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.1.0.0 ] || ln -sf libEGL.so.1.0.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.1
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.X
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL_nvidia.so.0
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL_nvidia.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1
%%LINUX%%@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1.2.0 ] || ln -sf libGL.so.1.2.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.X
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLdispatch.so.0
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM.so.1
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM.so.X
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM_nvidia.so.1
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM_nvidia.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2.so.2
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2.so.X
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2_nvidia.so.2
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2_nvidia.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX.so
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX.so.0
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX_indirect.so.0
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX_nvidia.so.0
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX_nvidia.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libOpenGL.so
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libOpenGL.so.0
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libXvMCNVIDIA.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libXvMCNVIDIA_dynamic.so
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libXvMCNVIDIA_dynamic.so.1
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libcuda.so
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libcuda.so.1
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libcuda.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvcuvid.so
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvcuvid.so.1
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvcuvid.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-cfg.so
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-cfg.so.1
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-cfg.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-compiler.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-wayland.so.1
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-wayland.so.X
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-eglcore.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so.1
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fatbinaryloader.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.1
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glcore.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glsi.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk2.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk3.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ifr.so
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ifr.so.1
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ifr.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ml.so
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ml.so.1
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ml.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-opencl.so.1
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-opencl.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ptxjitcompiler.so
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ptxjitcompiler.so.1
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ptxjitcompiler.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-tls.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libvdpau_nvidia.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/tls/libnvidia-tls.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/vdpau/libvdpau_nvidia.so.1
%%LINUX%%%%LINUXBASE%%/usr/share/egl/egl_external_platform.d/10_nvidia_wayland.json
%%LINUX%%%%LINUXBASE%%/usr/share/glvnd/egl_vendor.d/10_nvidia.json
%%LINUX%%%%LINUXBASE%%/usr/share/man/man1/nvidia-cuda-mps-control.1.gz
%%LINUX%%%%LINUXBASE%%/usr/share/man/man1/nvidia-persistenced.1.gz
%%LINUX%%%%LINUXBASE%%/usr/share/man/man1/nvidia-settings.1.gz
%%LINUX%%%%LINUXBASE%%/usr/share/man/man1/nvidia-smi.1.gz
%%LINUX%%%%LINUXBASE%%/usr/share/man/man1/nvidia-xconfig.1.gz
%%LINUX%%%%LINUXBASE%%/usr/share/nvidia/monitoring.conf
%%LINUX%%%%LINUXBASE%%/usr/share/nvidia/nvidia-application-profiles-%%SHLIB_VERSION%%-key-documentation
%%LINUX%%%%LINUXBASE%%/usr/share/nvidia/nvidia-application-profiles-%%SHLIB_VERSION%%-rc
%%LINUX%%%%LINUXBASE%%/usr/share/nvidia/pci.ids
%%LINUX%%@postexec %%LINUXBASE%%/sbin/ldconfig
%%LINUX%%@postunexec %%LINUXBASE%%/sbin/ldconfig
%%LINUX%%@dir %%LINUXBASE%%/etc/OpenCL/vendors
%%LINUX%%@dir %%LINUXBASE%%/etc/OpenCL
%%LINUX%%@dir %%LINUXBASE%%/etc/vulkan/icd.d
%%LINUX%%@dir %%LINUXBASE%%/etc/vulkan
%%LINUX%%@dir %%LINUXBASE%%/etc
%%LINUX%%@dir %%LINUXBASE%%/usr/bin
%%LINUX32%%@dir %%LINUXBASE%%/usr/lib/tls
%%LINUX32%%@dir %%LINUXBASE%%/usr/lib/vdpau
%%LINUX32%%@dir %%LINUXBASE%%/usr/lib
%%LINUX%%@dir %%LINUXBASE%%%%LINUX_LIBDIR%%/tls
%%LINUX%%@dir %%LINUXBASE%%%%LINUX_LIBDIR%%/vdpau
%%LINUX%%@dir %%LINUXBASE%%%%LINUX_LIBDIR%%
%%LINUX%%@dir %%LINUXBASE%%/usr/share/egl/egl_external_platform.d
%%LINUX%%@dir %%LINUXBASE%%/usr/share/egl
%%LINUX%%@dir %%LINUXBASE%%/usr/share/glvnd/egl_vendor.d
%%LINUX%%@dir %%LINUXBASE%%/usr/share/glvnd
%%LINUX%%@dir %%LINUXBASE%%/usr/share/man/man1
%%LINUX%%@dir %%LINUXBASE%%/usr/share/man
%%LINUX%%@dir %%LINUXBASE%%/usr/share/nvidia
%%LINUX%%@dir %%LINUXBASE%%/usr/share
%%LINUX%%@dir %%LINUXBASE%%/usr
%%LINUX%%@dir %%LINUXBASE%%
%%LINUX%%@dir /compat

Return to bug 217901

Line 0 Link Here

(-)x11/nvidia-driver/files/Makefile.uvm (+14 lines)
	1	# $FreeBSD$
	2
	3	KMOD= nvidia-uvm
	4	SRCS= uvm_unsupported.c \
	5	vnode_if.h
	6
	7	CFLAGS+=-I../common/inc
	8	CFLAGS+=-I${SYSDIR}/compat/linuxkpi/common/include
	9	CFLAGS+=-D__KERNEL__
	10	CFLAGS+=-DNV_LINUX_PRINTK_H_PRESENT
	11	CFLAGS+=-DNV_FILE_OPERATIONS_HAS_UNLOCKED_IOCTL
	12	CFLAGS+=-DNV_FILE_OPERATIONS_HAS_COMPAT_IOCTL
	13
	14	.include <bsd.kmod.mk>

Line 0 Link Here

(-)x11/nvidia-driver/files/extra-patch-linux_kernel_nvidia-uvm_uvm_unsupported.c (+55 lines)
	1	--- linux/kernel/nvidia-uvm/uvm_unsupported.c.orig 2018-08-22 00:55:24 UTC
	2	+++ linux/kernel/nvidia-uvm/uvm_unsupported.c
	3	@@ -39,7 +39,9 @@
	4	#include "uvmtypes.h"
	5	#include "uvm_linux_ioctl.h"
	6	#include "uvm_minimal_init.h"
	7	+#ifdef __linux__
	8	#include "conftest.h"
	9	+#endif
	10
	11	#include <linux/module.h>
	12	#include <asm/uaccess.h>
	13	@@ -138,6 +140,9 @@ static int __init uvm_unsupported_module_init(void)
	14	uvm_dev = MKDEV(MAJOR(g_uvm_base_dev), NVIDIA_UVM_PRIMARY_MINOR_NUMBER);
	15	cdev_init(&g_uvm_cdev, &uvm_unsupported_fops);
	16	g_uvm_cdev.owner = THIS_MODULE;
	17	+#ifndef __linux__
	18	+ kobject_set_name(&g_uvm_cdev.kobj, "%s", NVIDIA_UVM_DEVICE_NAME);
	19	+#endif
	20
	21	ret = cdev_add(&g_uvm_cdev, uvm_dev, 1);
	22	if (ret != 0) {
	23	@@ -168,8 +173,32 @@ static void __exit uvm_unsupported_exit(void)
	24	MAJOR(g_uvm_base_dev));
	25	}
	26
	27	+#ifdef __linux__
	28	module_init(uvm_unsupported_module_init);
	29	module_exit(uvm_unsupported_exit);
	30	+#else
	31	+static int
	32	+nvidia_uvm_load(module_t mod, int cmd, void *arg)
	33	+{
	34	+ int err = 0;
	35	+
	36	+ switch (cmd) {
	37	+ case MOD_LOAD:
	38	+ uvm_unsupported_module_init();
	39	+ break;
	40	+ case MOD_UNLOAD:
	41	+ case MOD_SHUTDOWN:
	42	+ uvm_unsupported_exit();
	43	+ break;
	44	+ default:
	45	+ err = EINVAL;
	46	+ break;
	47	+ }
	48	+ return(err);
	49	+}
	50	+DEV_MODULE(nvidia_uvm, nvidia_uvm_load, NULL);
	51	+MODULE_DEPEND(nvidia_uvm, linuxkpi, 1, 1, 1);
	52	+#endif
	53
	54	MODULE_LICENSE("MIT");
	55	MODULE_INFO(supported, "external");

Line 0 Link Here

(-)x11/nvidia-driver/files/extra-patch-src-nvidia_linux.c (+35 lines)
	1	--- src/nvidia_linux.c.orig 2017-09-14 20:46:30 UTC
	2	+++ src/nvidia_linux.c
	3	@@ -35,23 +35,16 @@ int linux_ioctl_nvidia(
	4	struct linux_ioctl_args *args
	5	)
	6	{
	7	- struct file *fp;
	8	- int error;
	9	-#if __FreeBSD_version >= 1000053
	10	- cap_rights_t rights;
	11	-#endif
	12	- u_long cmd;
	13	+ static const uint32_t dir[4] = { IOC_VOID, IOC_IN, IOC_OUT, IOC_INOUT };
	14
	15	- error = fget(td, args->fd, cap_rights_init(&rights, CAP_IOCTL), &fp);
	16	- if (error != 0)
	17	- return error;
	18	-
	19	- cmd = args->cmd;
	20	-
	21	- error = fo_ioctl(fp, cmd, (caddr_t)args->arg, td->td_ucred, td);
	22	- fdrop(fp, td);
	23	-
	24	- return error;
	25	+ if ((args->cmd & (1<<29)) != 0) {
	26	+ /* FreeBSD has only 13 bits to encode the size. */
	27	+ printf("nvidia: pid %d (%s): ioctl cmd=0x%x size too large\n",
	28	+ (int)td->td_proc->p_pid, td->td_proc->p_comm, args->cmd);
	29	+ return (EINVAL);
	30	+ }
	31	+ args->cmd = (args->cmd & ~IOC_DIRMASK) \| dir[args->cmd >> 30];
	32	+ return (sys_ioctl(td, (struct ioctl_args *)args));
	33	}
	34
	35	struct linux_ioctl_handler nvidia_handler = {

Line 0 Link Here

(-)x11/nvidia-driver/files/extra-patch-src_nvidia_nvidia_linux.c (+35 lines)
	1	--- src/nvidia/nvidia_linux.c.orig 2017-09-14 20:46:30 UTC
	2	+++ src/nvidia/nvidia_linux.c
	3	@@ -35,23 +35,16 @@ int linux_ioctl_nvidia(
	4	struct linux_ioctl_args *args
	5	)
	6	{
	7	- struct file *fp;
	8	- int error;
	9	-#if __FreeBSD_version >= 1000053
	10	- cap_rights_t rights;
	11	-#endif
	12	- u_long cmd;
	13	+ static const uint32_t dir[4] = { IOC_VOID, IOC_IN, IOC_OUT, IOC_INOUT };
	14
	15	- error = fget(td, args->fd, cap_rights_init(&rights, CAP_IOCTL), &fp);
	16	- if (error != 0)
	17	- return error;
	18	-
	19	- cmd = args->cmd;
	20	-
	21	- error = fo_ioctl(fp, cmd, (caddr_t)args->arg, td->td_ucred, td);
	22	- fdrop(fp, td);
	23	-
	24	- return error;
	25	+ if ((args->cmd & (1<<29)) != 0) {
	26	+ /* FreeBSD has only 13 bits to encode the size. */
	27	+ printf("nvidia: pid %d (%s): ioctl cmd=0x%x size too large\n",
	28	+ (int)td->td_proc->p_pid, td->td_proc->p_comm, args->cmd);
	29	+ return (EINVAL);
	30	+ }
	31	+ args->cmd = (args->cmd & ~IOC_DIRMASK) \| dir[args->cmd >> 30];
	32	+ return (sys_ioctl(td, (struct ioctl_args *)args));
	33	}
	34
	35	struct linux_ioctl_handler nvidia_handler = {

Lines 34-80 man/man1/nvidia-smi.1.gz Link Here

(-)x11/nvidia-driver/pkg-plist (-41 / +166 lines)
34	%%MODULESDIR%%/extensions/.nvidia/libglx.so.1	34	%%MODULESDIR%%/extensions/.nvidia/libglx.so.1
35	/%%KMODDIR%%/nvidia.ko	35	/%%KMODDIR%%/nvidia.ko
36	/%%KMODDIR%%/nvidia-modeset.ko	36	/%%KMODDIR%%/nvidia-modeset.ko
37	%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL.so.%%SHLIB_VERSION%%	37	%%LINUX%%/%%KMODDIR%%/nvidia-uvm.ko
38	%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL.so.1	38	%%LINUX%%%%LINUXBASE%%/etc/OpenCL/vendors/nvidia.icd
39	%%LINUX%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libEGL.so.1.0.0 ] \|\| ln -sf libEGL.so.1.0.0 %%LINUXBASE%%/usr/lib/libEGL.so.1	39	%%LINUX%%%%LINUXBASE%%/etc/vulkan/icd.d/nvidia_icd.json
40	%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so.%%SHLIB_VERSION%%	40	%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-bug-report.sh
41	%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so.0	41	%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-cuda-mps-control
42	%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so	42	%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-cuda-mps-server
43	%%LINUX%%%%LINUXBASE%%/usr/lib/libGL.so.%%SHLIB_VERSION%%	43	%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-debugdump
44	%%LINUX%%%%LINUXBASE%%/usr/lib/libGL.so.1	44	%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-persistenced
45	%%LINUX%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libGL.so.1.2.0 ] \|\| ln -sf libGL.so.1.2.0 %%LINUXBASE%%/usr/lib/libGL.so.1	45	%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-settings
46	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.%%SHLIB_VERSION%%	46	%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-smi
47	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.1	47	%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-xconfig
48	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so	48	%%LINUX32%%%%LINUXBASE%%/usr/lib/libEGL.so.1
49	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM_nvidia.so.1	49	%%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libEGL.so.1.0.0 ] \|\| ln -sf libEGL.so.1.0.0 %%LINUXBASE%%/usr/lib/libEGL.so.1
50	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM_nvidia.so.%%SHLIB_VERSION%%	50	%%LINUX32%%%%LINUXBASE%%/usr/lib/libEGL.so.X
51	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv2.so.%%SHLIB_VERSION%%	51	%%LINUX32%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so.0
52	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv2.so.2	52	%%LINUX32%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so.%%SHLIB_VERSION%%
53	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv2.so	53	%%LINUX32%%%%LINUXBASE%%/usr/lib/libGL.so.1
54	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv2_nvidia.so.2	54	%%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libGL.so.1.2.0 ] \|\| ln -sf libGL.so.1.2.0 %%LINUXBASE%%/usr/lib/libGL.so.1
55	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv2_nvidia.so.%%SHLIB_VERSION%%	55	%%LINUX32%%%%LINUXBASE%%/usr/lib/libGL.so.X
56	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLdispatch.so	56	%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLdispatch.so.0
57	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLdispatch.so.0	57	%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.1
58	%%LINUX%%%%LINUXBASE%%/usr/lib/libOpenGL.so	58	%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.X
59	%%LINUX%%%%LINUXBASE%%/usr/lib/libOpenGL.so.0	59	%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv1_CM_nvidia.so.1
60	%%LINUX%%%%LINUXBASE%%/usr/lib/libcuda.so.%%SHLIB_VERSION%%	60	%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv1_CM_nvidia.so.%%SHLIB_VERSION%%
61	%%LINUX%%%%LINUXBASE%%/usr/lib/libcuda.so.1	61	%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv2.so.2
62	%%LINUX%%%%LINUXBASE%%/usr/lib/libnvidia-eglcore.so.%%SHLIB_VERSION%%	62	%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv2.so.X
63	%%LINUX%%%%LINUXBASE%%/usr/lib/libnvidia-glcore.so.%%SHLIB_VERSION%%	63	%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv2_nvidia.so.2
64	%%LINUX%%%%LINUXBASE%%/usr/lib/libnvidia-glsi.so.%%SHLIB_VERSION%%	64	%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv2_nvidia.so.%%SHLIB_VERSION%%
65	%%LINUX%%%%LINUXBASE%%/usr/lib/libnvidia-tls.so.%%SHLIB_VERSION%%	65	%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLX.so
66	%%LINUX%%%%LINUXBASE%%/usr/lib/libvdpau.so.%%SHLIB_VERSION%%	66	%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLX.so.0
67	%%LINUX%%%%LINUXBASE%%/usr/lib/libvdpau.so.1	67	%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLX_indirect.so.0
68	%%LINUX%%%%LINUXBASE%%/usr/lib/libvdpau_nvidia.so	68	%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLX_nvidia.so.0
69	%%LINUX%%%%LINUXBASE%%/usr/lib/libvdpau_trace.so	69	%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLX_nvidia.so.%%SHLIB_VERSION%%
70	%%LINUX%%%%LINUXBASE%%/usr/lib/vdpau/libvdpau_nvidia.so.%%SHLIB_VERSION%%	70	%%LINUX32%%%%LINUXBASE%%/usr/lib/libOpenGL.so
71	%%LINUX%%%%LINUXBASE%%/usr/lib/vdpau/libvdpau_nvidia.so.1	71	%%LINUX32%%%%LINUXBASE%%/usr/lib/libOpenGL.so.0
72	%%LINUX%%%%LINUXBASE%%/usr/lib/vdpau/libvdpau_trace.so.%%SHLIB_VERSION%%	72	%%LINUX32%%%%LINUXBASE%%/usr/lib/libcuda.so
73	%%LINUX%%%%LINUXBASE%%/usr/lib/vdpau/libvdpau_trace.so.1	73	%%LINUX32%%%%LINUXBASE%%/usr/lib/libcuda.so.1
74	%%LINUX%%@postexec %%LINUXBASE%%/sbin/ldconfig -r %%LINUXBASE%%	74	%%LINUX32%%%%LINUXBASE%%/usr/lib/libcuda.so.%%SHLIB_VERSION%%
75	%%LINUX%%@postunexec %%LINUXBASE%%/sbin/ldconfig -r %%LINUXBASE%%	75	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvcuvid.so
76	%%LINUX%%@dir %%LINUXBASE%%/usr/lib/vdpau	76	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvcuvid.so.1
77	%%LINUX%%@dir %%LINUXBASE%%/usr/lib	77	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvcuvid.so.%%SHLIB_VERSION%%
		78	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-compiler.so.%%SHLIB_VERSION%%
		79	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-eglcore.so.%%SHLIB_VERSION%%
		80	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-encode.so
		81	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-encode.so.1
		82	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-encode.so.%%SHLIB_VERSION%%
		83	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fatbinaryloader.so.%%SHLIB_VERSION%%
		84	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so
		85	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so.1
		86	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so.%%SHLIB_VERSION%%
		87	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glcore.so.%%SHLIB_VERSION%%
		88	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glsi.so.%%SHLIB_VERSION%%
		89	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so
		90	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so.1
		91	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so.%%SHLIB_VERSION%%
		92	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ml.so
		93	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ml.so.1
		94	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ml.so.%%SHLIB_VERSION%%
		95	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-opencl.so.1
		96	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-opencl.so.%%SHLIB_VERSION%%
		97	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ptxjitcompiler.so
		98	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ptxjitcompiler.so.1
		99	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ptxjitcompiler.so.%%SHLIB_VERSION%%
		100	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-tls.so.%%SHLIB_VERSION%%
		101	%%LINUX32%%%%LINUXBASE%%/usr/lib/libvdpau_nvidia.so.%%SHLIB_VERSION%%
		102	%%LINUX32%%%%LINUXBASE%%/usr/lib/tls/libnvidia-tls.so.%%SHLIB_VERSION%%
		103	%%LINUX32%%%%LINUXBASE%%/usr/lib/vdpau/libvdpau_nvidia.so.1
		104	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.1
		105	%%LINUX%%@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.1.0.0 ] \|\| ln -sf libEGL.so.1.0.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.1
		106	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.X
		107	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL_nvidia.so.0
		108	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL_nvidia.so.%%SHLIB_VERSION%%
		109	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1
		110	%%LINUX%%@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1.2.0 ] \|\| ln -sf libGL.so.1.2.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1
		111	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.X
		112	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLdispatch.so.0
		113	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM.so.1
		114	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM.so.X
		115	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM_nvidia.so.1
		116	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM_nvidia.so.%%SHLIB_VERSION%%
		117	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2.so.2
		118	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2.so.X
		119	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2_nvidia.so.2
		120	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2_nvidia.so.%%SHLIB_VERSION%%
		121	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX.so
		122	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX.so.0
		123	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX_indirect.so.0
		124	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX_nvidia.so.0
		125	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX_nvidia.so.%%SHLIB_VERSION%%
		126	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libOpenGL.so
		127	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libOpenGL.so.0
		128	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libXvMCNVIDIA.so.%%SHLIB_VERSION%%
		129	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libXvMCNVIDIA_dynamic.so
		130	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libXvMCNVIDIA_dynamic.so.1
		131	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libcuda.so
		132	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libcuda.so.1
		133	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libcuda.so.%%SHLIB_VERSION%%
		134	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvcuvid.so
		135	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvcuvid.so.1
		136	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvcuvid.so.%%SHLIB_VERSION%%
		137	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-cfg.so
		138	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-cfg.so.1
		139	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-cfg.so.%%SHLIB_VERSION%%
		140	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-compiler.so.%%SHLIB_VERSION%%
		141	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-wayland.so.1
142	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-wayland.so.X
143	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-eglcore.so.%%SHLIB_VERSION%%
144	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so
145	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so.1
146	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so.%%SHLIB_VERSION%%
147	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fatbinaryloader.so.%%SHLIB_VERSION%%
148	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so
149	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.1
150	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.%%SHLIB_VERSION%%
151	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glcore.so.%%SHLIB_VERSION%%
152	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glsi.so.%%SHLIB_VERSION%%
153	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk2.so.%%SHLIB_VERSION%%
154	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk3.so.%%SHLIB_VERSION%%
155	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ifr.so
156	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ifr.so.1
157	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ifr.so.%%SHLIB_VERSION%%
158	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ml.so
159	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ml.so.1
160	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ml.so.%%SHLIB_VERSION%%
161	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-opencl.so.1
162	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-opencl.so.%%SHLIB_VERSION%%
163	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ptxjitcompiler.so
164	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ptxjitcompiler.so.1
165	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ptxjitcompiler.so.%%SHLIB_VERSION%%
166	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-tls.so.%%SHLIB_VERSION%%
167	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libvdpau_nvidia.so.%%SHLIB_VERSION%%
168	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/tls/libnvidia-tls.so.%%SHLIB_VERSION%%
169	%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/vdpau/libvdpau_nvidia.so.1
170	%%LINUX%%%%LINUXBASE%%/usr/share/egl/egl_external_platform.d/10_nvidia_wayland.json
171	%%LINUX%%%%LINUXBASE%%/usr/share/glvnd/egl_vendor.d/10_nvidia.json
172	%%LINUX%%%%LINUXBASE%%/usr/share/man/man1/nvidia-cuda-mps-control.1.gz
173	%%LINUX%%%%LINUXBASE%%/usr/share/man/man1/nvidia-persistenced.1.gz
174	%%LINUX%%%%LINUXBASE%%/usr/share/man/man1/nvidia-settings.1.gz
175	%%LINUX%%%%LINUXBASE%%/usr/share/man/man1/nvidia-smi.1.gz
176	%%LINUX%%%%LINUXBASE%%/usr/share/man/man1/nvidia-xconfig.1.gz
177	%%LINUX%%%%LINUXBASE%%/usr/share/nvidia/monitoring.conf
178	%%LINUX%%%%LINUXBASE%%/usr/share/nvidia/nvidia-application-profiles-%%SHLIB_VERSION%%-key-documentation
179	%%LINUX%%%%LINUXBASE%%/usr/share/nvidia/nvidia-application-profiles-%%SHLIB_VERSION%%-rc
180	%%LINUX%%%%LINUXBASE%%/usr/share/nvidia/pci.ids
181	%%LINUX%%@postexec %%LINUXBASE%%/sbin/ldconfig
182	%%LINUX%%@postunexec %%LINUXBASE%%/sbin/ldconfig
183	%%LINUX%%@dir %%LINUXBASE%%/etc/OpenCL/vendors
184	%%LINUX%%@dir %%LINUXBASE%%/etc/OpenCL
185	%%LINUX%%@dir %%LINUXBASE%%/etc/vulkan/icd.d
186	%%LINUX%%@dir %%LINUXBASE%%/etc/vulkan
187	%%LINUX%%@dir %%LINUXBASE%%/etc
188	%%LINUX%%@dir %%LINUXBASE%%/usr/bin
189	%%LINUX32%%@dir %%LINUXBASE%%/usr/lib/tls
190	%%LINUX32%%@dir %%LINUXBASE%%/usr/lib/vdpau
191	%%LINUX32%%@dir %%LINUXBASE%%/usr/lib
192	%%LINUX%%@dir %%LINUXBASE%%%%LINUX_LIBDIR%%/tls
193	%%LINUX%%@dir %%LINUXBASE%%%%LINUX_LIBDIR%%/vdpau
194	%%LINUX%%@dir %%LINUXBASE%%%%LINUX_LIBDIR%%
195	%%LINUX%%@dir %%LINUXBASE%%/usr/share/egl/egl_external_platform.d
196	%%LINUX%%@dir %%LINUXBASE%%/usr/share/egl
197	%%LINUX%%@dir %%LINUXBASE%%/usr/share/glvnd/egl_vendor.d
198	%%LINUX%%@dir %%LINUXBASE%%/usr/share/glvnd
199	%%LINUX%%@dir %%LINUXBASE%%/usr/share/man/man1
200	%%LINUX%%@dir %%LINUXBASE%%/usr/share/man
201	%%LINUX%%@dir %%LINUXBASE%%/usr/share/nvidia
202	%%LINUX%%@dir %%LINUXBASE%%/usr/share
78	%%LINUX%%@dir %%LINUXBASE%%/usr	203	%%LINUX%%@dir %%LINUXBASE%%/usr
79	%%LINUX%%@dir %%LINUXBASE%%	204	%%LINUX%%@dir %%LINUXBASE%%
80	%%LINUX%%@dir /compat	205	%%LINUX%%@dir /compat