Attachment #585928 for bug #561706




				> "${T}"/nvidia-rmmod.conf || die
			doins "${T}"/nvidia-rmmod.conf
		fi
		if ! use X; then
			 sed -i -r 's/ nvidia-(drm|modeset)//g' "${D}"/etc/modprobe.d/nvidia-rmmod.conf || die
		fi

		# Ensures that our device nodes are created when not using X
		exeinto "$(get_udevdir)"

	# NVIDIA kernel <-> userspace driver config lib
	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}

	if use X; then
		# NVIDIA framebuffer capture library
		donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}

		# NVIDIA video encode/decode <-> CUDA
		if use kernel_linux; then
			donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
			donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
		fi

	if use X; then
		# Xorg DDX driver
		insinto /usr/$(get_libdir)/xorg/modules/drivers
		doins ${NV_X11}/nvidia_drv.so

		nv_libdir="${NV_OBJ}"/32
	fi

	# Libraries that don't depend on X11 libraries.
	local NV_LIBRARIES=(
		"libOpenCL.so.1.0.0 ${CL_ROOT}"
		"libcuda.so.${NV_SOVER}"
		"libnvidia-compiler.so.${NV_SOVER}"
		"libnvidia-fatbinaryloader.so.${NV_SOVER}"
		"libnvidia-opencl.so.${NV_SOVER}"
		"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
	)

	if use X; then
		NV_LIBRARIES=(
			"libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"
			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
			"libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"

			"libGLX.so.0 ${GL_ROOT}"
			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
			"libGLdispatch.so.0 ${GL_ROOT}"
			"libOpenCL.so.1.0.0 ${CL_ROOT}"
			"libOpenGL.so.0 ${GL_ROOT}"
			"libcuda.so.${NV_SOVER}"
			"libnvcuvid.so.${NV_SOVER}"
			"libnvidia-compiler.so.${NV_SOVER}"
			"libnvidia-eglcore.so.${NV_SOVER}"
			"libnvidia-encode.so.${NV_SOVER}"
			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
			"libnvidia-fbc.so.${NV_SOVER}"
			"libnvidia-glcore.so.${NV_SOVER}"
			"libnvidia-glsi.so.${NV_SOVER}"
			"libnvidia-glvkspirv.so.${NV_SOVER}"
			"libnvidia-ifr.so.${NV_SOVER}"
			"libnvidia-opencl.so.${NV_SOVER}"
			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
			"libvdpau_nvidia.so.${NV_SOVER}"
		)

		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
		then
			NV_LIBRARIES+=(
				"libnvidia-egl-wayland.so.1.1.2"
			)
		fi

		if use kernel_FreeBSD; then
			NV_GLX_LIBRARIES+=(
				"libnvidia-tls.so.${NV_SOVER}"
			)
		fi

		if use kernel_linux; then
			NV_GLX_LIBRARIES+=(
				"libnvidia-ml.so.${NV_SOVER}"
				"libnvidia-tls.so.${NV_SOVER}"
			)
		fi

		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
		then
			NV_LIBRARIES+=(
				"libnvidia-cbl.so.${NV_SOVER}"
				"libnvidia-rtcore.so.${NV_SOVER}"
				"libnvoptix.so.${NV_SOVER}"
			)
		fi
	fi

	if use kernel_FreeBSD; then
		NV_LIBRARIES+=(
			"libnvidia-tls.so.${NV_SOVER}"
		)
	fi

	if use kernel_linux; then
		NV_LIBRARIES+=(
			"libnvidia-ml.so.${NV_SOVER}"
			"libnvidia-tls.so.${NV_SOVER}"
		)
	fi

	for NV_LIB in "${NV_LIBRARIES[@]}"; do
		donvidia "${nv_libdir}"/${NV_LIB}
	done
}

pkg_preinst() {

Return to bug 561706

Lines 286-291 Link Here

(-)/var/portage/repos/gentoo/x11-drivers/nvidia-drivers/nvidia-drivers-430.40.ebuild (-33 / +40 lines)
286	> "${T}"/nvidia-rmmod.conf \|\| die	286	> "${T}"/nvidia-rmmod.conf \|\| die
287	doins "${T}"/nvidia-rmmod.conf	287	doins "${T}"/nvidia-rmmod.conf
288	fi	288	fi
		289	if ! use X; then
		290	sed -i -r 's/ nvidia-(drm\|modeset)//g' "${D}"/etc/modprobe.d/nvidia-rmmod.conf \|\| die
		291	fi
289		292
290	# Ensures that our device nodes are created when not using X	293	# Ensures that our device nodes are created when not using X
291	exeinto "$(get_udevdir)"	294	exeinto "$(get_udevdir)"
Lines 304-319 Link Here
304	# NVIDIA kernel <-> userspace driver config lib	307	# NVIDIA kernel <-> userspace driver config lib
305	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}	308	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
306		309
307	# NVIDIA framebuffer capture library	310	if use X; then
308	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}	311	# NVIDIA framebuffer capture library
		312	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
