Merge pull request #251820 from anthonyroussel/displaylink
displaylink: 5.7.0-61.129 -> 5.8.0-63.33
This commit is contained in:
commit
abf66d34a1
|
@ -8,7 +8,9 @@
|
|||
, makeWrapper
|
||||
, requireFile
|
||||
, substituteAll
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
let
|
||||
arch =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then "x64"
|
||||
|
@ -20,22 +22,22 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "displaylink";
|
||||
version = "5.7.0-61.129";
|
||||
version = "5.8.0-63.33";
|
||||
|
||||
src = requireFile rec {
|
||||
name = "displaylink-570.zip";
|
||||
sha256 = "807f1c203ac1e71c6f1f826493b9bb32e277f07cb2cf48537bf8cfdc68dd1515";
|
||||
name = "displaylink-580.zip";
|
||||
sha256 = "05m8vm6i9pc9pmvar021lw3ls60inlmq92nling0vj28skm55i92";
|
||||
message = ''
|
||||
In order to install the DisplayLink drivers, you must first
|
||||
comply with DisplayLink's EULA and download the binaries and
|
||||
sources from here:
|
||||
|
||||
https://www.synaptics.com/products/displaylink-graphics/downloads/ubuntu-5.7
|
||||
https://www.synaptics.com/products/displaylink-graphics/downloads/ubuntu-5.8
|
||||
|
||||
Once you have downloaded the file, please use the following
|
||||
commands and re-run the installation:
|
||||
|
||||
mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu5.7-EXE.zip" \$PWD/${name}
|
||||
mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu5.8-EXE.zip" \$PWD/${name}
|
||||
nix-prefetch-url file://\$PWD/${name}
|
||||
'';
|
||||
};
|
||||
|
@ -67,6 +69,12 @@ stdenv.mkDerivation rec {
|
|||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit (nixosTests) displaylink;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux";
|
||||
homepage = "https://www.displaylink.com/";
|
||||
|
@ -74,5 +82,6 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ abbradar ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
hydraPlatforms = [];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,31 +0,0 @@
|
|||
diff --git a/module/Makefile b/module/Makefile
|
||||
index fe573de..c8022c8 100644
|
||||
--- a/module/Makefile
|
||||
+++ b/module/Makefile
|
||||
@@ -50,7 +50,7 @@ ifneq ($(KERNELRELEASE),)
|
||||
# inside kbuild
|
||||
# Note: this can be removed once it is in kernel tree and Kconfig is properly used
|
||||
CONFIG_DRM_EVDI := m
|
||||
-ccflags-y := -isystem include/uapi/drm include/drm $(CFLAGS) $(EL8FLAG) $(EL9FLAG) $(RPIFLAG)
|
||||
+ccflags-y := -isystem include/uapi/drm $(CFLAGS) $(EL8FLAG) $(EL9FLAG) $(RPIFLAG)
|
||||
evdi-y := evdi_platform_drv.o evdi_platform_dev.o evdi_sysfs.o evdi_modeset.o evdi_connector.o evdi_encoder.o evdi_drm_drv.o evdi_fb.o evdi_gem.o evdi_painter.o evdi_params.o evdi_cursor.o evdi_debug.o evdi_i2c.o
|
||||
evdi-$(CONFIG_COMPAT) += evdi_ioc32.o
|
||||
obj-$(CONFIG_DRM_EVDI) := evdi.o
|
||||
diff --git a/module/evdi_drm.h b/module/evdi_drm.h
|
||||
index 29b8427..5012693 100644
|
||||
--- a/module/evdi_drm.h
|
||||
+++ b/module/evdi_drm.h
|
||||
@@ -12,12 +12,11 @@
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#include <linux/types.h>
|
||||
+#include <drm/drm.h>
|
||||
#else
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
|
||||
-#include "drm.h"
|
||||
-
|
||||
/* Output events sent from driver to evdi lib */
|
||||
#define DRM_EVDI_EVENT_UPDATE_READY 0x80000000
|
||||
#define DRM_EVDI_EVENT_DPMS 0x80000001
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, kernel, libdrm, python3 }:
|
||||
|
||||
let
|
||||
python3WithLibs = python3.withPackages (ps: with ps; [
|
||||
pybind11
|
||||
|
@ -6,13 +7,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evdi";
|
||||
version = "1.13.1";
|
||||
version = "1.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DisplayLink";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Or4hhnFOtC8vmB4kFUHbFHn2wg/NsUMY3d2Tiea6YbY=";
|
||||
hash = "sha256-em3Y56saB7K3Wr31Y0boc38xGb57gdveN0Cstgy8y20=";
|
||||
};
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare";
|
||||
|
@ -35,11 +36,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches = [
|
||||
./0000-fix-drm-path.patch
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/DisplayLink/evdi/releases/tag/v${version}";
|
||||
description = "Extensible Virtual Display Interface";
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
|
|
Loading…
Reference in a new issue