nvidia390: update to 390.116.
This commit is contained in:
parent
17bb3d5572
commit
5f661790ea
3 changed files with 5 additions and 64 deletions
|
@ -142,7 +142,7 @@ libnvidia-gtk3.so.346.47 nvidia-gtklibs-346.47_1 ignore
|
||||||
libnvidia-glcore.so.346.47 nvidia340-libs-340.46_1 ignore
|
libnvidia-glcore.so.346.47 nvidia340-libs-340.46_1 ignore
|
||||||
libnvidia-glcore.so.390.87 nvidia390-libs-390.87_1 ignore
|
libnvidia-glcore.so.390.87 nvidia390-libs-390.87_1 ignore
|
||||||
libnvidia-glsi.so.346.72 nvidia-libs-346.72_1 ignore
|
libnvidia-glsi.so.346.72 nvidia-libs-346.72_1 ignore
|
||||||
libnvidia-fatbinaryloader.so.390.87 nvidia390-libs-390.87_1 ignore
|
libnvidia-fatbinaryloader.so.390.116 nvidia390-libs-390.116_1 ignore
|
||||||
libnvidia-fatbinaryloader.so.418.43 nvidia-libs-418.43_1 ignore
|
libnvidia-fatbinaryloader.so.418.43 nvidia-libs-418.43_1 ignore
|
||||||
libglapi.so.0 libglapi-7.11_1
|
libglapi.so.0 libglapi-7.11_1
|
||||||
libgbm.so.1 libgbm-9.0_1
|
libgbm.so.1 libgbm-9.0_1
|
||||||
|
|
|
@ -1,54 +0,0 @@
|
||||||
Source: Hoshpak
|
|
||||||
Upstream: no
|
|
||||||
Reason: mode infix was removed from the two functions in linux-4.19
|
|
||||||
--- kernel/nvidia-drm/nvidia-drm-connector.c 2018-11-06 18:13:04.524177827 +0100
|
|
||||||
+++ kernel/nvidia-drm/nvidia-drm-connector.c 2018-11-06 18:13:44.110540624 +0100
|
|
||||||
@@ -30,6 +30,8 @@
|
|
||||||
#include "nvidia-drm-utils.h"
|
|
||||||
#include "nvidia-drm-encoder.h"
|
|
||||||
|
|
||||||
+#include <linux/version.h>
|
|
||||||
+
|
|
||||||
#include <drm/drm_crtc_helper.h>
|
|
||||||
|
|
||||||
#include <drm/drm_atomic.h>
|
|
||||||
@@ -226,8 +228,13 @@
|
|
||||||
|
|
||||||
|
|
||||||
if (nv_connector->edid != NULL) {
|
|
||||||
- drm_mode_connector_update_edid_property(
|
|
||||||
- connector, nv_connector->edid);
|
|
||||||
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
|
|
||||||
+ drm_mode_connector_update_edid_property(
|
|
||||||
+ connector, nv_connector->edid);
|
|
||||||
+ #else
|
|
||||||
+ drm_connector_update_edid_property(
|
|
||||||
+ connector, nv_connector->edid);
|
|
||||||
+ #endif
|
|
||||||
}
|
|
||||||
|
|
||||||
while (1) {
|
|
||||||
--- kernel/nvidia-drm/nvidia-drm-encoder.c 2018-11-06 18:12:59.580066311 +0100
|
|
||||||
+++ kernel/nvidia-drm/nvidia-drm-encoder.c 2018-11-06 18:13:28.428920260 +0100
|
|
||||||
@@ -30,6 +30,8 @@
|
|
||||||
#include "nvidia-drm-connector.h"
|
|
||||||
#include "nvidia-drm-crtc.h"
|
|
||||||
|
|
||||||
+#include <linux/version.h>
|
|
||||||
+
|
|
||||||
#include <drm/drm_crtc_helper.h>
|
|
||||||
|
|
||||||
#include <drm/drm_atomic.h>
|
|
||||||
@@ -216,7 +218,11 @@
|
|
||||||
|
|
||||||
/* Attach encoder and connector */
|
|
||||||
|
|
||||||
- ret = drm_mode_connector_attach_encoder(connector, encoder);
|
|
||||||
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
|
|
||||||
+ ret = drm_mode_connector_attach_encoder(connector, encoder);
|
|
||||||
+ #else
|
|
||||||
+ ret = drm_connector_attach_encoder(connector, encoder);
|
|
||||||
+ #endif
|
|
||||||
|
|
||||||
if (ret != 0) {
|
|
||||||
NV_DRM_DEV_LOG_ERR(
|
|
|
@ -3,8 +3,8 @@
|
||||||
_desc="NVIDIA drivers (GeForce 400, 500 series)"
|
_desc="NVIDIA drivers (GeForce 400, 500 series)"
|
||||||
|
|
||||||
pkgname=nvidia390
|
pkgname=nvidia390
|
||||||
version=390.87
|
version=390.116
|
||||||
revision=2
|
revision=1
|
||||||
maintainer="Juan RP <xtraeme@voidlinux.org>"
|
maintainer="Juan RP <xtraeme@voidlinux.org>"
|
||||||
license="Proprietary NVIDIA license"
|
license="Proprietary NVIDIA license"
|
||||||
homepage="http://www.nvidia.com"
|
homepage="http://www.nvidia.com"
|
||||||
|
@ -24,11 +24,11 @@ build_options_default="glvnd"
|
||||||
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
|
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
|
||||||
_pkg="NVIDIA-Linux-x86-${version}"
|
_pkg="NVIDIA-Linux-x86-${version}"
|
||||||
distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run"
|
distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run"
|
||||||
checksum=5c29c5f9d80a07ea71219c6323fe5fc9b7577847b970f23161685d4b890b9966
|
checksum=13133f07e8c733eeca9f78decbcd17754f37f84b9038c8b235f9e89b52fc5b29
|
||||||
else
|
else
|
||||||
_pkg="NVIDIA-Linux-x86_64-${version}-no-compat32"
|
_pkg="NVIDIA-Linux-x86_64-${version}-no-compat32"
|
||||||
distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
|
distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
|
||||||
checksum=c7c07151e17f610af11f7870560d96c3a3ee9bb91ba1bb82fcc7b5d473d40b66
|
checksum=de85a2eea39ca16e25645b345259b01fbe858b833286b7e6785afa273009ef6f
|
||||||
fi
|
fi
|
||||||
|
|
||||||
subpackages="nvidia390-gtklibs nvidia390-dkms nvidia390-opencl nvidia390-libs"
|
subpackages="nvidia390-gtklibs nvidia390-dkms nvidia390-opencl nvidia390-libs"
|
||||||
|
@ -40,11 +40,6 @@ do_extract() {
|
||||||
rm -f ${_pkg}.run
|
rm -f ${_pkg}.run
|
||||||
}
|
}
|
||||||
|
|
||||||
do_configure() {
|
|
||||||
cd ${_pkg}
|
|
||||||
patch -p0 < ${FILESDIR}/kernel-4.19.patch
|
|
||||||
}
|
|
||||||
|
|
||||||
pre_install() {
|
pre_install() {
|
||||||
cd ${_pkg}
|
cd ${_pkg}
|
||||||
cp nvidia_icd.json.template nvidia_icd.json
|
cp nvidia_icd.json.template nvidia_icd.json
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue