ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-30 01:17:28 +03:00
Code Issues Projects Releases Wiki Activity

evdi: unstable-20221013 -> 1.13.1 (#239883)

Browse Source
This commit is contained in:
Jens Binkert 2023-06-27 20:45:11 +02:00 committed by GitHub
parent c287bba061
commit e30b53b990
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/os-specific/linux/evdi/0000-fix-drm-path.patch Normal file
View File

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

20
pkgs/os-specific/linux/evdi/default.nix
View File

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