linuxPackages.evdi: 1.13.1 -> 1.14.1

https://github.com/DisplayLink/evdi/compare/v1.13.1...v1.14.1
This commit is contained in:
Anthony Roussel 2023-08-27 19:47:55 +02:00
parent 77cbaa4918
commit 812b1f2955
No known key found for this signature in database
GPG key ID: 9DC4987B1A55E75E
2 changed files with 4 additions and 37 deletions

View file

@ -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

View file

@ -1,4 +1,5 @@
{ lib, stdenv, fetchFromGitHub, kernel, libdrm, python3 }: { lib, stdenv, fetchFromGitHub, kernel, libdrm, python3 }:
let let
python3WithLibs = python3.withPackages (ps: with ps; [ python3WithLibs = python3.withPackages (ps: with ps; [
pybind11 pybind11
@ -6,13 +7,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "evdi"; pname = "evdi";
version = "1.13.1"; version = "1.14.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "DisplayLink"; owner = "DisplayLink";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Or4hhnFOtC8vmB4kFUHbFHn2wg/NsUMY3d2Tiea6YbY="; hash = "sha256-em3Y56saB7K3Wr31Y0boc38xGb57gdveN0Cstgy8y20=";
}; };
env.NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare"; env.NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare";
@ -35,11 +36,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
patches = [
./0000-fix-drm-path.patch
];
meta = with lib; { meta = with lib; {
changelog = "https://github.com/DisplayLink/evdi/releases/tag/v${version}";
description = "Extensible Virtual Display Interface"; description = "Extensible Virtual Display Interface";
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
platforms = platforms.linux; platforms = platforms.linux;