From 524de7b2545f1e02b9e591b055b5571f924c99a3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 4 Aug 2010 21:48:46 +0200 Subject: [PATCH] xf86-video-nvidia: update to NVIDIA-Linux-256.44, add metafile support Signed-off-by: Stephan Raue --- packages/x11/driver/xf86-video-nvidia/arch | 2 -- packages/x11/driver/xf86-video-nvidia/build | 5 +---- .../xf86-video-nvidia/config/xorg-nvidia.conf | 2 +- packages/x11/driver/xf86-video-nvidia/install | 16 +++++++--------- packages/x11/driver/xf86-video-nvidia/meta | 16 ++++++++++++++++ packages/x11/driver/xf86-video-nvidia/unpack | 8 ++++---- packages/x11/driver/xf86-video-nvidia/url | 2 -- 7 files changed, 29 insertions(+), 22 deletions(-) delete mode 100644 packages/x11/driver/xf86-video-nvidia/arch create mode 100644 packages/x11/driver/xf86-video-nvidia/meta delete mode 100644 packages/x11/driver/xf86-video-nvidia/url diff --git a/packages/x11/driver/xf86-video-nvidia/arch b/packages/x11/driver/xf86-video-nvidia/arch deleted file mode 100644 index 7414689203..0000000000 --- a/packages/x11/driver/xf86-video-nvidia/arch +++ /dev/null @@ -1,2 +0,0 @@ -i386 -x86_64 diff --git a/packages/x11/driver/xf86-video-nvidia/build b/packages/x11/driver/xf86-video-nvidia/build index cf7e9a9cdf..3b8056e82c 100755 --- a/packages/x11/driver/xf86-video-nvidia/build +++ b/packages/x11/driver/xf86-video-nvidia/build @@ -2,8 +2,5 @@ . config/options $1 -$SCRIPTS/build toolchain -$SCRIPTS/build linux - -cd $BUILD/$1/kernel +cd $PKG_BUILD/kernel make module CC=$CC SYSSRC=$(kernel_path) SYSOUT=$(kernel_path) diff --git a/packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf b/packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf index 9c376b26f7..70ccdf8e92 100644 --- a/packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf +++ b/packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf @@ -4,7 +4,7 @@ Section "Device" Option "ConnectToAcpid" "0" Option "UseEvents" "true" Option "TripleBuffer" "true" - Option "NvAGP" "1" +# Option "NvAGP" "1" EndSection Section "Extensions" diff --git a/packages/x11/driver/xf86-video-nvidia/install b/packages/x11/driver/xf86-video-nvidia/install index d8af9a0d5a..c2dd1ce333 100755 --- a/packages/x11/driver/xf86-video-nvidia/install +++ b/packages/x11/driver/xf86-video-nvidia/install @@ -3,29 +3,27 @@ . config/options $1 $SCRIPTS/build busybox-hosttools -$SCRIPTS/install linux -$SCRIPTS/install libXinerama VER=`ls $BUILD/linux*/modules/lib/modules` mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers - cp -P $BUILD/$1/nvidia_drv.so $INSTALL/$XORG_PATH_MODULES/drivers + cp -P $PKG_BUILD/nvidia_drv.so $INSTALL/$XORG_PATH_MODULES/drivers mkdir -p $INSTALL/$XORG_PATH_MODULES/extensions # rename to not conflicting with Mesa libGL.so - cp -P $BUILD/$1/libglx.so* $INSTALL/$XORG_PATH_MODULES/extensions/libglx_nvidia.so + cp -P $PKG_BUILD/libglx.so* $INSTALL/$XORG_PATH_MODULES/extensions/libglx_nvidia.so mkdir -p $INSTALL/etc/X11 cp $PKG_DIR/config/*.conf $INSTALL/etc/X11 mkdir -p $INSTALL/usr/lib - cp -P $BUILD/$1/libnvidia-glcore.so* $INSTALL/usr/lib - cp -P $BUILD/$1/tls/libnvidia-tls.so* $INSTALL/usr/lib + cp -P $PKG_BUILD/libnvidia-glcore.so* $INSTALL/usr/lib + cp -P $PKG_BUILD/tls/libnvidia-tls.so* $INSTALL/usr/lib # rename to not conflicting with Mesa libGL.so - cp -P $BUILD/$1/libGL.so* $INSTALL/usr/lib/libGL_nvidia.so.1 + cp -P $PKG_BUILD/libGL.so* $INSTALL/usr/lib/libGL_nvidia.so.1 mkdir -p $INSTALL/lib/modules/$VER/nvidia - cp $BUILD/$1/kernel/nvidia.ko $INSTALL/lib/modules/$VER/nvidia + cp $PKG_BUILD/kernel/nvidia.ko $INSTALL/lib/modules/$VER/nvidia for MOD in `find $INSTALL/lib/modules/$VER/nvidia -name *.ko`; do $STRIP --strip-debug $MOD @@ -39,6 +37,6 @@ mkdir -p $INSTALL/lib/modules/$VER/nvidia if [ "$VDPAU" = yes ]; then $SCRIPTS/install libvdpau - cp $BUILD/$1/libvdpau_nvidia.so* $INSTALL/usr/lib/libvdpau_nvidia.so.1 + cp $PKG_BUILD/libvdpau_nvidia.so* $INSTALL/usr/lib/libvdpau_nvidia.so.1 ln -sf libvdpau_nvidia.so.1 $INSTALL/usr/lib/libvdpau_nvidia.so fi diff --git a/packages/x11/driver/xf86-video-nvidia/meta b/packages/x11/driver/xf86-video-nvidia/meta new file mode 100644 index 0000000000..62a489e78f --- /dev/null +++ b/packages/x11/driver/xf86-video-nvidia/meta @@ -0,0 +1,16 @@ +PKG_NAME="xf86-video-nvidia" +PKG_VERSION="256.44" +PKG_REV="1" +PKG_ARCH="i386 x86_64" +PKG_LICENSE="nonfree" +PKG_SITE="http://www.nvidia.com/" +[ $TARGET_ARCH = i386 ] && PKG_URL="ftp://download.nvidia.com/XFree86/Linux-x86/$PKG_VERSION/NVIDIA-Linux-x86-$PKG_VERSION.run" +[ $TARGET_ARCH = x86_64 ] && PKG_URL="ftp://download.nvidia.com/XFree86/Linux-x86_64/$PKG_VERSION/NVIDIA-Linux-x86_64-$PKG_VERSION-no-compat32.run" +PKG_DEPENDS="linux libXinerama" +PKG_BUILD_DEPENDS="toolchain linux xorg-server" +PKG_PRIORITY="optional" +PKG_SECTION="x11/driver" +PKG_SHORTDESC="xf86-video-nvidia: The Xorg driver for NVIDIA video chips" +PKG_LONGDESC="These binary drivers provide optimized hardware acceleration of OpenGL applications via a direct-rendering X Server. AGP, PCIe, SLI, TV-out and flat panel displays are also supported. This version only supports GeForce 6xxx and higher of the Geforce GPUs plus complimentary Quadros and nforce." +PKG_IS_ADDON="no" + diff --git a/packages/x11/driver/xf86-video-nvidia/unpack b/packages/x11/driver/xf86-video-nvidia/unpack index 2c7d1a6633..7204f76d39 100755 --- a/packages/x11/driver/xf86-video-nvidia/unpack +++ b/packages/x11/driver/xf86-video-nvidia/unpack @@ -7,14 +7,14 @@ require_eglibc $1 NV_ARCH=x86 [ "$TARGET_ARCH" = x86_64 ] && NV_ARCH=x86_64 -NV_PKG="`grep $NV_ARCH- $PKG_DIR/url | sed 's%.*/\(.*\)$%\1%'`" -[ -d $BUILD/$1 ] && rm -rf $BUILD/$1 +NV_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`" +[ -d $PKG_BUILD ] && rm -rf $PKG_$BUILD -sh $SOURCES/$1/$NV_PKG --extract-only --target $BUILD/$1 +sh $SOURCES/$1/$NV_PKG --extract-only --target $PKG_$BUILD echo "### Applying upstream patches ###" for patch in `ls $PKG_DIR/patches.upstream`; do cat $PKG_DIR/patches.upstream/$patch | patch -d \ - `echo $BUILD/$1 | cut -f1 -d\ ` -p1 + `echo $PKG_BUILD | cut -f1 -d\ ` -p1 done diff --git a/packages/x11/driver/xf86-video-nvidia/url b/packages/x11/driver/xf86-video-nvidia/url deleted file mode 100644 index cd152909e2..0000000000 --- a/packages/x11/driver/xf86-video-nvidia/url +++ /dev/null @@ -1,2 +0,0 @@ -ftp://download.nvidia.com/XFree86/Linux-x86/256.35/NVIDIA-Linux-x86-256.35.run -ftp://download.nvidia.com/XFree86/Linux-x86_64/256.35/NVIDIA-Linux-x86_64-256.35-no-compat32.run \ No newline at end of file