
Code: Select all
cp /usr/portage/x11-drivers/nvidia-drivers/files/* /usr/local/portage/x11-drivers/nvidia-drivers/files/Code: Select all
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
inherit eutils multilib versionator linux-mod
X86_PKG_V="pkg1"
AMD64_PKG_V="pkg2"
NV_V="${PV/1.0./1.0-}"
X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${NV_V}"
DESCRIPTION="NVIDIA X11 driver and GLX libraries"
HOMEPAGE="http://www.nvidia.com/"
SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )
x86-fbsd? ( http://download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
LICENSE="NVIDIA"
SLOT="0"
KEYWORDS="-* amd64 x86 ~x86-fbsd"
IUSE="dlloader"
RESTRICT="nostrip multilib-pkg-force"
DEPEND="kernel_linux? ( virtual/linux-sources )"
RDEPEND="kernel_linux? ( virtual/modutils )
|| ( x11-base/xorg-server virtual/x11 )
|| ( media-libs/mesa virtual/x11 )
app-admin/eselect-opengl
kernel_linux? ( !media-video/nvidia-kernel )
kernel_FreeBSD? ( !media-video/nvidia-freebsd )
!app-emulation/emul-linux-x86-nvidia
!x11-drivers/nvidia-legacy-drivers
!media-video/nvidia-glx"
PROVIDE="virtual/opengl"
export _POSIX2_VERSION="199209"
if use x86; then
PKG_V="-${X86_PKG_V}"
NV_PACKAGE="${X86_NV_PACKAGE}"
elif use amd64; then
PKG_V="-${AMD64_PKG_V}"
NV_PACKAGE="${AMD64_NV_PACKAGE}"
elif use x86-fbsd; then
PKG_V=""
NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
fi
S="${WORKDIR}/${NV_PACKAGE}${PKG_V}/usr/src/nv"
# On BSD userland it wants real make command
MAKE="make"
mtrr_check() {
ebegin "Checking for MTRR support"
linux_chkconfig_present MTRR
eend $?
if [[ $? -ne 0 ]] ; then
eerror "This version needs MTRR support for most chipsets!"
eerror "Please enable MTRR support in your kernel config, found at:"
eerror
eerror " Processor type and features"
eerror " [*] MTRR (Memory Type Range Register) support"
eerror
eerror "and recompile your kernel ..."
die "MTRR support not detected!"
fi
}
pkg_setup() {
if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then
eerror "This ebuild doesn't currently support changing your default abi."
die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
fi
if ! use x86-fbsd; then
linux-mod_pkg_setup
MODULE_NAMES="nvidia(video:${S})"
BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
mtrr_check
fi
}
src_unpack() {
local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA-${PV}"
if ! use x86-fbsd; then
if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
echo
ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
ewarn "This is not officially supported for ${P}. It is likely you"
ewarn "will not be able to compile or use the kernel module."
ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
echo
ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
fi
fi
if ! use x86-fbsd; then
cd ${WORKDIR}
bash ${DISTDIR}/${NV_PACKAGE}${PKG_V}.run --extract-only
else
unpack ${A}
fi
# Patches go below here, add breif description
use x86-fbsd \
&& cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}/doc" \
|| cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}"
# Use the correct defines to make gtkglext build work
#epatch ${FILESDIR}/NVIDIA_glx-defines.patch
# Use some more sensible gl headers and make way for new glext.h
#epatch ${FILESDIR}/NVIDIA_glx-glheader.patch
if ! use x86-fbsd; then
# Zander kernel patches
#epatch ${NV_PATCH_PREFIX}-U062606.diff
# Quiet down warnings the user do not need to see
sed -i \
-e 's:-Wpointer-arith::g' \
-e 's:-Wsign-compare::g' \
${S}/Makefile.kbuild
# If you set this then it's your own fault when stuff breaks :)
[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
# If greater than 2.6.5 use M= instead of SUBDIR=
cd ${S}; convert_to_m Makefile.kbuild
fi
}
src_compile() {
# This is already the default on Linux, as there's no toplevel Makefile, but
# on FreeBSD there's one and triggers the kernel module build, as we install
# it by itself, pass this.
if use x86-fbsd; then
cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}/src"
MAKE="$(get_bmake)" emake CC="$(tc-getCC)" LD="$(tc-getLD)"
else
linux-mod_src_compile
fi
}
src_install() {
local MLTEST=$(type dyn_unpack)
cd ${WORKDIR}/${NV_PACKAGE}${PKG_V}
if ! use x86-fbsd; then
linux-mod_src_install
# Add the aliases
sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
insinto /etc/modules.d
newins ${WORKDIR}/nvidia nvidia
else
insinto /boot/modules
doins "${WORKDIR}/${X86_FBSD_NV_PACKAGE}/src/nvidia.kld"
exeinto /boot/modules
doexe "${WORKDIR}/${X86_FBSD_NV_PACKAGE}/src/nvidia.ko"
fi
if [[ "${MLTEST/set_abi}" == "${MLTEST}" ]] && has_multilib_profile ; then
local OABI=${ABI}
for ABI in $(get_install_abis) ; do
src_install-libs
done
ABI=${OABI}
unset OABI
elif use amd64 ; then
src_install-libs lib32 $(get_multilibdir)
src_install-libs lib $(get_libdir)
rm -rf ${D}/usr/$(get_multilibdir)/opengl/nvidia/include
rm -rf ${D}/usr/$(get_multilibdir)/opengl/nvidia/extensions
else
src_install-libs
fi
is_final_abi || return 0
if ! use x86-fbsd; then
# Docs, remove nvidia-settings as provided by media-video/nvidia-settings
newdoc usr/share/doc/README.txt README
dodoc usr/share/doc/Copyrights usr/share/doc/NVIDIA_Changelog
dodoc usr/share/doc/XF86Config.sample
dohtml usr/share/doc/html/*
else
dodoc doc/README doc/README.Linux doc/XF86Config.sample
fi
# nVidia want bug reports using this script
exeinto /usr/bin
doexe usr/bin/nvidia-bug-report.sh
}
# Install nvidia library:
# the first parameter is the place where to install it
# the second paramis the base name of the library
# the third parameter is the provided soversion
donvidia() {
dodir $1
exeinto $1
libname=$(basename $2)
doexe $2.$3
dosym ${libname}.$3 $1/${libname}
[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
}
src_install-libs() {
local pkglibdir=lib
local inslibdir=$(get_libdir)
if [[ ${#} -eq 2 ]] ; then
pkglibdir=${1}
inslibdir=${2}
elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
pkglibdir=lib32
fi
local usrpkglibdir=usr/${pkglibdir}
local libdir=usr/X11R6/${pkglibdir}
local drvdir=${libdir}/modules/drivers
local extdir=${libdir}/modules/extensions
local incdir=usr/include/GL
local sover=${PV}
local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
local NO_TLS_ROOT="${NV_ROOT}/no-tls"
local TLS_ROOT="${NV_ROOT}/tls"
local X11_LIB_DIR="/usr/${inslibdir}/xorg"
if ! has_version x11-base/xorg-server ; then
X11_LIB_DIR="/usr/${inslibdir}"
fi
if use x86-fbsd; then
# on FreeBSD everything is on obj/
pkglibdir=obj
usrpkglibdir=obj
x11pkglibdir=obj
drvdir=obj
extdir=obj
# don't ask me why the headers are there.. glxext.h is missing
incdir=doc
# on FreeBSD it has just .1 suffix
sover=1
fi
# The GLX libraries
donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover}
donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover}
dodir ${NO_TLS_ROOT}
donvidia ${NO_TLS_ROOT} ${usrpkglibdir}/libnvidia-tls.so ${sover}
if ! use x86-fbsd; then
donvidia ${TLS_ROOT} ${usrpkglibdir}/tls/libnvidia-tls.so ${sover}
fi
if want_tls ; then
dosym ../tls/libnvidia-tls.so ${NV_ROOT}/lib
dosym ../tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
dosym ../tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
else
dosym ../no-tls/libnvidia-tls.so ${NV_ROOT}/lib
dosym ../no-tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
dosym ../no-tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
fi
if ! use x86-fbsd; then
# Not sure whether installing the .la file is neccessary;
# this is adopted from the `nvidia' ebuild
local ver1=$(get_version_component_range 1)
local ver2=$(get_version_component_range 2)
local ver3=$(get_version_component_range 3)
sed -e "s:\${PV}:${PV}:" \
-e "s:\${ver1}:${ver1}:" \
-e "s:\${ver2}:${ver2}:" \
-e "s:\${ver3}:${ver3}:" \
-e "s:\${libdir}:${inslibdir}:" \
${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la
fi
exeinto ${X11_LIB_DIR}/modules/drivers
if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" ||
has_version "x11-base/xorg-server"; then
[[ -f ${drvdir}/nvidia_drv.so ]] && \
doexe ${drvdir}/nvidia_drv.so
else
[[ -f ${drvdir}/nvidia_drv.o ]] && \
doexe ${drvdir}/nvidia_drv.o
fi
insinto /usr/${inslibdir}
[[ -f ${libdir}/libXvMCNVIDIA.a ]] && \
doins ${libdir}/libXvMCNVIDIA.a
exeinto /usr/${inslibdir}
# fix Bug 131315
[[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \
doexe ${libdir}/libXvMCNVIDIA.so.${PV} && \
dosym /usr/${inslibdir}/libXvMCNVIDIA.so.${PV} \
/usr/${inslibdir}/libXvMCNVIDIA.so
exeinto ${NV_ROOT}/extensions
[[ -f ${extdir}/libglx.so.${sover} ]] && \
newexe ${extdir}/libglx.so.${sover} libglx.so
# Includes
insinto ${NV_ROOT}/include
doins ${incdir}/*.h
}
pkg_preinst() {
# Can we make up our minds ?!?!?
local NV_D=${IMAGE:-${D}}
if ! has_version x11-base/xorg-server ; then
for dir in lib lib32 lib64 ; do
if [[ -d ${NV_D}/usr/${dir}/xorg ]] ; then
mv ${NV_D}/usr/${dir}/xorg/* ${NV_D}/usr/${dir}
rmdir ${NV_D}/usr/${dir}/xorg
fi
done
fi
# Clean the dinamic libGL stuff's home to ensure
# we dont have stale libs floating around
if [[ -d ${ROOT}/usr/lib/opengl/nvidia ]] ; then
rm -rf ${ROOT}/usr/lib/opengl/nvidia/*
fi
# Make sure we nuke the old nvidia-glx's env.d file
if [[ -e ${ROOT}/etc/env.d/09nvidia ]] ; then
rm -f ${ROOT}/etc/env.d/09nvidia
fi
}
pkg_postinst() {
if ! use x86-fbsd; then
linux-mod_pkg_postinst
fi
#switch to the nvidia implementation
eselect opengl set --use-old nvidia
echo
einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
echo
einfo "You may also be interested in media-video/nvidia-settings"
echo
einfo "nVidia has requested that any bug reports submitted have the"
einfo "output of /usr/bin/nvidia-bug-report.sh included."
}
want_tls() {
# For uclibc or anything non glibc, return false
has_version sys-libs/glibc || return 1
# Old versions of glibc were lt/no-tls only
has_version '<sys-libs/glibc-2.3.2' && return 1
local valid_chost="true"
if use x86 ; then
case ${CHOST/-*} in
i486|i586|i686) ;;
*) valid_chost="false"
esac
fi
[[ ${valid_chost} == "false" ]] && return 1
# If we've got nptl, we've got tls
built_with_use sys-libs/glibc nptl && return 0
# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
case ${CHOST/-*} in
i486|i586) return 1 ;;
esac
fi
# These versions built linuxthreads version to support tls, too
has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0
return 1
}
pkg_postrm() {
eselect opengl set --use-old xorg-x11
}i getPaulBredbury wrote:Here's a working (on x86) ebuild
Code: Select all
host username # emerge -pv nvidia-drivers
These are the packages that would be merged, in order:
Calculating dependencies /usr/local/portage/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild: line 119: syntax error near unexpected token `&&'
/usr/local/portage/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild: line 119: ` && cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}/doc" \ '
!!! ERROR: x11-drivers/nvidia-drivers-1.0.9625 failed.
Call stack:
ebuild.sh, line 1454: Called die
!!! error sourcing ebuild
!!! If you need support, post the topmost build error, and the call stack if relevant.
aux_get(): (0) Error in x11-drivers/nvidia-drivers-1.0.9625 ebuild. (1)
Check for syntax error or corruption in the ebuild. (--debug)


It's about friggin' time they did this!!! This is the one feature that will make me want to upgrade.Gusar wrote:* Added new "TwinViewXineramaInfoOrder" X configuration option to control the order of display devices when in TwinView.


Code: Select all
diff -ru usr/src/nv/nv-i2c.c usr/src/nv.NOSMBUS/nv-i2c.c
--- usr/src/nv/nv-i2c.c 2006-09-15 01:10:17.000000000 +0200
+++ usr/src/nv.NOSMBUS/nv-i2c.c 2006-09-22 21:56:17.259789750 +0200
@@ -138,11 +138,7 @@
static u32 nv_i2c_algo_functionality(struct i2c_adapter *adap)
{
- return (I2C_FUNC_I2C |
- I2C_FUNC_SMBUS_QUICK |
- I2C_FUNC_SMBUS_BYTE |
- I2C_FUNC_SMBUS_BYTE_DATA |
- I2C_FUNC_SMBUS_WORD_DATA);
+ return I2C_FUNC_I2C;
}
static struct i2c_algorithm nv_i2c_algo = {
Code: Select all
Section "Screen"
Identifier "Screen0"
Device "Device0"
Monitor "Monitor0"
DefaultDepth 24
Option "RenderAccel" "True"
Option "NoRenderExtension" "False"
Option "AllowGLXWithComposite" "True"
Option "UseEdidFreqs" "True"
Option "AddARGBGLXVisuals" "True"
Option "SLI" "Auto"
Option "Coolbits" "1"
Option "HWCursor" "1"
Option "DPI" "96 x 96"
Option "CursorShadow" "true"
Option "CursorShadowAlpha" "100"
Option "CursorShadowXOffset" "4"
Option "CursorShadowYOffset" "2"
SubSection "Display"
Depth 24
Modes "1280x1024" "1024x768" "800x600" "640x480"
EndSubSection
EndSection
Code: Select all
econf --with-gl-libs="-Wl,-R/usr/$(get_libdir)/opengl/xorg-x11/lib/ -lGL" \
Brilliant! That fixes my problem. Finally I can use aiglx at homeGergan Penkov wrote:well this could be the reason, it seems that this line is still there:at least in the official compiz and probably in xgl-coffee, which was ok so long there was no official support for them in the binary drivers, but now probably leads to this (try removing --with-gl-libs=.... and rebuilding against nvidia).Code: Select all
econf --with-gl-libs="-Wl,-R/usr/$(get_libdir)/opengl/xorg-x11/lib/ -lGL" \
Code: Select all
ldd `which compiz`Code: Select all
oddfox@gentz ~ $ ldd `which compiz`
libpng12.so.0 => /usr/lib/libpng12.so.0 (0x00002acffefa9000)
libz.so.1 => /lib/libz.so.1 (0x00002acfff0cc000)
libXcomposite.so.1 => /usr/lib/libXcomposite.so.1 (0x00002acfff1e0000)
libXdamage.so.1 => /usr/lib/libXdamage.so.1 (0x00002acfff2e3000)
libXfixes.so.3 => /usr/lib/libXfixes.so.3 (0x00002acfff3e5000)
libXrandr.so.2 => /usr/lib/libXrandr.so.2 (0x00002acfff4ea000)
libXrender.so.1 => /usr/lib/libXrender.so.1 (0x00002acfff5ee000)
libXinerama.so.1 => /usr/lib/libXinerama.so.1 (0x00002acfff6f7000)
libXext.so.6 => /usr/lib/libXext.so.6 (0x00002acfff7f9000)
libstartup-notification-1.so.0 => /usr/lib/libstartup-notification-1.so.0 (0x00002acfff90b000)
libSM.so.6 => /usr/lib/libSM.so.6 (0x00002acfffa14000)
libICE.so.6 => /usr/lib/libICE.so.6 (0x00002acfffb1e000)
libX11.so.6 => /usr/lib/libX11.so.6 (0x00002acfffc3a000)
libXau.so.6 => /usr/lib/libXau.so.6 (0x00002acfffe43000)
libXdmcp.so.6 => /usr/lib/libXdmcp.so.6 (0x00002acffff46000)
libdl.so.2 => /lib/libdl.so.2 (0x00002ad00004c000)
libm.so.6 => /lib/libm.so.6 (0x00002ad000150000)
libc.so.6 => /lib/libc.so.6 (0x00002ad0002a5000)
/lib64/ld-linux-x86-64.so.2 (0x00002acffee8d000)Can you post the line you used in the ebuild to apply the patch.OddFox wrote:Works fine for me after making sure the custom ebuild uses the i2c patch
Code: Select all
# Use the correct defines to make gtkglext build work
#epatch ${FILESDIR}/NVIDIA_glx-defines.patch
# Use some more sensible gl headers and make way for new glext.h
#epatch ${FILESDIR}/NVIDIA_glx-glheader.patch
Code: Select all
# Use the correct defines to make gtkglext build work
#epatch ${FILESDIR}/NVIDIA_glx-defines.patch
# Use some more sensible gl headers and make way for new glext.h
#epatch ${FILESDIR}/NVIDIA_glx-glheader.patch
# i2c bug in the latest drivers (1.0.9625)
epatch ${FILESDIR}/NVIDIA_i2c.patch
Exactly what I have and fails. Very strange.OddFox wrote:Find the section in the nvidia-drivers ebuild that looks like this:
And change it to look like this:Code: Select all
# Use the correct defines to make gtkglext build work #epatch ${FILESDIR}/NVIDIA_glx-defines.patch # Use some more sensible gl headers and make way for new glext.h #epatch ${FILESDIR}/NVIDIA_glx-glheader.patch
Digest and merge.Code: Select all
# Use the correct defines to make gtkglext build work #epatch ${FILESDIR}/NVIDIA_glx-defines.patch # Use some more sensible gl headers and make way for new glext.h #epatch ${FILESDIR}/NVIDIA_glx-glheader.patch # i2c bug in the latest drivers (1.0.9625) epatch ${FILESDIR}/NVIDIA_i2c.patch