309		313
310	# NVIDIA video encode/decode <-> CUDA	314	# NVIDIA video encode/decode <-> CUDA
311	if use kernel_linux; then	315	if use kernel_linux; then
312	donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}	316	donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
313	donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}	317	donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
314	fi	318	fi
315		319
316	if use X; then
317	# Xorg DDX driver	320	# Xorg DDX driver
318	insinto /usr/$(get_libdir)/xorg/modules/drivers	321	insinto /usr/$(get_libdir)/xorg/modules/drivers
319	doins ${NV_X11}/nvidia_drv.so	322	doins ${NV_X11}/nvidia_drv.so
Lines 456-463 Link Here
456	nv_libdir="${NV_OBJ}"/32	459	nv_libdir="${NV_OBJ}"/32
457	fi	460	fi
458		461
		462	# Libraries that don't depend on X11 libraries.
		463	local NV_LIBRARIES=(
		464	"libOpenCL.so.1.0.0 ${CL_ROOT}"
		465	"libcuda.so.${NV_SOVER}"
		466	"libnvidia-compiler.so.${NV_SOVER}"
		467	"libnvidia-fatbinaryloader.so.${NV_SOVER}"
		468	"libnvidia-opencl.so.${NV_SOVER}"
		469	"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
		470	)
		471
459	if use X; then	472	if use X; then
460	NV_GLX_LIBRARIES=(	473	NV_LIBRARIES=(
461	"libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"	474	"libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"
462	"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"	475	"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
463	"libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"	476	"libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"
Lines 468-524 Link Here
468	"libGLX.so.0 ${GL_ROOT}"	481	"libGLX.so.0 ${GL_ROOT}"
469	"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"	482	"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
470	"libGLdispatch.so.0 ${GL_ROOT}"	483	"libGLdispatch.so.0 ${GL_ROOT}"
471	"libOpenCL.so.1.0.0 ${CL_ROOT}"
472	"libOpenGL.so.0 ${GL_ROOT}"	484	"libOpenGL.so.0 ${GL_ROOT}"
473	"libcuda.so.${NV_SOVER}"
474	"libnvcuvid.so.${NV_SOVER}"	485	"libnvcuvid.so.${NV_SOVER}"
475	"libnvidia-compiler.so.${NV_SOVER}"
476	"libnvidia-eglcore.so.${NV_SOVER}"	486	"libnvidia-eglcore.so.${NV_SOVER}"
477	"libnvidia-encode.so.${NV_SOVER}"	487	"libnvidia-encode.so.${NV_SOVER}"
478	"libnvidia-fatbinaryloader.so.${NV_SOVER}"
479	"libnvidia-fbc.so.${NV_SOVER}"	488	"libnvidia-fbc.so.${NV_SOVER}"
480	"libnvidia-glcore.so.${NV_SOVER}"	489	"libnvidia-glcore.so.${NV_SOVER}"
481	"libnvidia-glsi.so.${NV_SOVER}"	490	"libnvidia-glsi.so.${NV_SOVER}"
482	"libnvidia-glvkspirv.so.${NV_SOVER}"	491	"libnvidia-glvkspirv.so.${NV_SOVER}"
483	"libnvidia-ifr.so.${NV_SOVER}"	492	"libnvidia-ifr.so.${NV_SOVER}"
484	"libnvidia-opencl.so.${NV_SOVER}"
485	"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
486	"libvdpau_nvidia.so.${NV_SOVER}"	493	"libvdpau_nvidia.so.${NV_SOVER}"
487	)	494	)
488		495
489	if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];	496	if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
490	then	497	then
491	NV_GLX_LIBRARIES+=(	498	NV_LIBRARIES+=(
492	"libnvidia-egl-wayland.so.1.1.2"	499	"libnvidia-egl-wayland.so.1.1.2"
493	)	500	)
494	fi	501	fi
495		502
496	if use kernel_FreeBSD; then
497	NV_GLX_LIBRARIES+=(
498	"libnvidia-tls.so.${NV_SOVER}"
499	)
500	fi
501
502	if use kernel_linux; then
503	NV_GLX_LIBRARIES+=(
504	"libnvidia-ml.so.${NV_SOVER}"
505	"libnvidia-tls.so.${NV_SOVER}"
506	)
507	fi
508
509	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];	503	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
510	then	504	then
511	NV_GLX_LIBRARIES+=(	505	NV_LIBRARIES+=(
512	"libnvidia-cbl.so.${NV_SOVER}"	506	"libnvidia-cbl.so.${NV_SOVER}"
513	"libnvidia-rtcore.so.${NV_SOVER}"	507	"libnvidia-rtcore.so.${NV_SOVER}"
514	"libnvoptix.so.${NV_SOVER}"	508	"libnvoptix.so.${NV_SOVER}"
515	)	509	)
516	fi	510	fi
		511	fi
517		512
518	for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do	513	if use kernel_FreeBSD; then
519	donvidia "${nv_libdir}"/${NV_LIB}	514	NV_LIBRARIES+=(
520	done	515	"libnvidia-tls.so.${NV_SOVER}"
		516	)
		517	fi
		518
		519	if use kernel_linux; then
		520	NV_LIBRARIES+=(
		521	"libnvidia-ml.so.${NV_SOVER}"
		522	"libnvidia-tls.so.${NV_SOVER}"
		523	)
521	fi	524	fi
		525
		526	for NV_LIB in "${NV_LIBRARIES[@]}"; do
		527	donvidia "${nv_libdir}"/${NV_LIB}
		528	done
522	}	529	}
523		530
524	pkg_preinst() {	531	pkg_preinst() {