From e30b53b990354deb1a18f186dc5130c1525ef718 Mon Sep 17 00:00:00 2001 From: Jens Binkert Date: Tue, 27 Jun 2023 20:45:11 +0200 Subject: [PATCH] evdi: unstable-20221013 -> 1.13.1 (#239883) --- .../linux/evdi/0000-fix-drm-path.patch | 31 +++++++++++++++++++ pkgs/os-specific/linux/evdi/default.nix | 20 ++++++++---- 2 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 pkgs/os-specific/linux/evdi/0000-fix-drm-path.patch diff --git a/pkgs/os-specific/linux/evdi/0000-fix-drm-path.patch b/pkgs/os-specific/linux/evdi/0000-fix-drm-path.patch new file mode 100644 index 000000000000..a389b73185dd --- /dev/null +++ b/pkgs/os-specific/linux/evdi/0000-fix-drm-path.patch @@ -0,0 +1,31 @@ +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 ++#include + #else + #include + #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 f8f4f400ade2..18b53e540d11 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -1,21 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, kernel, libdrm }: - +{ lib, stdenv, fetchFromGitHub, kernel, libdrm, python3 }: +let + python3WithLibs = python3.withPackages (ps: with ps; [ + pybind11 + ]); +in stdenv.mkDerivation rec { pname = "evdi"; - version = "unstable-2022-10-13"; + version = "1.13.1"; src = fetchFromGitHub { owner = "DisplayLink"; repo = pname; - rev = "bdc258b25df4d00f222fde0e3c5003bf88ef17b5"; - hash = "sha256-mt+vEp9FFf7smmE2PzuH/3EYl7h89RBN1zTVvv2qJ/o="; + rev = "v${version}"; + hash = "sha256-Or4hhnFOtC8vmB4kFUHbFHn2wg/NsUMY3d2Tiea6YbY="; }; env.NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare"; nativeBuildInputs = kernel.moduleBuildDependencies; - buildInputs = [ kernel libdrm ]; + buildInputs = [ kernel libdrm python3WithLibs ]; makeFlags = kernel.makeFlags ++ [ "KVER=${kernel.modDirVersion}" @@ -31,6 +35,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + patches = [ + ./0000-fix-drm-path.patch + ]; + meta = with lib; { description = "Extensible Virtual Display Interface"; maintainers = with maintainers; [ eyjhb ];