Attachment #312529 for bug #413461

View | Details | Raw Unified | Return to bug 413461
Collapse All | Expand All




IUSE="acpi custom-cflags multilib kernel_FreeBSD kernel_linux +tools"
--

COMMON="<x11-base/xorg-server-1.12.99
		    >=app-admin/eselect-opengl-1.0.9 )
--

	>=app-admin/eselect-opengl-1.0.9

	x11-libs/libXvMC
--

PDEPEND=">=x11-libs/libvdpau-0.3-r1"
--

	# Xorg DDX driver
	insinto /usr/$(get_libdir)/xorg/modules/drivers
	doins ${NV_X11_DRV}/nvidia_drv.so || die "failed to install nvidia_drv.so"

	# Xorg GLX driver
	insinto /usr/$(get_libdir)/opengl/nvidia/extensions
	doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \
		die "failed to install libglx.so"
	dosym libglx.so.${NV_SOVER} \
		/usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \
		die "failed to create libglx.so symlink"

	# XvMC driver
	dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
		die "failed to install libXvMCNVIDIA.so"
	dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \
		die "failed to install libXvMCNVIDIA.so"
	dosym libXvMCNVIDIA.so.${NV_SOVER} \
		/usr/$(get_libdir)/libXvMCNVIDIA.so.1 || \
		die "failed to create libXvMCNVIDIA.so symlink"
	dosym libXvMCNVIDIA.so.1 /usr/$(get_libdir)/libXvMCNVIDIA.so || \
		die "failed to create libXvMCNVIDIA.so symlink"
	dosym libXvMCNVIDIA.so.${NV_SOVER} \
		/usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \
		die "failed to create libXvMCNVIDIA_dynamic.so symlink"
			/usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \
			die "failed to create libXvMCNVIDIA_dynamic.so symlink"
	fi
--

	# nvidia-xconfig is only needed when X use flag is set
	# nvidia-settings dropped completely, as it ships in separate package

	doexe ${NV_EXEC}/nvidia-xconfig || die
	use kernel_linux && { doexe ${NV_EXEC}/nvidia-debugdump || die ; }
	if use tools; then
		doexe ${NV_EXEC}/nvidia-settings || die

		doexe ${NV_EXEC}/nvidia-debugdump || die

	# Desktop entries for nvidia-settings
	if use tools && use kernel_linux ; then
		sed -e 's:__UTILS_PATH__:/opt/bin:' \
			-e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \
			-i "${NV_EXEC}/nvidia-settings.desktop"
		newmenu ${NV_EXEC}/nvidia-settings.desktop nvidia-settings-opt.desktop
	fi

	doicon ${NV_EXEC}/nvidia-settings.png


	# The GLX libraries
	donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover}
	donvidia /usr/${inslibdir} ${libdir}/libnvidia-glcore.so ${sover}
	if use kernel_FreeBSD; then
		donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover}
	else
		donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover}
		else
			donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover}
		fi
	
		# VDPAU
		donvidia /usr/${inslibdir} ${libdir}/libvdpau_nvidia.so ${sover}
--

	# VDPAU
	donvidia /usr/${inslibdir} ${libdir}/libvdpau_nvidia.so ${sover}


	# Switch to the nvidia implementation
	"${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
		"${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
	fi
--

	elog "This ebuild installs a kernel module and X driver. Both must"
	elog "match explicitly in their version. This means, if you restart"
	elog "X, you must modprobe -r nvidia before starting it back up"
	elog "before starting it back up"
--

	if ! use tools; then
		elog "USE=tools controls whether the nvidia-settings application"
		elog "is installed. If you would like to use it, enable that"
		elog "flag and re-emerge this ebuild. Optionally you can install"
		elog "media-video/nvidia-settings"
	fi
	elog "scenarios."
--

Return to bug 413461

Line 24 Link Here

(-)file_not_specified_in_diff (-76 / +65 lines)
24	IUSE="+X acpi custom-cflags multilib kernel_FreeBSD kernel_linux"	24	IUSE="acpi custom-cflags multilib kernel_FreeBSD kernel_linux +tools"
25	--
Lines 28-29 Link Here
28	COMMON="X? ( <x11-base/xorg-server-1.12.99	28	COMMON="<x11-base/xorg-server-1.12.99
29	>=app-admin/eselect-opengl-1.0.9 )
30	--
Line 32 Link Here
		31	>=app-admin/eselect-opengl-1.0.9
