diff --git a/packages/x11/driver/xf86-video-nvidia/meta b/packages/x11/driver/xf86-video-nvidia/meta index 4863346a82..577eb827a5 100644 --- a/packages/x11/driver/xf86-video-nvidia/meta +++ b/packages/x11/driver/xf86-video-nvidia/meta @@ -1,5 +1,5 @@ PKG_NAME="xf86-video-nvidia" -PKG_VERSION="256.53" +PKG_VERSION="260.19.21" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="nonfree" diff --git a/packages/x11/driver/xf86-video-nvidia/meta.new b/packages/x11/driver/xf86-video-nvidia/meta.new deleted file mode 100644 index 8ceb814f5f..0000000000 --- a/packages/x11/driver/xf86-video-nvidia/meta.new +++ /dev/null @@ -1,16 +0,0 @@ -PKG_NAME="xf86-video-nvidia" -PKG_VERSION="260.19.12" -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/patches.upstream/NVIDIA-256.44-2.6.36-0.1.diff b/packages/x11/driver/xf86-video-nvidia/patches.upstream/NVIDIA-256.44-2.6.36-0.1.diff deleted file mode 100644 index cf5ed96d9b..0000000000 --- a/packages/x11/driver/xf86-video-nvidia/patches.upstream/NVIDIA-256.44-2.6.36-0.1.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur NVIDIA-Linux-x86_64-256.53-no-compat32/kernel/nv.c NVIDIA-Linux-x86_64-256.53-no-compat32.patch/kernel/nv.c ---- NVIDIA-Linux-x86_64-256.53-no-compat32/kernel/nv.c 2010-08-28 05:28:03.000000000 +0200 -+++ NVIDIA-Linux-x86_64-256.53-no-compat32.patch/kernel/nv.c 2010-10-27 13:30:54.202322884 +0200 -@@ -423,7 +423,6 @@ - static struct file_operations nv_fops = { - .owner = THIS_MODULE, - .poll = nv_kern_poll, -- .ioctl = nv_kern_ioctl, - #if defined(HAVE_UNLOCKED_IOCTL) - .unlocked_ioctl = nv_kern_unlocked_ioctl, - #endif