diff --git a/packages/x11/driver/xf86-video-nvidia/package.mk b/packages/x11/driver/xf86-video-nvidia/package.mk index 5b6d51ae2c..b4bffc6e5b 100644 --- a/packages/x11/driver/xf86-video-nvidia/package.mk +++ b/packages/x11/driver/xf86-video-nvidia/package.mk @@ -6,8 +6,8 @@ PKG_NAME="xf86-video-nvidia" # Remember to run "python packages/x11/driver/xf86-video-nvidia/scripts/make_nvidia_udev.py" and commit changes to # "packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules" whenever bumping version. # Host may require installation of python-lxml and python-requests packages. -PKG_VERSION="390.87" -PKG_SHA256="c7c07151e17f610af11f7870560d96c3a3ee9bb91ba1bb82fcc7b5d473d40b66" +PKG_VERSION="410.66" +PKG_SHA256="c4e297ed93341841c7ccb32569c179baecbb6ea253215cbc3668a51d729227cd" PKG_ARCH="x86_64" PKG_LICENSE="nonfree" PKG_SITE="http://www.nvidia.com/" @@ -39,7 +39,9 @@ makeinstall_target() { 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 + cp -P libGLX.so* $INSTALL/$XORG_PATH_MODULES/extensions/libglx_nvidia.so + cp -P libglxserver_nvidia.so.$PKG_VERSION $INSTALL/$XORG_PATH_MODULES/extensions + ln -s libglxserver_nvidia.so.$PKG_VERSION $INSTALL/$XORG_PATH_MODULES/extensions/libglxserver_nvidia.so mkdir -p $INSTALL/etc/X11 cp $PKG_DIR/config/*.conf $INSTALL/etc/X11 @@ -49,6 +51,7 @@ makeinstall_target() { cp -P libnvidia-ml.so.$PKG_VERSION $INSTALL/usr/lib ln -sf /var/lib/libnvidia-ml.so.1 $INSTALL/usr/lib/libnvidia-ml.so.1 cp -P tls/libnvidia-tls.so.$PKG_VERSION $INSTALL/usr/lib + cp -P libGLdispatch.so.* $INSTALL/usr/lib # rename to not conflicting with Mesa libGL.so cp -P libGL.so.$PKG_VERSION $INSTALL/usr/lib/libGL_nvidia.so.1 diff --git a/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules b/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules index 72a48e5590..fc037b33ad 100644 --- a/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules +++ b/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules @@ -3,69 +3,6 @@ SUBSYSTEM=="pci", ATTR{class}=="0x030000", ATTRS{vendor}=="0x10de", GOTO="subsys GOTO="end_video" LABEL="subsystem_pci" -ATTRS{device}=="0x06c0", GOTO="configure_nvidia" -ATTRS{device}=="0x06c4", GOTO="configure_nvidia" -ATTRS{device}=="0x06ca", GOTO="configure_nvidia" -ATTRS{device}=="0x06cd", GOTO="configure_nvidia" -ATTRS{device}=="0x06d1", GOTO="configure_nvidia" -ATTRS{device}=="0x06d2", GOTO="configure_nvidia" -ATTRS{device}=="0x06d8", GOTO="configure_nvidia" -ATTRS{device}=="0x06d9", GOTO="configure_nvidia" -ATTRS{device}=="0x06da", GOTO="configure_nvidia" -ATTRS{device}=="0x06dc", GOTO="configure_nvidia" -ATTRS{device}=="0x06dd", GOTO="configure_nvidia" -ATTRS{device}=="0x06de", GOTO="configure_nvidia" -ATTRS{device}=="0x06df", GOTO="configure_nvidia" -ATTRS{device}=="0x0dc0", GOTO="configure_nvidia" -ATTRS{device}=="0x0dc4", GOTO="configure_nvidia" -ATTRS{device}=="0x0dc5", GOTO="configure_nvidia" -ATTRS{device}=="0x0dc6", GOTO="configure_nvidia" -ATTRS{device}=="0x0dcd", GOTO="configure_nvidia" -ATTRS{device}=="0x0dce", GOTO="configure_nvidia" -ATTRS{device}=="0x0dd1", GOTO="configure_nvidia" -ATTRS{device}=="0x0dd2", GOTO="configure_nvidia" -ATTRS{device}=="0x0dd3", GOTO="configure_nvidia" -ATTRS{device}=="0x0dd6", GOTO="configure_nvidia" -ATTRS{device}=="0x0dd8", GOTO="configure_nvidia" -ATTRS{device}=="0x0dda", GOTO="configure_nvidia" -ATTRS{device}=="0x0de0", GOTO="configure_nvidia" -ATTRS{device}=="0x0de1", GOTO="configure_nvidia" -ATTRS{device}=="0x0de2", GOTO="configure_nvidia" -ATTRS{device}=="0x0de3", GOTO="configure_nvidia" -ATTRS{device}=="0x0de4", GOTO="configure_nvidia" -ATTRS{device}=="0x0de5", GOTO="configure_nvidia" -ATTRS{device}=="0x0de7", GOTO="configure_nvidia" -ATTRS{device}=="0x0de8", GOTO="configure_nvidia" -ATTRS{device}=="0x0de9", GOTO="configure_nvidia" -ATTRS{device}=="0x0dea", GOTO="configure_nvidia" -ATTRS{device}=="0x0deb", GOTO="configure_nvidia" -ATTRS{device}=="0x0dec", GOTO="configure_nvidia" -ATTRS{device}=="0x0ded", GOTO="configure_nvidia" -ATTRS{device}=="0x0dee", GOTO="configure_nvidia" -ATTRS{device}=="0x0def", GOTO="configure_nvidia" -ATTRS{device}=="0x0df0", GOTO="configure_nvidia" -ATTRS{device}=="0x0df1", GOTO="configure_nvidia" -ATTRS{device}=="0x0df2", GOTO="configure_nvidia" -ATTRS{device}=="0x0df3", GOTO="configure_nvidia" -ATTRS{device}=="0x0df4", GOTO="configure_nvidia" -ATTRS{device}=="0x0df5", GOTO="configure_nvidia" -ATTRS{device}=="0x0df6", GOTO="configure_nvidia" -ATTRS{device}=="0x0df7", GOTO="configure_nvidia" -ATTRS{device}=="0x0df8", GOTO="configure_nvidia" -ATTRS{device}=="0x0df9", GOTO="configure_nvidia" -ATTRS{device}=="0x0dfa", GOTO="configure_nvidia" -ATTRS{device}=="0x0dfc", GOTO="configure_nvidia" -ATTRS{device}=="0x0e22", GOTO="configure_nvidia" -ATTRS{device}=="0x0e23", GOTO="configure_nvidia" -ATTRS{device}=="0x0e24", GOTO="configure_nvidia" -ATTRS{device}=="0x0e30", GOTO="configure_nvidia" -ATTRS{device}=="0x0e31", GOTO="configure_nvidia" -ATTRS{device}=="0x0e3a", GOTO="configure_nvidia" -ATTRS{device}=="0x0e3b", GOTO="configure_nvidia" -ATTRS{device}=="0x0f00", GOTO="configure_nvidia" -ATTRS{device}=="0x0f01", GOTO="configure_nvidia" -ATTRS{device}=="0x0f02", GOTO="configure_nvidia" -ATTRS{device}=="0x0f03", GOTO="configure_nvidia" ATTRS{device}=="0x0fc0", GOTO="configure_nvidia" ATTRS{device}=="0x0fc1", GOTO="configure_nvidia" ATTRS{device}=="0x0fc2", GOTO="configure_nvidia" @@ -121,41 +58,6 @@ ATTRS{device}=="0x102a", GOTO="configure_nvidia" ATTRS{device}=="0x102d", GOTO="configure_nvidia" ATTRS{device}=="0x103a", GOTO="configure_nvidia" ATTRS{device}=="0x103c", GOTO="configure_nvidia" -ATTRS{device}=="0x1040", GOTO="configure_nvidia" -ATTRS{device}=="0x1042", GOTO="configure_nvidia" -ATTRS{device}=="0x1048", GOTO="configure_nvidia" -ATTRS{device}=="0x1049", GOTO="configure_nvidia" -ATTRS{device}=="0x104a", GOTO="configure_nvidia" -ATTRS{device}=="0x104b", GOTO="configure_nvidia" -ATTRS{device}=="0x104c", GOTO="configure_nvidia" -ATTRS{device}=="0x1050", GOTO="configure_nvidia" -ATTRS{device}=="0x1051", GOTO="configure_nvidia" -ATTRS{device}=="0x1052", GOTO="configure_nvidia" -ATTRS{device}=="0x1054", GOTO="configure_nvidia" -ATTRS{device}=="0x1055", GOTO="configure_nvidia" -ATTRS{device}=="0x1056", GOTO="configure_nvidia" -ATTRS{device}=="0x1057", GOTO="configure_nvidia" -ATTRS{device}=="0x1058", GOTO="configure_nvidia" -ATTRS{device}=="0x1059", GOTO="configure_nvidia" -ATTRS{device}=="0x105a", GOTO="configure_nvidia" -ATTRS{device}=="0x105b", GOTO="configure_nvidia" -ATTRS{device}=="0x107c", GOTO="configure_nvidia" -ATTRS{device}=="0x107d", GOTO="configure_nvidia" -ATTRS{device}=="0x1080", GOTO="configure_nvidia" -ATTRS{device}=="0x1081", GOTO="configure_nvidia" -ATTRS{device}=="0x1082", GOTO="configure_nvidia" -ATTRS{device}=="0x1084", GOTO="configure_nvidia" -ATTRS{device}=="0x1086", GOTO="configure_nvidia" -ATTRS{device}=="0x1087", GOTO="configure_nvidia" -ATTRS{device}=="0x1088", GOTO="configure_nvidia" -ATTRS{device}=="0x1089", GOTO="configure_nvidia" -ATTRS{device}=="0x108b", GOTO="configure_nvidia" -ATTRS{device}=="0x1091", GOTO="configure_nvidia" -ATTRS{device}=="0x1094", GOTO="configure_nvidia" -ATTRS{device}=="0x1096", GOTO="configure_nvidia" -ATTRS{device}=="0x109a", GOTO="configure_nvidia" -ATTRS{device}=="0x109b", GOTO="configure_nvidia" -ATTRS{device}=="0x1140", GOTO="configure_nvidia" ATTRS{device}=="0x1180", GOTO="configure_nvidia" ATTRS{device}=="0x1183", GOTO="configure_nvidia" ATTRS{device}=="0x1184", GOTO="configure_nvidia" @@ -201,28 +103,6 @@ ATTRS{device}=="0x11e2", GOTO="configure_nvidia" ATTRS{device}=="0x11e3", GOTO="configure_nvidia" ATTRS{device}=="0x11fa", GOTO="configure_nvidia" ATTRS{device}=="0x11fc", GOTO="configure_nvidia" -ATTRS{device}=="0x1200", GOTO="configure_nvidia" -ATTRS{device}=="0x1201", GOTO="configure_nvidia" -ATTRS{device}=="0x1203", GOTO="configure_nvidia" -ATTRS{device}=="0x1205", GOTO="configure_nvidia" -ATTRS{device}=="0x1206", GOTO="configure_nvidia" -ATTRS{device}=="0x1207", GOTO="configure_nvidia" -ATTRS{device}=="0x1208", GOTO="configure_nvidia" -ATTRS{device}=="0x1210", GOTO="configure_nvidia" -ATTRS{device}=="0x1211", GOTO="configure_nvidia" -ATTRS{device}=="0x1212", GOTO="configure_nvidia" -ATTRS{device}=="0x1213", GOTO="configure_nvidia" -ATTRS{device}=="0x1241", GOTO="configure_nvidia" -ATTRS{device}=="0x1243", GOTO="configure_nvidia" -ATTRS{device}=="0x1244", GOTO="configure_nvidia" -ATTRS{device}=="0x1245", GOTO="configure_nvidia" -ATTRS{device}=="0x1246", GOTO="configure_nvidia" -ATTRS{device}=="0x1247", GOTO="configure_nvidia" -ATTRS{device}=="0x1248", GOTO="configure_nvidia" -ATTRS{device}=="0x1249", GOTO="configure_nvidia" -ATTRS{device}=="0x124b", GOTO="configure_nvidia" -ATTRS{device}=="0x124d", GOTO="configure_nvidia" -ATTRS{device}=="0x1251", GOTO="configure_nvidia" ATTRS{device}=="0x1280", GOTO="configure_nvidia" ATTRS{device}=="0x1281", GOTO="configure_nvidia" ATTRS{device}=="0x1282", GOTO="configure_nvidia" @@ -332,6 +212,7 @@ ATTRS{device}=="0x1b84", GOTO="configure_nvidia" ATTRS{device}=="0x1b87", GOTO="configure_nvidia" ATTRS{device}=="0x1ba0", GOTO="configure_nvidia" ATTRS{device}=="0x1ba1", GOTO="configure_nvidia" +ATTRS{device}=="0x1ba2", GOTO="configure_nvidia" ATTRS{device}=="0x1bb0", GOTO="configure_nvidia" ATTRS{device}=="0x1bb1", GOTO="configure_nvidia" ATTRS{device}=="0x1bb3", GOTO="configure_nvidia" @@ -354,6 +235,7 @@ ATTRS{device}=="0x1c09", GOTO="configure_nvidia" ATTRS{device}=="0x1c20", GOTO="configure_nvidia" ATTRS{device}=="0x1c21", GOTO="configure_nvidia" ATTRS{device}=="0x1c22", GOTO="configure_nvidia" +ATTRS{device}=="0x1c23", GOTO="configure_nvidia" ATTRS{device}=="0x1c30", GOTO="configure_nvidia" ATTRS{device}=="0x1c60", GOTO="configure_nvidia" ATTRS{device}=="0x1c61", GOTO="configure_nvidia" @@ -364,6 +246,7 @@ ATTRS{device}=="0x1c83", GOTO="configure_nvidia" ATTRS{device}=="0x1c8c", GOTO="configure_nvidia" ATTRS{device}=="0x1c8d", GOTO="configure_nvidia" ATTRS{device}=="0x1c8f", GOTO="configure_nvidia" +ATTRS{device}=="0x1c92", GOTO="configure_nvidia" ATTRS{device}=="0x1cb1", GOTO="configure_nvidia" ATTRS{device}=="0x1cb2", GOTO="configure_nvidia" ATTRS{device}=="0x1cb3", GOTO="configure_nvidia" @@ -382,7 +265,17 @@ ATTRS{device}=="0x1db4", GOTO="configure_nvidia" ATTRS{device}=="0x1db5", GOTO="configure_nvidia" ATTRS{device}=="0x1db6", GOTO="configure_nvidia" ATTRS{device}=="0x1db7", GOTO="configure_nvidia" +ATTRS{device}=="0x1db8", GOTO="configure_nvidia" ATTRS{device}=="0x1dba", GOTO="configure_nvidia" +ATTRS{device}=="0x1df5", GOTO="configure_nvidia" +ATTRS{device}=="0x1e04", GOTO="configure_nvidia" +ATTRS{device}=="0x1e07", GOTO="configure_nvidia" +ATTRS{device}=="0x1e30", GOTO="configure_nvidia" +ATTRS{device}=="0x1e82", GOTO="configure_nvidia" +ATTRS{device}=="0x1e87", GOTO="configure_nvidia" +ATTRS{device}=="0x1eb0", GOTO="configure_nvidia" +ATTRS{device}=="0x1f02", GOTO="configure_nvidia" +ATTRS{device}=="0x1f07", GOTO="configure_nvidia" GOTO="configure_nvidia-legacy" LABEL="configure_nvidia"