[patch] Diff between nvidia-drivers-295.49 and X-flag enabled ebuilds

patch (text/plain), 5.70 KB, created by Amir Aupov on 2012-05-21 14:50:34 UTC

24c24
< IUSE="+X acpi custom-cflags multilib kernel_FreeBSD kernel_linux"
---
> IUSE="acpi custom-cflags multilib kernel_FreeBSD kernel_linux +tools"
28,29c28
< COMMON="X? ( <x11-base/xorg-server-1.12.99
< 		    >=app-admin/eselect-opengl-1.0.9 )
---
> COMMON="<x11-base/xorg-server-1.12.99
31a31
> 	>=app-admin/eselect-opengl-1.0.9
36c36
< 	X? ( x11-libs/libXvMC )
---
> 	x11-libs/libXvMC
38c38
< PDEPEND="X? ( >=x11-libs/libvdpau-0.3-r1 )"
---
> PDEPEND=">=x11-libs/libvdpau-0.3-r1"
390,417c390,414
< 	# Install Xorg drivers on demand, bug #413461
< 	if use X; then
< 		# 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"
< 	fi
---
> 	# 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"
441,442d437
< 	# nvidia-xconfig is only needed when X use flag is set
< 	# nvidia-settings dropped completely, as it ships in separate package
444,445c439,442
< 	if use X; then
< 		doexe ${NV_EXEC}/nvidia-xconfig || die
---
> 	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
450d446
< 		doexe ${NV_EXEC}/nvidia-debugdump || die
452a449,458
> 	# 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
> 
501,513c507,513
< 	# Xorg libraries are only needed when X flag is set, bug #413461
< 	if use X; then
< 		# 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}
< 		fi
< 	
< 		# VDPAU
< 		donvidia /usr/${inslibdir} ${libdir}/libvdpau_nvidia.so ${sover}
---
> 	# 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}
515a516,518
> 	# VDPAU
> 	donvidia /usr/${inslibdir} ${libdir}/libvdpau_nvidia.so ${sover}
> 
542,545c545,546
< 	# Switch to the nvidia implementation only if X is set
< 	if use X; then 
< 		"${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
< 	fi
---
> 	# Switch to the nvidia implementation
> 	"${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
554,557c555,557
< 	elog "This ebuild installs a kernel module and X driver (if X flag"
< 	elog "is set). Both must match explicitly in their version." 
< 	elog "This means, if you restart X, you must modprobe -r nvidia"
< 	elog "before starting it back up"
---
> 	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"
572,578c572,577
< 	elog "nvidia-settings is now shipped within media-video/nvidia-settings"
< 	elog 
< 
< 	elog "USE=X controls whether the Xorg drivers are installed."
< 	elog "Having this flag unset prevents from pulling Xorg"
< 	elog "dependencies, which might be desired on several usage"
< 	elog "scenarios."
---
> 	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