summary refs log tree commit diff
path: root/pkgs/os-specific/linux/evdi
diff options
context:
space:
mode:
authorAnthony Roussel <anthony@roussel.dev>2023-08-27 19:47:55 +0200
committerAnthony Roussel <anthony@roussel.dev>2023-09-21 10:15:39 +0200
commit812b1f2955400970332f1058050588288b78d675 (patch)
tree27194f116a81acb0c124a1d73cd3d209418afba9 /pkgs/os-specific/linux/evdi
parent77cbaa49185e5af87fa6f4269c0b5d287d88b468 (diff)
downloadnixpkgs-812b1f2955400970332f1058050588288b78d675.tar
nixpkgs-812b1f2955400970332f1058050588288b78d675.tar.gz
nixpkgs-812b1f2955400970332f1058050588288b78d675.tar.bz2
nixpkgs-812b1f2955400970332f1058050588288b78d675.tar.lz
nixpkgs-812b1f2955400970332f1058050588288b78d675.tar.xz
nixpkgs-812b1f2955400970332f1058050588288b78d675.tar.zst
nixpkgs-812b1f2955400970332f1058050588288b78d675.zip
linuxPackages.evdi: 1.13.1 -> 1.14.1
https://github.com/DisplayLink/evdi/compare/v1.13.1...v1.14.1
Diffstat (limited to 'pkgs/os-specific/linux/evdi')
-rw-r--r--pkgs/os-specific/linux/evdi/0000-fix-drm-path.patch31
-rw-r--r--pkgs/os-specific/linux/evdi/default.nix10
2 files changed, 4 insertions, 37 deletions
diff --git a/pkgs/os-specific/linux/evdi/0000-fix-drm-path.patch b/pkgs/os-specific/linux/evdi/0000-fix-drm-path.patch
deleted file mode 100644
index a389b73185d..00000000000
--- a/pkgs/os-specific/linux/evdi/0000-fix-drm-path.patch
+++ /dev/null
@@ -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
diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
index 71ab8bea79e..ebb6fbe2cc6 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -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;