From e32d4dadeeef8db012106916e4828ba7bca42894 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 24 Feb 2024 17:57:40 +0100 Subject: [PATCH] x11-drivers/evdi: add 1.14.2, drop 1.14.1 --- ...iver-5.8.0 => displaylink-driver-5.8.0-r1} | 6 +-- .../x11-drivers/{evdi-1.14.1 => evdi-1.14.2} | 4 +- ...ild => displaylink-driver-5.8.0-r1.ebuild} | 2 +- x11-drivers/evdi/Manifest | 2 +- ...{evdi-1.14.1.ebuild => evdi-1.14.2.ebuild} | 4 -- .../files/evdi-1.14.1-fix-kernel-6-6.patch | 46 ------------------- 6 files changed, 7 insertions(+), 57 deletions(-) rename metadata/md5-cache/x11-drivers/{displaylink-driver-5.8.0 => displaylink-driver-5.8.0-r1} (83%) rename metadata/md5-cache/x11-drivers/{evdi-1.14.1 => evdi-1.14.2} (86%) rename x11-drivers/displaylink-driver/{displaylink-driver-5.8.0.ebuild => displaylink-driver-5.8.0-r1.ebuild} (98%) rename x11-drivers/evdi/{evdi-1.14.1.ebuild => evdi-1.14.2.ebuild} (93%) delete mode 100644 x11-drivers/evdi/files/evdi-1.14.1-fix-kernel-6-6.patch diff --git a/metadata/md5-cache/x11-drivers/displaylink-driver-5.8.0 b/metadata/md5-cache/x11-drivers/displaylink-driver-5.8.0-r1 similarity index 83% rename from metadata/md5-cache/x11-drivers/displaylink-driver-5.8.0 rename to metadata/md5-cache/x11-drivers/displaylink-driver-5.8.0-r1 index 4a634dac..10ee6eb2 100644 --- a/metadata/md5-cache/x11-drivers/displaylink-driver-5.8.0 +++ b/metadata/md5-cache/x11-drivers/displaylink-driver-5.8.0-r1 @@ -1,15 +1,15 @@ BDEPEND=app-admin/chrpath app-arch/unzip sys-apps/grep[pcre] virtual/pkgconfig virtual/pkgconfig DEFINED_PHASES=compile install postinst postrm unpack -DEPEND=~x11-drivers/evdi-1.14.1 virtual/libusb:1 +DEPEND=>=x11-drivers/evdi-1.14.1 virtual/libusb:1 DESCRIPTION=DisplayLink USB Graphics Software EAPI=8 HOMEPAGE=https://www.synaptics.com/products/displaylink-graphics INHERIT=systemd udev KEYWORDS=~amd64 LICENSE=DisplayLink-EULA -RDEPEND=~x11-drivers/evdi-1.14.1 virtual/libusb:1 +RDEPEND=>=x11-drivers/evdi-1.14.1 virtual/libusb:1 RESTRICT=mirror bindist SLOT=0 SRC_URI=https://www.synaptics.com/sites/default/files/exe_files/2023-08/DisplayLink%20USB%20Graphics%20Software%20for%20Ubuntu5.8-EXE.zip -> displaylink-driver-5.8.0.zip _eclasses_=toolchain-funcs e56c7649b804f051623c8bc1a1c44084 multilib c19072c3cd7ac5cb21de013f7e9832e0 systemd c8b03e8df84486aa991d4396686e8942 udev eec0bbab06977f1cfc5597269c1fa152 -_md5_=df41852633cb69556161294c13584a3c +_md5_=a08b2914e4d65b4201e09d66a02da75f diff --git a/metadata/md5-cache/x11-drivers/evdi-1.14.1 b/metadata/md5-cache/x11-drivers/evdi-1.14.2 similarity index 86% rename from metadata/md5-cache/x11-drivers/evdi-1.14.1 rename to metadata/md5-cache/x11-drivers/evdi-1.14.2 index 0107daaf..4a0e3950 100644 --- a/metadata/md5-cache/x11-drivers/evdi-1.14.1 +++ b/metadata/md5-cache/x11-drivers/evdi-1.14.2 @@ -11,6 +11,6 @@ KEYWORDS=~amd64 LICENSE=GPL-2 LGPL-2.1 RDEPEND=x11-libs/libdrm sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) SLOT=0 -SRC_URI=https://github.com/DisplayLink/evdi/archive/v1.14.1.tar.gz -> evdi-1.14.1.tar.gz +SRC_URI=https://github.com/DisplayLink/evdi/archive/v1.14.2.tar.gz -> evdi-1.14.2.tar.gz _eclasses_=toolchain-funcs e56c7649b804f051623c8bc1a1c44084 multilib c19072c3cd7ac5cb21de013f7e9832e0 dist-kernel-utils 145861da258122cbba5240a850f1a5e8 edo c0eb9cbe6b0bd01fcb4918f12598a4d3 linux-info c4f1201b96a8a2c1f3b86cc8b2c71c91 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe linux-mod-r1 137b318f89f77c2b66124fcc7790737a -_md5_=cf8164dbfceb212929d1646be3382f56 +_md5_=d3165ce2139402813d5baa15fe373ce8 diff --git a/x11-drivers/displaylink-driver/displaylink-driver-5.8.0.ebuild b/x11-drivers/displaylink-driver/displaylink-driver-5.8.0-r1.ebuild similarity index 98% rename from x11-drivers/displaylink-driver/displaylink-driver-5.8.0.ebuild rename to x11-drivers/displaylink-driver/displaylink-driver-5.8.0-r1.ebuild index 8d2ae871..90a6a30c 100644 --- a/x11-drivers/displaylink-driver/displaylink-driver-5.8.0.ebuild +++ b/x11-drivers/displaylink-driver/displaylink-driver-5.8.0-r1.ebuild @@ -18,7 +18,7 @@ SLOT="0" KEYWORDS="~amd64" DEPEND=" - ~x11-drivers/evdi-1.14.1 + >=x11-drivers/evdi-1.14.1 virtual/libusb:1 " RDEPEND="${DEPEND}" diff --git a/x11-drivers/evdi/Manifest b/x11-drivers/evdi/Manifest index 460f7bae..c4fb1793 100644 --- a/x11-drivers/evdi/Manifest +++ b/x11-drivers/evdi/Manifest @@ -1 +1 @@ -DIST evdi-1.14.1.tar.gz 80554 BLAKE2B 4e574b9722050221603007b730efd31dc5c93e4a4fabaf369e47444d59b8a8a031004561c53daa25a239666da6f8e499ebf8d949b39ac8eecea5e610ffb26945 SHA512 a4eee90a395856b524b596989c24637cb328ddabc841d3f5a0d14fc0481f1c288a164d97cf9bb448c8dbae64a6b264425d793185625a5503726d396d91975c3f +DIST evdi-1.14.2.tar.gz 87688 BLAKE2B 6bef81459e5c2c6e74261e01deeb71e461159c766bc43be82af22c89b0a7a616125ee1943659df3fbc8b38723e2de81d58488fd5a9e9ea1de5b6e165062540e0 SHA512 27c516c14b9503528da5c04d8f318fc1c21a1692e72da860feb96957b13f437da9ed000b045b3e4ef1109cba7ca0fd7813c32f00c74f71419ecf50a58ca957eb diff --git a/x11-drivers/evdi/evdi-1.14.1.ebuild b/x11-drivers/evdi/evdi-1.14.2.ebuild similarity index 93% rename from x11-drivers/evdi/evdi-1.14.1.ebuild rename to x11-drivers/evdi/evdi-1.14.2.ebuild index 39315f2e..2dccedf5 100644 --- a/x11-drivers/evdi/evdi-1.14.1.ebuild +++ b/x11-drivers/evdi/evdi-1.14.2.ebuild @@ -18,10 +18,6 @@ RDEPEND="${DEPEND}" CONFIG_CHECK="~FB_VIRTUAL ~I2C DRM ~USB_SUPPORT USB_ARCH_HAS_HCD" -PATCHES=( - "${FILESDIR}"/${P}-fix-kernel-6-6.patch -) - src_compile() { local modlist=( evdi=video:"${S}/module" ) linux-mod-r1_src_compile diff --git a/x11-drivers/evdi/files/evdi-1.14.1-fix-kernel-6-6.patch b/x11-drivers/evdi/files/evdi-1.14.1-fix-kernel-6-6.patch deleted file mode 100644 index 38b6cbc7..00000000 --- a/x11-drivers/evdi/files/evdi-1.14.1-fix-kernel-6-6.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b0e78c2170c5f41b0b20f3a4b7a20a9df5fdea27 Mon Sep 17 00:00:00 2001 -From: Alex Biddulph -Date: Wed, 15 Nov 2023 08:59:44 +1100 -Subject: [PATCH] Resolve compiler errors when compiling against Linux Kernel - 6.6. - -Specifically, the changes made are: - - drm_gem_prime_fd_to_handle and drm_gem_prime_handle_to_fd are no longer exported as these are the defaults, so .prime_fd_to_handle and .prime_handle_to_fd no longer need to be set. - - FBINFO_DEFAULT is no longer defined as it was defined as 0 and this is the default value (assuming the info struct is zero initialised) ---- - module/evdi_drm_drv.c | 4 ++++ - module/evdi_fb.c | 2 ++ - 2 files changed, 6 insertions(+) - -diff --git a/module/evdi_drm_drv.c b/module/evdi_drm_drv.c -index 09a9da0..b51bf2f 100644 ---- a/module/evdi_drm_drv.c -+++ b/module/evdi_drm_drv.c -@@ -124,9 +124,13 @@ static struct drm_driver driver = { - - .fops = &evdi_driver_fops, - -+#if KERNEL_VERSION(6, 6, 0) > LINUX_VERSION_CODE - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, -+#endif - .gem_prime_import = drm_gem_prime_import, -+#if KERNEL_VERSION(6, 6, 0) > LINUX_VERSION_CODE - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, -+#endif - #if KERNEL_VERSION(5, 11, 0) <= LINUX_VERSION_CODE || defined(EL8) - #else - .preclose = evdi_driver_preclose, -diff --git a/module/evdi_fb.c b/module/evdi_fb.c -index 3789b33..3ae2ef6 100644 ---- a/module/evdi_fb.c -+++ b/module/evdi_fb.c -@@ -418,7 +418,9 @@ static int evdifb_create(struct drm_fb_helper *helper, - info->fix.smem_start = (unsigned long)efbdev->efb.obj->vmapping; - - #if KERNEL_VERSION(4, 20, 0) <= LINUX_VERSION_CODE || defined(EL8) -+#ifdef FBINFO_DEFAULT - info->flags = FBINFO_DEFAULT; -+#endif - #else - info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT; - #endif