From 0dbe80be8e636337e7033fcffcc1de4fa9f392db Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 5 Apr 2015 20:40:00 -0700 Subject: [PATCH] Revert "remove package: xf86-video-nvidia-legacy" This reverts commit fcf23bcf04e7c491fa6586c02946c2511857343d. --- .../config/xorg-nvidia.conf | 33 ++++++++ .../xf86-video-nvidia-legacy/package.mk | 80 +++++++++++++++++++ ...xf86-video-nvidia-legacy-kernel-3.19.patch | 30 +++++++ 3 files changed, 143 insertions(+) create mode 100644 packages/x11/driver/xf86-video-nvidia-legacy/config/xorg-nvidia.conf create mode 100644 packages/x11/driver/xf86-video-nvidia-legacy/package.mk create mode 100644 packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-kernel-3.19.patch diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/config/xorg-nvidia.conf b/packages/x11/driver/xf86-video-nvidia-legacy/config/xorg-nvidia.conf new file mode 100644 index 0000000000..cd1c69a439 --- /dev/null +++ b/packages/x11/driver/xf86-video-nvidia-legacy/config/xorg-nvidia.conf @@ -0,0 +1,33 @@ +Section "Device" + Identifier "nvidia" + Driver "nvidia" + Option "DynamicTwinView" "False" + Option "NoFlip" "false" + Option "NoLogo" "true" + Option "ConnectToAcpid" "0" + Option "ModeValidation" "NoVesaModes, NoXServerModes" + Option "HWCursor" "false" + # To put Xorg in debug mode change "false" to "true" in the line below: + Option "ModeDebug" "false" + # To use a local edid.bin file uncomment the 4 lines below (change DFP-0 to match your card) +# Option "ConnectedMonitor" "DFP-0" +# Option "CustomEDID" "DFP-0:/storage/.config/edid.bin" +# Option "IgnoreEDID" "false" +# Option "UseEDID" "true" +EndSection + +Section "Screen" + Identifier "screen" + Device "nvidia" + DefaultDepth 24 + Option "ColorRange" "Full" +# Option "ColorRange" "Limited" +# Option "ColorSpace" "RGB" + SubSection "Display" + Depth 24 + EndSubSection +EndSection + +Section "Extensions" + Option "Composite" "false" +EndSection diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/package.mk b/packages/x11/driver/xf86-video-nvidia-legacy/package.mk new file mode 100644 index 0000000000..ab2f06994b --- /dev/null +++ b/packages/x11/driver/xf86-video-nvidia-legacy/package.mk @@ -0,0 +1,80 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) +# +# OpenELEC is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# OpenELEC is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC. If not, see . +################################################################################ + +PKG_NAME="xf86-video-nvidia-legacy" +PKG_VERSION="304.125" +PKG_REV="1" +PKG_ARCH="x86_64" +PKG_LICENSE="nonfree" +PKG_SITE="http://www.nvidia.com/" +PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86_64/$PKG_VERSION/NVIDIA-Linux-x86_64-$PKG_VERSION-no-compat32.run" +PKG_DEPENDS_TARGET="toolchain util-macros linux xorg-server libvdpau" +PKG_NEED_UNPACK="$LINUX_DEPENDS" +PKG_PRIORITY="optional" +PKG_SECTION="x11/driver" +PKG_SHORTDESC="xf86-video-nvidia-legacy: The Xorg driver for NVIDIA video chips supporting Geforce 6 and Geforce 7 devices too" +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" +PKG_AUTORECONF="no" + +unpack() { + NV_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`" + [ -d $PKG_BUILD ] && rm -rf $PKG_BUILD + + sh $SOURCES/$PKG_NAME/$NV_PKG --extract-only --target $BUILD/$PKG_NAME-$PKG_VERSION +} + +make_target() { + unset LDFLAGS + + cd kernel + make module CC=$CC SYSSRC=$(kernel_path) SYSOUT=$(kernel_path) + cd .. +} + +makeinstall_target() { + mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers + cp -P 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 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 libnvidia-glcore.so.$PKG_VERSION $INSTALL/usr/lib + cp -P libnvidia-ml.so.$PKG_VERSION $INSTALL/usr/lib + ln -sf libnvidia-ml.so.$PKG_VERSION $INSTALL/usr/lib/libnvidia-ml.so.1 + cp -P tls/libnvidia-tls.so.$PKG_VERSION $INSTALL/usr/lib + # rename to not conflicting with Mesa libGL.so + cp -P libGL.so* $INSTALL/usr/lib/libGL_nvidia.so.1 + + mkdir -p $INSTALL/lib/modules/$(get_module_dir)/nvidia + cp kernel/nvidia.ko $INSTALL/lib/modules/$(get_module_dir)/nvidia + + mkdir -p $INSTALL/usr/bin + cp nvidia-smi $INSTALL/usr/bin + cp nvidia-xconfig $INSTALL/usr/bin + + mkdir -p $INSTALL/usr/lib/vdpau + cp libvdpau_nvidia.so* $INSTALL/usr/lib/vdpau/libvdpau_nvidia.so.1 + ln -sf libvdpau_nvidia.so.1 $INSTALL/usr/lib/vdpau/libvdpau_nvidia.so +} diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-kernel-3.19.patch b/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-kernel-3.19.patch new file mode 100644 index 0000000000..02036168dd --- /dev/null +++ b/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-kernel-3.19.patch @@ -0,0 +1,30 @@ +diff -Naur xf86-video-nvidia-legacy-304.125/kernel/nv.c xf86-video-nvidia-legacy-304.125.patch/kernel/nv.c +--- xf86-video-nvidia-legacy-304.125/kernel/nv.c 2014-12-02 04:55:59.000000000 +0100 ++++ xf86-video-nvidia-legacy-304.125.patch/kernel/nv.c 2015-02-11 19:07:09.844431593 +0100 +@@ -17,7 +17,7 @@ + #include "rmil.h" + + #if defined(MODULE_LICENSE) +-MODULE_LICENSE("NVIDIA"); ++MODULE_LICENSE("GPL\0NVIDIA"); + #endif + #if defined(MODULE_INFO) + MODULE_INFO(supported, "external"); +@@ -2026,7 +2026,7 @@ + unsigned long i_arg + ) + { +- return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg); ++ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg); + } + + long nv_kern_compat_ioctl( +@@ -2035,7 +2035,7 @@ + unsigned long i_arg + ) + { +- return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg); ++ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg); + } + + /*