Line 36 Link Here
36	X? ( x11-libs/libXvMC )	36	x11-libs/libXvMC
37	--
Line 38 Link Here
38	PDEPEND="X? ( >=x11-libs/libvdpau-0.3-r1 )"	38	PDEPEND=">=x11-libs/libvdpau-0.3-r1"
39	--
Lines 390-417 Link Here
390	# Install Xorg drivers on demand, bug #413461	390	# Xorg DDX driver
391	if use X; then	391	insinto /usr/$(get_libdir)/xorg/modules/drivers
392	# Xorg DDX driver	392	doins ${NV_X11_DRV}/nvidia_drv.so \|\| die "failed to install nvidia_drv.so"
393	insinto /usr/$(get_libdir)/xorg/modules/drivers	393
394	doins ${NV_X11_DRV}/nvidia_drv.so \|\| die "failed to install nvidia_drv.so"	394	# Xorg GLX driver
395		395	insinto /usr/$(get_libdir)/opengl/nvidia/extensions
396	# Xorg GLX driver	396	doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} \|\| \
397	insinto /usr/$(get_libdir)/opengl/nvidia/extensions	397	die "failed to install libglx.so"
398	doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} \|\| \	398	dosym libglx.so.${NV_SOVER} \
399	die "failed to install libglx.so"	399	/usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so \|\| \
400	dosym libglx.so.${NV_SOVER} \	400	die "failed to create libglx.so symlink"
401	/usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so \|\| \	401
402	die "failed to create libglx.so symlink"	402	# XvMC driver
403		403	dolib.a ${NV_X11}/libXvMCNVIDIA.a \|\| \
404	# XvMC driver	404	die "failed to install libXvMCNVIDIA.so"
405	dolib.a ${NV_X11}/libXvMCNVIDIA.a \|\| \	405	dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} \|\| \
406	die "failed to install libXvMCNVIDIA.so"	406	die "failed to install libXvMCNVIDIA.so"
407	dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} \|\| \	407	dosym libXvMCNVIDIA.so.${NV_SOVER} \
408	die "failed to install libXvMCNVIDIA.so"	408	/usr/$(get_libdir)/libXvMCNVIDIA.so.1 \|\| \
409	dosym libXvMCNVIDIA.so.${NV_SOVER} \	409	die "failed to create libXvMCNVIDIA.so symlink"
410	/usr/$(get_libdir)/libXvMCNVIDIA.so.1 \|\| \	410	dosym libXvMCNVIDIA.so.1 /usr/$(get_libdir)/libXvMCNVIDIA.so \|\| \
411	die "failed to create libXvMCNVIDIA.so symlink"	411	die "failed to create libXvMCNVIDIA.so symlink"
412	dosym libXvMCNVIDIA.so.1 /usr/$(get_libdir)/libXvMCNVIDIA.so \|\| \	412	dosym libXvMCNVIDIA.so.${NV_SOVER} \
413	die "failed to create libXvMCNVIDIA.so symlink"	413	/usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 \|\| \
414	dosym libXvMCNVIDIA.so.${NV_SOVER} \	414	die "failed to create libXvMCNVIDIA_dynamic.so symlink"
415	/usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 \|\| \
416	die "failed to create libXvMCNVIDIA_dynamic.so symlink"
417	fi
418	--
Lines 441-442 Link Here
441	# nvidia-xconfig is only needed when X use flag is set
442	# nvidia-settings dropped completely, as it ships in separate package
Lines 444-445 Link Here
444	if use X; then	439	doexe ${NV_EXEC}/nvidia-xconfig \|\| die
445	doexe ${NV_EXEC}/nvidia-xconfig \|\| die	440	use kernel_linux && { doexe ${NV_EXEC}/nvidia-debugdump \|\| die ; }
446	--	441	if use tools; then
		442	doexe ${NV_EXEC}/nvidia-settings \|\| die
Line 450 Link Here
450	doexe ${NV_EXEC}/nvidia-debugdump \|\| die
Line 453 Link Here
		449	# Desktop entries for nvidia-settings
		450	if use tools && use kernel_linux ; then
		451	sed -e 's:__UTILS_PATH__:/opt/bin:' \
		452	-e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \
		453	-i "${NV_EXEC}/nvidia-settings.desktop"
		454	newmenu ${NV_EXEC}/nvidia-settings.desktop nvidia-settings-opt.desktop
		455	fi
		456
		457	doicon ${NV_EXEC}/nvidia-settings.png
		458
Lines 501-513 Link Here
501	# Xorg libraries are only needed when X flag is set, bug #413461	507	# The GLX libraries
502	if use X; then	508	donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover}
503	# The GLX libraries	509	donvidia /usr/${inslibdir} ${libdir}/libnvidia-glcore.so ${sover}
504	donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover}	510	if use kernel_FreeBSD; then
505	donvidia /usr/${inslibdir} ${libdir}/libnvidia-glcore.so ${sover}	511	donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover}
506	if use kernel_FreeBSD; then	512	else
507	donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover}	513	donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover}
508	else
509	donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover}
510	fi
511
512	# VDPAU
513	donvidia /usr/${inslibdir} ${libdir}/libvdpau_nvidia.so ${sover}
514	--
Line 516 Link Here
		516	# VDPAU
		517	donvidia /usr/${inslibdir} ${libdir}/libvdpau_nvidia.so ${sover}
		518
Lines 542-545 Link Here
542	# Switch to the nvidia implementation only if X is set	545	# Switch to the nvidia implementation
543	if use X; then	546	"${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
544	"${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
545	fi
546	--
Lines 554-557 Link Here
554	elog "This ebuild installs a kernel module and X driver (if X flag"	555	elog "This ebuild installs a kernel module and X driver. Both must"
555	elog "is set). Both must match explicitly in their version."	556	elog "match explicitly in their version. This means, if you restart"
556	elog "This means, if you restart X, you must modprobe -r nvidia"	557	elog "X, you must modprobe -r nvidia before starting it back up"
557	elog "before starting it back up"
558	--
Lines 572-578 Link Here
572	elog "nvidia-settings is now shipped within media-video/nvidia-settings"	572	if ! use tools; then
573	elog	573	elog "USE=tools controls whether the nvidia-settings application"
574		574	elog "is installed. If you would like to use it, enable that"
575	elog "USE=X controls whether the Xorg drivers are installed."	575	elog "flag and re-emerge this ebuild. Optionally you can install"
576	elog "Having this flag unset prevents from pulling Xorg"	576	elog "media-video/nvidia-settings"
577	elog "dependencies, which might be desired on several usage"	577	fi
578	elog "scenarios."
579	--